iqltechnologies / brighty

brighty/system/Router/RouteCollection.php

Spacing +13 added lines, -13 removed lines

@@ -229,7 +229,7 @@ 
      */
     public function addPlaceholder($placeholder, ?string $pattern = null): RouteCollectionInterface
     {
-        if (! is_array($placeholder)) {
+        if (!is_array($placeholder)) {
             $placeholder = [$placeholder => $pattern];
         }
 
@@ -823,7 +823,7 @@ 
      *
      * @param array|Closure|string $to
      */
-    public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): RouteCollectionInterface
+    public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null) : RouteCollectionInterface
     {
         if (empty($from) || empty($to)) {
             throw new InvalidArgumentException('You must supply the parameters: from, to.');
@@ -982,7 +982,7 @@ 
                 $to   = $route['route'][$from];
 
                 // ignore closures
-                if (! is_string($to)) {
+                if (!is_string($to)) {
                     continue;
                 }
 
@@ -1088,7 +1088,7 @@ 
         // Build our resulting string, inserting the $params in
         // the appropriate places.
         foreach ($matches[0] as $index => $pattern) {
-            if (! preg_match('#^' . $pattern . '$#u', $params[$index])) {
+            if (!preg_match('#^' . $pattern . '$#u', $params[$index])) {
                 throw RouterException::forInvalidParameterType();
             }
 
@@ -1133,7 +1133,7 @@ 
         }
 
         // Hostname limiting?
-        if (! empty($options['hostname'])) {
+        if (!empty($options['hostname'])) {
             // @todo determine if there's a way to whitelist hosts?
             if (isset($_SERVER['HTTP_HOST']) && strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname'])) {
                 return;
@@ -1143,10 +1143,10 @@ 
         }
 
         // Limiting to subdomains?
-        elseif (! empty($options['subdomain'])) {
+        elseif (!empty($options['subdomain'])) {
             // If we don't match the current subdomain, then
             // we don't need to add the route.
-            if (! $this->checkSubdomains($options['subdomain'])) {
+            if (!$this->checkSubdomains($options['subdomain'])) {
                 return;
             }
 
@@ -1163,7 +1163,7 @@ 
             for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
                 $to = preg_replace_callback(
                     '/\$X/',
-                    static function ($m) use ($i) {
+                    static function($m) use ($i) {
                         return '$' . $i;
                     },
                     $to,
@@ -1179,7 +1179,7 @@ 
         }
 
         // If is redirect, No processing
-        if (! isset($options['redirect']) && is_string($to)) {
+        if (!isset($options['redirect']) && is_string($to)) {
             // If no namespace found, add the default namespace
             if (strpos($to, '\\') === false || strpos($to, '\\') > 0) {
                 $namespace = $options['namespace'] ?? $this->defaultNamespace;
@@ -1197,7 +1197,7 @@ 
         // routes should always be the "source of truth".
         // this works only because discovered routes are added just prior
         // to attempting to route the request.
-        if (isset($this->routes[$verb][$name]) && ! $overwrite) {
+        if (isset($this->routes[$verb][$name]) && !$overwrite) {
             return;
         }
 
@@ -1222,7 +1222,7 @@ 
     private function checkSubdomains($subdomains): bool
     {
         // CLI calls can't be on subdomain.
-        if (! isset($_SERVER['HTTP_HOST'])) {
+        if (!isset($_SERVER['HTTP_HOST'])) {
             return false;
         }
 
@@ -1230,13 +1230,13 @@ 
             $this->currentSubdomain = $this->determineCurrentSubdomain();
         }
 
-        if (! is_array($subdomains)) {
+        if (!is_array($subdomains)) {
             $subdomains = [$subdomains];
         }
 
         // Routes can be limited to any sub-domain. In that case, though,
         // it does require a sub-domain to be present.
-        if (! empty($this->currentSubdomain) && in_array('*', $subdomains, true)) {
+        if (!empty($this->currentSubdomain) && in_array('*', $subdomains, true)) {
             return true;
         }
 

brighty/system/Cache/Handlers/PredisHandler.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             $this->redis->hmget($key, ['__ci_type', '__ci_value'])
         );
 
-        if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false) {
+        if (!isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false) {
             return null;
         }
 
@@ -123,7 +123,7 @@ 
                 return false;
         }
 
-        if (! $this->redis->hmset($key, ['__ci_type' => $dataType, '__ci_value' => $value])) {
+        if (!$this->redis->hmset($key, ['__ci_type' => $dataType, '__ci_value' => $value])) {
             return false;
         }
 

brighty/system/Cache/Handlers/FileHandler.php

Spacing +10 added lines, -10 removed lines

@@ -47,17 +47,17 @@ 
      */
     public function __construct(Cache $config)
     {
-        if (! property_exists($config, 'file')) {
+        if (!property_exists($config, 'file')) {
             $config->file = [
                 'storePath' => $config->storePath ?? WRITEPATH . 'cache',
                 'mode'      => 0640,
             ];
         }
 
-        $this->path = ! empty($config->file['storePath']) ? $config->file['storePath'] : WRITEPATH . 'cache';
+        $this->path = !empty($config->file['storePath']) ? $config->file['storePath'] : WRITEPATH . 'cache';
         $this->path = rtrim($this->path, '/') . '/';
 
-        if (! is_really_writable($this->path)) {
+        if (!is_really_writable($this->path)) {
             throw CacheException::forUnableToWrite($this->path);
         }
 
@@ -151,7 +151,7 @@ 
                 'data' => 0,
                 'ttl'  => 60,
             ];
-        } elseif (! is_int($data['data'])) {
+        } elseif (!is_int($data['data'])) {
             return false;
         }
 
@@ -173,7 +173,7 @@ 
                 'data' => 0,
                 'ttl'  => 60,
             ];
-        } elseif (! is_int($data['data'])) {
+        } elseif (!is_int($data['data'])) {
             return false;
         }
 
@@ -232,12 +232,12 @@ 
      */
     protected function getItem(string $filename)
     {
-        if (! is_file($this->path . $filename)) {
+        if (!is_file($this->path . $filename)) {
             return false;
         }
 
         $data = @unserialize(file_get_contents($this->path . $filename));
-        if (! is_array($data) || ! isset($data['ttl'])) {
+        if (!is_array($data) || !isset($data['ttl'])) {
             return false;
         }
 
@@ -298,7 +298,7 @@ 
         // Trim the trailing slash
         $path = rtrim($path, '/\\');
 
-        if (! $currentDir = @opendir($path)) {
+        if (!$currentDir = @opendir($path)) {
             return false;
         }
 
@@ -306,7 +306,7 @@ 
             if ($filename !== '.' && $filename !== '..') {
                 if (is_dir($path . DIRECTORY_SEPARATOR . $filename) && $filename[0] !== '.') {
                     $this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $delDir, $htdocs, $_level + 1);
-                } elseif ($htdocs !== true || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
+                } elseif ($htdocs !== true || !preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
                     @unlink($path . DIRECTORY_SEPARATOR . $filename);
                 }
             }
@@ -372,7 +372,7 @@ 
      */
     protected function getFileInfo(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
     {
-        if (! is_file($file)) {
+        if (!is_file($file)) {
             return false;
         }
 

brighty/system/Cache/Handlers/RedisHandler.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
     {
         $this->prefix = $config->prefix;
 
-        if (! empty($config)) {
+        if (!empty($config)) {
             $this->config = array_merge($this->config, $config->redis);
         }
     }
@@ -73,20 +73,20 @@ 
             // Note:: If Redis is your primary cache choice, and it is "offline", every page load will end up been delayed by the timeout duration.
             // I feel like some sort of temporary flag should be set, to indicate that we think Redis is "offline", allowing us to bypass the timeout for a set period of time.
 
-            if (! $this->redis->connect($config['host'], ($config['host'][0] === '/' ? 0 : $config['port']), $config['timeout'])) {
+            if (!$this->redis->connect($config['host'], ($config['host'][0] === '/' ? 0 : $config['port']), $config['timeout'])) {
                 // Note:: I'm unsure if log_message() is necessary, however I'm not 100% comfortable removing it.
                 log_message('error', 'Cache: Redis connection failed. Check your configuration.');
 
                 throw new CriticalError('Cache: Redis connection failed. Check your configuration.');
             }
 
-            if (isset($config['password']) && ! $this->redis->auth($config['password'])) {
+            if (isset($config['password']) && !$this->redis->auth($config['password'])) {
                 log_message('error', 'Cache: Redis authentication failed.');
 
                 throw new CriticalError('Cache: Redis authentication failed.');
             }
 
-            if (isset($config['database']) && ! $this->redis->select($config['database'])) {
+            if (isset($config['database']) && !$this->redis->select($config['database'])) {
                 log_message('error', 'Cache: Redis select database failed.');
 
                 throw new CriticalError('Cache: Redis select database failed.');
@@ -104,7 +104,7 @@ 
         $key  = static::validateKey($key, $this->prefix);
         $data = $this->redis->hMGet($key, ['__ci_type', '__ci_value']);
 
-        if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false) {
+        if (!isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false) {
             return null;
         }
 
@@ -151,7 +151,7 @@ 
                 return false;
         }
 
-        if (! $this->redis->hMSet($key, ['__ci_type' => $dataType, '__ci_value' => $value])) {
+        if (!$this->redis->hMSet($key, ['__ci_type' => $dataType, '__ci_value' => $value])) {
             return false;
         }
 

brighty/system/Cache/Handlers/MemcachedHandler.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
     {
         $this->prefix = $config->prefix;
 
-        if (! empty($config)) {
+        if (!empty($config)) {
             $this->config = array_merge($this->config, $config->memcached);
         }
     }
@@ -87,7 +87,7 @@ 
 
                 // $stats should be an associate array with a key in the format of host:port.
                 // If it doesn't have the key, we know the server is not working as expected.
-                if (! isset($stats[$this->config['host'] . ':' . $this->config['port']])) {
+                if (!isset($stats[$this->config['host'] . ':' . $this->config['port']])) {
                     throw new CriticalError('Cache: Memcached connection failed.');
                 }
             } elseif (class_exists(Memcache::class)) {
@@ -156,7 +156,7 @@ 
     {
         $key = static::validateKey($key, $this->prefix);
 
-        if (! $this->config['raw']) {
+        if (!$this->config['raw']) {
             $value = [
                 $value,
                 time(),
@@ -198,7 +198,7 @@ 
      */
     public function increment(string $key, int $offset = 1)
     {
-        if (! $this->config['raw']) {
+        if (!$this->config['raw']) {
             return false;
         }
 
@@ -212,7 +212,7 @@ 
      */
     public function decrement(string $key, int $offset = 1)
     {
-        if (! $this->config['raw']) {
+        if (!$this->config['raw']) {
             return false;
         }
 
@@ -248,7 +248,7 @@ 
         $stored = $this->memcached->get($key);
 
         // if not an array, don't try to count for PHP7.2
-        if (! is_array($stored) || count($stored) !== 3) {
+        if (!is_array($stored) || count($stored) !== 3) {
             return false; // @TODO This will return null in a future release
         }
 

brighty/system/Cache/Handlers/BaseHandler.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
      */
     public static function validateKey($key, $prefix = ''): string
     {
-        if (! is_string($key)) {
+        if (!is_string($key)) {
             throw new InvalidArgumentException('Cache key must be a string');
         }
         if ($key === '') {

brighty/system/Cache/CacheFactory.php

Spacing +7 added lines, -7 removed lines

@@ -42,27 +42,27 @@
      */
     public static function getHandler(Cache $config, ?string $handler = null, ?string $backup = null)
     {
-        if (! isset($config->validHandlers) || ! is_array($config->validHandlers)) {
+        if (!isset($config->validHandlers) || !is_array($config->validHandlers)) {
             throw CacheException::forInvalidHandlers();
         }
 
-        if (! isset($config->handler) || ! isset($config->backupHandler)) {
+        if (!isset($config->handler) || !isset($config->backupHandler)) {
             throw CacheException::forNoBackup();
         }
 
-        $handler = ! empty($handler) ? $handler : $config->handler;
-        $backup  = ! empty($backup) ? $backup : $config->backupHandler;
+        $handler = !empty($handler) ? $handler : $config->handler;
+        $backup  = !empty($backup) ? $backup : $config->backupHandler;
 
-        if (! array_key_exists($handler, $config->validHandlers) || ! array_key_exists($backup, $config->validHandlers)) {
+        if (!array_key_exists($handler, $config->validHandlers) || !array_key_exists($backup, $config->validHandlers)) {
             throw CacheException::forHandlerNotFound();
         }
 
         $adapter = new $config->validHandlers[$handler]($config);
 
-        if (! $adapter->isSupported()) {
+        if (!$adapter->isSupported()) {
             $adapter = new $config->validHandlers[$backup]($config);
 
-            if (! $adapter->isSupported()) {
+            if (!$adapter->isSupported()) {
                 // Fall back to the dummy adapter.
                 $adapter = new $config->validHandlers['dummy']();
             }

brighty/system/Modules/Modules.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function shouldDiscover(string $alias): bool
     {
-        if (! $this->enabled) {
+        if (!$this->enabled) {
             return false;
         }
 

brighty/system/Session/Session.php

Spacing +21 added lines, -21 removed lines

@@ -230,7 +230,7 @@ 
 
         // Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers
         if (isset($_COOKIE[$this->sessionCookieName])
-            && (! is_string($_COOKIE[$this->sessionCookieName]) || ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[$this->sessionCookieName]))
+            && (!is_string($_COOKIE[$this->sessionCookieName]) || !preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[$this->sessionCookieName]))
         ) {
             unset($_COOKIE[$this->sessionCookieName]);
         }
@@ -241,7 +241,7 @@ 
         if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
             && ($regenerateTime = $this->sessionTimeToUpdate) > 0
         ) {
-            if (! isset($_SESSION['__ci_last_regenerate'])) {
+            if (!isset($_SESSION['__ci_last_regenerate'])) {
                 $_SESSION['__ci_last_regenerate'] = time();
             } elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerateTime)) {
                 $this->regenerate((bool) $this->sessionRegenerateDestroy);
@@ -304,13 +304,13 @@ 
         ini_set('session.cookie_samesite', $sameSite);
         session_set_cookie_params($params);
 
-        if (! isset($this->sessionExpiration)) {
+        if (!isset($this->sessionExpiration)) {
             $this->sessionExpiration = (int) ini_get('session.gc_maxlifetime');
         } elseif ($this->sessionExpiration > 0) {
             ini_set('session.gc_maxlifetime', (string) $this->sessionExpiration);
         }
 
-        if (! empty($this->sessionSavePath)) {
+        if (!empty($this->sessionSavePath)) {
             ini_set('session.save_path', $this->sessionSavePath);
         }
 
@@ -467,7 +467,7 @@ 
      */
     public function get(?string $key = null)
     {
-        if (! empty($key) && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
+        if (!empty($key) && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
             return $value;
         }
 
@@ -475,7 +475,7 @@ 
             return $key === null ? [] : null;
         }
 
-        if (! empty($key)) {
+        if (!empty($key)) {
             return null;
         }
 
@@ -485,7 +485,7 @@ 
         $keys = array_keys($_SESSION);
 
         foreach ($keys as $key) {
-            if (! in_array($key, $_exclude, true)) {
+            if (!in_array($key, $_exclude, true)) {
                 $userdata[$key] = $_SESSION[$key];
             }
         }
@@ -616,14 +616,14 @@ 
     {
         if (isset($key)) {
             return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key])
-                && ! is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
+                && !is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
         }
 
         $flashdata = [];
 
-        if (! empty($_SESSION['__ci_vars'])) {
+        if (!empty($_SESSION['__ci_vars'])) {
             foreach ($_SESSION['__ci_vars'] as $key => &$value) {
-                if (! is_int($value)) {
+                if (!is_int($value)) {
                     $flashdata[$key] = $_SESSION[$key];
                 }
             }
@@ -653,7 +653,7 @@ 
     {
         if (is_array($key)) {
             foreach ($key as $sessionKey) {
-                if (! isset($_SESSION[$sessionKey])) {
+                if (!isset($_SESSION[$sessionKey])) {
                     return false;
                 }
             }
@@ -665,7 +665,7 @@ 
             return true;
         }
 
-        if (! isset($_SESSION[$key])) {
+        if (!isset($_SESSION[$key])) {
             return false;
         }
 
@@ -685,12 +685,12 @@ 
             return;
         }
 
-        if (! is_array($key)) {
+        if (!is_array($key)) {
             $key = [$key];
         }
 
         foreach ($key as $k) {
-            if (isset($_SESSION['__ci_vars'][$k]) && ! is_int($_SESSION['__ci_vars'][$k])) {
+            if (isset($_SESSION['__ci_vars'][$k]) && !is_int($_SESSION['__ci_vars'][$k])) {
                 unset($_SESSION['__ci_vars'][$k]);
             }
         }
@@ -707,14 +707,14 @@ 
      */
     public function getFlashKeys(): array
     {
-        if (! isset($_SESSION['__ci_vars'])) {
+        if (!isset($_SESSION['__ci_vars'])) {
             return [];
         }
 
         $keys = [];
 
         foreach (array_keys($_SESSION['__ci_vars']) as $key) {
-            if (! is_int($_SESSION['__ci_vars'][$key])) {
+            if (!is_int($_SESSION['__ci_vars'][$key])) {
                 $keys[] = $key;
             }
         }
@@ -753,7 +753,7 @@ 
 
         $tempdata = [];
 
-        if (! empty($_SESSION['__ci_vars'])) {
+        if (!empty($_SESSION['__ci_vars'])) {
             foreach ($_SESSION['__ci_vars'] as $key => &$value) {
                 if (is_int($value)) {
                     $tempdata[$key] = $_SESSION[$key];
@@ -802,7 +802,7 @@ 
                     $v += time();
                 }
 
-                if (! array_key_exists($k, $_SESSION)) {
+                if (!array_key_exists($k, $_SESSION)) {
                     return false;
                 }
 
@@ -814,7 +814,7 @@ 
             return true;
         }
 
-        if (! isset($_SESSION[$key])) {
+        if (!isset($_SESSION[$key])) {
             return false;
         }
 
@@ -835,7 +835,7 @@ 
             return;
         }
 
-        if (! is_array($key)) {
+        if (!is_array($key)) {
             $key = [$key];
         }
 
@@ -855,7 +855,7 @@ 
      */
     public function getTempKeys(): array
     {
-        if (! isset($_SESSION['__ci_vars'])) {
+        if (!isset($_SESSION['__ci_vars'])) {
             return [];
         }