Merge pull request #3 from chrisryan/master

Add Support for PHP 8.
traderinteractive · Sep 27, 2022 · ced0ed1 · ced0ed1
2 parents a340de7 + d5f9a80
commit ced0ed1
Show file tree

Hide file tree

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

diff --git a/composer.json b/composer.json
@@ -7,22 +7,22 @@
         "filter"
     ],
     "license": "MIT",
-    "configure": {
+    "config": {
         "sort-packages": true
     },
     "require": {
-        "php": "^7.0",
-        "traderinteractive/exceptions": "^1.0"
+        "php": "^7.3 || ^8.0",
+        "traderinteractive/exceptions": "^2.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.0",
+        "squizlabs/php_codesniffer": "^3.2"
     },
     "autoload": {
         "psr-4": {
             "TraderInteractive\\Filter\\": "src"
         }
     },
-    "require-dev": {
-        "phpunit/phpunit": "^6.5",
-        "squizlabs/php_codesniffer": "^3.2"
-    },
     "scripts": {
         "lint": "vendor/bin/phpcs",
         "test": "vendor/bin/phpunit"

diff --git a/tests/FloatsTest.php b/tests/FloatsTest.php
@@ -88,109 +88,109 @@ public function filterNegativeString()
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage "true" $value is not a string
      */
     public function filterNonStringOrFloat()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('"true" $value is not a string');
         Floats::filter(true);
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @exceptedExceptionMessage  does not pass is_numeric
      */
     public function filterEmptyString()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage(' does not pass is_numeric');
         Floats::filter('');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage  does not pass is_numeric
      */
     public function filterWhitespaceString()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage(' does not pass is_numeric');
         Floats::filter('   ');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage 123-4 does not pass is_numeric
      */
     public function filterNonDigitString()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('123-4 does not pass is_numeric');
         Floats::filter('123-4');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
      */
     public function filterHexString()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
         Floats::filter('0xFF');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage 1. 0 does not pass is_numeric
      */
     public function filterRogueSpaceStringAfterPeriod()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('1. 0 does not pass is_numeric');
         Floats::filter('1. 0');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage 1 0 does not pass is_numeric
      */
     public function filterRogueSpaceStringBetweenDigits()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('1 0 does not pass is_numeric');
         Floats::filter('1 0');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage 1e999999999999 overflow
      */
     public function filterOverflow()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('1e999999999999 overflow');
         Floats::filter('1e999999999999');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage -1e999999999999 overflow
      */
     public function filterUnderflow()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('-1e999999999999 overflow');
         Floats::filter('-1e999999999999');
     }
 
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage -1 is less than 0
      */
     public function filterLessThanMin()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('-1 is less than 0');
         Floats::filter(-1.0, false, 0.0);
     }
 
@@ -206,11 +206,11 @@ public function filterEqualToMin()
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage 1 is greater than 0
      */
     public function filterGreaterThanMax()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('1 is greater than 0');
         Floats::filter(1.0, false, null, 0.0);
     }
 
@@ -235,11 +235,11 @@ public function filterCastInts()
     /**
      * @test
      * @covers ::filter
-     * @expectedException \TraderInteractive\Exceptions\FilterException
-     * @expectedExceptionMessage "1" $value is not a string
      */
     public function filterCastIntsIsFalse()
     {
+        $this->expectException(\TraderInteractive\Exceptions\FilterException::class);
+        $this->expectExceptionMessage('"1" $value is not a string');
         Floats::filter(1, false, null, null, false);
     }
 }