Preparation 3.0 (#323)

* Preparation 3.0
* Update with ECS and Rector
* Bugs fixed

Author: Spomky

Controller/JWKSetController.php

@@ -2,29 +2,15 @@
 
 declare(strict_types=1);
 
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 namespace Jose\Bundle\JoseFramework\Controller;
 
 use Symfony\Component\HttpFoundation\Response;
 
 class JWKSetController
 {
-    /**
-     * @var string
-     */
-    private $jwkset;
-
-    public function __construct(string $jwkset)
-    {
-        $this->jwkset = $jwkset;
+    public function __construct(
+        private string $jwkset
+    ) {
     }
 
     public function __invoke(): Response

Controller/JWKSetControllerFactory.php

@@ -2,15 +2,6 @@
 
 declare(strict_types=1);
 
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 namespace Jose\Bundle\JoseFramework\Controller;
 
 use Jose\Component\Core\JWKSet;

DataCollector/AlgorithmCollector.php

@@ -2,15 +2,6 @@
 
 declare(strict_types=1);
 
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 namespace Jose\Bundle\JoseFramework\DataCollector;
 
 use function array_key_exists;
@@ -27,14 +18,9 @@
 
 final class AlgorithmCollector implements Collector
 {
-    /**
-     * @var AlgorithmManagerFactory
-     */
-    private $algorithmManagerFactory;
-
-    public function __construct(AlgorithmManagerFactory $algorithmManagerFactory)
-    {
-        $this->algorithmManagerFactory = $algorithmManagerFactory;
+    public function __construct(
+        private AlgorithmManagerFactory $algorithmManagerFactory
+    ) {
     }
 
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
@@ -49,8 +35,14 @@ public function collect(array &$data, Request $request, Response $response, ?Thr
         $keyEncryptionAlgorithms = 0;
         $contentEncryptionAlgorithms = 0;
         foreach ($algorithms as $alias => $algorithm) {
-            $type = $this->getAlgorithmType($algorithm, $signatureAlgorithms, $macAlgorithms, $keyEncryptionAlgorithms, $contentEncryptionAlgorithms);
-            if (!array_key_exists($type, $data['algorithm']['algorithms'])) {
+            $type = $this->getAlgorithmType(
+                $algorithm,
+                $signatureAlgorithms,
+                $macAlgorithms,
+                $keyEncryptionAlgorithms,
+                $contentEncryptionAlgorithms
+            );
+            if (! array_key_exists($type, $data['algorithm']['algorithms'])) {
                 $data['algorithm']['algorithms'][$type] = [];
             }
             $data['algorithm']['algorithms'][$type][$alias] = [
@@ -66,8 +58,13 @@ public function collect(array &$data, Request $request, Response $response, ?Thr
         ];
     }
 
-    private function getAlgorithmType(Algorithm $algorithm, int &$signatureAlgorithms, int &$macAlgorithms, int &$keyEncryptionAlgorithms, int &$contentEncryptionAlgorithms): string
-    {
+    private function getAlgorithmType(
+        Algorithm $algorithm,
+        int &$signatureAlgorithms,
+        int &$macAlgorithms,
+        int &$keyEncryptionAlgorithms,
+        int &$contentEncryptionAlgorithms
+    ): string {
         switch (true) {
             case $algorithm instanceof SignatureAlgorithm:
                 $signatureAlgorithms++;
@@ -198,7 +195,7 @@ private function getAlgorithmMessages(): array
                 'message' => 'This algorithm is not secured (known attacks). See <a target="_blank" href="https://tools.ietf.org/html/draft-irtf-cfrg-webcrypto-algorithms-00#section-5">https://tools.ietf.org/html/draft-irtf-cfrg-webcrypto-algorithms-00#section-5</a>.',
             ],
         ];
-        if (!function_exists('openssl_pkey_derive')) {
+        if (! function_exists('openssl_pkey_derive')) {
             $messages += [
                 'ECDH-ES' => [
                     'severity' => 'severity-medium',

DataCollector/CheckerCollector.php

@@ -2,15 +2,6 @@
 
 declare(strict_types=1);
 
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 namespace Jose\Bundle\JoseFramework\DataCollector;
 
 use Jose\Bundle\JoseFramework\Event\ClaimCheckedFailureEvent;
@@ -29,50 +20,28 @@
 
 class CheckerCollector implements Collector, EventSubscriberInterface
 {
-    /**
-     * @var null|ClaimCheckerManagerFactory
-     */
-    private $claimCheckerManagerFactory;
-
-    /**
-     * @var null|HeaderCheckerManagerFactory
-     */
-    private $headerCheckerManagerFactory;
-
-    /**
-     * @var array
-     */
-    private $headerCheckedSuccesses = [];
+    private array $headerCheckedSuccesses = [];
 
-    /**
-     * @var array
-     */
-    private $headerCheckedFailures = [];
+    private array $headerCheckedFailures = [];
 
-    /**
-     * @var array
-     */
-    private $claimCheckedSuccesses = [];
+    private array $claimCheckedSuccesses = [];
 
-    /**
-     * @var array
-     */
-    private $claimCheckedFailures = [];
+    private array $claimCheckedFailures = [];
 
     /**
      * @var HeaderCheckerManager[]
      */
-    private $headerCheckerManagers = [];
+    private array $headerCheckerManagers = [];
 
     /**
      * @var ClaimCheckerManager[]
      */
-    private $claimCheckerManagers = [];
+    private array $claimCheckerManagers = [];
 
-    public function __construct(?ClaimCheckerManagerFactory $claimCheckerManagerFactory = null, ?HeaderCheckerManagerFactory $headerCheckerManagerFactory = null)
-    {
-        $this->claimCheckerManagerFactory = $claimCheckerManagerFactory;
-        $this->headerCheckerManagerFactory = $headerCheckerManagerFactory;
+    public function __construct(
+        private ?ClaimCheckerManagerFactory $claimCheckerManagerFactory = null,
+        private ?HeaderCheckerManagerFactory $headerCheckerManagerFactory = null
+    ) {
     }
 
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
@@ -94,7 +63,7 @@ public function addClaimCheckerManager(string $id, ClaimCheckerManager $claimChe
         $this->claimCheckerManagers[$id] = $claimCheckerManager;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             HeaderCheckedSuccessEvent::class => ['catchHeaderCheckSuccess'],
@@ -145,7 +114,7 @@ private function collectHeaderCheckerManagers(array &$data): void
     private function collectSupportedHeaderCheckers(array &$data): void
     {
         $data['checker']['header_checkers'] = [];
-        if (null !== $this->headerCheckerManagerFactory) {
+        if ($this->headerCheckerManagerFactory !== null) {
             $aliases = $this->headerCheckerManagerFactory->all();
             foreach ($aliases as $alias => $checker) {
                 $data['checker']['header_checkers'][$alias] = [
@@ -172,7 +141,7 @@ private function collectClaimCheckerManagers(array &$data): void
     private function collectSupportedClaimCheckers(array &$data): void
     {
         $data['checker']['claim_checkers'] = [];
-        if (null !== $this->claimCheckerManagerFactory) {
+        if ($this->claimCheckerManagerFactory !== null) {
             $aliases = $this->claimCheckerManagerFactory->all();
             foreach ($aliases as $alias => $checker) {
                 $data['checker']['claim_checkers'][$alias] = [

DataCollector/Collector.php

@@ -2,15 +2,6 @@
 
 declare(strict_types=1);
 
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2020 Spomky-Labs
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
 namespace Jose\Bundle\JoseFramework\DataCollector;
 
 use Symfony\Component\HttpFoundation\Request;