Fix dev deps and config

web-token · Aug 22, 2020 · 4f4379e · 4f4379e
1 parent fa5b0d5
commit 4f4379e
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 68 deletions.
diff --git a/composer.json b/composer.json
@@ -57,7 +57,7 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-sodium": "*",
-        "brick/math": "^0.8.17",
+        "brick/math": "^0.8.17|^0.9",
         "fgrosse/phpasn1": "^2.0",
         "psr/event-dispatcher": "^1.0",
         "psr/http-client": "^1.0",
@@ -76,17 +76,17 @@
         "ext-gmp": "*",
         "bjeavons/zxcvbn-php": "^1.0",
         "blackfire/php-sdk": "^1.14",
-        "infection/infection": "^0.15|^0.16",
+        "infection/infection": "^0.15|^0.16|^0.17",
         "matthiasnoback/symfony-config-test": "^3.1|^4.0",
         "nyholm/psr7": "^1.0",
         "php-coveralls/php-coveralls": "^2.0",
         "php-http/httplug-bundle": "^1.7",
         "php-http/mock-client": "^1.0",
-        "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-deprecation-rules": "^0.11",
-        "phpstan/phpstan-phpunit": "^0.11",
-        "phpstan/phpstan-strict-rules": "^0.11",
-        "phpunit/phpunit": "^8.0",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-deprecation-rules": "^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan-strict-rules": "^0.12",
+        "phpunit/phpunit": "^8.0|^9.0",
         "symfony/browser-kit": "^4.2|^5.0",
         "symfony/framework-bundle": "^4.2|^5.0",
         "symfony/finder": "^4.2|^5.0",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,56 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        processIsolation="false"
-        stopOnFailure="false"
-        bootstrap="vendor/autoload.php"
-        beStrictAboutTestsThatDoNotTestAnything="false"
-        colors="true">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests/</directory>
-            <directory>./src/Bundle/*/Tests/</directory>
-            <directory>./src/Component/*/Tests/</directory>
-            <directory>./src/Ecc/*/Tests/</directory>
-            <directory>./src/SignatureAlgorithm/*/Tests/</directory>
-            <directory>./src/EncryptionAlgorithm/ContentEncryption/*/Tests/</directory>
-            <directory>./src/EncryptionAlgorithm/KeyEncryption/*/Tests/</directory>
-            <directory>./src/EncryptionAlgorithm/Experimental/Tests/</directory>
-            <directory>./src/Easy/Tests/</directory>
-        </testsuite>
-    </testsuites>
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <ini name="intl.default_locale" value="en" />
-        <ini name="intl.error_level" value="0" />
-        <ini name="memory_limit" value="-1" />
-        <server name="KERNEL_CLASS" value="Jose\Bundle\JoseFramework\Tests\AppKernel" />
-        <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="8" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
-    </php>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./</directory>
-            <exclude>
-                <directory>./performance</directory>
-                <directory>./vendor</directory>
-                <directory>./tests</directory>
-                <directory>./src/Bundle/*/Tests/</directory>
-                <directory>./src/Component/*/Tests/</directory>
-                <directory>./src/Ecc/*/Tests/</directory>
-                <directory>./src/EncryptionAlgorithm/ContentEncryption/*/Tests/</directory>
-                <directory>./src/EncryptionAlgorithm/KeyEncryption/*/Tests/</directory>
-                <directory>./src/EncryptionAlgorithm/Experimental/Tests/</directory>
-                <directory suffix="Test.php">./src</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="vendor/autoload.php" beStrictAboutTestsThatDoNotTestAnything="false" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./</directory>
+    </include>
+    <exclude>
+      <directory>./performance</directory>
+      <directory>./vendor</directory>
+      <directory>./tests</directory>
+      <directory>./src/Bundle/*/Tests/</directory>
+      <directory>./src/Component/*/Tests/</directory>
+      <directory>./src/Ecc/*/Tests/</directory>
+      <directory>./src/EncryptionAlgorithm/ContentEncryption/*/Tests/</directory>
+      <directory>./src/EncryptionAlgorithm/KeyEncryption/*/Tests/</directory>
+      <directory>./src/EncryptionAlgorithm/Experimental/Tests/</directory>
+      <directory suffix="Test.php">./src</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>./tests/</directory>
+      <directory>./src/Bundle/*/Tests/</directory>
+      <directory>./src/Component/*/Tests/</directory>
+      <directory>./src/Ecc/*/Tests/</directory>
+      <directory>./src/SignatureAlgorithm/*/Tests/</directory>
+      <directory>./src/EncryptionAlgorithm/ContentEncryption/*/Tests/</directory>
+      <directory>./src/EncryptionAlgorithm/KeyEncryption/*/Tests/</directory>
+      <directory>./src/EncryptionAlgorithm/Experimental/Tests/</directory>
+      <directory>./src/Easy/Tests/</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+    <ini name="intl.default_locale" value="en"/>
+    <ini name="intl.error_level" value="0"/>
+    <ini name="memory_limit" value="-1"/>
+    <server name="KERNEL_CLASS" value="Jose\Bundle\JoseFramework\Tests\AppKernel"/>
+    <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
+    <server name="SYMFONY_PHPUNIT_VERSION" value="8"/>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
+  </php>
+  <listeners>
+    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+  </listeners>
 </phpunit>
diff --git a/src/Bundle/JoseFramework/Tests/Functional/Serializer/JWEEncoderTest.php b/src/Bundle/JoseFramework/Tests/Functional/Serializer/JWEEncoderTest.php
@@ -117,7 +117,7 @@ public function jWEEncoderCanEncodeAllFormats(): void
         // Compact
         $loader = $jweLoaderFactory->create(['jwe_compact'], ['A256KW'], ['A256CBC-HS512'], []);
         $token = $serializer->encode($jwe, 'jwe_compact');
-        static::assertRegExp('/(eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0)\.(.+?)\.(.+?)\.(.+?)\.(.+)/', $token);
+        static::assertMatchesRegularExpression('/(eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0)\.(.+?)\.(.+?)\.(.+?)\.(.+)/', $token);
         $loader->loadAndDecryptWithKey($token, $jwk, $recipient);
         // Flat
         $loader = $jweLoaderFactory->create(['jwe_json_flattened'], ['A256KW'], ['A256CBC-HS512'], []);

diff --git a/src/Bundle/JoseFramework/Tests/config/config_test.yml b/src/Bundle/JoseFramework/Tests/config/config_test.yml
@@ -4,7 +4,7 @@ framework:
     session:
         storage_id: 'session.storage.mock_file'
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/Tests/config/routing.yml"
         strict_requirements: ~
     fragments:       ~
     http_method_override: true
@@ -95,7 +95,7 @@ jose:
                 is_public: true
         certificate1:
             certificate:
-                path: '%kernel.root_dir%/config/keys/google.crt'
+                path: '%kernel.project_dir%/Tests/config/keys/google.crt'
                 additional_values:
                     use: 'sig'
                     alg: 'RS256'
@@ -123,7 +123,7 @@ jose:
                 is_public: true
         file1:
             file:
-                path: '%kernel.root_dir%/config/keys/private.encrypted.key'
+                path: '%kernel.project_dir%/Tests/config/keys/private.encrypted.key'
                 password: 'tests'
                 additional_values:
                     use: 'enc'

diff --git a/src/Ecc/composer.json b/src/Ecc/composer.json
@@ -20,7 +20,7 @@
         }
     },
     "require": {
-        "brick/math": "^0.8.17"
+        "brick/math": "^0.8.17|^0.9"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0"

diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json b/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json
@@ -20,7 +20,7 @@
         }
     },
     "require": {
-        "brick/math": "^0.8.17",
+        "brick/math": "^0.8.17|^0.9",
         "ext-openssl": "*",
         "symfony/polyfill-mbstring": "^1.12",
         "web-token/jwt-encryption": "^2.1"

diff --git a/src/SignatureAlgorithm/RSA/composer.json b/src/SignatureAlgorithm/RSA/composer.json
@@ -20,7 +20,7 @@
         }
     },
     "require": {
-        "brick/math": "^0.8.17",
+        "brick/math": "^0.8.17|^0.9",
         "ext-openssl": "*",
         "web-token/jwt-signature": "^2.1"
     },