Drop PHP 5.6 to support PHP 7.4

webflo · webflo · commit 91fab4233c05 · 2020-11-14T22:15:09.000+01:00
... testing both versions in PHPUnit is not possible.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 dist: trusty
 php:
-  - "5.6"
   - "7.2"
   - "7.3"
   - "7.4"
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
   },
   "require-dev": {
     "composer/composer": "^2.0",
-    "phpunit/phpunit": "4.*",
+    "phpunit/phpunit": "^8.5.9",
     "derhasi/tempdirectory": "0.1.*",
     "squizlabs/php_codesniffer": "2.*",
     "escapestudios/symfony2-coding-standard": "2.*"
diff --git a/tests/FixturesTest.php b/tests/FixturesTest.php
@@ -3,11 +3,12 @@
 namespace DrupalComposer\PreservePaths\Tests;
 
 use derhasi\tempdirectory\TempDirectory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for some examples.
  */
-class FixturesTest extends \PHPUnit_Framework_TestCase
+class FixturesTest extends TestCase
 {
 
     /**
@@ -28,7 +29,7 @@ class FixturesTest extends \PHPUnit_Framework_TestCase
     /**
      * Set up test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->projectRoot = realpath(__DIR__.'/..');
         $this->composerBin = realpath(__DIR__.'/../vendor/bin/composer');
@@ -57,7 +58,7 @@ public function testFixtures($folder, $commands = array(), $files = array())
         // Add this project as local development repository sow we work with
         // the latest code.
         $this->composer('config', 'repositories.dev', 'path', $this->projectRoot);
-        
+
         $output = $this->composer('install');
 
         // Check for deprecation notices.
@@ -67,12 +68,12 @@ public function testFixtures($folder, $commands = array(), $files = array())
         foreach ($commands as $command) {
             call_user_func_array(array($this, 'composer'), $command);
         }
-        
+
         // Check for file existance.
         foreach ($files as $file) {
             $this->assertFileExists($file);
         }
-        
+
         unset($workingDirectory);
     }
 
@@ -94,7 +95,7 @@ public function fixturesProvider()
             ),
         );
     }
-    
+
     /**
      * Run composer command.
      *
@@ -134,7 +135,7 @@ protected function composer($command)
     protected function assertDeprecationNotice($lines)
     {
         foreach ($lines as $line) {
-            $this->assertNotContains('Deprecation Notice:', $line);
+            $this->assertStringNotContainsString('Deprecation Notice:', $line);
         }
     }
 }
diff --git a/tests/PathPreserverTest.php b/tests/PathPreserverTest.php
@@ -2,27 +2,35 @@
 
 namespace DrupalComposer\PreservePaths\Tests;
 
-use DrupalComposer\PreservePaths\PathPreserver;
+use Composer\IO\IOInterface;
 use Composer\Util\Filesystem;
-use Composer\Package\Package;
-use Composer\Package\RootPackage;
-use Composer\Composer;
-use Composer\Config;
 use derhasi\tempdirectory\TempDirectory;
+use DrupalComposer\PreservePaths\PathPreserver;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test for path preserver functionality.
  */
-class PathPreserverTest extends \PHPUnit_Framework_TestCase
+class PathPreserverTest extends TestCase
 {
 
+    /**
+     * @var \Composer\Util\Filesystem
+     */
+    protected $fs;
+
+    /**
+     * @var \Composer\IO\IOInterface
+     */
+    protected $io;
+
     /**
      * set up test environmemt
      */
-    public function setUp()
+    protected function setUp(): void
     {
         $this->fs = new Filesystem();
-        $this->io = $this->getMock('Composer\IO\IOInterface');
+        $this->io = $this->getMockBuilder(IOInterface::class)->getMock();
     }
 
     /**

-Original file line number
+Diff line change
@@ @@ -1,7 +1,6 @@ @@
 language: php
 dist: trusty
 php:
 -  - "5.6"
   - "7.2"
   - "7.3"
   - "7.4"
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,12 @@`
`3`	`3`	`namespace DrupalComposer\PreservePaths\Tests;`
`4`	`4`
`5`	`5`	`use derhasi\tempdirectory\TempDirectory;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`6`	`7`
`7`	`8`	`/**`
`8`	`9`	`* Tests for some examples.`
`9`	`10`	`*/`
`10`		`-class FixturesTest extends \PHPUnit_Framework_TestCase`
	`11`	`+class FixturesTest extends TestCase`
`11`	`12`	`{`
`12`	`13`
`13`	`14`	`/**`
`@@ -28,7 +29,7 @@ class FixturesTest extends \PHPUnit_Framework_TestCase`
`28`	`29`	`/**`
`29`	`30`	`* Set up test.`
`30`	`31`	`*/`
`31`		`- protected function setUp()`
	`32`	`+ protected function setUp(): void`
`32`	`33`	`{`
`33`	`34`	`$this->projectRoot = realpath(__DIR__.'/..');`
`34`	`35`	`$this->composerBin = realpath(__DIR__.'/../vendor/bin/composer');`
`@@ -57,7 +58,7 @@ public function testFixtures($folder, $commands = array(), $files = array())`
`57`	`58`	`// Add this project as local development repository sow we work with`
`58`	`59`	`// the latest code.`
`59`	`60`	`$this->composer('config', 'repositories.dev', 'path', $this->projectRoot);`
`60`		`-`
	`61`	`+`
`61`	`62`	`$output = $this->composer('install');`
`62`	`63`
`63`	`64`	`// Check for deprecation notices.`
`@@ -67,12 +68,12 @@ public function testFixtures($folder, $commands = array(), $files = array())`
`67`	`68`	`foreach ($commands as $command) {`
`68`	`69`	`call_user_func_array(array($this, 'composer'), $command);`
`69`	`70`	`}`
`70`		`-`
	`71`	`+`
`71`	`72`	`// Check for file existance.`
`72`	`73`	`foreach ($files as $file) {`
`73`	`74`	`$this->assertFileExists($file);`
`74`	`75`	`}`
`75`		`-`
	`76`	`+`
`76`	`77`	`unset($workingDirectory);`
`77`	`78`	`}`
`78`	`79`
`@@ -94,7 +95,7 @@ public function fixturesProvider()`
`94`	`95`	`),`
`95`	`96`	`);`
`96`	`97`	`}`
`97`		`-`
	`98`	`+`
`98`	`99`	`/**`
`99`	`100`	`* Run composer command.`
`100`	`101`	`*`
`@@ -134,7 +135,7 @@ protected function composer($command)`
`134`	`135`	`protected function assertDeprecationNotice($lines)`
`135`	`136`	`{`
`136`	`137`	`foreach ($lines as $line) {`
`137`		`- $this->assertNotContains('Deprecation Notice:', $line);`
	`138`	`+ $this->assertStringNotContainsString('Deprecation Notice:', $line);`
`138`	`139`	`}`
`139`	`140`	`}`
`140`	`141`	`}`