Code optimization

src/Decrypter.php

@@ -93,7 +93,7 @@ public function decryptUsingKeySet(JWEInterface &$jwe, JWKSetInterface $jwk_set)
                     if (null !== $cek) {
                         if (true === $this->decryptPayload($jwe, $cek, $content_encryption_algorithm, $complete_headers)) {
                             $this->getCheckerManager()->checkJWT($jwe);
-                            
+
                             return true;
                         };
                     }

src/Loader.php

@@ -15,9 +15,11 @@
 use Jose\Object\JWE;
 use Jose\Object\JWEInterface;
 use Jose\Object\JWS;
+use Jose\Object\JWSInterface;
 use Jose\Object\Recipient;
 use Jose\Object\RecipientInterface;
 use Jose\Object\Signature;
+use Jose\Object\SignatureInterface;
 
 /**
  * Class able to load JWS or JWE.
@@ -55,31 +57,60 @@ public static function load($input)
     private static function loadSerializedJsonJWS(array $data)
     {
         $jws = new JWS();
-        if (array_key_exists('payload', $data)) {
-            $payload = Base64Url::decode($data['payload']);
-            $json = json_decode($payload, true);
-            if (null !== $json && !empty($payload)) {
-                $payload = $json;
-            }
-            $jws = $jws->withPayload($payload);
-        }
+
+        self::populatePayload($jws, $data);
 
         foreach ($data['signatures'] as $signature) {
             $object = new Signature();
             $object = $object->withSignature(Base64Url::decode($signature['signature']));
-            if (array_key_exists('protected', $signature)) {
-                $object = $object->withEncodedProtectedHeaders($signature['protected']);
-            }
-            if (array_key_exists('header', $signature)) {
-                $object = $object->withHeaders($signature['header']);
-            }
+
+            self::populateProtectedHeaders($object, $signature);
+            self::populateHeaders($object, $signature);
 
             $jws = $jws->addSignature($object);
         }
 
         return $jws;
     }
 
+    /**
+     * @param \Jose\Object\SignatureInterface $signature
+     * @param array                           $data
+     */
+    private static function populateProtectedHeaders(SignatureInterface &$signature, array $data)
+    {
+        if (array_key_exists('protected', $data)) {
+            $signature = $signature->withEncodedProtectedHeaders($data['protected']);
+        }
+    }
+
+    /**
+     * @param \Jose\Object\SignatureInterface $signature
+     * @param array                           $data
+     */
+    private static function populateHeaders(SignatureInterface &$signature, array $data)
+    {
+        if (array_key_exists('header', $data)) {
+            $signature = $signature->withHeaders($data['header']);
+        }
+    }
+
+    /**
+     * @param \Jose\Object\JWSInterface $jws
+     * @param array                     $data
+     */
+    private static function populatePayload(JWSInterface &$jws, array $data)
+    {
+        if (array_key_exists('payload', $data)) {
+            $payload = Base64Url::decode($data['payload']);
+            $json = json_decode($payload, true);
+            if (null !== $json && !empty($payload)) {
+                $payload = $json;
+            }
+            $jws = $jws->withPayload($payload);
+        }
+    }
+
     /**
      * @param array $data
      *

src/Object/JWE.php

@@ -304,15 +304,9 @@ public function toCompactJSON($id)
     {
         $recipient = $this->getRecipient($id);
 
-        if (empty($this->getSharedProtectedHeaders())) {
-            throw new \InvalidArgumentException('This JWE does not have shared protected headers and cannot be converted into Compact JSON.');
-        }
-        if (!empty($this->getSharedHeaders()) || !empty($this->getRecipient($id)->getHeaders())) {
-            throw new \InvalidArgumentException('This JWE has shared headers or recipient headers and cannot be converted into Compact JSON.');
-        }
-        if (!empty($this->getAAD())) {
-            throw new \InvalidArgumentException('This JWE has AAD and cannot be converted into Compact JSON.');
-        }
+        $this->checkHasNoAAD();
+        $this->checkHasSharedProtectedHeaders();
+        $this->checkRecipientHasNoHeaders($id);
 
         return sprintf(
             '%s.%s.%s.%s.%s',
@@ -324,6 +318,36 @@ public function toCompactJSON($id)
         );
     }
 
+    /**
+     *
+     */
+    private function checkHasNoAAD()
+    {
+        if (!empty($this->getAAD())) {
+            throw new \InvalidArgumentException('This JWE has AAD and cannot be converted into Compact JSON.');
+        }
+    }
+
+    /**
+     * @param int $id
+     */
+    private function checkRecipientHasNoHeaders($id)
+    {
+        if (!empty($this->getSharedHeaders()) || !empty($this->getRecipient($id)->getHeaders())) {
+            throw new \InvalidArgumentException('This JWE has shared headers or recipient headers and cannot be converted into Compact JSON.');
+        }
+    }
+
+    /**
+     *
+     */
+    private function checkHasSharedProtectedHeaders()
+    {
+        if (empty($this->getSharedProtectedHeaders())) {
+            throw new \InvalidArgumentException('This JWE does not have shared protected headers and cannot be converted into Compact JSON.');
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

src/Verifier.php

@@ -103,7 +103,7 @@ private function checkJWKSet(JWKSetInterface $jwk_set)
 
     /**
      * @param \Jose\Object\JWSInterface $jws
-     * @param null                      $detached_payload
+     * @param null|string               $detached_payload
      */
     private function checkPayload(JWSInterface $jws, $detached_payload = null)
     {