o2system / security

src/Encryptions/Cookie.php

Spacing +15 added lines, -15 removed lines

@@ -59,15 +59,15 @@ 
 
         if (class_exists('\O2System\Framework', false)) {
             $this->options = config()->getItem('cookie')->getArrayCopy();
-            $this->options[ 'expire' ] = time() + $this->options[ 'lifetime' ];
-            unset($this->options[ 'lifetime' ]);
+            $this->options['expire'] = time() + $this->options['lifetime'];
+            unset($this->options['lifetime']);
         }
 
-        $this->options[ 'domain' ] = empty($this->options[ 'domain' ])
-            ? isset($_SERVER[ 'HTTP_HOST' ])
-                ? $_SERVER[ 'HTTP_HOST' ]
-                : $_SERVER[ 'SERVER_NAME' ]
-            : $this->options[ 'domain' ];
+        $this->options['domain'] = empty($this->options['domain'])
+            ? isset($_SERVER['HTTP_HOST'])
+                ? $_SERVER['HTTP_HOST']
+                : $_SERVER['SERVER_NAME']
+            : $this->options['domain'];
     }
 
     // ------------------------------------------------------------------------
@@ -85,7 +85,7 @@ 
     {
         foreach ($options as $key => $value) {
             if (array_key_exists($key, $this->options)) {
-                $this->options[ $key ] = $value;
+                $this->options[$key] = $value;
             }
         }
 
@@ -110,8 +110,8 @@ 
             ? serialize($value)
             : $value;
 
-        $name = isset($this->options[ 'prefix' ])
-            ? $this->options[ 'prefix' ] . $name
+        $name = isset($this->options['prefix'])
+            ? $this->options['prefix'] . $name
             : $name;
 
         $value = $this->crypt->encrypt($value);
@@ -119,9 +119,9 @@ 
         return setcookie(
             $name,
             $value,
-            $this->options[ 'expire' ],
-            $this->options[ 'path' ],
-            '.' . ltrim($this->options[ 'domain' ], '.'),
+            $this->options['expire'],
+            $this->options['path'],
+            '.' . ltrim($this->options['domain'], '.'),
             false,
             false
         );
@@ -140,8 +140,8 @@ 
      */
     public function decrypt($name)
     {
-        $name = isset($this->options[ 'prefix' ])
-            ? $this->options[ 'prefix' ] . $name
+        $name = isset($this->options['prefix'])
+            ? $this->options['prefix'] . $name
             : $name;
 
         if ($value = input()->cookie($name)) {

src/Encryptions/Crypt.php

Spacing +110 added lines, -110 removed lines

@@ -131,7 +131,7 @@ 
             'openssl' => extension_loaded('openssl'),
         ];
 
-        if ( ! $this->drivers[ 'mcrypt' ] && ! $this->drivers[ 'openssl' ]) {
+        if ( ! $this->drivers['mcrypt'] && ! $this->drivers['openssl']) {
             //Encryption: Unable to find an available encryption driver.
             throw new BadPhpExtensionCallException('E_SECURITY_CRYPT_UNABLE_TO_FIND_DRIVER');
         }
@@ -163,14 +163,14 @@ 
      */
     public function initialize(array $params)
     {
-        if ( ! empty($params[ 'driver' ])) {
-            if (isset($this->drivers[ $params[ 'driver' ] ])) {
-                if ($this->drivers[ $params[ 'driver' ] ]) {
-                    $this->driver = $params[ 'driver' ];
+        if ( ! empty($params['driver'])) {
+            if (isset($this->drivers[$params['driver']])) {
+                if ($this->drivers[$params['driver']]) {
+                    $this->driver = $params['driver'];
                 } else {
                     //"Encryption: Driver '" . $params[ 'driver' ] . "' is not available."
                     throw new BadPhpExtensionCallException(
-                        'E_SECURITY_CRYPT_DRIVER_NOT_AVAILABLE', $params[ 'driver' ]
+                        'E_SECURITY_CRYPT_DRIVER_NOT_AVAILABLE', $params['driver']
                     );
                 }
             } else {
@@ -178,19 +178,19 @@ 
                 throw new BadPhpExtensionCallException(
                     'E_SECURITY_CRYPT_DRIVER_NOT_CONFIGURED',
                     0,
-                    [$params[ 'driver' ]]
+                    [$params['driver']]
                 );
             }
         }
 
         if (empty($this->driver)) {
-            $this->driver = ($this->drivers[ 'openssl' ] === true)
+            $this->driver = ($this->drivers['openssl'] === true)
                 ? 'openssl'
                 : 'mcrypt';
         }
 
-        empty($params[ 'cipher' ]) && $params[ 'cipher' ] = $this->cipher;
-        empty($params[ 'key' ]) OR $this->key = $params[ 'key' ];
+        empty($params['cipher']) && $params['cipher'] = $this->cipher;
+        empty($params['key']) OR $this->key = $params['key'];
         $this->{$this->driver . 'Initialize'}($params);
 
         return $this;
@@ -237,20 +237,20 @@ 
             return false;
         }
 
-        isset($params[ 'key' ]) OR
-        $params[ 'key' ] = $this->hkdf($this->key, 'sha512', null, self::strlen($this->key), 'encryption');
+        isset($params['key']) OR
+        $params['key'] = $this->hkdf($this->key, 'sha512', null, self::strlen($this->key), 'encryption');
 
         if (($data = $this->{$this->driver . 'Encrypt'}($data, $params)) === false) {
             return false;
         }
 
-        $params[ 'base64' ] && $data = base64_encode($data);
+        $params['base64'] && $data = base64_encode($data);
 
-        if (isset($params[ 'hmac_digest' ])) {
-            isset($params[ 'hmac_key' ]) OR
-            $params[ 'hmac_key' ] = $this->hkdf($this->key, 'sha512', null, null, 'authentication');
+        if (isset($params['hmac_digest'])) {
+            isset($params['hmac_key']) OR
+            $params['hmac_key'] = $this->hkdf($this->key, 'sha512', null, null, 'authentication');
 
-            return hash_hmac($params[ 'hmac_digest' ], $data, $params[ 'hmac_key' ], ! $params[ 'base64' ]) . $data;
+            return hash_hmac($params['hmac_digest'], $data, $params['hmac_key'], ! $params['base64']) . $data;
         }
 
         return $data;
@@ -277,49 +277,49 @@ 
                     'hmac_key'    => null,
                 ]
                 : false;
-        } elseif ( ! isset($params[ 'cipher' ], $params[ 'mode' ], $params[ 'key' ])) {
+        } elseif ( ! isset($params['cipher'], $params['mode'], $params['key'])) {
             return false;
         }
 
-        if (isset($params[ 'mode' ])) {
-            $params[ 'mode' ] = strtolower($params[ 'mode' ]);
-            if ( ! isset($this->modes[ $this->driver ][ $params[ 'mode' ] ])) {
+        if (isset($params['mode'])) {
+            $params['mode'] = strtolower($params['mode']);
+            if ( ! isset($this->modes[$this->driver][$params['mode']])) {
                 return false;
             } else {
-                $params[ 'mode' ] = $this->modes[ $this->driver ][ $params[ 'mode' ] ];
+                $params['mode'] = $this->modes[$this->driver][$params['mode']];
             }
         }
 
-        if (isset($params[ 'hmac' ]) && $params[ 'hmac' ] === false) {
-            $params[ 'hmac_digest' ] = $params[ 'hmac_key' ] = null;
+        if (isset($params['hmac']) && $params['hmac'] === false) {
+            $params['hmac_digest'] = $params['hmac_key'] = null;
         } else {
-            if ( ! isset($params[ 'hmac_key' ])) {
+            if ( ! isset($params['hmac_key'])) {
                 return false;
-            } elseif (isset($params[ 'hmac_digest' ])) {
-                $params[ 'hmac_digest' ] = strtolower($params[ 'hmac_digest' ]);
-                if ( ! isset($this->digests[ $params[ 'hmac_digest' ] ])) {
+            } elseif (isset($params['hmac_digest'])) {
+                $params['hmac_digest'] = strtolower($params['hmac_digest']);
+                if ( ! isset($this->digests[$params['hmac_digest']])) {
                     return false;
                 }
             } else {
-                $params[ 'hmac_digest' ] = 'sha512';
+                $params['hmac_digest'] = 'sha512';
             }
         }
 
         $params = [
             'handle'      => null,
-            'cipher'      => $params[ 'cipher' ],
-            'mode'        => $params[ 'mode' ],
-            'key'         => $params[ 'key' ],
-            'base64'      => isset($params[ 'raw_data' ])
-                ? ! $params[ 'raw_data' ]
+            'cipher'      => $params['cipher'],
+            'mode'        => $params['mode'],
+            'key'         => $params['key'],
+            'base64'      => isset($params['raw_data'])
+                ? ! $params['raw_data']
                 : false,
-            'hmac_digest' => $params[ 'hmac_digest' ],
-            'hmac_key'    => $params[ 'hmac_key' ],
+            'hmac_digest' => $params['hmac_digest'],
+            'hmac_key'    => $params['hmac_key'],
         ];
 
-        $this->cipherAlias($params[ 'cipher' ]);
-        $params[ 'handle' ] = ($params[ 'cipher' ] !== $this->cipher OR $params[ 'mode' ] !== $this->mode)
-            ? $this->{$this->driver . 'GetHandle'}($params[ 'cipher' ], $params[ 'mode' ])
+        $this->cipherAlias($params['cipher']);
+        $params['handle'] = ($params['cipher'] !== $this->cipher OR $params['mode'] !== $this->mode)
+            ? $this->{$this->driver . 'GetHandle'}($params['cipher'], $params['mode'])
             : $this->handle;
 
         return $params;
@@ -394,8 +394,8 @@ 
             //   confirms that it is MCrypt's fault.
         }
 
-        if (isset($dictionary[ $this->driver ][ $cipher ])) {
-            $cipher = $dictionary[ $this->driver ][ $cipher ];
+        if (isset($dictionary[$this->driver][$cipher])) {
+            $cipher = $dictionary[$this->driver][$cipher];
         }
     }
 
@@ -416,17 +416,17 @@ 
      */
     public function hkdf($key, $digest = 'sha512', $salt = null, $length = null, $info = '')
     {
-        if ( ! isset($this->digests[ $digest ])) {
+        if ( ! isset($this->digests[$digest])) {
             return false;
         }
 
         if (empty($length) OR ! is_int($length)) {
-            $length = $this->digests[ $digest ];
-        } elseif ($length > (255 * $this->digests[ $digest ])) {
+            $length = $this->digests[$digest];
+        } elseif ($length > (255 * $this->digests[$digest])) {
             return false;
         }
 
-        self::strlen($salt) OR $salt = str_repeat("\0", $this->digests[ $digest ]);
+        self::strlen($salt) OR $salt = str_repeat("\0", $this->digests[$digest]);
 
         $prk = hash_hmac($digest, $key, $salt, true);
         $key = '';
@@ -482,12 +482,12 @@ 
             return false;
         }
 
-        if (isset($params[ 'hmac_digest' ])) {
+        if (isset($params['hmac_digest'])) {
             // This might look illogical, but it is done during encryption as well ...
             // The 'base64' value is effectively an inverted "raw data" parameter
-            $digest_size = ($params[ 'base64' ])
-                ? $this->digests[ $params[ 'hmac_digest' ] ] * 2
-                : $this->digests[ $params[ 'hmac_digest' ] ];
+            $digest_size = ($params['base64'])
+                ? $this->digests[$params['hmac_digest']] * 2
+                : $this->digests[$params['hmac_digest']];
 
             if (self::strlen($data) <= $digest_size) {
                 return false;
@@ -496,14 +496,14 @@ 
             $hmac_input = self::substr($data, 0, $digest_size);
             $data = self::substr($data, $digest_size);
 
-            isset($params[ 'hmac_key' ]) OR
-            $params[ 'hmac_key' ] = $this->hkdf($this->key, 'sha512', null, null, 'authentication');
-            $hmac_check = hash_hmac($params[ 'hmac_digest' ], $data, $params[ 'hmac_key' ], ! $params[ 'base64' ]);
+            isset($params['hmac_key']) OR
+            $params['hmac_key'] = $this->hkdf($this->key, 'sha512', null, null, 'authentication');
+            $hmac_check = hash_hmac($params['hmac_digest'], $data, $params['hmac_key'], ! $params['base64']);
 
             // Time-attack-safe comparison
             $diff = 0;
             for ($i = 0; $i < $digest_size; $i++) {
-                $diff |= ord($hmac_input[ $i ]) ^ ord($hmac_check[ $i ]);
+                $diff |= ord($hmac_input[$i]) ^ ord($hmac_check[$i]);
             }
 
             if ($diff !== 0) {
@@ -511,12 +511,12 @@ 
             }
         }
 
-        if ($params[ 'base64' ]) {
+        if ($params['base64']) {
             $data = base64_decode($data);
         }
 
-        isset($params[ 'key' ]) OR
-        $params[ 'key' ] = $this->hkdf($this->key, 'sha512', null, self::strlen($this->key), 'encryption');
+        isset($params['key']) OR
+        $params['key'] = $this->hkdf($this->key, 'sha512', null, self::strlen($this->key), 'encryption');
 
         return $this->{$this->driver . 'Decrypt'}($data, $params);
     }
@@ -534,7 +534,7 @@ 
     {
         // Because aliases
         if ($key === 'mode') {
-            return array_search($this->mode, $this->modes[ $this->driver ], true);
+            return array_search($this->mode, $this->modes[$this->driver], true);
         } elseif (in_array($key, ['cipher', 'driver', 'drivers', 'digests'], true)) {
             return $this->{'_' . $key};
         }
@@ -553,33 +553,33 @@ 
      */
     protected function mcryptInitialize($params)
     {
-        if ( ! empty($params[ 'cipher' ])) {
-            $params[ 'cipher' ] = strtolower($params[ 'cipher' ]);
-            $this->cipherAlias($params[ 'cipher' ]);
+        if ( ! empty($params['cipher'])) {
+            $params['cipher'] = strtolower($params['cipher']);
+            $this->cipherAlias($params['cipher']);
 
-            if ( ! in_array($params[ 'cipher' ], mcrypt_list_algorithms(), true)) {
+            if ( ! in_array($params['cipher'], mcrypt_list_algorithms(), true)) {
                 // 'Encryption: MCrypt cipher ' . strtoupper( $params[ 'cipher' ] ) . ' is not available.'
                 throw new BadFunctionCallException(
                     'E_SECURITY_MCRYPT_CIPHER_UNAVAILABLE',
                     0,
-                    [strtoupper($params[ 'cipher' ])]
+                    [strtoupper($params['cipher'])]
                 );
             } else {
-                $this->cipher = $params[ 'cipher' ];
+                $this->cipher = $params['cipher'];
             }
         }
 
-        if ( ! empty($params[ 'mode' ])) {
-            $params[ 'mode' ] = strtolower($params[ 'mode' ]);
-            if ( ! isset($this->modes[ 'mcrypt' ][ $params[ 'mode' ] ])) {
+        if ( ! empty($params['mode'])) {
+            $params['mode'] = strtolower($params['mode']);
+            if ( ! isset($this->modes['mcrypt'][$params['mode']])) {
                 // 'Encryption: MCrypt mode ' . strtoupper( $params[ 'mode' ] ) . ' is not available.'
                 throw new BadFunctionCallException(
                     'E_SECURITY_MCRYPT_MODE_UNAVAILABLE',
                     0,
-                    [strtoupper($params[ 'mode' ])]
+                    [strtoupper($params['mode'])]
                 );
             } else {
-                $this->mode = $this->modes[ 'mcrypt' ][ $params[ 'mode' ] ];
+                $this->mode = $this->modes['mcrypt'][$params['mode']];
             }
         }
 
@@ -618,23 +618,23 @@ 
      */
     protected function opensslInitialize($params)
     {
-        if ( ! empty($params[ 'cipher' ])) {
-            $params[ 'cipher' ] = strtolower($params[ 'cipher' ]);
-            $this->cipherAlias($params[ 'cipher' ]);
-            $this->cipher = $params[ 'cipher' ];
+        if ( ! empty($params['cipher'])) {
+            $params['cipher'] = strtolower($params['cipher']);
+            $this->cipherAlias($params['cipher']);
+            $this->cipher = $params['cipher'];
         }
 
-        if ( ! empty($params[ 'mode' ])) {
-            $params[ 'mode' ] = strtolower($params[ 'mode' ]);
-            if ( ! isset($this->modes[ 'openssl' ][ $params[ 'mode' ] ])) {
+        if ( ! empty($params['mode'])) {
+            $params['mode'] = strtolower($params['mode']);
+            if ( ! isset($this->modes['openssl'][$params['mode']])) {
                 // 'Encryption: OpenSSL mode ' . strtoupper( $params[ 'mode' ] ) . ' is not available.'
                 throw new BadFunctionCallException(
                     'E_SECURITY_CRYPT_OPENSSL_MODE_UNAVAILABLE',
                     0,
-                    [strtoupper($params[ 'mode' ])]
+                    [strtoupper($params['mode'])]
                 );
             } else {
-                $this->mode = $this->modes[ 'openssl' ][ $params[ 'mode' ] ];
+                $this->mode = $this->modes['openssl'][$params['mode']];
             }
         }
 
@@ -676,19 +676,19 @@ 
      */
     protected function mcryptEncrypt($data, $params)
     {
-        if ( ! is_resource($params[ 'handle' ])) {
+        if ( ! is_resource($params['handle'])) {
             return false;
         }
 
         // The greater-than-1 comparison is mostly a work-around for a bug,
         // where 1 is returned for ARCFour instead of 0.
-        $iv = (($iv_size = mcrypt_enc_get_iv_size($params[ 'handle' ])) > 1)
+        $iv = (($iv_size = mcrypt_enc_get_iv_size($params['handle'])) > 1)
             ? $this->createKey($iv_size)
             : null;
 
-        if (mcrypt_generic_init($params[ 'handle' ], $params[ 'key' ], $iv) < 0) {
-            if ($params[ 'handle' ] !== $this->handle) {
-                mcrypt_module_close($params[ 'handle' ]);
+        if (mcrypt_generic_init($params['handle'], $params['key'], $iv) < 0) {
+            if ($params['handle'] !== $this->handle) {
+                mcrypt_module_close($params['handle']);
             }
 
             return false;
@@ -696,8 +696,8 @@ 
 
         // Use PKCS#7 padding in order to ensure compatibility with OpenSSL
         // and other implementations outside of PHP.
-        if (in_array(strtolower(mcrypt_enc_get_modes_name($params[ 'handle' ])), ['cbc', 'ecb'], true)) {
-            $block_size = mcrypt_enc_get_block_size($params[ 'handle' ]);
+        if (in_array(strtolower(mcrypt_enc_get_modes_name($params['handle'])), ['cbc', 'ecb'], true)) {
+            $block_size = mcrypt_enc_get_block_size($params['handle']);
             $pad = $block_size - (self::strlen($data) % $block_size);
             $data .= str_repeat(chr($pad), $pad);
         }
@@ -713,13 +713,13 @@ 
         // This probably would've been fine (even though still wasteful),
         // but OpenSSL isn't that dumb and we need to make the process
         // portable, so ...
-        $data = (mcrypt_enc_get_modes_name($params[ 'handle' ]) !== 'ECB')
-            ? $iv . mcrypt_generic($params[ 'handle' ], $data)
-            : mcrypt_generic($params[ 'handle' ], $data);
+        $data = (mcrypt_enc_get_modes_name($params['handle']) !== 'ECB')
+            ? $iv . mcrypt_generic($params['handle'], $data)
+            : mcrypt_generic($params['handle'], $data);
 
-        mcrypt_generic_deinit($params[ 'handle' ]);
-        if ($params[ 'handle' ] !== $this->handle) {
-            mcrypt_module_close($params[ 'handle' ]);
+        mcrypt_generic_deinit($params['handle']);
+        if ($params['handle'] !== $this->handle) {
+            mcrypt_module_close($params['handle']);
         }
 
         return $data;
@@ -768,18 +768,18 @@ 
      */
     protected function opensslEncrypt($data, $params)
     {
-        if (empty($params[ 'handle' ])) {
+        if (empty($params['handle'])) {
             return false;
         }
 
-        $iv = ($iv_size = openssl_cipher_iv_length($params[ 'handle' ]))
+        $iv = ($iv_size = openssl_cipher_iv_length($params['handle']))
             ? $this->createKey($iv_size)
             : null;
 
         $data = openssl_encrypt(
             $data,
-            $params[ 'handle' ],
-            $params[ 'key' ],
+            $params['handle'],
+            $params['key'],
             1, // DO NOT TOUCH!
             $iv
         );
@@ -803,14 +803,14 @@ 
      */
     protected function mcryptDecrypt($data, $params)
     {
-        if ( ! is_resource($params[ 'handle' ])) {
+        if ( ! is_resource($params['handle'])) {
             return false;
         }
 
         // The greater-than-1 comparison is mostly a work-around for a bug,
         // where 1 is returned for ARCFour instead of 0.
-        if (($iv_size = mcrypt_enc_get_iv_size($params[ 'handle' ])) > 1) {
-            if (mcrypt_enc_get_modes_name($params[ 'handle' ]) !== 'ECB') {
+        if (($iv_size = mcrypt_enc_get_iv_size($params['handle'])) > 1) {
+            if (mcrypt_enc_get_modes_name($params['handle']) !== 'ECB') {
                 $iv = self::substr($data, 0, $iv_size);
                 $data = self::substr($data, $iv_size);
             } else {
@@ -821,23 +821,23 @@ 
             $iv = null;
         }
 
-        if (mcrypt_generic_init($params[ 'handle' ], $params[ 'key' ], $iv) < 0) {
-            if ($params[ 'handle' ] !== $this->handle) {
-                mcrypt_module_close($params[ 'handle' ]);
+        if (mcrypt_generic_init($params['handle'], $params['key'], $iv) < 0) {
+            if ($params['handle'] !== $this->handle) {
+                mcrypt_module_close($params['handle']);
             }
 
             return false;
         }
 
-        $data = mdecrypt_generic($params[ 'handle' ], $data);
+        $data = mdecrypt_generic($params['handle'], $data);
         // Remove PKCS#7 padding, if necessary
-        if (in_array(strtolower(mcrypt_enc_get_modes_name($params[ 'handle' ])), ['cbc', 'ecb'], true)) {
-            $data = self::substr($data, 0, -ord($data[ self::strlen($data) - 1 ]));
+        if (in_array(strtolower(mcrypt_enc_get_modes_name($params['handle'])), ['cbc', 'ecb'], true)) {
+            $data = self::substr($data, 0, -ord($data[self::strlen($data) - 1]));
         }
 
-        mcrypt_generic_deinit($params[ 'handle' ]);
-        if ($params[ 'handle' ] !== $this->handle) {
-            mcrypt_module_close($params[ 'handle' ]);
+        mcrypt_generic_deinit($params['handle']);
+        if ($params['handle'] !== $this->handle) {
+            mcrypt_module_close($params['handle']);
         }
 
         return $data;
@@ -855,19 +855,19 @@ 
      */
     protected function opensslDecrypt($data, $params)
     {
-        if ($iv_size = openssl_cipher_iv_length($params[ 'handle' ])) {
+        if ($iv_size = openssl_cipher_iv_length($params['handle'])) {
             $iv = self::substr($data, 0, $iv_size);
             $data = self::substr($data, $iv_size);
         } else {
             $iv = null;
         }
 
-        return empty($params[ 'handle' ])
+        return empty($params['handle'])
             ? false
             : openssl_decrypt(
                 $data,
-                $params[ 'handle' ],
-                $params[ 'key' ],
+                $params['handle'],
+                $params['key'],
                 1, // DO NOT TOUCH!
                 $iv
             );

src/Encryptions/Binary.php

Spacing +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
 
             if ($cryptoKey > 0) {
                 foreach ($charactersMap as $key => $value) {
-                    static::$charactersMap[ $key * $cryptoKey ] = $value;
+                    static::$charactersMap[$key * $cryptoKey] = $value;
                 }
             }
         }
@@ -217,7 +217,7 @@ 
 
         foreach ($numbers as $number) {
             if (array_key_exists($number, static::$charactersMap)) {
-                $letters[] = static::$charactersMap[ $number ];
+                $letters[] = static::$charactersMap[$number];
             }
         }
 

src/Filters/Validation.php

Spacing +7 added lines, -7 removed lines

@@ -197,13 +197,13 @@ 
     public static function isUrl($string)

     {

         if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $string, $matches)) {

-            if (empty($matches[ 2 ])) {

+            if (empty($matches[2])) {

                 return false;

-            } elseif ( ! in_array($matches[ 1 ], ['http', 'https'], true)) {

+            } elseif ( ! in_array($matches[1], ['http', 'https'], true)) {

                 return false;

             }

 

-            $string = $matches[ 2 ];

+            $string = $matches[2];

         }

 

         $string = 'http://' . $string;

@@ -599,18 +599,18 @@ 
             switch ($type) {

                 case 'uppercase':

                     if (preg_match_all('/[A-Z]/', $string, $uppercase)) {

-                        $valid[ $type ] = count($uppercase[ 0 ]);

+                        $valid[$type] = count($uppercase[0]);

                     }

                     break;

                 case 'lowercase':

                     if (preg_match_all('/[a-z]/', $string, $lowercase)) {

-                        $valid[ $type ] = count($lowercase[ 0 ]);

+                        $valid[$type] = count($lowercase[0]);

                     }

                     break;

                 case 'number':

                 case 'numbers':

                     if (preg_match_all('/[0-9]/', $string, $numbers)) {

-                        $valid[ $type ] = count($numbers[ 0 ]);

+                        $valid[$type] = count($numbers[0]);

                     }

                     break;

                 case 'special character':

@@ -618,7 +618,7 @@ 
                 case 'special':

                     // Special Characters

                     if (preg_match_all('/[!@#$%^&*()\-_=+{};:,<.>]/', $string, $special)) {

-                        $valid[ $type ] = count($special[ 0 ]);

+                        $valid[$type] = count($special[0]);

                     }

                     break;

             }

src/Filters/Utf8.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
  * in it's constructor, but it's _not_ class-specific.

  *

  */

-$charset = strtoupper(o2system()->config[ 'charset' ]);

+$charset = strtoupper(o2system()->config['charset']);

 ini_set('default_charset', $charset);

 

 if (extension_loaded('mbstring')) {

@@ -84,7 +84,7 @@ 
         if (

             defined('PREG_BAD_UTF8_ERROR')                // PCRE must support UTF-8

             AND (ICONV_ENABLED === true || MB_ENABLED === true)    // iconv or mbstring must be installed

-            AND strtoupper(o2system()->config[ 'charset' ]) === 'UTF-8'    // Application charset must be UTF-8

+            AND strtoupper(o2system()->config['charset']) === 'UTF-8'    // Application charset must be UTF-8

         ) {

             $this->isEnabled = true;

             logger()->debug('LOG_DEBUG_UTF8_SUPPORT_ENABLED');

src/Filters/Xss.php

Spacing +4 added lines, -4 removed lines

@@ -358,7 +358,7 @@ 
                 // of numerous XSS issues we've had.

                 $matches['attributes'] = preg_replace('#^[^a-z]+#i', '', $matches['attributes']);

 

-                if (!preg_match($attributesPattern, $matches['attributes'], $attribute, PREG_OFFSET_CAPTURE)) {

+                if ( ! preg_match($attributesPattern, $matches['attributes'], $attribute, PREG_OFFSET_CAPTURE)) {

                     // No (valid) attribute found? Discard everything else inside the tag

                     break;

                 }

@@ -509,7 +509,7 @@ 
         $match = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-/]+)|i', self::token . '\\1=\\2', $match[0]);

 

         $charset = 'UTF-8';

-        if(function_exists('config')) {

+        if (function_exists('config')) {

             $charset = config()->getItem('charset');

         }

 

@@ -551,7 +551,7 @@ 
 

         isset($charset) || $charset = 'UTF-8';

 

-        if(function_exists('config')) {

+        if (function_exists('config')) {

             $charset = config()->getItem('charset');

         }

 

@@ -562,7 +562,7 @@ 
 

             // Decode standard entities, avoiding false positives

             if ($c = preg_match_all('/&[a-z]{2,}(?![a-z;])/i', $string, $matches)) {

-                if (!isset($entities)) {

+                if ( ! isset($entities)) {

                     $entities = array_map(

                         'strtolower',

                         get_html_translation_table(HTML_ENTITIES, $flag)

src/Encoders/Json.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     public static function encode($string)
     {
         $json = json_encode($string);
-        if(JSON_ERROR_NONE === json_last_error()) {
+        if (JSON_ERROR_NONE === json_last_error()) {
             return $json;
         }
 
@@ -39,7 +39,7 @@ 
     public static function decode($string)
     {
         $json = json_decode($string, true);
-        if(JSON_ERROR_NONE === json_last_error()) {
+        if (JSON_ERROR_NONE === json_last_error()) {
             return new SplArrayObject($json);
         }
 

src/Generators/MachineId.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 
         $uri = new Uri();
 
-        $metadata[ 'domain' ] = $uri->getHost();
-        $metadata[ 'ipAddress' ] = $_SERVER[ 'SERVER_ADDR' ];
+        $metadata['domain'] = $uri->getHost();
+        $metadata['ipAddress'] = $_SERVER['SERVER_ADDR'];
 
         $string = json_encode($metadata);
         $string = md5($string);

src/Generators/Token.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         $max = strlen($codeAlphabet);
 
         for ($i = 0; $i < $length; $i++) {
-            $token .= $codeAlphabet[ random_int(0, $max - 1) ];
+            $token .= $codeAlphabet[random_int(0, $max - 1)];
         }
 
         return $token;