chore: fixes cs and adds cs checking to travis (firebase#284)

tedchiu · Mar 25, 2020 · feb0e82 · feb0e82
1 parent 3811d69
commit feb0e82
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 136 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,4 +5,3 @@
 /.gitignore export-ignore
 /.travis.yml export-ignore
 /phpunit.xml.dist export-ignore
-/run-tests.sh export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: php
 
+branches:
+  - only: [master]
+
 php:
   - 5.6
   - 7.0
@@ -16,8 +19,18 @@ matrix:
       dist: trusty
     - php: 5.5
       dist: trusty
+    - name: "Check Style"
+      php: "7.4"
+      env: RUN_CS_FIXER=true
 
 sudo: false
 
 before_script: composer install
-script: vendor/bin/phpunit
+script:
+  - if [ "${RUN_CS_FIXER}" = "true" ]; then
+      composer require friendsofphp/php-cs-fixer &&
+      vendor/bin/php-cs-fixer fix --diff --dry-run . &&
+      vendor/bin/php-cs-fixer fix --rules=native_function_invocation --allow-risky=yes --diff src;
+    else
+      vendor/bin/phpunit;
+    fi
diff --git a/run-tests.sh b/run-tests.sh
diff --git a/src/BeforeValidException.php b/src/BeforeValidException.php
@@ -3,5 +3,4 @@
 
 class BeforeValidException extends \UnexpectedValueException
 {
-
 }
diff --git a/src/ExpiredException.php b/src/ExpiredException.php
@@ -3,5 +3,4 @@
 
 class ExpiredException extends \UnexpectedValueException
 {
-
 }
diff --git a/src/JWK.php b/src/JWK.php
@@ -50,7 +50,7 @@ public static function parseKeySet(array $jwks)
             }
         }
 
-        if (0 === count($keys)) {
+        if (0 === \count($keys)) {
             throw new UnexpectedValueException('No supported algorithms found in JWK Set');
         }
 
@@ -81,18 +81,18 @@ private static function parseKey(array $jwk)
 
         switch ($jwk['kty']) {
             case 'RSA':
-                if (array_key_exists('d', $jwk)) {
+                if (\array_key_exists('d', $jwk)) {
                     throw new UnexpectedValueException('RSA private keys are not supported');
                 }
                 if (!isset($jwk['n']) || !isset($jwk['e'])) {
                     throw new UnexpectedValueException('RSA keys must contain values for both "n" and "e"');
                 }
 
                 $pem = self::createPemFromModulusAndExponent($jwk['n'], $jwk['e']);
-                $publicKey = openssl_pkey_get_public($pem);
+                $publicKey = \openssl_pkey_get_public($pem);
                 if (false === $publicKey) {
                     throw new DomainException(
-                        'OpenSSL error: ' . openssl_error_string()
+                        'OpenSSL error: ' . \openssl_error_string()
                     );
                 }
                 return $publicKey;
@@ -118,32 +118,32 @@ private static function createPemFromModulusAndExponent($n, $e)
         $publicExponent = JWT::urlsafeB64Decode($e);
 
         $components = array(
-            'modulus' => pack('Ca*a*', 2, self::encodeLength(strlen($modulus)), $modulus),
-            'publicExponent' => pack('Ca*a*', 2, self::encodeLength(strlen($publicExponent)), $publicExponent)
+            'modulus' => \pack('Ca*a*', 2, self::encodeLength(\strlen($modulus)), $modulus),
+            'publicExponent' => \pack('Ca*a*', 2, self::encodeLength(\strlen($publicExponent)), $publicExponent)
         );
 
-        $rsaPublicKey = pack(
+        $rsaPublicKey = \pack(
             'Ca*a*a*',
             48,
-            self::encodeLength(strlen($components['modulus']) + strlen($components['publicExponent'])),
+            self::encodeLength(\strlen($components['modulus']) + \strlen($components['publicExponent'])),
             $components['modulus'],
             $components['publicExponent']
         );
 
         // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
-        $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-        $rsaPublicKey = chr(0) . $rsaPublicKey;
-        $rsaPublicKey = chr(3) . self::encodeLength(strlen($rsaPublicKey)) . $rsaPublicKey;
+        $rsaOID = \pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+        $rsaPublicKey = \chr(0) . $rsaPublicKey;
+        $rsaPublicKey = \chr(3) . self::encodeLength(\strlen($rsaPublicKey)) . $rsaPublicKey;
 
-        $rsaPublicKey = pack(
+        $rsaPublicKey = \pack(
             'Ca*a*',
             48,
-            self::encodeLength(strlen($rsaOID . $rsaPublicKey)),
+            self::encodeLength(\strlen($rsaOID . $rsaPublicKey)),
             $rsaOID . $rsaPublicKey
         );
 
         $rsaPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-            chunk_split(base64_encode($rsaPublicKey), 64) .
+            \chunk_split(\base64_encode($rsaPublicKey), 64) .
             '-----END PUBLIC KEY-----';
 
         return $rsaPublicKey;
@@ -161,11 +161,11 @@ private static function createPemFromModulusAndExponent($n, $e)
     private static function encodeLength($length)
     {
         if ($length <= 0x7F) {
-            return chr($length);
+            return \chr($length);
         }
 
-        $temp = ltrim(pack('N', $length), chr(0));
+        $temp = \ltrim(\pack('N', $length), \chr(0));
 
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
+        return \pack('Ca*', 0x80 | \strlen($temp), $temp);
     }
 }