Skip to content

maintenance(#629): identifier migrated as string #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nio-dtp merged 1 commit into from
Mar 9, 2026
Merged

maintenance(#629): identifier migrated as string #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Model/Component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function createFromHashMigrated(string $hash): ComponentInterface
}

$model = array_shift($data);
$identifier = json_decode(array_shift($data), true);
$identifier = array_shift($data);

$this->setModel($model);
$this->setIdentifier($identifier);
Expand Down Expand Up @@ -145,7 +145,9 @@ public function setIdentifier($identifier)
}

$this->identifier = $identifier;
$this->identifierMigrated = json_encode($identifier);

$identifierMigrated = is_array($identifier) ? (string) reset($identifier) : $identifier;
$this->identifierMigrated = $identifierMigrated;

if (null !== $this->getModel()) {
$this->buildHash();
Expand Down
3 changes: 2 additions & 1 deletion src/Model/HashTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ public function buildHash()
} elseif (!is_array($identifier)) {
throw new \InvalidArgumentException('Identifier must be a scalar or an array');
}
$identifierMigrated = is_array($identifier) ? (string) reset($identifier) : $identifier;

$this->hashMigrated = $model.'##'.json_encode($identifier);
$this->hashMigrated = $model.'##'.$identifierMigrated;
}

/**
Expand Down
18 changes: 6 additions & 12 deletions tests/units/Spy/Timeline/Model/Component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ public function testBuildHash()
->and($component->setIdentifier('norris'))
->when($component->buildHash()) // should be already called on setModel or setIdentifier
->string($component->getHash())->isEqualTo('chuck#s:6:"norris";')
->string($component->getHashMigrated())->isEqualTo('chuck##"norris"')
->string($component->getHashMigrated())->isEqualTo('chuck##norris')
->and($component->setIdentifier(['norris', 'testa']))
->when($component->buildHash()) // should be already called on setModel or setIdentifier
->string($component->getHash())->isEqualTo('chuck#a:2:{i:0;s:6:"norris";i:1;s:5:"testa";}')
->string($component->getHashMigrated())->isEqualTo('chuck##["norris","testa"]')
->string($component->getHashMigrated())->isEqualTo('chuck##norris')
->and($component->setIdentifier(['norris' => 'foo', 'testa' => 1]))
->when($component->buildHash()) // should be already called on setModel or setIdentifier
->string($component->getHash())->isEqualTo('chuck#a:2:{s:6:"norris";s:3:"foo";s:5:"testa";i:1;}')
->string($component->getHashMigrated())->isEqualTo('chuck##{"norris":"foo","testa":1}')
->string($component->getHashMigrated())->isEqualTo('chuck##foo')
;
}

Expand All @@ -46,25 +46,17 @@ public function testCreateFromHash()
->string($component->getModel())->isEqualTo('model')
->string($component->getIdentifier())->isEqualTo('chuck')
// ok
->when($component->createFromHashMigrated('model##"chuck"'))
->when($component->createFromHashMigrated('model##chuck'))
->string($component->getModel())->isEqualTo('model')
->string($component->getIdentifier())->isEqualTo('chuck')
// composite
->when($component->createFromHash('model#a:2:{i:0;s:5:"chuck";i:1;s:5:"testa";}'))
->string($component->getModel())->isEqualTo('model')
->array($component->getIdentifier())->isEqualTo(array('chuck', 'testa'))
// composite
->when($component->createFromHashMigrated('model##["chuck","testa"]'))
->string($component->getModel())->isEqualTo('model')
->array($component->getIdentifier())->isEqualTo(array('chuck', 'testa'))
// composite associative
->when($component->createFromHash('chuck#a:2:{s:6:"norris";s:3:"foo";s:5:"testa";i:1;}'))
->string($component->getModel())->isEqualTo('chuck')
->array($component->getIdentifier())->isEqualTo(['norris' => 'foo', 'testa' => 1])
// composite associative
->when($component->createFromHashMigrated('model##{"norris":"foo","testa":1}'))
->string($component->getModel())->isEqualTo('model')
->array($component->getIdentifier())->isEqualTo(['norris' => 'foo', 'testa' => 1])
;
}

Expand All @@ -79,6 +71,7 @@ public function testSetModel()
->and($component->setIdentifier('norris'))
->and($component->setModel('chuck'))
->string($component->getHash())->isEqualTo('chuck#s:6:"norris";')
->string($component->getHashMigrated())->isEqualTo('chuck##norris')
;
}

Expand All @@ -93,6 +86,7 @@ public function testSetIdentifier()
->and($component->setModel('chuck'))
->and($component->setIdentifier('norris'))
->string($component->getHash())->isEqualTo('chuck#s:6:"norris";')
->string($component->getHashMigrated())->isEqualTo('chuck##norris')
;
}
}