support PHP8.0, phpunit ^8.5 & ^9.3

Author: Erwane

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - '2.x'
+      - '2.0'
   pull_request:
     branches:
       - '*'
@@ -19,10 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '8.1'
-          - '8.2'
-          - '8.3'
-          - '8.4'
+          - '8.0'
 
     steps:
     - uses: actions/checkout@v4
@@ -45,16 +42,38 @@ jobs:
       env:
         XDEBUG_MODE: coverage
       run: |
-        if [[ '${{ matrix.php-version }}' == '8.1' ]]; then
+        if [[ '${{ matrix.php-version }}' == '8.0' ]]; then
           export CODECOVERAGE=1
           vendor/bin/phpunit --coverage-clover=coverage.xml
         else
           vendor/bin/phpunit
         fi
 
     - name: Submit code coverage
-      if: matrix.php-version == '8.1'
+      if: matrix.php-version == '8.0'
       uses: codecov/codecov-action@v5
       with:
         files: coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
+
+  cs-stan:
+    name: Coding Standard & Static Analysis
+    runs-on: ubuntu-24.04
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.0'
+        extensions: mbstring, intl
+        coverage: none
+        tools: phive, cs2pr
+
+    - name: Composer install
+      run: composer update
+
+    - name: Run phpcs
+      if: always()
+      run: vendor/bin/phpcs --report=checkstyle src/ tests/ | cs2pr

README.md

@@ -2,7 +2,7 @@
 
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
 [![codecov](https://codecov.io/gh/Erwane/phpunit-resource-helper/branch/2.x/graph/badge.svg?token=hF5HhETnkg)](https://codecov.io/gh/Erwane/phpunit-resource-helper)
-[![Build Status](https://github.com/Erwane/phpunit-resource-helper/actions/workflows/ci.yml/badge.svg?branch=2.x)](https://github.com/Erwane/phpunit-resource-helper/actions)
+[![Build Status](https://github.com/Erwane/phpunit-resource-helper/actions/workflows/ci.yml/badge.svg?branch=2.0)](https://github.com/Erwane/phpunit-resource-helper/actions)
 [![Packagist Downloads](https://img.shields.io/packagist/dt/Erwane/phpunit-resource-helper)](https://packagist.org/packages/Erwane/phpunit-resource-helper)
 [![Packagist Version](https://img.shields.io/packagist/v/Erwane/phpunit-resource-helper)](https://packagist.org/packages/Erwane/phpunit-resource-helper)
 
@@ -12,10 +12,10 @@ Help your phpunit tests to load resources from files, like, json content, raw e-
 
 ## Version map
 
-| branch | This package version | PHP min |
-|:------:|----------------------|:-------:|
-|  1.x   | ^1.0                 | PHP 7.2 |
-|  2.x   | ^2.0                 | PHP 8.1 |
+| branch | This package version | PHP min |   PHPUnit    |
+|:------:|----------------------|:-------:|:------------:|
+|  1.x   | ^1.0                 | PHP 7.2 |     ^8.0     |
+|  2.0   | ^2.0                 | PHP 8.0 | ^8.5 \| ^9.3 | 
 
 ## Usage
 

composer.json

@@ -21,12 +21,12 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "ext-json": "*"
+        "php": "8.0.*",
+        "ext-json": "*",
+        "phpunit/phpunit":"^8.5 | ^9.3"
     },
     "require-dev": {
-        "cakephp/cakephp-codesniffer": "^5.0",
-        "phpunit/phpunit": "^10.5",
+        "cakephp/cakephp-codesniffer": "^4.0",
         "symfony/var-dumper": "^v6.0"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
-         colors="true"
-         cacheDirectory="tmp/phpunit.cache"
-         displayDetailsOnPhpunitDeprecations="true"
-         displayDetailsOnTestsThatTriggerDeprecations="true"
-         displayDetailsOnTestsThatTriggerErrors="true"
-         displayDetailsOnTestsThatTriggerWarnings="true">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd" bootstrap="tests/bootstrap.php"
+         colors="true">
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="all">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
-    <source>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </source>
-
     <extensions>
-        <bootstrap class="ResourceHelper\PHPUnitExtension"></bootstrap>
+        <extension class="ResourceHelper\PHPUnitExtension"></extension>
     </extensions>
 </phpunit>

src/Extension/CleanupSubscriber.php

@@ -10,21 +10,22 @@
 
 namespace ResourceHelper;
 
-use PHPUnit\Runner\Extension\Extension;
-use PHPUnit\Runner\Extension\Facade;
-use PHPUnit\Runner\Extension\ParameterCollection;
-use PHPUnit\TextUI\Configuration\Configuration;
-use ResourceHelper\Extension\CleanupSubscriber;
+use PHPUnit\Runner\AfterSuccessfulTestHook;
 
 /**
- * PHPUnit extension.
- *
- * @codeCoverageIgnore
+ * PHPUnit extension to clean up temp files.
  */
-class PHPUnitExtension implements Extension
+class PHPUnitExtension implements AfterSuccessfulTestHook
 {
-    public function bootstrap(Configuration $configuration, Facade $facade, ParameterCollection $parameters): void
+    /**
+     * Cleanup test files if case of successful result.
+     *
+     * @param string $test Test name with namespace
+     * @param float $time Test duration time
+     * @return void
+     */
+    public function executeAfterSuccessfulTest(string $test, float $time): void
     {
-        $facade->registerSubscriber(new CleanupSubscriber());
+        ResourceHelper::destroyTmpTestDir($test);
     }
 }

src/PHPUnitExtension.php

@@ -10,16 +10,26 @@
 
 namespace ResourceHelper\Test\TestCase;
 
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use ResourceHelper\PHPUnitExtension;
+use ResourceHelper\ResourceHelper;
 
-#[CoversClass(PHPUnitExtension::class)]
+/**
+ * @uses   \ResourceHelper\PHPUnitExtension
+ * @covers \ResourceHelper\PHPUnitExtension
+ */
 class PHPUnitExtensionTest extends TestCase
 {
     public function testAfterSuccessfulTest(): void
     {
         $ext = new PHPUnitExtension();
-        $this->assertTrue(method_exists($ext, 'bootstrap'));
+        $this->assertTrue(method_exists($ext, 'executeAfterSuccessfulTest'));
+
+        // Create tmp test dir
+        ResourceHelper::createTmpTestDir($this);
+
+        $ext->executeAfterSuccessfulTest($this->toString(), 0.3);
+
+        $this->assertDirectoryDoesNotExist(ResourceHelper::getTmpTestPath($this));
     }
 }