Added support for PHP 8.0 (#180)

Author: GrahamCampbell

.gitignore

@@ -1,3 +1,4 @@
+/.phpunit.result.cache
 /composer.lock
 /phpunit.xml
 /vendor

.travis.yml

@@ -41,9 +41,23 @@ matrix:
     - php: 7.4
       dist: bionic
       env: SYMFONY_VERSION=^5.0
+    - php: nightly
+      dist: bionic
+      env: SYMFONY_VERSION=^3.4
+    - php: nightly
+      dist: bionic
+      env: SYMFONY_VERSION=^4.0
+    - php: nightly
+      dist: bionic
+      env: SYMFONY_VERSION=^5.0
 
-before_install: travis_retry composer require "symfony/process:${SYMFONY_VERSION}" --no-update
-
-install: travis_retry composer install --prefer-dist --no-progress -n -o
+before_install:
+  - composer self-update --2
+  - travis_retry composer require "symfony/process:${SYMFONY_VERSION}" --no-update
 
-script: vendor/bin/phpunit
+install:
+  - if [[ "$TRAVIS_PHP_VERSION" != 'nightly' ]]; then travis_retry composer update --prefer-dist --no-progress -n -o; fi
+  - if [[ "$TRAVIS_PHP_VERSION" = 'nightly' ]]; then travis_retry composer update --ignore-platform-req=php --prefer-dist --no-progress -n -o; fi
+  
+script:
+  - vendor/bin/phpunit

composer.json

@@ -31,14 +31,14 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^5.6 || ^7.0 || ^8.0",
         "ext-pcre": "*",
         "symfony/polyfill-mbstring": "^1.7",
-        "symfony/process": "^3.4|^4.0|^5.0"
+        "symfony/process": "^3.4 || ^4.0 || ^5.0"
     },
     "require-dev": {
         "ext-fileinfo": "*",
-        "phpunit/phpunit": "^5.7|^6.5|^7.0",
+        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.0 || ^8.0 || ^9.0",
         "psr/log": "^1.0"
     },
     "suggest": {

phpunit.xml.dist

@@ -9,7 +9,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          failOnRisky="true"
-         failOnWarning="true"
+         failOnWarning="false"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"

tests/Gitonomy/Git/Tests/AbstractTest.php

@@ -117,7 +117,7 @@ public static function createTempDir()
      *
      * @param string $dir directory to delete
      */
-    public static function deleteDir($dir)
+    protected static function deleteDir($dir)
     {
         $iterator = new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS);
         $iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::CHILD_FIRST);

tests/Gitonomy/Git/Tests/AdminTest.php

@@ -21,14 +21,20 @@ class AdminTest extends AbstractTest
 {
     private $tmpDir;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    public function setUpTmpDir()
     {
         $this->tmpDir = self::createTempDir();
     }
 
-    protected function tearDown()
+    /**
+     * @after
+     */
+    public function tearDownTmpDir()
     {
-        $this->deleteDir(self::createTempDir());
+        self::deleteDir(self::createTempDir());
     }
 
     public function testBare()

tests/Gitonomy/Git/Tests/BlobTest.php

@@ -30,7 +30,11 @@ public function testGetContent($repository)
     {
         $blob = $this->getReadmeBlob($repository);
 
-        $this->assertContains(self::README_FRAGMENT, $blob->getContent());
+        if (method_exists($this, 'assertStringContainsString')) {
+            $this->assertStringContainsString(self::README_FRAGMENT, $blob->getContent());
+        } else {
+            $this->assertContains(self::README_FRAGMENT, $blob->getContent());
+        }
     }
 
     /**
@@ -50,7 +54,12 @@ public function testNotExisting($repository)
     public function testGetMimetype($repository)
     {
         $blob = $this->getReadmeBlob($repository);
-        $this->assertRegexp('#text/plain#', $blob->getMimetype());
+
+        if (method_exists($this, 'assertMatchesRegularExpression')) {
+            $this->assertMatchesRegularExpression('#text/plain#', $blob->getMimetype());
+        } else {
+            $this->assertRegExp('#text/plain#', $blob->getMimetype());
+        }
     }
 
     /**

tests/Gitonomy/Git/Tests/HooksTest.php

@@ -19,7 +19,10 @@ class HooksTest extends AbstractTest
 {
     private static $symlinkOnWindows = null;
 
-    public static function setUpBeforeClass()
+    /**
+     * @beforeClass
+     */
+    public static function setUpWindows()
     {
         if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
             self::$symlinkOnWindows = true;
@@ -52,6 +55,7 @@ public function assertHasHook($repository, $hook)
         $file = $this->hookPath($repository, $hook);
 
         $this->assertTrue($repository->getHooks()->has($hook), "hook $hook in repository");
+
         $this->assertFileExists($file, "Hook $hook is present");
     }
 
@@ -60,7 +64,12 @@ public function assertNoHook($repository, $hook)
         $file = $this->hookPath($repository, $hook);
 
         $this->assertFalse($repository->getHooks()->has($hook), "No hook $hook in repository");
-        $this->assertFileNotExists($file, "Hook $hook is not present");
+
+        if (method_exists($this, 'assertFileDoesNotExist')) {
+            $this->assertFileDoesNotExist($file, "Hook $hook is not present");
+        } else {
+            $this->assertFileNotExists($file, "Hook $hook is not present");
+        }
     }
 
     /**
@@ -104,7 +113,12 @@ public function testSymlink($repository)
         $repository->getHooks()->setSymlink('foo', $file);
 
         $this->assertTrue(is_link($this->hookPath($repository, 'foo')), 'foo hook is a symlink');
-        $this->assertEquals(str_replace('\\', '/', $file), str_replace('\\', '/', readlink($this->hookPath($repository, 'foo'))), 'target of symlink is correct');
+
+        $this->assertEquals(
+            str_replace('\\', '/', $file),
+            str_replace('\\', '/', readlink($this->hookPath($repository, 'foo'))),
+            'target of symlink is correct'
+        );
     }
 
     /**
@@ -147,6 +161,7 @@ public function testSet_Existing_ThrowsLogicException($repository)
         $repository->getHooks()->set('foo', 'bar');
 
         $this->expectException(LogicException::class);
+
         $repository->getHooks()->set('foo', 'bar');
     }
 
@@ -159,7 +174,12 @@ public function testRemove($repository)
         touch($file);
 
         $repository->getHooks()->remove('foo');
-        $this->assertFileNotExists($file);
+
+        if (method_exists($this, 'assertFileDoesNotExist')) {
+            $this->assertFileDoesNotExist($file);
+        } else {
+            $this->assertFileNotExists($file);
+        }
     }
 
     /**

tests/Gitonomy/Git/Tests/RepositoryTest.php

@@ -21,12 +21,17 @@ class RepositoryTest extends AbstractTest
     /**
      * @dataProvider provideFoobar
      */
-    public function testGetBlob_WithExisting_Works($repository)
+    public function testGetBlobWithExistingWorks($repository)
     {
         $blob = $repository->getCommit(self::LONGFILE_COMMIT)->getTree()->resolvePath('README.md');
 
         $this->assertInstanceOf(Blob::class, $blob, 'getBlob() returns a Blob object');
-        $this->assertContains('Foo Bar project', $blob->getContent(), 'file is correct');
+
+        if (method_exists($this, 'assertStringContainsString')) {
+            $this->assertStringContainsString('Foo Bar project', $blob->getContent(), 'file is correct');
+        } else {
+            $this->assertContains('Foo Bar project', $blob->getContent(), 'file is correct');
+        }
     }
 
     /**