Merge remote-tracking branch 'origin/v1.3' into v1.3

Author: Spomky

.travis.yml

@@ -18,6 +18,8 @@ matrix:
           emv: SYMFONY_DEPRECATIONS_HELPER=weak
         - php: 7.2
           emv: SYMFONY_DEPRECATIONS_HELPER=weak
+        - php: 7.3
+          emv: SYMFONY_DEPRECATIONS_HELPER=weak
         - php: nightly
           emv: SYMFONY_DEPRECATIONS_HELPER=weak
 

composer.json

@@ -17,7 +17,7 @@
     "autoload": {
         "psr-4": {
             "Jose\\":  "src/",
-            "Jose\\Tests\\":  "test/",
+            "Jose\\Tests\\":  "tests/",
             "Jose\\Component\\Signature\\Algorithm\\": [
                 "src/SignatureAlgorithm/ECDSA",
                 "src/SignatureAlgorithm/EdDSA",
@@ -76,6 +76,7 @@
         "php-coveralls/php-coveralls": "^2.0",
         "php-http/httplug-bundle": "^1.7",
         "php-http/mock-client": "^1.0",
+        "phpunit/phpunit": "^7.5",
         "symfony/browser-kit": "^3.4|^4.0",
         "symfony/finder": "^3.4|^4.0",
         "symfony/phpunit-bridge": "^3.4|^4.0",
@@ -116,7 +117,7 @@
    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2.x-dev"
+            "dev-master": "1.3.x-dev"
         }
     },
     "conflict": {

phpunit.xml.dist

@@ -47,6 +47,7 @@
         </whitelist>
     </filter>
     <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\CoverageListener" />
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>
 </phpunit>

src/Bundle/JoseFramework/DependencyInjection/Configuration.php

@@ -51,14 +51,14 @@ public function getConfigTreeBuilder()
 
         return $treeBuilder;
     }
-    
-     private function getRootNode(TreeBuilder $treeBuilder, $name)
-     {
-         // BC layer for symfony/config 4.1 and older
-         if (! \method_exists($treeBuilder, 'getRootNode')) {
-             return $treeBuilder->root($name);
-         }
 
-         return $treeBuilder->getRootNode();
-     }
+    private function getRootNode(TreeBuilder $treeBuilder, $name)
+    {
+        // BC layer for symfony/config 4.1 and older
+        if (!\method_exists($treeBuilder, 'getRootNode')) {
+            return $treeBuilder->root($name);
+        }
+
+        return $treeBuilder->getRootNode();
+    }
 }

src/Bundle/JoseFramework/Serializer/JWEEncoder.php

@@ -54,11 +54,11 @@ public function encode($data, $format, array $context = [])
             return $this->serializerManager->serialize(mb_strtolower($format), $data, $this->getRecipientIndex($context));
         } catch (\Exception $ex) {
             $message = sprintf('Cannot encode JWE to %s format.', $format);
-            
+
             if (\class_exists('Symfony\Component\Serializer\Exception\NotEncodableValueException')) {
                 throw new NotEncodableValueException($message, 0, $ex);
             }
-            
+
             throw new UnexpectedValueException($message, 0, $ex);
         }
     }
@@ -67,13 +67,13 @@ public function decode($data, $format, array $context = [])
     {
         try {
             return $this->serializerManager->unserialize($data);
-        } catch (\Exception $ex) {            
+        } catch (\Exception $ex) {
             $message = sprintf('Cannot decode JWE from %s format.', $format);
-            
+
             if (\class_exists('Symfony\Component\Serializer\Exception\NotEncodableValueException')) {
                 throw new NotEncodableValueException($message, 0, $ex);
             }
-            
+
             throw new UnexpectedValueException($message, 0, $ex);
         }
     }

src/Component/Core/Converter/JsonConverter.php

@@ -13,6 +13,9 @@
 
 namespace Jose\Component\Core\Converter;
 
+/**
+ * @deprecated This interface is deprecated in v1.3 and will be removed in v2.0
+ */
 interface JsonConverter
 {
     /**

src/Component/Core/Converter/StandardConverter.php

@@ -13,6 +13,9 @@
 
 namespace Jose\Component\Core\Converter;
 
+/**
+ * @deprecated This class is deprecated in v1.3 and will be removed in v2.0
+ */
 final class StandardConverter implements JsonConverter
 {
     /**

src/Component/Core/Util/JsonConverter.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2018 Spomky-Labs
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+namespace Jose\Component\Core\Util;
+
+final class JsonConverter
+{
+    public static function encode($payload): string
+    {
+        return \json_encode($payload, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+    }
+
+    public static function decode(string $payload)
+    {
+        return \json_decode($payload, true, 512, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+    }
+}