Merge pull request #54 from sjokkateer/minor

Remove phpstan resolved error and move test assets into approperiate directory
laminas · May 16, 2022 · 23bca94 · 23bca94
2 parents 80c90d6 + e852cfa
commit 23bca94
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -28,6 +28,6 @@
 
     <exclude-pattern><![CDATA[*/test/_files/*]]></exclude-pattern>
     <!-- Excluded since phpcs does not yet provide intersection types -->
-    <exclude-pattern>./test/Classes/IntersectionTypeConstructorDependency.php</exclude-pattern>
+    <exclude-pattern>./test/TestAsset/Constructor/IntersectionTypeConstructorDependency.php</exclude-pattern>
     <rule ref="LaminasCodingStandard"/>
 </ruleset>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -280,11 +280,6 @@ parameters:
 			count: 1
 			path: src/Resolver/AbstractInjection.php
 
-		-
-			message: "#^Property Laminas\\\\Di\\\\Resolver\\\\DependencyResolver\\:\\:\\$gettypeMap has no typehint specified\\.$#"
-			count: 1
-			path: src/Resolver/DependencyResolver.php
-
 		-
 			message: "#^Method Laminas\\\\Di\\\\Resolver\\\\DependencyResolver\\:\\:getConfiguredParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/test/Definition/Reflection/ParameterTest.php b/test/Definition/Reflection/ParameterTest.php
@@ -6,8 +6,6 @@
 
 use Laminas\Di\Definition\Reflection\Parameter;
 use Laminas\Di\Exception\UnsupportedReflectionTypeException;
-use LaminasTest\Di\Classes\IntersectionTypeConstructorDependency;
-use LaminasTest\Di\Classes\UnionTypeConstructorDependency;
 use LaminasTest\Di\TestAsset;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
@@ -117,7 +115,7 @@ public function testGivenUnionTypeToParameterExpectedUnexpectedValueExceptionThr
     {
         $this->expectException(UnsupportedReflectionTypeException::class);
 
-        $class      = UnionTypeConstructorDependency::class;
+        $class      = TestAsset\Constructor\UnionTypeConstructorDependency::class;
         $parameters = (new ReflectionClass($class))->getConstructor()->getParameters();
         $param      = new Parameter($parameters[0]);
 
@@ -131,7 +129,7 @@ public function testGivenIntersectionTypeToParameterExpectedUnexpectedValueExcep
     {
         $this->expectException(UnsupportedReflectionTypeException::class);
 
-        $class      = IntersectionTypeConstructorDependency::class;
+        $class      = TestAsset\Constructor\IntersectionTypeConstructorDependency::class;
         $parameters = (new ReflectionClass($class))->getConstructor()->getParameters();
         $param      = new Parameter($parameters[0]);
 

diff --git a/...IntersectionTypeConstructorDependency.php → ...IntersectionTypeConstructorDependency.php b/...IntersectionTypeConstructorDependency.php → ...IntersectionTypeConstructorDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace LaminasTest\Di\Classes;
+namespace LaminasTest\Di\TestAsset\Constructor;
 
 use Countable;
 use Iterator;

diff --git a/...lasses/UnionTypeConstructorDependency.php → ...ructor/UnionTypeConstructorDependency.php b/...lasses/UnionTypeConstructorDependency.php → ...ructor/UnionTypeConstructorDependency.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace LaminasTest\Di\Classes;
+namespace LaminasTest\Di\TestAsset\Constructor;
 
 use Countable;
 use stdClass;