Add ReturnTypeWillChange (#353)

KnpLabs · Oct 13, 2021 · 5c42ee5 · 5c42ee5
1 parent f88fcfb
commit 5c42ee5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 1 deletion.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -34,6 +34,8 @@ jobs:
                       php: '7.4'
                     - description: 'No Symfony specified'
                       php: '8.0'
+                    - description: 'No Symfony specified'
+                      php: '8.1'
                     - description: 'Lowest deps'
                       php: '7.3'
                       composer_option: '--prefer-lowest'
@@ -45,6 +47,9 @@ jobs:
                     - description: 'Symfony 5.3'
                       php: '7.4'
                       symfony: 5.3.*
+                    - description: 'Symfony 5.4'
+                      php: '7.4'
+                      symfony: 5.4.x-dev
                     - description: 'Dev deps'
                       php: '8.0'
                       dev: true

diff --git a/src/Knp/Menu/Iterator/CurrentItemFilterIterator.php b/src/Knp/Menu/Iterator/CurrentItemFilterIterator.php
@@ -24,6 +24,10 @@ public function __construct(\Iterator $iterator, MatcherInterface $matcher)
         parent::__construct($iterator);
     }
 
+    /**
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
     public function accept()
     {
         return $this->matcher->isCurrent($this->current());

diff --git a/src/Knp/Menu/Iterator/DisplayedItemFilterIterator.php b/src/Knp/Menu/Iterator/DisplayedItemFilterIterator.php
@@ -7,11 +7,19 @@
  */
 class DisplayedItemFilterIterator extends \RecursiveFilterIterator
 {
+    /**
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
     public function accept()
     {
         return $this->current()->isDisplayed();
     }
 
+    /**
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
     public function hasChildren()
     {
         return $this->current()->getDisplayChildren() && parent::hasChildren();

diff --git a/src/Knp/Menu/Iterator/RecursiveItemIterator.php b/src/Knp/Menu/Iterator/RecursiveItemIterator.php
@@ -22,6 +22,10 @@ public function hasChildren(): bool
         return 0 < \count($this->current());
     }
 
+    /**
+     * @return \RecursiveIterator
+     */
+    #[\ReturnTypeWillChange]
     public function getChildren()
     {
         return new static($this->current());

diff --git a/src/Knp/Menu/MenuItem.php b/src/Knp/Menu/MenuItem.php
@@ -591,6 +591,7 @@ public function offsetExists($offset): bool
      *
      * @return ItemInterface|null
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->getChild($offset);

diff --git a/tests/Knp/Menu/Tests/Integration/Symfony/RoutingExtensionTest.php b/tests/Knp/Menu/Tests/Integration/Symfony/RoutingExtensionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Knp\Menu\Tests\Silex;
+namespace Knp\Menu\Tests\Integration\Symfony;
 
 use Knp\Menu\Integration\Symfony\RoutingExtension;
 use PHPUnit\Framework\TestCase;