Upgrade to phpunit 10 (#26)

* Upgrade to phpunit 10

* Bump up php to 8.1

* Upgrade phpunit config

* Use jobs_default variable

* Fix tests

* Remove unused code

* Ignore *.cache files and directories

* Add minimum coverage

Author: funivan

.circleci/config.yml

@@ -1,20 +1,24 @@
 version: 2.1
 
 orbs:
-  ci: bigcommerce/internal@volatile
   php: bigcommerce/internal-php@volatile
 
-default_matrix: &default_matrix
+jobs_default: &jobs_default
+  e:
+    name: php/php
+    php-version: << matrix.php-version >>
   matrix:
     parameters:
-      php-version: [ "8.0", "8.1", "8.2" ]
+      php-version: [ "8.1", "8.2" ]
+
 
 workflows:
   version: 2
   full:
     jobs:
       - php/phpunit-tests:
-          <<: *default_matrix
+          <<: *jobs_default
+          minimum_coverage: 10
       - php/static-analysis:
-          <<: *default_matrix
+          <<: *jobs_default
           generate_ide_helper: false

.gitignore

@@ -1,4 +1,4 @@
-/.phpunit.result.cache
 /vendor/
 /.idea
 composer.lock
+*.cache

composer.json

@@ -22,10 +22,10 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.1",
         "bigcommerce/injector": "^3.0",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": " ^9.0"
+        "phpunit/phpunit": " ^10.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.10"

phpunit.xml

@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         convertWarningsToExceptions="true"
-         failOnWarning="true"
-         failOnRisky="true"
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+        backupGlobals="false"
+        colors="true"
+        bootstrap="vendor/autoload.php"
+        failOnWarning="true"
+        failOnRisky="true"
+        cacheDirectory=".phpunit.cache"
 >
-  <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-  </coverage>
   <testsuites>
     <testsuite name="MockInjector Test Suite">
       <directory>./tests</directory>
@@ -23,4 +18,9 @@
       <group>dummy</group>
     </exclude>
   </groups>
+  <source>
+    <include>
+      <directory>src</directory>
+    </include>
+  </source>
 </phpunit>

tests/AutoMockingTestTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types = 1);
 
 namespace Tests;
@@ -8,21 +9,21 @@
 
 class AutoMockingTestTest extends TestCase
 {
-    public function testTestShouldNotBeRiskyWhenItHasProphecyExpectations()
+    public function testTestShouldNotBeRiskyWhenItHasProphecyExpectations(): void
     {
         $riskyTest = new DummyTest('testWithProphecyExpectations');
 
         $riskyTest->runBare();
 
-        $this->assertSame(1, $riskyTest->getNumAssertions());
+        $this->assertSame(1, $riskyTest->numberOfAssertionsPerformed());
     }
 
-    public function testTestShouldBeRiskyWhenItHasNoAssertions()
+    public function testTestShouldBeRiskyWhenItHasNoAssertions(): void
     {
         $riskyTest = new DummyTest('testWithoutAssertions');
 
         $riskyTest->runBare();
 
-        $this->assertSame(0, $riskyTest->getNumAssertions());
+        $this->assertSame(0, $riskyTest->numberOfAssertionsPerformed());
     }
 }

tests/Dummy/DummyDependency.php

@@ -1,44 +1,20 @@
 <?php
+
 namespace Tests\Dummy;
 
 /**
  * Dummy class that the Injector can easily create as a dependency
  */
 class DummyDependency
 {
-    /**
-     * @var bool
-     */
-    private $enabled;
-
-    /**
-     * @var DummySubDependency
-     */
-    private $dependency;
-
-    /**
-     * DummyDependency constructor.
-     * @param DummySubDependency $dependency
-     * @param bool $enabled
-     */
-    public function __construct(DummySubDependency $dependency, $enabled = true)
-    {
-        $this->enabled = $enabled;
-        $this->dependency = $dependency;
-    }
 
-    /**
-     * @return boolean
-     */
-    public function isEnabled()
+    public function __construct(
+        private readonly DummySubDependency $dependency
+    )
     {
-        return $this->enabled;
     }
 
-    /**
-     * @return DummySubDependency
-     */
-    public function getDependency()
+    public function getDependency(): DummySubDependency
     {
         return $this->dependency;
     }

tests/Dummy/DummyTest.php

@@ -15,7 +15,7 @@ class DummyTest extends AutoMockingTest
      * This is a dummy test which is called by AutoMockInjectorTestTest. It has one expectation configured using
      * Prophecy (see `->shouldBeCalled()`), therefore there is 1 assertion and the test shouldn't be marked as Risky.
      */
-    public function testWithProphecyExpectations()
+    public function testWithProphecyExpectations() : void
     {
         /** @var DummyDependency $dummyDependency */
         $dummyDependency = $this->createWithMocks(DummyDependency::class);
@@ -30,7 +30,7 @@ public function testWithProphecyExpectations()
     /**
      * This is a dummy test which doesn't have any assertions, therefore is risky.
      */
-    public function testWithoutAssertions()
+    public function testWithoutAssertions() : void
     {
     }
 }

tests/MockInjectorTest.php

@@ -30,7 +30,7 @@ protected function setUp(): void
     /**
      * @covers ::create
      */
-    public function testCreate()
+    public function testCreate() : void
     {
         $this->mockInjector->create("abc123", [1 => "hello"])->willReturn("cat")->shouldBeCalledTimes(1);
         $i = new MockInjector($this->mockContainer->reveal(), $this->mockInjector->reveal());
@@ -40,7 +40,7 @@ public function testCreate()
     /**
      * @covers ::invoke
      */
-    public function testInvoke()
+    public function testInvoke() : void
     {
         $obj = new \stdClass();
         $this->mockInjector->invoke($obj, "method1", [1 => "hello"])->willReturn("fish")->shouldBeCalledTimes(1);
@@ -51,7 +51,7 @@ public function testInvoke()
     /**
      * @covers ::checkPredictions
      */
-    public function testCheckPredictions()
+    public function testCheckPredictions() : void
     {
         $this->mockContainer->checkPredictions()->shouldBeCalledTimes(1);
         $i = new MockInjector($this->mockContainer->reveal(), $this->mockInjector->reveal());
@@ -61,7 +61,7 @@ public function testCheckPredictions()
     /**
      * @covers ::getAllMocks
      */
-    public function testGetAllMocks()
+    public function testGetAllMocks() : void
     {
         $this->mockContainer->getAllMocks()->willReturn([1, 2, 6])->shouldBeCalledTimes(1);
         $i = new MockInjector($this->mockContainer->reveal(), $this->mockInjector->reveal());
@@ -71,7 +71,7 @@ public function testGetAllMocks()
     /**
      * @covers ::getMock
      */
-    public function testGetMock()
+    public function testGetMock() : void
     {
         $dummy = new \stdClass();
         $this->mockContainer->getMock("blah")->willReturn($dummy)->shouldBeCalledTimes(1);
@@ -84,7 +84,7 @@ public function testGetMock()
      * and will instantiate an object with an auto-mocked dependency.
      * @covers ::__construct
      */
-    public function testWithoutDependencies()
+    public function testWithoutDependencies() : void
     {
         $i = new MockInjector();
         /** @var DummyDependency $obj */