Remove prophecy in favour of native PHPUnit mocks

Signed-off-by: George Steel <[email protected]>
mezzio · Oct 16, 2022 · 88fd72a · 88fd72a
1 parent f3731a2
commit 88fd72a
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 297 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/composer.json b/composer.json
@@ -44,8 +44,6 @@
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.4.0",
         "laminas/laminas-servicemanager": "^3.15",
-        "phpspec/prophecy": "^1.15",
-        "phpspec/prophecy-phpunit": "^2.0.1",
         "phpunit/phpunit": "^9.5.25",
         "psalm/plugin-phpunit": "^0.17.0",
         "vimeo/psalm": "^4.29"

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.24.0@06dd975cb55d36af80f242561738f16c5f58264f">
+<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
   <file src="src/ConfigProvider.php">
     <MixedArrayOffset occurrences="1"/>
     <UndefinedClass occurrences="1">
@@ -58,11 +58,7 @@
     <InvalidFunctionCall occurrences="1">
       <code>$configProvider()</code>
     </InvalidFunctionCall>
-    <MissingReturnType occurrences="2">
-      <code>testReturnedArrayContainsDependencies</code>
-      <code>testServicesDefinedInConfigProvider</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="7">
+    <MixedArgument occurrences="4">
       <code>$configProvider()</code>
       <code>$config['dependencies']</code>
       <code>$factory</code>
@@ -94,69 +90,4 @@
       <code>assertIsArray</code>
     </RedundantCondition>
   </file>
-  <file src="test/LaminasAclFactoryTest.php">
-    <MissingReturnType occurrences="7">
-      <code>testFactoryWithEmptyRolesResources</code>
-      <code>testFactoryWithInvalidRole</code>
-      <code>testFactoryWithUnknownRole</code>
-      <code>testFactoryWithoutAllowOrDeny</code>
-      <code>testFactoryWithoutConfig</code>
-      <code>testFactoryWithoutLaminasAclConfig</code>
-      <code>testFactoryWithoutResources</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="7">
-      <code>$this-&gt;container-&gt;reveal()</code>
-      <code>$this-&gt;container-&gt;reveal()</code>
-      <code>$this-&gt;container-&gt;reveal()</code>
-      <code>$this-&gt;container-&gt;reveal()</code>
-      <code>$this-&gt;container-&gt;reveal()</code>
-      <code>$this-&gt;container-&gt;reveal()</code>
-      <code>$this-&gt;container-&gt;reveal()</code>
-    </MixedArgument>
-    <MixedMethodCall occurrences="7">
-      <code>willReturn</code>
-      <code>willReturn</code>
-      <code>willReturn</code>
-      <code>willReturn</code>
-      <code>willReturn</code>
-      <code>willReturn</code>
-      <code>willReturn</code>
-    </MixedMethodCall>
-    <PossiblyUndefinedMethod occurrences="7">
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-    </PossiblyUndefinedMethod>
-  </file>
-  <file src="test/LaminasAclTest.php">
-    <MissingReturnType occurrences="5">
-      <code>testConstructor</code>
-      <code>testIsGranted</code>
-      <code>testIsGrantedWithFailedRouting</code>
-      <code>testIsGrantedWithoutRouteResult</code>
-      <code>testIsNotGranted</code>
-    </MissingReturnType>
-    <MixedArgument occurrences="5">
-      <code>$this-&gt;acl-&gt;reveal()</code>
-      <code>$this-&gt;acl-&gt;reveal()</code>
-      <code>$this-&gt;acl-&gt;reveal()</code>
-      <code>$this-&gt;acl-&gt;reveal()</code>
-      <code>$this-&gt;acl-&gt;reveal()</code>
-    </MixedArgument>
-    <PossiblyInvalidMethodCall occurrences="2">
-      <code>willReturn</code>
-      <code>willReturn</code>
-    </PossiblyInvalidMethodCall>
-    <PossiblyUndefinedMethod occurrences="5">
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-      <code>reveal</code>
-    </PossiblyUndefinedMethod>
-  </file>
 </files>
diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -26,25 +26,25 @@ protected function setUp(): void
     public function testInvocationReturnsArray(): array
     {
         $config = ($this->provider)();
-        $this->assertIsArray($config);
+        self::assertIsArray($config);
         return $config;
     }
 
     /**
      * @depends testInvocationReturnsArray
      */
-    public function testReturnedArrayContainsDependencies(array $config)
+    public function testReturnedArrayContainsDependencies(array $config): void
     {
-        $this->assertArrayHasKey('dependencies', $config);
-        $this->assertIsArray($config['dependencies']);
-        $this->assertArrayHasKey('factories', $config['dependencies']);
+        self::assertArrayHasKey('dependencies', $config);
+        self::assertIsArray($config['dependencies']);
+        self::assertArrayHasKey('factories', $config['dependencies']);
 
         $factories = $config['dependencies']['factories'];
-        $this->assertIsArray($factories);
-        $this->assertArrayHasKey(LaminasAcl::class, $factories);
+        self::assertIsArray($factories);
+        self::assertArrayHasKey(LaminasAcl::class, $factories);
     }
 
-    public function testServicesDefinedInConfigProvider()
+    public function testServicesDefinedInConfigProvider(): void
     {
         $config = ($this->provider)();
 
@@ -66,8 +66,8 @@ public function testServicesDefinedInConfigProvider()
 
         $dependencies = $this->provider->getDependencies();
         foreach ($dependencies['factories'] as $name => $factory) {
-            $this->assertTrue($container->has($name), sprintf('Container does not contain service %s', $name));
-            $this->assertIsObject(
+            self::assertTrue($container->has($name), sprintf('Container does not contain service %s', $name));
+            self::assertIsObject(
                 $container->get($name),
                 sprintf('Cannot get service %s from container using factory %s', $name, $factory)
             );