RouteList: Countable and IteratorAggregate are deprecated

nette · Mar 25, 2020 · e23d6da · e23d6da
1 parent c2c41c2
commit e23d6da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/Application/Routers/RouteList.php b/src/Application/Routers/RouteList.php
@@ -93,8 +93,10 @@ public function getModule(): ?string
  }
 
 
+ /** @deprecated */
  public function count(): int
  {
+ trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED);
  return count($this->getRouters());
  }
 
@@ -149,8 +151,10 @@ public function offsetUnset($index): void
  }
 
 
+ /** @deprecated */
  public function getIterator(): \ArrayIterator
  {
+ trigger_error(__METHOD__ . '() is deprecated, use getRouters().', E_USER_DEPRECATED);
  return new \ArrayIterator($this->getRouters());
  }
 }
diff --git a/src/Bridges/ApplicationTracy/RoutingPanel.php b/src/Bridges/ApplicationTracy/RoutingPanel.php
@@ -100,7 +100,7 @@ private function analyse(Nette\Routing\Router $router, string $module = ''): voi
  {
  if ($router instanceof Routers\RouteList) {
  if ($router->match($this->httpRequest)) {
- foreach ($router as $subRouter) {
+ foreach ($router->getRouters() as $subRouter) {
  $this->analyse($subRouter, $module . $router->getModule());
  }
  }

diff --git a/tests/Bridges.DI/RoutingExtension.basic.phpt b/tests/Bridges.DI/RoutingExtension.basic.phpt
@@ -36,7 +36,7 @@ test(function () {
  $container = new Container1;
  $router = $container->getService('router');
  Assert::type(Nette\Application\Routers\RouteList::class, $router);
- Assert::count(2, $router);
+ @Assert::count(2, $router); // @ is deprecated
  Assert::same('index.php', $router[0]->getMask());
  Assert::same('item/<id>', $router[1]->getMask());