Remove X5C EOL (#353)

* Update KeyConverter.php
* Tests updated
* ECS+RECTOR
* Exported files

Author: Spomky

.gitattributes

@@ -1,10 +1,18 @@
 * text=auto
 
+/.github export-ignore
+/packs export-ignore
 /performance export-ignore
+/tests export-ignore
+/.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.scrutinizer.yml export-ignore
-/.travis.yml export-ignore
+/.gitsplit.yml export-ignore
+/CODE_OF_CONDUCT.md export-ignore
+/ecs.php export-ignore
+/infection.json export-ignore
+/Makefile export-ignore
 /phpbench.json export-ignore
+/phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
-/README.md export-ignore
+/rector.php export-ignore

.gitignore

@@ -1,14 +1,12 @@
 .phpbench
 .phpunit.result.cache
-.travis/phar-private.pem
 jose.phar
 jose.phar.pubkey
 jose.phar.version
-.travis/build-key.pem
-.travis/secrets.tar
 report.md
 composer.lock
 .php_cs
 .php_cs.cache
 vendor/
 src/Bundle/JoseFramework/var/
+infection.txt

.gitsplit.yml

@@ -53,6 +53,4 @@ splits:
       target: "https://${GH_TOKEN}@github.com/web-token/signature-pack.git"
 
 origins:
-    - ^master$
-    - ^v\d+\.\d+$
-    - ^v\d+\.\d+\.\d+.*$
+    - ^\d+\.\d+\.\d+.*$

SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+|---------|--------------------|
+| 4.0.x   | :white_check_mark: |
+| 3.1.x   | :white_check_mark: |
+| 3.0.x   | :white_check_mark: |
+| < 3.0.0 | :x:                |
+
+## Reporting a Vulnerability
+
+If you think you have found a security issue, DO NOT open an issue. You MUST email your issue: security AT
+spomky-labs.com.

composer.json

@@ -88,7 +88,7 @@
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^8.0|^9.0",
+        "phpunit/phpunit": "^9.5.5",
         "rector/rector": "^0.14",
         "roave/security-advisories": "dev-latest",
         "symfony/browser-kit": "^5.4|^6.0",

phpstan.neon

@@ -17,5 +17,5 @@ parameters:
         - '#Parameter \#2 \.\.\.\$values of function sprintf expects bool\|float\|int\|string\|null\, mixed given\.#'
         - '#Parameter \#1 \.\.\.\$arrays of function array_merge expects array\, mixed given\.#'
         - '#Cannot cast mixed to int\.#'
-includes:
-    - vendor/phpstan/phpstan/conf/bleedingEdge.neon
+        - '#Parameter .* of (static )?method .* expects Jose\\Component\\Core\\JWK, mixed given\.#'
+        - '#Cannot call method (get|has)\(\) on mixed\.#'

src/Component/KeyManagement/KeyConverter/KeyConverter.php

@@ -77,7 +77,7 @@ public static function loadKeyFromX509Resource(OpenSSLCertificate $res): array
             $values = self::loadKeyFromPEM($details['key']);
             openssl_x509_export($res, $out);
             $x5c = preg_replace('#-.*-#', '', $out);
-            $x5c = preg_replace('~\R~', PHP_EOL, $x5c);
+            $x5c = preg_replace('~\R~', '', $x5c);
             if (! is_string($x5c)) {
                 throw new InvalidArgumentException('Unable to load the certificate');
             }

src/Ecc/Curve.php

@@ -168,12 +168,13 @@ public function mul(Point $one, BigInteger $n): Point
 
     public function cmp(self $other): int
     {
-        $equal = $this->getA()
-            ->isEqualTo($other->getA())
-            && $this->getB()
-                ->isEqualTo($other->getB())
-            && $this->getPrime()
-                ->isEqualTo($other->getPrime());
+        $equalsA = $this->getA()
+            ->isEqualTo($other->getA());
+        $equalsB = $this->getB()
+            ->isEqualTo($other->getB());
+        $equalsPrime = $this->getPrime()
+            ->isEqualTo($other->getPrime());
+        $equal = $equalsA && $equalsB && $equalsPrime;
 
         return $equal ? 0 : 1;
     }

tests/Bundle/JoseFramework/config/config_test.yml

@@ -1,7 +1,9 @@
 framework:
   test: ~
   secret: 'test'
-  session: ~
+  session:
+    handler_id: null
+    storage_factory_id: 'session.storage.factory.mock_file'
   router:
     resource: "%kernel.project_dir%/tests/Bundle/JoseFramework/config/routing.yml"
     strict_requirements: ~