Merge 5871866 into ee05755

.travis.yml

@@ -12,32 +12,28 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPS=lowest
-    - php: 7.1
+    - php: 7.3
       env:
         - DEPS=latest
         - TEST_COVERAGE=true
         - STATIC_ANALYSIS=true
-    - php: 7.2
-      env:
-        - DEPS=lowest
-    - php: 7.2
-      env:
-        - DEPS=latest
-    - php: 7.3
+    - php: 7.4
       env:
         - DEPS=lowest
-    - php: 7.3
+    - php: 7.4
       env:
         - DEPS=latest
-    - php: 7.4
+    - php: nightly
       env:
         - DEPS=lowest
-    - php: 7.4
+    - php: nightly
       env:
         - DEPS=latest
+  allow_failures:
+    - php: nightly
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

composer.json

@@ -30,19 +30,20 @@
         }
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.3",
         "laminas/laminas-stdlib": "^3.2.1",
         "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
-        "phpstan/phpstan-shim": "^0.10.5",
         "psr/container": "^1.0",
         "psr/log": "^1.0"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.2.0",
         "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-servicemanager": "^3.0",
+        "laminas/laminas-servicemanager": "^3.4",
         "mikey179/vfsstream": "^1.6.7",
-        "phpunit/phpunit": "^7.5.18 || ^8.5"
+        "phpstan/phpstan": "^0.12",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.3"
     },
     "conflict": {
         "laminas/laminas-servicemanager-di": "*",

phpunit.xml.dist

@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true">
-    <testsuites>
-        <testsuite name="laminas-di">
-            <directory>./test/</directory>
-        </testsuite>
-    </testsuites>
-
-    <groups>
-        <exclude>
-            <group>disable</group>
-        </exclude>
-    </groups>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-
-    <php>
-        <ini name="date.timezone" value="UTC"/>
-        <ini name="error_reporting" value="E_ALL"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="laminas-di">
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <groups>
+    <exclude>
+      <group>disable</group>
+    </exclude>
+  </groups>
+  <php>
+    <ini name="date.timezone" value="UTC"/>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
 </phpunit>

test/CodeGenerator/AbstractInjectorTest.php

@@ -18,6 +18,7 @@
 use LaminasTest\Di\TestAsset\InvokableInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Container\ContainerInterface;
 use ReflectionProperty;
@@ -30,6 +31,8 @@
  */
 class AbstractInjectorTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var InjectorInterface|ObjectProphecy
      */

test/CodeGenerator/InjectorGeneratorTest.php

@@ -17,6 +17,7 @@
 use LaminasTest\Di\TestAsset;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -27,6 +28,7 @@ class InjectorGeneratorTest extends TestCase
     const DEFAULT_NAMESPACE = 'LaminasTest\Di\Generated';
 
     use GeneratorTestTrait;
+    use ProphecyTrait;
 
     public function testGenerateCreatesFiles() : void
     {

test/Container/ConfigFactoryTest.php

@@ -137,7 +137,7 @@ public function testLegacyConfigTriggersDeprecationNotice()
             ],
         ]);
 
-        $this->expectException(DeprecatedError::class);
+        $this->expectDeprecation(DeprecatedError::class);
         (new ConfigFactory())->create($container);
     }
 }

test/GeneratedInjectorDelegatorTest.php

@@ -12,11 +12,14 @@
 use Laminas\Di\GeneratedInjectorDelegator;
 use Laminas\Di\InjectorInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 
 class GeneratedInjectorDelegatorTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testProvidedNamespaceIsNotAString()
     {
         $container = $this->prophesize(ContainerInterface::class);

test/LegacyConfigTest.php

@@ -53,7 +53,7 @@ public function testLegacyConfigMigration(array $config, array $expected)
 
     public function testFQParamNamesTriggerDeprecated()
     {
-        $this->expectException(DeprecatedError::class);
+        $this->expectDeprecation(DeprecatedError::class);
 
         new LegacyConfig([
             'instance' => [

test/Resolver/AbstractInjectionTest.php

@@ -19,14 +19,14 @@ class AbstractInjectionTest extends TestCase
 {
     public function testUsageIsDeprecated()
     {
-        $this->expectException(Deprecated::class);
-        $this->expectExceptionMessage(sprintf(
+        $this->expectDeprecation(Deprecated::class);
+        $this->expectDeprecationMessage(sprintf(
             '%s is deprecated, please migrate to %s',
             AbstractInjection::class,
             InjectionInterface::class
         ));
 
-        new class() extends AbstractInjection
+        new class () extends AbstractInjection
         {
             public function export(): string
             {

test/Resolver/DependencyResolverTest.php

@@ -25,6 +25,7 @@
 use Laminas\Di\Resolver\ValueInjection;
 use LaminasTest\Di\TestAsset;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
 use stdClass;
 
@@ -33,6 +34,8 @@
  */
 class DependencyResolverTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @return PHPUnit_Framework_MockObject_MockObject|ContainerInterface
      */

test/Resolver/TypeInjectionTest.php

@@ -15,6 +15,7 @@
 use Laminas\Di\Resolver\ValueInjection;
 use PHPUnit\Framework\Error\Deprecated;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
 use stdClass;
 
@@ -25,6 +26,8 @@
  */
 class TypeInjectionTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testImplementsContract()
     {
         $this->assertInstanceOf(InjectionInterface::class, new TypeInjection('typename'));
@@ -55,7 +58,7 @@ public function testExport()
     public function provideTypeNames(): iterable
     {
         return [
-            'arbitary' => [ 'SomeArbitaryTypeName' ],
+            'arbitary' => ['SomeArbitaryTypeName'],
         ];
     }
 
@@ -70,7 +73,7 @@ public function testIsExportableIsAlwaysTrue($typeName)
     public function testGetTypeIsDeprectaed()
     {
         $subject = new TypeInjection('SomeType');
-        $this->expectException(Deprecated::class);
+        $this->expectDeprecation();
         $this->assertSame('SomeType', $subject->getType());
     }
 }

test/Resolver/ValueInjectionTest.php

@@ -17,6 +17,7 @@
 use PHPUnit\Framework\Error\Deprecated;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
 use stdClass;
 
@@ -27,6 +28,8 @@
  */
 class ValueInjectionTest extends TestCase
 {
+    use ProphecyTrait;
+
     private $streamFixture = null;
 
     protected function setUp(): void
@@ -182,7 +185,7 @@ public function testGetValueTriggersDeprecatedNotice()
         $value = uniqid();
         $subject = new ValueInjection($value);
 
-        $this->expectException(Deprecated::class);
+        $this->expectDeprecation(Deprecated::class);
         self::assertSame($value, $subject->getValue());
     }
 }