Merge pull request #33 from chrisryan/master

Add Support for PHP 8
subjective-php · May 22, 2023 · 114bd19 · 114bd19
2 parents 5cc352b + 83bdb92
commit 114bd19
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
     steps:
     - name: Checkout
       uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -7,10 +7,10 @@
     },
     "license": "MIT",
     "require": {
-        "php": "^7.0"
+        "php": "^7.0||^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": ">=6.5",
         "squizlabs/php_codesniffer": "^3.3"
     },
     "autoload": {

diff --git a/tests/ReaderTest.php b/tests/ReaderTest.php
@@ -14,20 +14,6 @@
  */
 final class ReaderTest extends TestCase
 {
-    private $unreadableFilePath;
-
-    public function setUp()
-    {
-        $this->unreadableFilePath = tempnam(sys_get_temp_dir(), 'csv');
-        touch($this->unreadableFilePath);
-        chmod($this->unreadableFilePath, 0220);
-    }
-
-    public function tearDown()
-    {
-        unlink($this->unreadableFilePath);
-    }
-
     /**
      * Verify basic usage of Reader.
      *
@@ -85,7 +71,7 @@ public function basicUsage(Reader $reader)
      *
      * @return array
      */
-    public function getReaders()
+    public static function getReaders()
     {
         $headers = ['id', 'author', 'title', 'genre', 'price', 'publish_date', 'description'];
         return [
@@ -104,14 +90,14 @@ public function getReaders()
      *
      * @test
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage $file must be a string containing a full path to a readable delimited file
      * @dataProvider getFiles
      *
      * @return void
      */
     public function constructInvalidFileParam($file)
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('$file must be a string containing a full path to a readable delimited file');
         $reader = new Reader($file);
     }
 
@@ -120,7 +106,7 @@ public function constructInvalidFileParam($file)
      *
      * @return array
      */
-    public function getFiles()
+    public static function getFiles()
     {
         return [
             [__DIR__ . '/_files/not_readable.csv'],
@@ -135,13 +121,13 @@ public function getFiles()
      *
      * @test
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage $delimiter must be a single character string
      *
      * @return void
      */
     public function constructInvalidDelimiter()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('$delimiter must be a single character string');
         new Reader(__DIR__ . '/_files/basic.csv', null, 'too long');
     }
 
@@ -150,13 +136,13 @@ public function constructInvalidDelimiter()
      *
      * @test
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage $enclosure must be a single character string
      *
      * @return void
      */
     public function constructInvalidEnclosure()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('$enclosure must be a single character string');
         new Reader(__DIR__ . '/_files/basic.csv', null, ',', 123);
     }
 
@@ -165,13 +151,13 @@ public function constructInvalidEnclosure()
      *
      * @test
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage $escapeChar must be a single character string
      *
      * @return void
      */
     public function constructInvalidEscapeChar()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('$escapeChar must be a single character string');
         new Reader(__DIR__ . '/_files/basic.csv', null, ',', '"', null);
     }
 
@@ -254,7 +240,7 @@ public function emptyFiles(Reader $reader)
      *
      * @return array
      */
-    public function getEmptyFiles()
+    public static function getEmptyFiles()
     {
         $headers = ['id', 'author', 'title', 'genre', 'price', 'publish_date', 'description'];
         return [