Merge pull request #3 from lamoda/add-php8-to-supported-versions

add php 8 to supported versions
lamoda · Feb 22, 2021 · fad5545 · fad5545
2 parents 8ef04ef + 19b1d4d
commit fad5545
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -7,7 +7,7 @@ build:
   tests:
     override:
       -
-        command: vendor/bin/phpunit --coverage-clover=build/clover.xml
+        command: XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover=build/clover.xml
         coverage:
           file: build/clover.xml
           format: clover

diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 8.0
   - nightly
 
 sudo: false

diff --git a/composer.json b/composer.json
@@ -11,15 +11,15 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^7.1 || ^8.0",
     "paillechat/php-enum": "^1.2 || ^2.1",
     "symfony/http-kernel": "^3.4 || ^4.0 || ^5.0",
     "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0",
     "symfony/config": "^3.4 || ^4.0 || ^5.0",
     "doctrine/dbal": "^2.4"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0",
+    "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
     "symfony/yaml": "^3.4 || ^4.0 || ^5.0"
   },
   "autoload": {

diff --git a/tests/Unit/DBAL/EnumTypeTest.php b/tests/Unit/DBAL/EnumTypeTest.php
@@ -3,6 +3,7 @@
 namespace Lamoda\EnumBundle\Tests\Unit\DBAL;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\Type;
 use Lamoda\EnumBundle\DBAL\EnumType;
 use Lamoda\EnumBundle\Naming\LowercaseNamingStrategy;
@@ -54,19 +55,15 @@ public function getObjectToValueMap(): array
         ];
     }
 
-    /**
-     * @expectedException \Doctrine\DBAL\Types\ConversionException
-     */
     public function testConvertToPHPValueInvalidValue(): void
     {
+        $this->expectException(ConversionException::class);
         self::createType()->convertToPHPValue('UNKNOWN', $this->createPlatformMock());
     }
 
-    /**
-     * @expectedException \Doctrine\DBAL\Types\ConversionException
-     */
     public function testConvertToDataBaseValueInvalidValue(): void
     {
+        $this->expectException(ConversionException::class);
         self::createType()->convertToDatabaseValue(OtherEnum::BAR(), $this->createPlatformMock());
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ php: @@
       - 7.1
       - 7.2
       - 7.3
+      - 8.0
       - nightly
     sudo: false
@@ Expand Down @@