Add PHP 8.1 and Symfony 6 support

.gitattributes

@@ -0,0 +1,4 @@
+/.* export-ignore
+/tests export-ignore
+/phpunit.xml.dist export-ignore
+/CHANGELOG.md

.github/workflows/test.yaml

@@ -0,0 +1,70 @@
+name: Test
+
+on:
+    push:
+    pull_request:
+        types: [opened, synchronize, edited, reopened]
+
+jobs:
+    test:
+        name: "PHP ${{ matrix.php-version }}${{ matrix.symfony-process-version != '' && format(' + symfony/process {0}', matrix.symfony-process-version) || '' }}"
+        runs-on: ubuntu-20.04
+
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version:
+                    - '5.5'
+                    - '5.6'
+                    - '7.0'
+                    - '7.1'
+                    - '7.2'
+                    - '7.3'
+                    - '7.4'
+                    - '8.0'
+                    - '8.1'
+                symfony-process-version: ['']
+                include:
+                    - php-version: '7.0'
+                      symfony-process-version: '2.0'
+                    - php-version: '7.0'
+                      symfony-process-version: '3.0'
+                    - php-version: '7.2'
+                      symfony-process-version: '5.0'
+                    - php-version: '7.3'
+                      symfony-process-version: '5.0'
+                    - php-version: '7.4'
+                      symfony-process-version: '5.0'
+                    - php-version: '8.0'
+                      symfony-process-version: '5.0'
+                    - php-version: '8.0'
+                      symfony-process-version: '6.0'
+                    - php-version: '8.1'
+                      symfony-process-version: '5.0'
+                    - php-version: '8.1'
+                      symfony-process-version: '6.0'
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  coverage: none
+                  ini-values: "memory_limit=-1"
+                  php-version: ${{ matrix.php-version }}
+                  tools: composer:v2
+
+            - name: Configure Symfony Process
+              if: ${{ matrix.symfony-process-version != '' }}
+              run: composer require --no-update "symfony/process:^${{ matrix.symfony-process-version }}"
+
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress
+
+            - name: Install Simple PHPUnit
+              run: vendor/bin/simple-phpunit install
+
+            - name: Run PHPUnit
+              run: vendor/bin/simple-phpunit -v

.gitignore

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

README.md

@@ -2,7 +2,7 @@
 
 Binary-Driver is a set of PHP tools to build binary drivers.
 
-[![Build Status](https://travis-ci.org/alchemy-fr/BinaryDriver.png?branch=master)](https://travis-ci.org/alchemy-fr/BinaryDriver)
+[![Build Status](https://github.com/alchemy-fr/BinaryDriver/actions/workflows/test.yaml/badge.svg)](https://github.com/alchemy-fr/BinaryDriver/actions/workflows/test.yaml)
 
 ## Why ?
 

composer.json

@@ -27,17 +27,22 @@
         }
     ],
     "require": {
-        "php"                 : ">=5.5",
-        "evenement/evenement" : "^3.0|^2.0|^1.0",
-        "psr/log"             : "^1.0",
-        "symfony/process"     : "^2.3|^3.0|^4.0|^5.0"
+        "php": ">=5.5",
+        "evenement/evenement": "^1.0|^2.0|^3.0",
+        "psr/log": "^1.0|^2.0",
+        "symfony/process": "^2.3|^3.0|^4.0|^5.0|^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit"     : "^4.0|^5.0"
+        "symfony/phpunit-bridge": "^5.0"
     },
     "autoload": {
         "psr-0": {
             "Alchemy": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Alchemy\\Tests\\": "tests/Alchemy"
+        }
     }
 }

phpunit.xml.dist

@@ -7,24 +7,24 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="true"
          verbose="false"
          bootstrap="tests/bootstrap.php"
 >
     <php>
+      <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="true"/>
+      <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled" />
       <ini name="display_errors" value="on"/>
     </php>
 
     <testsuites>
-        <testsuite>
+        <testsuite name="unit">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <filter>
-      <blacklist>
-        <directory>vendor</directory>
-        <directory>tests</directory>
-      </blacklist>
+      <whitelist processUncoveredFilesFromWhitelist="true">
+        <directory suffix=".php">src/</directory>
+      </whitelist>
     </filter>
 
 </phpunit>

src/Alchemy/BinaryDriver/BinaryDriverTestCase.php

@@ -2,20 +2,21 @@
 
 namespace Alchemy\BinaryDriver;
 
+use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Process\Process;
 
 /**
  * Convenient PHPUnit methods for testing BinaryDriverInterface implementations.
  */
-class BinaryDriverTestCase extends \PHPUnit_Framework_TestCase
+class BinaryDriverTestCase extends TestCase
 {
     /**
      * @return ProcessBuilderFactoryInterface
      */
     public function createProcessBuilderFactoryMock()
     {
-        return $this->getMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
+        return $this->createMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
     }
 
     /**
@@ -63,14 +64,14 @@ public function createProcessMock($runs = 1, $success = true, $commandLine = nul
      */
     public function createLoggerMock()
     {
-        return $this->getMock('Psr\Log\LoggerInterface');
+        return $this->createMock('Psr\Log\LoggerInterface');
     }
 
     /**
      * @return ConfigurationInterface
      */
     public function createConfigurationMock()
     {
-        return $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface');
+        return $this->createMock('Alchemy\BinaryDriver\ConfigurationInterface');
     }
 }

src/Alchemy/BinaryDriver/Configuration.php

@@ -23,6 +23,7 @@ public function __construct(array $data = array())
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new \ArrayIterator($this->data);
@@ -76,6 +77,7 @@ public function all()
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $this->has($offset);
@@ -84,6 +86,7 @@ public function offsetExists($offset)
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->get($offset);
@@ -92,6 +95,7 @@ public function offsetGet($offset)
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->set($offset, $value);
@@ -100,6 +104,7 @@ public function offsetSet($offset, $value)
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         $this->remove($offset);

tests/Alchemy/Tests/BinaryDriver/AbstractBinaryTest.php

@@ -7,6 +7,7 @@
 use Alchemy\BinaryDriver\Configuration;
 use Alchemy\BinaryDriver\Exception\ExecutableNotFoundException;
 use Alchemy\BinaryDriver\Listeners\ListenerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Process\ExecutableFinder;
 
 class AbstractBinaryTest extends BinaryDriverTestCase
@@ -61,21 +62,21 @@ public function testMultipleLoadWithBinaryName()
 
     public function testLoadWithMultiplePathExpectingAFailure()
     {
-        $this->setExpectedException(ExecutableNotFoundException::class);
+        $this->expectException(ExecutableNotFoundException::class);
 
         Implementation::load(array('bachibouzouk', 'moribon'));
     }
 
     public function testLoadWithUniquePathExpectingAFailure()
     {
-        $this->setExpectedException(ExecutableNotFoundException::class);
+        $this->expectException(ExecutableNotFoundException::class);
 
         Implementation::load('bachibouzouk');
     }
 
     public function testLoadWithCustomLogger()
     {
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger = $this->createMock('Psr\Log\LoggerInterface');
         $imp = Implementation::load('php', $logger);
 
         $this->assertEquals($logger, $imp->getProcessRunner()->getLogger());
@@ -91,7 +92,7 @@ public function testLoadWithCustomConfigurationAsArray()
 
     public function testLoadWithCustomConfigurationAsObject()
     {
-        $conf = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface');
+        $conf = $this->createMock('Alchemy\BinaryDriver\ConfigurationInterface');
         $imp = Implementation::load('php', null, $conf);
 
         $this->assertEquals($conf, $imp->getConfiguration());
@@ -100,7 +101,7 @@ public function testLoadWithCustomConfigurationAsObject()
     public function testProcessBuilderFactoryGetterAndSetters()
     {
         $imp = Implementation::load('php');
-        $factory = $this->getMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
+        $factory = $this->createMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
 
         $imp->setProcessBuilderFactory($factory);
         $this->assertEquals($factory, $imp->getProcessBuilderFactory());
@@ -109,7 +110,7 @@ public function testProcessBuilderFactoryGetterAndSetters()
     public function testConfigurationGetterAndSetters()
     {
         $imp = Implementation::load('php');
-        $conf = $this->getMock('Alchemy\BinaryDriver\ConfigurationInterface');
+        $conf = $this->createMock('Alchemy\BinaryDriver\ConfigurationInterface');
 
         $imp->setConfiguration($conf);
         $this->assertEquals($conf, $imp->getConfiguration());
@@ -132,7 +133,7 @@ public function testTimeoutIsSetOnProcessBuilderSetting()
     {
         $imp = Implementation::load('php', null, array('timeout' => 42));
 
-        $factory = $this->getMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
+        $factory = $this->createMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
         $factory->expects($this->once())
             ->method('setTimeout')
             ->with(42);
@@ -148,7 +149,7 @@ public function testListenRegistersAListener()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $listener = $this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface');
+        $listener = $this->createMock('Alchemy\BinaryDriver\Listeners\ListenerInterface');
 
         $listeners->expects($this->once())
             ->method('register')
@@ -168,8 +169,8 @@ public function testListenRegistersAListener()
     public function testCommandRunsAProcess($parameters, $bypassErrors, $expectedParameters, $output)
     {
         $imp = Implementation::load('php');
-        $factory = $this->getMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
-        $processRunner = $this->getMock('Alchemy\BinaryDriver\ProcessRunnerInterface');
+        $factory = $this->createMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
+        $processRunner = $this->createMock('Alchemy\BinaryDriver\ProcessRunnerInterface');
 
         $process = $this->getMockBuilder('Symfony\Component\Process\Process')
             ->disableOriginalConstructor()
@@ -197,8 +198,8 @@ public function testCommandRunsAProcess($parameters, $bypassErrors, $expectedPar
     public function testCommandWithTemporaryListeners($parameters, $bypassErrors, $expectedParameters, $output, $count, $listeners)
     {
         $imp = Implementation::load('php');
-        $factory = $this->getMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
-        $processRunner = $this->getMock('Alchemy\BinaryDriver\ProcessRunnerInterface');
+        $factory = $this->createMock('Alchemy\BinaryDriver\ProcessBuilderFactoryInterface');
+        $processRunner = $this->createMock('Alchemy\BinaryDriver\ProcessRunnerInterface');
 
         $process = $this->getMockBuilder('Symfony\Component\Process\Process')
             ->disableOriginalConstructor()
@@ -263,7 +264,7 @@ public function testUnlistenUnregistersAListener()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $listener = $this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface');
+        $listener = $this->createMock('Alchemy\BinaryDriver\Listeners\ListenerInterface');
 
         $listeners->expects($this->once())
             ->method('unregister')
@@ -278,11 +279,11 @@ public function testUnlistenUnregistersAListener()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     private function getMockListener()
     {
-        $listener = $this->getMock(ListenerInterface::class);
+        $listener = $this->createMock(ListenerInterface::class);
         $listener->expects($this->any())
             ->method('forwardedEvents')
             ->willReturn(array());