Updated to PHPUnit 10.1 (#250)

* Updated to PHPUnit 10.1, fixed deprecations * Fixed usages of deprecated mock methods
aphiria · Apr 16, 2023 · 60b0d4b · 60b0d4b
1 parent 9a311d5
commit 60b0d4b
Show file tree

Hide file tree

Showing 53 changed files with 185 additions and 168 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Changed
 
-- Updated to PHPUnit 10.0 ([#248](https://github.com/aphiria/aphiria/pull/248))
+- Updated to PHPUnit 10.1 ([#248](https://github.com/aphiria/aphiria/pull/248), [#250](https://github.com/aphiria/aphiria/pull/250))
 
 ## [v1.0.0-alpha8](https://github.com/aphiria/aphiria/compare/v1.0.0-alpha7...v1.0.0-alpha8) (2022-12-10)
 

diff --git a/composer.json b/composer.json
@@ -99,7 +99,7 @@
         "friendsofphp/php-cs-fixer": "^3.6",
         "mockery/mockery": "^1.5",
         "nyholm/psr7": "^1.5",
-        "phpunit/phpunit": "^10.0",
+        "phpunit/phpunit": "^10.1",
         "psalm/plugin-mockery": "^1.1",
         "vimeo/psalm": "^5.1"
     },

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory suffix=".php">src/*/src</directory>
-        </include>
-        <report>
-          <html outputDirectory="./.coverage"/>
-        </report>
-    </coverage>
-    <testsuite name="Aphiria">
-        <directory>src/*/tests</directory>
-    </testsuite>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
+  <coverage>
+    <report>
+      <html outputDirectory="./.coverage"/>
+    </report>
+  </coverage>
+  <testsuite name="Aphiria">
+    <directory>src/*/tests</directory>
+  </testsuite>
+  <source>
+    <include>
+      <directory suffix=".php">src/*/src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Api/composer.json b/src/Api/composer.json
@@ -51,7 +51,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
         "mockery/mockery": "^1.4",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",

diff --git a/src/Api/phpunit.xml.dist b/src/Api/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
-        <report>
-            <html outputDirectory="./.coverage"/>
-        </report>
-    </coverage>
-    <testsuite name="API">
-        <directory>tests</directory>
-    </testsuite>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
+<coverage>
+    <report>
+        <html outputDirectory="./.coverage"/>
+    </report>
+</coverage>
+<testsuite name="API">
+    <directory>tests</directory>
+</testsuite>
+<source>
+    <include>
+        <directory suffix=".php">src</directory>
+    </include>
+</source>
 </phpunit>
diff --git a/src/Application/composer.json b/src/Application/composer.json
@@ -43,7 +43,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",

diff --git a/src/Application/phpunit.xml.dist b/src/Application/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <html outputDirectory="./.coverage"/>
         </report>
     </coverage>
     <testsuite name="Application">
         <directory>tests</directory>
     </testsuite>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Authentication/composer.json b/src/Authentication/composer.json
@@ -45,7 +45,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",

diff --git a/src/Authentication/phpunit.xml.dist b/src/Authentication/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <html outputDirectory="./.coverage"/>
         </report>
     </coverage>
     <testsuite name="Authentication">
         <directory>tests</directory>
     </testsuite>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Authorization/composer.json b/src/Authorization/composer.json
@@ -46,7 +46,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",

diff --git a/src/Authorization/phpunit.xml.dist b/src/Authorization/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <html outputDirectory="./.coverage"/>
         </report>
     </coverage>
     <testsuite name="Authorization">
         <directory>tests</directory>
     </testsuite>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Collections/composer.json b/src/Collections/composer.json
@@ -46,7 +46,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",

diff --git a/src/Collections/phpunit.xml.dist b/src/Collections/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <html outputDirectory="./.coverage"/>
         </report>
     </coverage>
     <testsuite name="Collections">
         <directory>tests</directory>
     </testsuite>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Console/composer.json b/src/Console/composer.json
@@ -45,7 +45,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
         "mockery/mockery": "^1.4",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",

diff --git a/src/Console/phpunit.xml.dist b/src/Console/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <html outputDirectory="./.coverage"/>
         </report>
     </coverage>
     <testsuite name="Console">
         <directory>tests</directory>
     </testsuite>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Console/src/Drivers/Driver.php b/src/Console/src/Drivers/Driver.php
@@ -13,7 +13,6 @@
 namespace Aphiria\Console\Drivers;
 
 use Aphiria\Console\StatusCode;
-use PHPUnit\Framework\Attributes\CodeCoverageIgnore;
 
 /**
  * Defines a base CLI driver that's common to multiple OS
@@ -91,7 +90,6 @@ abstract protected function getCliDimensionsFromOS(): ?array;
      *
      * @return array|null The dimensions (width x height) as a tuple if found, otherwise null
      */
-    #[CodeCoverageIgnore]
     protected function getCliDimensionsFromStty(): ?array
     {
         $sttyOutput = $this->runProcess('stty -a | grep columns');
@@ -116,7 +114,6 @@ protected function getCliDimensionsFromStty(): ?array
      * @param string $command The command to run in the process
      * @return string|null The output of the process
      */
-    #[CodeCoverageIgnore]
     protected function runProcess(string $command): ?string
     {
         $process = \proc_open(
@@ -145,7 +142,6 @@ protected function runProcess(string $command): ?string
      *
      * @return bool Whether or not STTY is supported
      */
-    #[CodeCoverageIgnore]
     protected function supportsStty(): bool
     {
         if ($this->supportsStty !== null) {

diff --git a/src/Console/src/Drivers/UnixLikeDriver.php b/src/Console/src/Drivers/UnixLikeDriver.php
@@ -13,7 +13,6 @@
 namespace Aphiria\Console\Drivers;
 
 use Aphiria\Console\Output\IOutput;
-use PHPUnit\Framework\Attributes\CodeCoverageIgnore;
 
 /**
  * Defines the *nix-based CLI driver
@@ -48,7 +47,6 @@ public function readHiddenInput(IOutput $output): ?string
     /**
      * @inheritdoc
      */
-    #[CodeCoverageIgnore]
     protected function getCliDimensionsFromOS(): ?array
     {
         return $this->getCliDimensionsFromStty();

diff --git a/src/Console/src/Drivers/WindowsDriver.php b/src/Console/src/Drivers/WindowsDriver.php
@@ -13,7 +13,6 @@
 namespace Aphiria\Console\Drivers;
 
 use Aphiria\Console\Output\IOutput;
-use PHPUnit\Framework\Attributes\CodeCoverageIgnore;
 
 /**
  * Defines the Windows OS CLI driver
@@ -27,7 +26,6 @@ class WindowsDriver extends Driver
      * @inheritdoc
      * @psalm-suppress ForbiddenCode We purposely are running an external executable
      */
-    #[CodeCoverageIgnore]
     public function readHiddenInput(IOutput $output): ?string
     {
         // Check if we're running from a PHAR
@@ -51,7 +49,6 @@ public function readHiddenInput(IOutput $output): ?string
      *
      * @return array|null The dimensions (width x height) as a tuple if found, otherwise null
      */
-    #[CodeCoverageIgnore]
     protected function getCliDimensionsFromConsoleMode(): ?array
     {
         $modeOutput = $this->runProcess('mode CON');

diff --git a/src/Console/tests/Drivers/UnixLikeDriverTest.php b/src/Console/tests/Drivers/UnixLikeDriverTest.php
@@ -12,12 +12,18 @@
 
 namespace Aphiria\Console\Tests\Drivers;
 
+use Aphiria\Console\Drivers\Driver;
 use Aphiria\Console\Drivers\HiddenInputNotSupportedException;
 use Aphiria\Console\Drivers\UnixLikeDriver;
 use Aphiria\Console\Output\IOutput;
 use Aphiria\Console\StatusCode;
+use PHPUnit\Framework\Attributes\IgnoreMethodForCodeCoverage;
 use PHPUnit\Framework\TestCase;
 
+#[IgnoreMethodForCodeCoverage(UnixLikeDriver::class, 'getCliDimensionsFromOS')]
+#[IgnoreMethodForCodeCoverage(Driver::class, 'getCliDimensionsFromStty')]
+#[IgnoreMethodForCodeCoverage(Driver::class, 'runProcess')]
+#[IgnoreMethodForCodeCoverage(Driver::class, 'supportsStty')]
 class UnixLikeDriverTest extends TestCase
 {
     private UnixLikeDriver $driver;

diff --git a/src/Console/tests/Drivers/WindowsDriverTest.php b/src/Console/tests/Drivers/WindowsDriverTest.php
@@ -12,10 +12,18 @@
 
 namespace Aphiria\Console\Tests\Drivers;
 
+use Aphiria\Console\Drivers\Driver;
 use Aphiria\Console\Drivers\WindowsDriver;
 use Aphiria\Console\StatusCode;
+use PHPUnit\Framework\Attributes\IgnoreMethodForCodeCoverage;
 use PHPUnit\Framework\TestCase;
 
+#[IgnoreMethodForCodeCoverage(WindowsDriver::class, 'getCliDimensionsFromOS')]
+#[IgnoreMethodForCodeCoverage(WindowsDriver::class, 'readHiddenInput')]
+#[IgnoreMethodForCodeCoverage(WindowsDriver::class, 'getCliDimensionsFromConsoleMode')]
+#[IgnoreMethodForCodeCoverage(Driver::class, 'getCliDimensionsFromStty')]
+#[IgnoreMethodForCodeCoverage(Driver::class, 'runProcess')]
+#[IgnoreMethodForCodeCoverage(Driver::class, 'supportsStty')]
 class WindowsDriverTest extends TestCase
 {
     private WindowsDriver $driver;

diff --git a/src/ContentNegotiation/composer.json b/src/ContentNegotiation/composer.json
@@ -50,7 +50,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",

diff --git a/src/ContentNegotiation/phpunit.xml.dist b/src/ContentNegotiation/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <html outputDirectory="./.coverage"/>
         </report>
     </coverage>
     <testsuite name="ContentNegotiation">
         <directory>tests</directory>
     </testsuite>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/DependencyInjection/composer.json b/src/DependencyInjection/composer.json
@@ -45,7 +45,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.1"
     },
     "scripts": {
         "phpcs-test": "@phpcs-fix --dry-run",