smarcet / JOSE4PHP

src/jwa/JSONWebSignatureAndEncryptionAlgorithms.php

Spacing +13 added lines, -15 removed lines

@@ -129,7 +129,7 @@ 
     /**
      *  AES Key Wrap using 256-bit key
      */
-    const A256KW= 'A256KW';
+    const A256KW = 'A256KW';
 
     /**
      *   Direct use of a shared symmetric key
@@ -216,43 +216,41 @@ 
      */
     const A256GCM = 'A256GCM';
 
-    public static $header_location_alg = array
-    (
+    public static $header_location_alg = array(
         self::HS256,
         self::HS384,
         self::HS512,
         self::RS256,
         self::RS384,
         self::RS512,
-        self::ES256 ,
+        self::ES256,
         self::ES384,
-        self::ES512 ,
+        self::ES512,
         self::PS256,
-        self::PS384 ,
+        self::PS384,
         self::PS512,
         self::None,
         self::RSA1_5,
-        self::RSA_OAEP ,
+        self::RSA_OAEP,
         self::RSA_OAEP_256,
-        self::A128KW ,
+        self::A128KW,
         self::A192KW,
         self::A192KW,
         self::A256KW,
         self::Dir,
         self::ECDH_ES,
-        self::ECDH_ES_A128KW ,
+        self::ECDH_ES_A128KW,
         self::ECDH_ES_A192KW,
-        self::ECDH_ES_A256KW ,
-        self::A128GCMKW ,
+        self::ECDH_ES_A256KW,
+        self::A128GCMKW,
         self::A192GCMKW,
-        self::A256GCMKW ,
-        self::PBES2_HS256_A128KW ,
+        self::A256GCMKW,
+        self::PBES2_HS256_A128KW,
         self::PBES2_HS384_A192KW,
         self::PBES2_HS512_A256KW,
     );
 
-    public static $header_location_enc = array
-    (
+    public static $header_location_enc = array(
         self::A128CBC_HS256,
         self::A192CBC_HS384,
         self::A256CBC_HS512,

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwt/JWTClaim.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
      * @param string $name
      * @param JsonValue $value
      */
-    public function __construct($name , $value){
+    public function __construct($name, $value) {
         $this->name  = $name;
         $this->value = $value;
     }
@@ -53,21 +53,21 @@ 
     /**
      * @return string
      */
-    public function getName(){
+    public function getName() {
         return $this->name;
     }
 
     /**
      * @return JsonValue
      */
-    public function getValue(){
+    public function getValue() {
         return $this->value;
     }
 
     /**
      * @return array|bool|int|string|\utils\json_types\IJsonObject
      */
-    public function getRawValue(){
+    public function getRawValue() {
         return $this->getValue()->getValue();
     }
 

src/jwt/RegisteredJWTClaimNames.php

Spacing +3 added lines, -5 removed lines

@@ -105,9 +105,8 @@ 
      * @var array
      * @see jwt/impl/JWTClaimSet.php constructor
      */
-    public static $registered_claim_set = array
-    (
-        self::Issuer ,
+    public static $registered_claim_set = array(
+        self::Issuer,
         self::Subject,
         self::Audience,
         self::IssuedAt,
@@ -119,8 +118,7 @@ 
     /**
      * @var array
      */
-    public static $registered_claim_set_types = array
-    (
+    public static $registered_claim_set_types = array(
         self::Issuer         => JsonTypes::StringOrURI,
         self::Audience       => JsonTypes::StringOrURI,
         self::Subject        => JsonTypes::StringOrURI,

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwt/impl/JWT.php

Spacing +4 added lines, -5 removed lines

@@ -91,9 +91,8 @@ 
      */
     public function take()
     {
-        $payload = ($this->header->getType()->getString() === 'JWT') ?  $this->claim_set : '';
-        return array
-        (
+        $payload = ($this->header->getType()->getString() === 'JWT') ? $this->claim_set : '';
+        return array(
             $this->header,
             $payload,
             $this->signature
@@ -108,9 +107,9 @@ 
     {
         $now = new \DateTime();
         $exp = $this->getClaimSet()->getExpirationTime()->getDateTime();
-        if($exp < $now) return true;
+        if ($exp < $now) return true;
         $iat = $this->getClaimSet()->getIssuedAt()->getDateTime();
-        if($iat > $now) return true;
+        if ($iat > $now) return true;
         $diff = $now->getTimestamp() - $iat->getTimestamp();
         return $diff > $tolerance;
     }

Braces +6 added lines, -2 removed lines

@@ -108,9 +108,13 @@
     {
         $now = new \DateTime();
         $exp = $this->getClaimSet()->getExpirationTime()->getDateTime();
-        if($exp < $now) return true;
+        if($exp < $now) {
+         return true;
+        }
         $iat = $this->getClaimSet()->getIssuedAt()->getDateTime();
-        if($iat > $now) return true;
+        if($iat > $now) {
+         return true;
+        }
         $diff = $now->getTimestamp() - $iat->getTimestamp();
         return $diff > $tolerance;
     }

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwt/impl/JWTSerializer.php

Spacing +6 added lines, -6 removed lines

@@ -31,11 +31,11 @@ 
      * @param IJWTSnapshot $jwt_snapshot
      * @return string
      */
-    static public function serialize(IJWTSnapshot $jwt_snapshot){
+    static public function serialize(IJWTSnapshot $jwt_snapshot) {
         list($header, $payload, $signature) = $jwt_snapshot->take();
 
         $e_header    = JOSEHeaderSerializer::serialize($header);
-        $e_payload   = ($header->getType()->getString() === 'JWT') ?  JWTClaimSetSerializer::serialize($payload) : JWTRawSerializer::serialize($payload);
+        $e_payload   = ($header->getType()->getString() === 'JWT') ? JWTClaimSetSerializer::serialize($payload) : JWTRawSerializer::serialize($payload);
         $e_signature = JWTRawSerializer::serialize($signature);
 
         return sprintf('%s.%s.%s', $e_header, $e_payload, $e_signature);
@@ -46,18 +46,18 @@ 
      * @return array
      * @throws InvalidJWTException
      */
-    static public function deserialize($input){
+    static public function deserialize($input) {
 
         $e_parts = explode(IBasicJWT::SegmentSeparator, $input);
 
-        if(count($e_parts) < 2)
+        if (count($e_parts) < 2)
             throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
         $e_header    = $e_parts[0];
         $e_payload   = $e_parts[1];
-        $e_signature = count($e_parts)>2 ? $e_parts[2] : '';
+        $e_signature = count($e_parts) > 2 ? $e_parts[2] : '';
         $header    = JOSEHeaderSerializer::deserialize($e_header);
         $payload   = ($header->getType()->getString() === 'JWT') ? JWTClaimSetSerializer::deserialize($e_payload) : JWTRawSerializer::deserialize($e_payload);
-        $signature = !empty($e_signature) ? JWTRawSerializer::deserialize($e_signature): '';
+        $signature = !empty($e_signature) ? JWTRawSerializer::deserialize($e_signature) : '';
         return array($header, $payload, $signature);
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 
         $e_parts = explode(IBasicJWT::SegmentSeparator, $input);
 
-        if(count($e_parts) < 2)
-            throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
+        if(count($e_parts) < 2) {
+                    throw new InvalidJWTException(sprintf('%s has only 2 or less encoded parts!'));
+        }
         $e_header    = $e_parts[0];
         $e_payload   = $e_parts[1];
         $e_signature = count($e_parts)>2 ? $e_parts[2] : '';

src/jwt/impl/JWTClaimSet.php

Spacing +3 added lines, -5 removed lines

@@ -40,8 +40,7 @@ 
      * @param JsonValue $id
      * @param NumericDate $nbf
      */
-    public function __construct
-    (
+    public function __construct(
         StringOrURI $issuer          = null,
         StringOrURI $subject         = null,
         StringOrURI $audience        = null,
@@ -135,7 +134,7 @@ 
     public function getClaims()
     {
        $claims = array();
-       foreach($this->set as $k => $v)
+       foreach ($this->set as $k => $v)
        {
            array_push($claims, new JWTClaim($k, $v));
        }
@@ -260,7 +259,6 @@ 
     public function getClaimByName($claim_name)
     {
        return isset($this->set[$claim_name]) ?
-           $this->set[$claim_name] :
-           null;
+           $this->set[$claim_name] : null;
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -123,8 +123,9 @@
      */
     public function addClaim(JWTClaim $claim)
     {
-        if (isset($this->set[$claim->getName()]))
-            throw new ClaimAlreadyExistsException($claim->getName());
+        if (isset($this->set[$claim->getName()])) {
+                    throw new ClaimAlreadyExistsException($claim->getName());
+        }
 
         $this->set[$claim->getName()] = $claim->getValue();
     }

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwt/impl/JOSEHeader.php

Spacing +2 added lines, -3 removed lines

@@ -33,8 +33,7 @@ 
      * @param JsonValue|null $kid
      * @param StringOrURI|null $cty
      */
-    public function __construct
-    (
+    public function __construct(
         StringOrURI $alg,
         StringOrURI $type = null,
         JsonValue   $kid  = null,
@@ -96,7 +95,7 @@ 
     public function getHeaderByName($name)
     {
         $value = $this[$name];
-        if(is_null($value)) return null;
+        if (is_null($value)) return null;
         return new JOSEHeaderParam($name, $value);
     }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -96,7 +96,9 @@
     public function getHeaderByName($name)
     {
         $value = $this[$name];
-        if(is_null($value)) return null;
+        if(is_null($value)) {
+         return null;
+        }
         return new JOSEHeaderParam($name, $value);
     }
 }
\ No newline at end of file

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwt/impl/UnsecuredJWT.php

Spacing +3 added lines, -5 removed lines

@@ -37,10 +37,8 @@ 
     protected function __construct(IJWTClaimSet $claim_set)
     {
 
-        parent::__construct
-        (
-            new JOSEHeader
-            (
+        parent::__construct(
+            new JOSEHeader(
                 new StringOrURI('none'),
                 new StringOrURI('JWT')
             ),
@@ -75,7 +73,7 @@ 
     {
         list($header, $payload, $signature) = JWTSerializer::deserialize($compact_serialization);
 
-        if(!($payload instanceof IJWTClaimSet))
+        if (!($payload instanceof IJWTClaimSet))
             throw new \RuntimeException('Invalid payload type!');
 
         $jwt = new UnsecuredJWT($payload);

Braces +3 added lines, -2 removed lines

@@ -75,8 +75,9 @@
     {
         list($header, $payload, $signature) = JWTSerializer::deserialize($compact_serialization);
 
-        if(!($payload instanceof IJWTClaimSet))
-            throw new \RuntimeException('Invalid payload type!');
+        if(!($payload instanceof IJWTClaimSet)) {
+                    throw new \RuntimeException('Invalid payload type!');
+        }
 
         $jwt = new UnsecuredJWT($payload);
         $jwt->header = $header;

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;
 

src/jwt/utils/JWTRawSerializer.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
      * @param string $raw_input
      * @return string
      */
-    public static function serialize($raw_input){
+    public static function serialize($raw_input) {
         $base64 = new Base64UrlRepresentation();
         return $base64->encode($raw_input);
     }
@@ -30,7 +30,7 @@ 
      * @param string $input
      * @return string
      */
-    public static function deserialize($input){
+    public static function deserialize($input) {
         $base64 = new Base64UrlRepresentation();
         return $base64->decode($input);
     }

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace jwk;