Fix static analysis, tests and CS.

ndm2 · ndm2 · commit b25d58ed033d · 2020-04-16T11:56:00.000+02:00
diff --git a/phpstan.tests.neon b/phpstan.tests.neon
@@ -10,13 +10,16 @@ parameters:
         - '#PHPUnit\\Framework\\MockObject\\MockObject given#'
         - '#PHPUnit\\Framework\\MockObject\\MockObject::expects()#'
         - '#Call to an undefined method Icings\\Menu\\Matcher\\Voter\\UrlVoter\|PHPUnit\\Framework\\MockObject\\MockObject::matchItem\(\)#'
-        - '#Call to an undefined static method Icings\\Menu\\TestSuite\\RequestFactoryTrait\|PHPUnit\\Framework\\MockObject\\MockObject::createRequest\(\)#'
+        - '#Call to static method createRequest\(\) on an unknown class Icings\\Menu\\TestSuite\\RequestFactoryTrait#'
         - '#Call to an undefined method Icings\\Menu\\View\\Helper\\MenuHelper\|PHPUnit\\Framework\\MockObject\\MockObject::setMenuFactory\(\)#'
         - '#Call to an undefined method Icings\\Menu\\View\\Helper\\MenuHelper\|PHPUnit\\Framework\\MockObject\\MockObject::create\(\)#'
         - '#Call to an undefined method Icings\\Menu\\View\\Helper\\MenuHelper\|PHPUnit\\Framework\\MockObject\\MockObject::render\(\)#'
         - '#Call to an undefined method Icings\\Menu\\View\\Helper\\MenuHelper\|PHPUnit\\Framework\\MockObject\\MockObject::setConfig\(\)#'
         - '#Class Icings\\Menu\\Renderer\\StringTemplateRenderer constructor invoked with 0 parameters, 1-2 required#'
         - '#Parameter \#1 \$matcher of class Icings\\Menu\\Renderer\\StringTemplateRenderer constructor expects Knp\\Menu\\Matcher\\MatcherInterface, string given#'
         - '#Parameter \#2 \$config of class Icings\\Menu\\Renderer\\StringTemplateRenderer constructor expects array, string given#'
-        - '#Parameter \#1 \$name of method Icings\\Menu\\View\\Helper\\MenuHelper::create\(\) expects array|Knp\Menu\ItemInterface|string|null, int given#'
+        - '#Parameter \#1 \$name of method Icings\\Menu\\View\\Helper\\MenuHelper::create\(\) expects string, int given#'
+        - '#Parameter \#1 \$menu of method Icings\\Menu\\View\\Helper\\MenuHelper::render\(\) expects array\|Knp\\Menu\\ItemInterface\|string\|null, int given#'
         - '#PHPDoc tag @var for variable \$stub has invalid type Icings\\Menu\\TestSuite\\RequestFactoryTrait#'
+        - '#Parameter \#1 \$input of function array_walk expects array, array\<int, string\>\|false given#'
+        - '#Parameter \#1 \$input of function array_filter expects array, array\<int, string\>\|false given#'
diff --git a/src/Integration/PerItemVotersExtension.php b/src/Integration/PerItemVotersExtension.php
@@ -18,7 +18,7 @@
 class PerItemVotersExtension implements ExtensionInterface
 {
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function buildOptions(array $options = []): array
     {
@@ -31,7 +31,7 @@ public function buildOptions(array $options = []): array
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function buildItem(ItemInterface $item, array $options): void
     {
diff --git a/src/Integration/RoutingExtension.php b/src/Integration/RoutingExtension.php
@@ -19,7 +19,7 @@
 class RoutingExtension implements ExtensionInterface
 {
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function buildOptions(array $options = []): array
     {
@@ -55,7 +55,7 @@ public function buildOptions(array $options = []): array
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function buildItem(ItemInterface $item, array $options): void
     {
diff --git a/src/Integration/TemplaterExtension.php b/src/Integration/TemplaterExtension.php
@@ -18,7 +18,7 @@
 class TemplaterExtension implements ExtensionInterface
 {
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function buildOptions(array $options = []): array
     {
@@ -89,7 +89,7 @@ public function buildOptions(array $options = []): array
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function buildItem(ItemInterface $item, array $options): void
     {
diff --git a/src/Matcher/Matcher.php b/src/Matcher/Matcher.php
@@ -43,15 +43,15 @@ public function __construct()
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function addVoter(VoterInterface $voter): void
     {
         $this->_voters[] = $voter;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function isCurrent(ItemInterface $item): bool
     {
@@ -81,7 +81,7 @@ public function isCurrent(ItemInterface $item): bool
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function isAncestor(ItemInterface $item, ?int $depth = null): bool
     {
@@ -108,7 +108,7 @@ public function isAncestor(ItemInterface $item, ?int $depth = null): bool
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function clear(): void
     {
diff --git a/src/Matcher/Voter/FuzzyRouteVoter.php b/src/Matcher/Voter/FuzzyRouteVoter.php
@@ -47,7 +47,7 @@ public function __construct(ServerRequest $request)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function matchItem(ItemInterface $item): ?bool
     {
@@ -160,7 +160,6 @@ function (&$value) {
      * - normalization as applied by `_normalizeParams()`
      *
      * @see _normalizeParams()
-     *
      * @param array $route The route (URL array) to normalize.
      * @return void
      */
diff --git a/src/Matcher/Voter/UrlVoter.php b/src/Matcher/Voter/UrlVoter.php
@@ -87,7 +87,7 @@ public function __construct(ServerRequest $request, array $options = [])
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function matchItem(ItemInterface $item): ?bool
     {
diff --git a/src/Renderer/StringTemplateRenderer.php b/src/Renderer/StringTemplateRenderer.php
@@ -157,7 +157,6 @@ public function __construct(MatcherInterface $matcher, array $config = [])
      * This method supports all the options that the constructor supports.
      *
      * @see __construct()
-     *
      * @param ItemInterface $item The menu to render.
      * @param array $options An array of options, see the "Options" section in the method
      *   description.
diff --git a/src/View/Helper/MenuHelper.php b/src/View/Helper/MenuHelper.php
@@ -146,7 +146,6 @@ public function getMenuFactory(): MenuFactoryInterface
      * @see StringTemplateRenderer::__construct()
      * @see create()
      * @see render()
-     *
      * @param View $View The View this helper is being attached to.
      * @param array $config An array of options, see the "Configuration options" section in the
      *   method description.
@@ -181,9 +180,7 @@ public function __construct(View $View, array $config = [])
      * passed as options to the renderer.
      *
      * @see __construct()
-     *
      * @throws \InvalidArgumentException In case the `$name` argument is not a string, or is empty.
-     *
      * @param string $name The name of the menu. The name serves as an identifier for retrieving
      *   and rendering specific menus.
      * @param array $options An array of options, see the "Options" section in the method
@@ -210,7 +207,6 @@ public function create(string $name, array $options = []): ItemInterface
      * This method supports all the options that the constructor supports.
      *
      * @see __construct()
-     *
      * @throws \RuntimeException In case no menu object is passed, and no menu has been created via
      *  the `create()` method yet.
      * @throws \InvalidArgumentException In case the menu with name given in the `$menu` argument
@@ -224,7 +220,6 @@ public function create(string $name, array $options = []): ItemInterface
      * @throws \InvalidArgumentException In case the `voters` option is not an array.
      * @throws \InvalidArgumentException In case the `renderer` option is not a
      *  `Knp\Menu\Renderer\RendererInterface` implementation.
-     *
      * @param ItemInterface|string|array|null $menu Either an `\Knp\Menu\ItemInterface` implementation,
      *  the name of a menu created via `create()`, or an array of options to use instead of the
      *  `$options` argument. If omitted or an array, the menu that was last created via `create()`
diff --git a/tests/TestCase/Matcher/Voter/FuzzyRouteVoterTest.php b/tests/TestCase/Matcher/Voter/FuzzyRouteVoterTest.php
@@ -149,7 +149,6 @@ public function paramsDataProvider(): array
 
     /**
      * @dataProvider paramsDataProvider
-     *
      * @param string $requestUri
      * @param array $expected
      */
@@ -518,7 +517,6 @@ public function matchingDataProvider(): array
 
     /**
      * @dataProvider matchingDataProvider
-     *
      * @param array $url The URL array to test.
      * @param string $requestUri The request URI to test against.
      * @param bool|null $expected The matching result.
diff --git a/tests/TestCase/Matcher/Voter/UrlVoterTest.php b/tests/TestCase/Matcher/Voter/UrlVoterTest.php
@@ -299,7 +299,6 @@ public function expandedMatchingDataProvider(): array
 
     /**
      * @dataProvider expandedMatchingDataProvider
-     *
      * @param string $requestUri The request URI to match against.
      * @param string $uri The menu items main URI.
      * @param array[] $routes An array of URL arrays.
diff --git a/tests/TestCase/Renderer/StringTemplateRendererTest.php b/tests/TestCase/Renderer/StringTemplateRendererTest.php
@@ -45,7 +45,7 @@ public function testConstructMissingRequiredArguments(): void
         }
 
         $this->expectException(\Error::class);
-        $this->expectExceptionMessageRegExp(
+        $this->expectExceptionMessageMatches(
             '/^(Argument 1 .+? must implement interface Knp\\\\Menu\\\\Matcher\\\\MatcherInterface, none given|Too few arguments .+? at least 1 expected)/'
         );
 
@@ -59,7 +59,7 @@ public function testConstructInvalidMatcherArgumentType(): void
         }
 
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessageRegExp(
+        $this->expectExceptionMessageMatches(
             '/^Argument 1 .+? must implement interface Knp\\\\Menu\\\\Matcher\\\\MatcherInterface, string given/'
         );
 
@@ -73,7 +73,7 @@ public function testConstructInvalidConfigArgumentType(): void
         }
 
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessageRegExp(
+        $this->expectExceptionMessageMatches(
             '/^Argument 2 .+? must be of the type array, string given/'
         );
 
diff --git a/tests/TestCase/View/Helper/MenuHelperTest.php b/tests/TestCase/View/Helper/MenuHelperTest.php
@@ -95,7 +95,7 @@ public function testConstructConfiguration(): void
     public function testCreateInvalidNameArgumentType(): void
     {
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessageRegExp(
+        $this->expectExceptionMessageMatches(
             '/^Argument 1 passed to Icings\\\\Menu\\\\View\\\\Helper\\\\MenuHelper::create\(\) must be of the type string, (int|integer) given/'
         );
 
@@ -859,7 +859,7 @@ public function testRenderInvalidVotersOptionArray(): void
         $this->skipIf(PHP_MAJOR_VERSION < 7);
 
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessageRegExp(
+        $this->expectExceptionMessageMatches(
             '/^Argument 1 .+? must (be an instance of|implement interface) Knp\\\\Menu\\\\Matcher\\\\Voter\\\\VoterInterface, string given/'
         );
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`class PerItemVotersExtension implements ExtensionInterface`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`		`- * {@inheritDoc}`
	`21`	`+ * @inheritDoc`
`22`	`22`	`*/`
`23`	`23`	`public function buildOptions(array $options = []): array`
`24`	`24`	`{`
`@@ -31,7 +31,7 @@ public function buildOptions(array $options = []): array`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`
`34`		`- * {@inheritDoc}`
	`34`	`+ * @inheritDoc`
`35`	`35`	`*/`
`36`	`36`	`public function buildItem(ItemInterface $item, array $options): void`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`class RoutingExtension implements ExtensionInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * {@inheritDoc}`
	`22`	`+ * @inheritDoc`
`23`	`23`	`*/`
`24`	`24`	`public function buildOptions(array $options = []): array`
`25`	`25`	`{`
`@@ -55,7 +55,7 @@ public function buildOptions(array $options = []): array`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
`58`		`- * {@inheritDoc}`
	`58`	`+ * @inheritDoc`
`59`	`59`	`*/`
`60`	`60`	`public function buildItem(ItemInterface $item, array $options): void`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,15 @@ public function __construct()`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * {@inheritDoc}`
	`46`	`+ * @inheritDoc`
`47`	`47`	`*/`
`48`	`48`	`public function addVoter(VoterInterface $voter): void`
`49`	`49`	`{`
`50`	`50`	`$this->_voters[] = $voter;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`54`		`- * {@inheritDoc}`
	`54`	`+ * @inheritDoc`
`55`	`55`	`*/`
`56`	`56`	`public function isCurrent(ItemInterface $item): bool`
`57`	`57`	`{`
`@@ -81,7 +81,7 @@ public function isCurrent(ItemInterface $item): bool`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
`84`		`- * {@inheritDoc}`
	`84`	`+ * @inheritDoc`
`85`	`85`	`*/`
`86`	`86`	`public function isAncestor(ItemInterface $item, ?int $depth = null): bool`
`87`	`87`	`{`
`@@ -108,7 +108,7 @@ public function isAncestor(ItemInterface $item, ?int $depth = null): bool`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`
`111`		`- * {@inheritDoc}`
	`111`	`+ * @inheritDoc`
`112`	`112`	`*/`
`113`	`113`	`public function clear(): void`
`114`	`114`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(ServerRequest $request)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * {@inheritDoc}`
	`50`	`+ * @inheritDoc`
`51`	`51`	`*/`
`52`	`52`	`public function matchItem(ItemInterface $item): ?bool`
`53`	`53`	`{`
`@@ -160,7 +160,6 @@ function (&$value) {`
`160`	`160`	* - normalization as applied by `_normalizeParams()`
`161`	`161`	`*`
`162`	`162`	`* @see _normalizeParams()`
`163`		`- *`
`164`	`163`	`* @param array $route The route (URL array) to normalize.`
`165`	`164`	`* @return void`
`166`	`165`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function __construct(ServerRequest $request, array $options = [])`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`/**`
`90`		`- * {@inheritDoc}`
	`90`	`+ * @inheritDoc`
`91`	`91`	`*/`
`92`	`92`	`public function matchItem(ItemInterface $item): ?bool`
`93`	`93`	`{`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ public function __construct(MatcherInterface $matcher, array $config = [])`
`157`	`157`	`* This method supports all the options that the constructor supports.`
`158`	`158`	`*`
`159`	`159`	`* @see __construct()`
`160`		`- *`
`161`	`160`	`* @param ItemInterface $item The menu to render.`
`162`	`161`	`* @param array $options An array of options, see the "Options" section in the method`
`163`	`162`	`* description.`