Updated PHP compatibilit version range for ^7.4|^8.0 (#45)

yokai-php · May 10, 2021 · f9111f2 · f9111f2
1 parent e0f559c
commit f9111f2
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 35 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,14 +14,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.1
-            symfony-version: 4.4.*
           - php-version: 7.4
             symfony-version: 4.4.*
-          - php-version: 7.2
-            symfony-version: 5.2.*
+          - php-version: 8.0
+            symfony-version: 4.4.*
           - php-version: 7.4
             symfony-version: 5.2.*
+          - php-version: 8.0
+            symfony-version: 5.2.*
 
     steps:
       - name: "Checkout"
@@ -48,8 +48,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.4
-            symfony-version: 4.4.*
+          - php-version: 8.0
 
     steps:
       - name: "Checkout"
@@ -62,9 +61,7 @@ jobs:
           php-version: ${{ matrix.php-version }}
 
       - name: "Install dependencies with composer"
-        run: |
-          composer require --no-update "symfony/framework-bundle:${{ matrix.symfony-version }}"
-          composer update --no-interaction --no-progress --no-suggest
+        run: composer update --no-interaction --no-progress --no-suggest
 
       - name: "Run static analyzis with phpstan/phpstan"
         run: vendor/bin/phpstan analyze
@@ -76,8 +73,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.4
-            symfony-version: 4.4.*
+          - php-version: 8.0
 
     steps:
       - name: "Checkout"
@@ -90,9 +86,7 @@ jobs:
           php-version: ${{ matrix.php-version }}
 
       - name: "Install dependencies with composer"
-        run: |
-          composer require --no-update "symfony/framework-bundle:${{ matrix.symfony-version }}"
-          composer update --no-interaction --no-progress --no-suggest
+        run: composer update --no-interaction --no-progress --no-suggest
 
       - name: "Run checkstyle with squizlabs/php_codesniffer"
         run: vendor/bin/phpcs
@@ -104,8 +98,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.4
-            symfony-version: 4.4.*
+          - php-version: 8.0
 
     steps:
       - name: "Checkout"
@@ -118,9 +111,7 @@ jobs:
           php-version: ${{ matrix.php-version }}
 
       - name: "Install dependencies with composer"
-        run: |
-          composer require --no-update "symfony/framework-bundle:${{ matrix.symfony-version }}"
-          composer update --no-interaction --no-progress --no-suggest
+        run: composer update --no-interaction --no-progress --no-suggest
 
       - name: "Run tests with phpunit/phpunit"
         env:

diff --git a/composer.json b/composer.json
@@ -9,18 +9,19 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.4|^8.0",
         "ext-openssl": "*",
         "symfony/framework-bundle": "^4.4|^5.0",
         "doctrine/orm": "^2.7",
         "doctrine/doctrine-bundle": "^2.0",
         "yokai/dependency-injection": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
-        "symfony/yaml": "^4.4|^5.0",
-        "phpstan/phpstan": "^0.12.80",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpunit/phpunit": "^9.5",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "symfony/yaml": "^4.4|^5.2",
+        "phpstan/phpstan": "^0.12",
+        "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {
         "psr-4": { "Yokai\\SecurityTokenBundle\\": "src/" }

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
-        >
-
+         bootstrap="vendor/autoload.php">
     <php>
         <server name="KERNEL_CLASS" value="Yokai\SecurityTokenBundle\Tests\Kernel"/>
     </php>
-
     <testsuites>
         <testsuite name="YokaiSecurityTokenBundle Test Suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/tests/Command/ArchiveTokenCommandTest.php b/tests/Command/ArchiveTokenCommandTest.php
@@ -4,6 +4,7 @@
 
 namespace Yokai\SecurityTokenBundle\Tests\Command;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -18,6 +19,8 @@
  */
 class ArchiveTokenCommandTest extends KernelTestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var ArchivistInterface|ObjectProphecy
      */

diff --git a/tests/DependencyInjection/DependencyInjectionTest.php b/tests/DependencyInjection/DependencyInjectionTest.php
@@ -10,6 +10,7 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Generator;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ProphecySubjectInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Config\FileLocator;
@@ -37,6 +38,8 @@
  */
 class DependencyInjectionTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var ContainerBuilder
      */

diff --git a/tests/Factory/TokenFactoryTest.php b/tests/Factory/TokenFactoryTest.php
@@ -6,6 +6,7 @@
 
 use DateTime;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yokai\SecurityTokenBundle\Configuration\TokenConfiguration;
 use Yokai\SecurityTokenBundle\Configuration\TokenConfigurationRegistry;
@@ -23,6 +24,8 @@
  */
 class TokenFactoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var InformationGuesserInterface|ObjectProphecy
      */

diff --git a/tests/Manager/ChainUserManagerTest.php b/tests/Manager/ChainUserManagerTest.php
@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yokai\SecurityTokenBundle\Manager\ChainUserManager;
 use Yokai\SecurityTokenBundle\Manager\UserManagerInterface;
@@ -20,6 +21,8 @@
  */
 class ChainUserManagerTest extends TestCase
 {
+    use ProphecyTrait;
+
     private function manager($managers): ChainUserManager
     {
         return new ChainUserManager($managers);

diff --git a/tests/Manager/DoctrineUserManagerTest.php b/tests/Manager/DoctrineUserManagerTest.php
@@ -9,6 +9,7 @@
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\ObjectManager;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yokai\SecurityTokenBundle\Manager\DoctrineUserManager;
 
@@ -19,6 +20,8 @@
  */
 class DoctrineUserManagerTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var ManagerRegistry|ObjectProphecy
      */

diff --git a/tests/Manager/TokenManagerTest.php b/tests/Manager/TokenManagerTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Yokai\SecurityTokenBundle\Entity\Token;
@@ -35,6 +36,8 @@
  */
 class TokenManagerTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var TokenFactoryInterface|ObjectProphecy
      */

diff --git a/tests/Repository/DoctrineORMTokenRepositoryTest.php b/tests/Repository/DoctrineORMTokenRepositoryTest.php
@@ -7,6 +7,7 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Yokai\SecurityTokenBundle\Entity\Token;
 use Yokai\SecurityTokenBundle\Exception\TokenConsumedException;
@@ -21,6 +22,8 @@
  */
 class DoctrineORMTokenRepositoryTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var EntityManager|ObjectProphecy
      */