Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/Metabor/Callback/Composite.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ public function __invoke(mixed ...$args): mixed

public function attach(CallbackInterface $callback): void
{
$this->callbacks->attach($callback);
$this->callbacks->offsetSet($callback, null);
}

public function detach(CallbackInterface $callback): void
{
$this->callbacks->detach($callback);
$this->callbacks->offsetUnset($callback);
}

public function getIterator(): \Traversable
Expand Down
4 changes: 2 additions & 2 deletions src/Metabor/Event/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ public function getName(): string

public function attach(\SplObserver $observer): void
{
$this->observers->attach($observer);
$this->observers->offsetSet($observer, null);
}

public function detach(\SplObserver $observer): void
{
$this->observers->detach($observer);
$this->observers->offsetUnset($observer);
}

public function notify(): void
Expand Down
4 changes: 2 additions & 2 deletions src/Metabor/KeyValue/Composite.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ public function __construct()

public function attach(\ArrayAccess $keyValue): void
{
$this->container->attach($keyValue);
$this->container->offsetSet($keyValue, null);
}

public function detach(\ArrayAccess $keyValue): void
{
$this->container->detach($keyValue);
$this->container->offsetUnset($keyValue);
}

public function offsetExists(mixed $offset): bool
Expand Down
4 changes: 2 additions & 2 deletions src/Metabor/Observer/Subject.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ public function __construct()

public function attach(\SplObserver $observer): void
{
$this->observers->attach($observer);
$this->observers->offsetSet($observer, null);
}

public function detach(\SplObserver $observer): void
{
$this->observers->detach($observer);
$this->observers->offsetUnset($observer);
}

public function notify(): void
Expand Down
4 changes: 2 additions & 2 deletions src/Metabor/Statemachine/Factory/Factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ public function setTransitonSelector(TransitionSelectorInterface $transitionSele

public function attachStatemachineObserver(\SplObserver $observer): void
{
$this->statemachineObserver->attach($observer);
$this->statemachineObserver->offsetSet($observer, null);
}

public function detachStatemachineObserver(\SplObserver $observer): void
{
$this->statemachineObserver->detach($observer);
$this->statemachineObserver->offsetUnset($observer);
}

public function getStatemachineObserver(): \Traversable
Expand Down
4 changes: 2 additions & 2 deletions src/Metabor/Statemachine/Graph/GraphBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ public function setStateLayout($flag, $value, array $layout)
*/
public function attachLayoutCallback(Callback $callback)
{
$this->layoutCallback->attach($callback);
$this->layoutCallback->offsetSet($callback, null);
}

/**
* @param Callback $callback
*/
public function detachLayoutCallback(Callback $callback)
{
$this->layoutCallback->detach($callback);
$this->layoutCallback->offsetUnset($callback);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Metabor/Statemachine/Observer/SubjectHasUpdated.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ class SubjectHasUpdated extends \SplObjectStorage implements \SplObserver
public function update(\SplSubject $subject): void
{
if ($subject instanceof StatemachineInterface) {
$this->attach($subject->getSubject());
$this->offsetSet($subject->getSubject(), null);
} else {
$this->attach($subject);
$this->offsetSet($subject, null);
}
}
}
2 changes: 1 addition & 1 deletion src/Metabor/Statemachine/State.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function getTransitions(): \Traversable

public function addTransition(TransitionInterface $transition): void
{
$this->transitions->attach($transition);
$this->transitions->offsetSet($transition, null);
$eventName = $transition->getEventName();
if ($eventName) {
$this->getEvent($eventName);
Expand Down
4 changes: 2 additions & 2 deletions tests/Metabor/KeyValue/FilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ public function testFiltersArrayAccessObjectsByCriteria(): void
$iterator = new \SplObjectStorage();
$keyValue1 = new \ArrayIterator();
$keyValue1[$key] = $value1;
$iterator->attach($keyValue1);
$iterator->offsetSet($keyValue1, null);
$keyValue2 = new \ArrayIterator();
$keyValue2[$key] = $value2;
$iterator->attach($keyValue2);
$iterator->offsetSet($keyValue2, null);

$criteria = new Criteria(array($key => $value1));
$filtered = new Filter($iterator, $criteria);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public function testFiltersAllNotActiveTransitions(): void

$transitions = new \SplObjectStorage();
$transitionActive = $this->createTransition(true, $subject, $context, $event);
$transitions->attach($transitionActive);
$transitions->offsetSet($transitionActive, null);
$transitionNotActive = $this->createTransition(false, $subject, $context, $event);
$transitions->attach($transitionNotActive);
$transitions->offsetSet($transitionNotActive, null);

$filteredTransitions = new ActiveTransitionFilter($transitions, $subject, $context, $event);
$this->assertContains($transitionActive, $filteredTransitions);
Expand Down