Fix more broken tests, with help from #56

Thanks to the PR from @gennadigennadigennadi I've incorporated those fixes into this PR to get PHPUnit 9 support. Signed-off-by: Drew Robinson <[email protected]>
laminas · Oct 16, 2020 · 77e0761 · 77e0761
1 parent d3a9795
commit 77e0761
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/test/AbstractPluginManagerTest.php b/test/AbstractPluginManagerTest.php
@@ -206,7 +206,7 @@ public function testCallingSetServiceLocatorSetsCreationContextWithDeprecationNo
         $pluginManager = new TestAsset\LenientPluginManager();
         restore_error_handler();
 
-        self::assertAttributeSame($pluginManager, 'creationContext', $pluginManager);
+        self::assertSame($pluginManager, $pluginManager->getCreationContext());
         $serviceManager = new ServiceManager();
 
         set_error_handler(function ($errno, $errstr) {
@@ -215,7 +215,7 @@ public function testCallingSetServiceLocatorSetsCreationContextWithDeprecationNo
         $pluginManager->setServiceLocator($serviceManager);
         restore_error_handler();
 
-        self::assertAttributeSame($serviceManager, 'creationContext', $pluginManager);
+        self::assertSame($serviceManager, $pluginManager->getCreationContext());
     }
 
     /**
@@ -228,7 +228,7 @@ public function testPassingNoInitialConstructorArgumentSetsPluginManagerAsCreati
         }, E_USER_DEPRECATED);
         $pluginManager = new TestAsset\LenientPluginManager();
         restore_error_handler();
-        self::assertAttributeSame($pluginManager, 'creationContext', $pluginManager);
+        self::assertSame($pluginManager, $pluginManager->getCreationContext());
     }
 
     /**
@@ -245,7 +245,7 @@ public function testCanPassConfigInterfaceAsFirstConstructorArgumentWithDeprecat
         $pluginManager = new TestAsset\LenientPluginManager($config->reveal());
         restore_error_handler();
 
-        self::assertAttributeSame($pluginManager, 'creationContext', $pluginManager);
+        self::assertSame($pluginManager, $pluginManager->getCreationContext());
     }
 
     public function invalidConstructorArguments()

diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
@@ -166,10 +166,17 @@ public function testMapsOneToOneInvokablesAsInvokableFactoriesInternally()
             ],
         ];
 
-        $serviceManager = new ServiceManager($config);
-        self::assertAttributeSame([
+        $serviceManager = new class ($config) extends ServiceManager
+        {
+            public function getFactories(): array
+            {
+                return $this->factories;
+            }
+        };
+
+        self::assertSame([
             InvokableObject::class => InvokableFactory::class,
-        ], 'factories', $serviceManager, 'Invokable object factory not found');
+        ], $serviceManager->getFactories(), 'Invokable object factory not found');
     }
 
     public function testMapsNonSymmetricInvokablesAsAliasPlusInvokableFactory()
@@ -180,13 +187,24 @@ public function testMapsNonSymmetricInvokablesAsAliasPlusInvokableFactory()
             ],
         ];
 
-        $serviceManager = new ServiceManager($config);
+        $serviceManager = new class ($config) extends ServiceManager
+        {
+            public function getAliases(): array
+            {
+                return $this->aliases;
+            }
+
+            public function getFactories(): array
+            {
+                return $this->factories;
+            }
+        };
         self::assertAttributeSame([
             'Invokable' => InvokableObject::class,
-        ], 'aliases', $serviceManager, 'Alias not found for non-symmetric invokable');
+        ], $serviceManager->getAliases(), 'Alias not found for non-symmetric invokable');
         self::assertAttributeSame([
             InvokableObject::class => InvokableFactory::class,
-        ], 'factories', $serviceManager, 'Factory not found for non-symmetric invokable target');
+        ], $serviceManager->getFactories(), 'Factory not found for non-symmetric invokable target');
     }
 
     /**

diff --git a/test/TestAsset/LenientPluginManager.php b/test/TestAsset/LenientPluginManager.php
@@ -11,6 +11,7 @@
 namespace LaminasTest\ServiceManager\TestAsset;
 
 use Laminas\ServiceManager\AbstractPluginManager;
+use Psr\Container\ContainerInterface;
 
 class LenientPluginManager extends AbstractPluginManager
 {
@@ -21,4 +22,9 @@ public function validate($instance)
     {
         return;
     }
+
+    public function getCreationContext(): ContainerInterface
+    {
+        return $this->creationContext;
+    }
 }