Update tests to work on PHP 8

sanmai · Jan 6, 2021 · 8dbda5c · 8dbda5c
1 parent db057d2
commit 8dbda5c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -8,6 +8,7 @@ return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
+        '@PHPUnit84Migration:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'declare_strict_types' => true,
         'explicit_indirect_variable' => true,

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.13",
-        "phpunit/phpunit": "^6.5 || ^7.4"
+        "phpunit/phpunit": "^6.5 || ^7.4 || ^9"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/USBScaleReader/ReaderTest.php b/tests/USBScaleReader/ReaderTest.php
@@ -49,40 +49,36 @@ public function testWeightInOunces()
         $this->assertEquals(221.126280375, $reader->getWeight());
     }
 
-    /**
-     * @expectedException \USBScaleReader\Exception
-     * @expectedExceptionCode 1
-     */
     public function testInvalidStatus()
     {
+        $this->expectException(\USBScaleReader\Exception::class);
+        $this->expectExceptionCode(1);
+
         $reader = $this->readerFromHex('03020bff0000');
     }
 
-    /**
-     * @expectedException \USBScaleReader\Exception
-     * @expectedExceptionCode 1
-     */
     public function testNegativeWeight()
     {
+        $this->expectException(\USBScaleReader\Exception::class);
+        $this->expectExceptionCode(1);
+
         $reader = $this->readerFromHex('03050bff0000');
     }
 
-    /**
-     * @expectedException \USBScaleReader\Exception
-     * @expectedExceptionCode 2
-     */
     public function testUnknownUnit()
     {
+        $this->expectException(\USBScaleReader\Exception::class);
+        $this->expectExceptionCode(2);
+
         $reader = $this->readerFromHex('030400009000');
         $reader->getWeight();
     }
 
-    /**
-     * @expectedException \USBScaleReader\Exception
-     * @expectedExceptionCode 3
-     */
     public function testUnreadableDevice()
     {
+        $this->expectException(\USBScaleReader\Exception::class);
+        $this->expectExceptionCode(3);
+
         Reader::fromDevice('');
     }
 }