Merge pull request #117 from Alexandre-T/dev-php8

rvanlaak · Jun 23, 2021 · e94a8fa · e94a8fa
2 parents 86e0dfb + b82bb4b
commit e94a8fa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,8 @@ matrix:
           env: SYMFONY_VERSION=4.3.*
         - php: 7.4
           env: SYMFONY_VERSION=5.0.*
+        - php: 8.0
+          env: SYMFONY_VERSION=5.2.*
 
 
 install:

diff --git a/Manager/SettingsManager.php b/Manager/SettingsManager.php
@@ -9,6 +9,8 @@
 use Dmishh\SettingsBundle\Exception\WrongScopeException;
 use Dmishh\SettingsBundle\Serializer\SerializerInterface;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectManager;
 
 /**
  * Settings Manager provides settings management and persistence using Doctrine's Object Manager.
@@ -29,12 +31,12 @@ class SettingsManager implements SettingsManagerInterface
     private $ownerSettings;
 
     /**
-     * @var \Doctrine\Common\Persistence\ObjectManager
+     * @var ObjectManager
      */
     private $em;
 
     /**
-     * @var \Doctrine\ORM\EntityRepository
+     * @var EntityRepository<Setting>
      */
     private $repository;
 

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "psr/cache": "^1.0",
         "symfony/framework-bundle": "^3.4 || ^4.3 || ^5.0",
         "symfony/form": "^3.4 || ^4.3 || ^5.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -90,11 +90,6 @@ parameters:
 			count: 1
 			path: Form/Type/SettingsType.php
 
-		-
-			message: "#^Parameter \\#2 \\$input1 of function array_map expects array, array\\|false given\\.$#"
-			count: 1
-			path: Form/Type/SettingsType.php
-
 		-
 			message: "#^Method Dmishh\\\\SettingsBundle\\\\Form\\\\Type\\\\SettingsType\\:\\:configureOptions\\(\\) has no return typehint specified\\.$#"
 			count: 1
@@ -150,11 +145,6 @@ parameters:
 			count: 1
 			path: Manager/SettingsManager.php
 
-		-
-			message: "#^Property Dmishh\\\\SettingsBundle\\\\Manager\\\\SettingsManager\\:\\:\\$repository \\(Doctrine\\\\ORM\\\\EntityRepository\\) does not accept Doctrine\\\\Persistence\\\\ObjectRepository\\.$#"
-			count: 1
-			path: Manager/SettingsManager.php
-
 		-
 			message: "#^Method Dmishh\\\\SettingsBundle\\\\Manager\\\\SettingsManager\\:\\:get\\(\\) has no return typehint specified\\.$#"
 			count: 1