blitz-php / framework

src/Router/Router.php

Spacing +12 added lines, -12 removed lines

@@ -145,7 +145,7 @@ 
         // Toujours là ? Ensuite, nous pouvons essayer de faire correspondre l'URI avec
         // Contrôleurs/répertoires, mais l'application peut ne pas
         // vouloir ceci, comme dans le cas des API.
-        if (! $this->collection->shouldAutoRoute()) {
+        if (!$this->collection->shouldAutoRoute()) {
             throw new PageNotFoundException("Can't find a route for '{$uri}'.");
         }
 
@@ -195,7 +195,7 @@ 
 
             return [
                 $routeArray[0], // Controller
-                $routeArray[1] ?? 'index',   // Method
+                $routeArray[1] ?? 'index', // Method
             ];
         }
 
@@ -224,7 +224,7 @@ 
      */
     public function directory(): string
     {
-        return ! empty($this->directory) ? $this->directory : '';
+        return !empty($this->directory) ? $this->directory : '';
     }
 
     /**
@@ -335,7 +335,7 @@ 
                 // Are we using Closures? If so, then we need
                 // to collect the params into an array
                 // so it can be passed to the controller method later.
-                if (! is_string($val) && is_callable($val)) {
+                if (!is_string($val) && is_callable($val)) {
                     $this->controller = $val;
 
                     // Remove the original string from the matches array
@@ -411,18 +411,18 @@ 
         }
 
         $controllerName = $this->controllerName();
-        if (! $this->isValidSegment($controllerName)) {
+        if (!$this->isValidSegment($controllerName)) {
             throw new PageNotFoundException($this->controller . ' is not a valid controller name');
         }
 
         // Utilise le nom de la méthode s'il existe.
         // Si ce n'est pas le cas, ce n'est pas grave - le nom de la méthode par défaut
         // a déjà été défini.
-        if (! empty($segments)) {
+        if (!empty($segments)) {
             $this->setMethod(array_shift($segments) ?: $this->method);
         }
 
-        if (! empty($segments)) {
+        if (!empty($segments)) {
             $this->params = $segments;
         }
 
@@ -504,14 +504,14 @@ 
         while ($c-- > 0) {
             $segmentConvert = ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
             // dès que nous rencontrons un segment non conforme à PSR-4, arrêtons la recherche
-            if (! $this->isValidSegment($segmentConvert)) {
+            if (!$this->isValidSegment($segmentConvert)) {
                 return $segments;
             }
 
             $test = CONTROLLER_PATH . $this->directory . $segmentConvert;
 
             // tant que chaque segment n'est *pas* un fichier de contrôleur mais correspond à un répertoire, ajoutez-le à $this->répertoire
-            if (! is_file($test . '.php') && is_dir($test)) {
+            if (!is_file($test . '.php') && is_dir($test)) {
                 $this->setDirectory($segmentConvert, true, false);
                 array_shift($segments);
 
@@ -542,7 +542,7 @@ 
             $segments = explode('/', trim($dir, '/'));
 
             foreach ($segments as $segment) {
-                if (! $this->isValidSegment($segment)) {
+                if (!$this->isValidSegment($segment)) {
                     return;
                 }
             }
@@ -588,7 +588,7 @@ 
 
         // $this->method contient déjà le nom de la méthode par défaut,
         // donc ne l'écrasez pas avec le vide.
-        if (! empty($method)) {
+        if (!empty($method)) {
             $this->setMethod($method);
         }
 
@@ -611,7 +611,7 @@ 
             $this->method = 'index';
         }
 
-        if (! is_file(CONTROLLER_PATH . $this->directory . $this->makeController($class) . '.php')) {
+        if (!is_file(CONTROLLER_PATH . $this->directory . $this->makeController($class) . '.php')) {
             return;
         }
 

src/Router/RouteCollection.php

Spacing +12 added lines, -12 removed lines

@@ -217,7 +217,7 @@ 
      */
     public function addPlaceholder($placeholder, ?string $pattern = null): self
     {
-        if (! is_array($placeholder)) {
+        if (!is_array($placeholder)) {
             $placeholder = [$placeholder => $pattern];
         }
 
@@ -775,7 +775,7 @@ 
      *
      * @param array|Closure|string $to
      */
-    public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): self
+    public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null) : self
     {
         if (empty($from) || empty($to)) {
             throw new InvalidArgumentException('You must supply the parameters: from, to.');
@@ -935,7 +935,7 @@ 
                 $to   = $route['route'][$from];
 
                 // on ignore les closures
-                if (! is_string($to)) {
+                if (!is_string($to)) {
                     continue;
                 }
 
@@ -1019,7 +1019,7 @@ 
         // Construire notre chaîne résultante, en insérant les $params dans
         // les endroits appropriés.
         foreach ($matches[0] as $index => $pattern) {
-            if (! preg_match('#^' . $pattern . '$#u', $params[$index])) {
+            if (!preg_match('#^' . $pattern . '$#u', $params[$index])) {
                 throw RouterException::invalidParameterType();
             }
 
@@ -1064,7 +1064,7 @@ 
         }
 
         // Limitation du nom d'hôte ?
-        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;
@@ -1074,10 +1074,10 @@ 
         }
 
         // Limitation du nom sous-domaine ?
-        elseif (! empty($options['subdomain'])) {
+        elseif (!empty($options['subdomain'])) {
             // Si nous ne correspondons pas au sous-domaine actuel, alors
             // nous n'avons pas besoin d'ajouter la route.
-            if (! $this->checkSubdomains($options['subdomain'])) {
+            if (!$this->checkSubdomains($options['subdomain'])) {
                 return;
             }
 
@@ -1108,7 +1108,7 @@ 
         }
 
         // S'il s'agit d'une redirection, aucun traitement
-        if (! isset($options['redirect']) && is_string($to)) {
+        if (!isset($options['redirect']) && is_string($to)) {
             // Si aucun espace de noms n'est trouvé, ajouter l'espace de noms par défaut
             if (strpos($to, '\\') === false || strpos($to, '\\') > 0) {
                 $namespace = $options['namespace'] ?? $this->defaultNamespace;
@@ -1126,7 +1126,7 @@ 
         // les routes manuelement définies doivent toujours être la "source de vérité".
         // cela ne fonctionne que parce que les routes découvertes sont ajoutées juste avant
         // pour tenter de router la requête.
-        if (isset($this->routes[$verb][$name]) && ! $overwrite) {
+        if (isset($this->routes[$verb][$name]) && !$overwrite) {
             return;
         }
 
@@ -1151,7 +1151,7 @@ 
     private function checkSubdomains($subdomains): bool
     {
         // Les appels CLI ne peuvent pas être sur le sous-domaine.
-        if (! isset($_SERVER['HTTP_HOST'])) {
+        if (!isset($_SERVER['HTTP_HOST'])) {
             return false;
         }
 
@@ -1159,13 +1159,13 @@ 
             $this->currentSubdomain = $this->determineCurrentSubdomain();
         }
 
-        if (! is_array($subdomains)) {
+        if (!is_array($subdomains)) {
             $subdomains = [$subdomains];
         }
 
         // Les routes peuvent être limitées à n'importe quel sous-domaine. Dans ce cas, cependant,
         // il nécessite la présence d'un sous-domaine.
-        if (! empty($this->currentSubdomain) && in_array('*', $subdomains, true)) {
+        if (!empty($this->currentSubdomain) && in_array('*', $subdomains, true)) {
             return true;
         }
 

src/Cache/Handlers/File.php

Spacing +17 added lines, -17 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function set($key, $value, $ttl = null): bool
     {
-        if ($value === '' || ! $this->_init) {
+        if ($value === '' || !$this->_init) {
             return false;
         }
 
@@ -97,7 +97,7 @@ 
             return false;
         }
 
-        if (! empty($this->_config['serialize'])) {
+        if (!empty($this->_config['serialize'])) {
             $value = serialize($value);
         }
 
@@ -130,7 +130,7 @@ 
     {
         $key = $this->_key($key);
 
-        if (! $this->_init || $this->_setKey($key) === false) {
+        if (!$this->_init || $this->_setKey($key) === false) {
             return $default;
         }
 
@@ -167,7 +167,7 @@ 
 
         $data = trim($data);
 
-        if ($data !== '' && ! empty($this->_config['serialize'])) {
+        if ($data !== '' && !empty($this->_config['serialize'])) {
             $data = unserialize($data);
         }
 
@@ -181,7 +181,7 @@ 
     {
         $key = $this->_key($key);
 
-        if ($this->_setKey($key) === false || ! $this->_init) {
+        if ($this->_setKey($key) === false || !$this->_init) {
             return false;
         }
 
@@ -203,7 +203,7 @@ 
      */
     public function clear(): bool
     {
-        if (! $this->_init) {
+        if (!$this->_init) {
             return false;
         }
         $this->_File = null;
@@ -228,14 +228,14 @@ 
             }
 
             $realPath = $fileInfo->getRealPath();
-            if (! $realPath) {
+            if (!$realPath) {
                 unset($fileInfo);
 
                 continue;
             }
 
             $path = $realPath . DIRECTORY_SEPARATOR;
-            if (! in_array($path, $cleared, true)) {
+            if (!in_array($path, $cleared, true)) {
                 $this->_clearDirectory($path);
                 $cleared[] = $path;
             }
@@ -256,12 +256,12 @@ 
      */
     protected function _clearDirectory(string $path): void
     {
-        if (! is_dir($path)) {
+        if (!is_dir($path)) {
             return;
         }
 
         $dir = dir($path);
-        if (! $dir) {
+        if (!$dir) {
             return;
         }
 
@@ -327,13 +327,13 @@ 
         }
         $dir = $this->_config['path'] . $groups;
 
-        if (! is_dir($dir)) {
+        if (!is_dir($dir)) {
             mkdir($dir, 0775, true);
         }
 
         $path = new SplFileInfo($dir . $key);
 
-        if (! $createKey && ! $path->isFile()) {
+        if (!$createKey && !$path->isFile()) {
             return false;
         }
         if (
@@ -352,7 +352,7 @@ 
             }
             unset($path);
 
-            if (! $exists && ! chmod($this->_File->getPathname(), (int) $this->_config['mask'])) {
+            if (!$exists && !chmod($this->_File->getPathname(), (int) $this->_config['mask'])) {
                 trigger_error(sprintf(
                     'Could not apply permission mask "%s" on cache file "%s"',
                     $this->_File->getPathname(),
@@ -372,14 +372,14 @@ 
         $dir     = new SplFileInfo($this->_config['path']);
         $path    = $dir->getPathname();
         $success = true;
-        if (! is_dir($path)) {
+        if (!is_dir($path)) {
             // phpcs:disable
             $success = @mkdir($path, 0775, true);
             // phpcs:enable
         }
 
         $isWritableDir = ($dir->isDir() && $dir->isWritable());
-        if (! $success || ($this->_init && ! $isWritableDir)) {
+        if (!$success || ($this->_init && !$isWritableDir)) {
             $this->_init = false;
             trigger_error(sprintf(
                 '%s is not writable',
@@ -423,8 +423,8 @@ 
         );
         $filtered = new CallbackFilterIterator(
             $contents,
-            static function (SplFileInfo $current) use ($group, $prefix) {
-                if (! $current->isFile()) {
+            static function(SplFileInfo $current) use ($group, $prefix) {
+                if (!$current->isFile()) {
                     return false;
                 }
 

src/Cache/Handlers/BaseHandler.php

Spacing +5 added lines, -5 removed lines

@@ -91,11 +91,11 @@ 
     {
         $this->setConfig($config);
 
-        if (! empty($this->_config['groups'])) {
+        if (!empty($this->_config['groups'])) {
             sort($this->_config['groups']);
             $this->_groupPrefix = str_repeat('%s_', count($this->_config['groups']));
         }
-        if (! is_numeric($this->_config['duration'])) {
+        if (!is_numeric($this->_config['duration'])) {
             $this->_config['duration'] = strtotime($this->_config['duration']) - time();
         }
 
@@ -117,7 +117,7 @@ 
      */
     public function ensureValidKey(string $key): void
     {
-        if (! is_string($key) || $key === '') {
+        if (!is_string($key) || $key === '') {
             throw new InvalidArgumentException('A cache key must be a non-empty string.');
         }
 
@@ -137,7 +137,7 @@ 
      */
     protected function ensureValidType($iterable, string $check = self::CHECK_VALUE): void
     {
-        if (! is_iterable($iterable)) {
+        if (!is_iterable($iterable)) {
             throw new InvalidArgumentException(sprintf(
                 'A cache %s must be either an array or a Traversable.',
                 $check === self::CHECK_VALUE ? 'key set' : 'set'
@@ -266,7 +266,7 @@ 
         $result = true;
 
         foreach ($keys as $key) {
-            if (! $this->delete($key)) {
+            if (!$this->delete($key)) {
                 $result = false;
             }
         }

src/Cache/Cache.php

Spacing +8 added lines, -8 removed lines

@@ -101,16 +101,16 @@ 
      */
     protected function factory(): CacheInterface
     {
-        if (! static::$_enabled) {
+        if (!static::$_enabled) {
             return new Dummy();
         }
-        if (! empty($this->adapter)) {
+        if (!empty($this->adapter)) {
             return $this->adapter;
         }
 
         $validHandlers = $this->config['valid_handlers'] ?? self::$validHandlers;
 
-        if (empty($validHandlers) || ! is_array($validHandlers)) {
+        if (empty($validHandlers) || !is_array($validHandlers)) {
             throw new InvalidArgumentException('Cache config must have an array of $valid_handlers.');
         }
 
@@ -121,28 +121,28 @@ 
             throw new InvalidArgumentException('Cache config must have a handler set.');
         }
 
-        if (! array_key_exists($handler, $validHandlers)) {
+        if (!array_key_exists($handler, $validHandlers)) {
             throw new InvalidArgumentException('Cache config has an invalid handler specified.');
         }
 
         $adapter = new $validHandlers[$handler]();
-        if (! ($adapter instanceof BaseHandler)) {
+        if (!($adapter instanceof BaseHandler)) {
             if (empty($fallback)) {
                 $adapter = new Dummy();
-            } elseif (! array_key_exists($fallback, $validHandlers)) {
+            } elseif (!array_key_exists($fallback, $validHandlers)) {
                 throw new InvalidArgumentException('Cache config has an invalid fallback handler specified.');
             } else {
                 $adapter = new $validHandlers[$fallback]();
             }
         }
 
-        if (! ($adapter instanceof BaseHandler)) {
+        if (!($adapter instanceof BaseHandler)) {
             throw new InvalidArgumentException(
                 'Cache handler must use BlitzPHP\Cache\Handlers\BaseHandler as a base class.'
             );
         }
 
-        if (! $adapter->init($this->config)) {
+        if (!$adapter->init($this->config)) {
             throw new RuntimeException(
                 sprintf(
                     'Cache engine %s is not properly configured. Check error log for additional information.',

src/Utilities/Collection.php

Spacing +23 added lines, -23 removed lines

@@ -206,7 +206,7 @@ 
 
         $counts = new self();
 
-        $collection->each(static function ($value) use ($counts) {
+        $collection->each(static function($value) use ($counts) {
             $counts[$value] = isset($counts[$value]) ? $counts[$value] + 1 : 1;
         });
 
@@ -324,7 +324,7 @@ 
     {
         (new static(func_get_args()))
             ->push($this)
-            ->each(static function ($item) {
+            ->each(static function($item) {
                 Helpers::r($item);
             });
 
@@ -483,7 +483,7 @@ 
      */
     public function eachSpread(callable $callback)
     {
-        return $this->each(static function ($chunk, $key) use ($callback) {
+        return $this->each(static function($chunk, $key) use ($callback) {
             $chunk[] = $key;
 
             return $callback(...$chunk);
@@ -505,7 +505,7 @@ 
             $callback = $this->valueRetriever($key);
 
             foreach ($this->items as $k => $v) {
-                if (! $callback($v, $k)) {
+                if (!$callback($v, $k)) {
                     return false;
                 }
             }
@@ -527,7 +527,7 @@ 
     {
         if ($keys instanceof self) {
             $keys = $keys->all();
-        } elseif (! is_array($keys)) {
+        } elseif (!is_array($keys)) {
             $keys = func_get_args();
         }
 
@@ -602,7 +602,7 @@ 
      */
     public function unless($value, callable $callback, ?callable $default = null)
     {
-        return $this->when(! $value, $callback, $default);
+        return $this->when(!$value, $callback, $default);
     }
 
     /**
@@ -666,7 +666,7 @@ 
             $operator = '=';
         }
 
-        return static function ($item) use ($key, $operator, $value) {
+        return static function($item) use ($key, $operator, $value) {
             $retrieved = Arr::get($item, $key);
 
             $strings = array_filter([$retrieved, $value], static fn ($value) => is_string($value) || (is_object($value) && method_exists($value, '__toString')));
@@ -911,14 +911,14 @@ 
         foreach ($this->items as $key => $value) {
             $groupKeys = $groupBy($value, $key);
 
-            if (! is_array($groupKeys)) {
+            if (!is_array($groupKeys)) {
                 $groupKeys = [$groupKeys];
             }
 
             foreach ($groupKeys as $groupKey) {
                 $groupKey = is_bool($groupKey) ? (int) $groupKey : $groupKey;
 
-                if (! array_key_exists($groupKey, $results)) {
+                if (!array_key_exists($groupKey, $results)) {
                     $results[$groupKey] = new static();
                 }
 
@@ -928,7 +928,7 @@ 
 
         $result = new static($results);
 
-        if (! empty($nextGroups)) {
+        if (!empty($nextGroups)) {
             return $result->map->groupBy($nextGroups, $preserveKeys);
         }
 
@@ -973,7 +973,7 @@ 
         $keys = is_array($key) ? $key : func_get_args();
 
         foreach ($keys as $value) {
-            if (! $this->offsetExists($value)) {
+            if (!$this->offsetExists($value)) {
                 return false;
             }
         }
@@ -1044,7 +1044,7 @@ 
      */
     public function isNotEmpty()
     {
-        return ! $this->isEmpty();
+        return !$this->isEmpty();
     }
 
     /**
@@ -1056,7 +1056,7 @@ 
      */
     protected function useAsCallable($value)
     {
-        return ! is_string($value) && is_callable($value);
+        return !is_string($value) && is_callable($value);
     }
 
     /**
@@ -1146,7 +1146,7 @@ 
      */
     public function mapSpread(callable $callback)
     {
-        return $this->map(static function ($chunk, $key) use ($callback) {
+        return $this->map(static function($chunk, $key) use ($callback) {
             $chunk[] = $key;
 
             return $callback(...$chunk);
@@ -1171,7 +1171,7 @@ 
 
             $value = reset($pair);
 
-            if (! isset($dictionary[$key])) {
+            if (!isset($dictionary[$key])) {
                 $dictionary[$key] = [];
             }
 
@@ -1250,7 +1250,7 @@ 
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->filter(static fn ($value) => null !== $value)->reduce(static function ($result, $item) use ($callback) {
+        return $this->filter(static fn ($value) => null !== $value)->reduce(static function($result, $item) use ($callback) {
             $value = $callback($item);
 
             return null === $result || $value > $result ? $value : $result;
@@ -1399,7 +1399,7 @@ 
                 : $this->operatorForWhere(...func_get_args());
 
         foreach ($this->items as $key => $item) {
-            $partitions[(int) ! $callback($item, $key)][$key] = $item;
+            $partitions[(int) !$callback($item, $key)][$key] = $item;
         }
 
         return new static($partitions);
@@ -1541,9 +1541,9 @@ 
     {
         $useAsCallable = $this->useAsCallable($callback);
 
-        return $this->filter(static function ($value, $key) use ($callback, $useAsCallable) {
+        return $this->filter(static function($value, $key) use ($callback, $useAsCallable) {
             return $useAsCallable
-                ? ! $callback($value, $key)
+                ? !$callback($value, $key)
                 : $value !== $callback;
         });
     }
@@ -1592,7 +1592,7 @@ 
      */
     public function search($value, $strict = false)
     {
-        if (! $this->useAsCallable($value)) {
+        if (!$this->useAsCallable($value)) {
             return array_search($value, $this->items, $strict);
         }
 
@@ -1883,7 +1883,7 @@ 
 
         $exists = [];
 
-        return $this->reject(static function ($item, $key) use ($callback, $strict, &$exists) {
+        return $this->reject(static function($item, $key) use ($callback, $strict, &$exists) {
             if (in_array($id = $callback($item, $key), $exists, $strict)) {
                 return true;
             }
@@ -1975,7 +1975,7 @@ 
      */
     public function jsonSerialize(): array
     {
-        return array_map(static function ($value) {
+        return array_map(static function($value) {
             if ($value instanceof JsonSerializable) {
                 return $value->jsonSerialize();
             }
@@ -2165,7 +2165,7 @@ 
      */
     public function __get($key)
     {
-        if (! in_array($key, static::$proxies, true)) {
+        if (!in_array($key, static::$proxies, true)) {
             throw new Exception("Property [{$key}] does not exist on this collection instance.");
         }
 

src/Utilities/Helpers.php

Spacing +28 added lines, -28 removed lines

@@ -25,7 +25,7 @@ 
     {
         static $_is_php;
 
-        if (! isset($_is_php[$version])) {
+        if (!isset($_is_php[$version])) {
             $_is_php[$version] = version_compare(PHP_VERSION, $version, '>=');
         }
 
@@ -40,13 +40,13 @@ 
         $host = explode(':', $_SERVER['HTTP_HOST'] ?? '')[0];
 
         return
-            ! empty($host) // Si c'est vide, ca veut certainement dire qu'on est en CLI, or le CLI << n'est pas >> utilisé en ligne
-            && ! in_array($host, ['localhost', '127.0.0.1'], true)
-            && ! preg_match('#\.dev$#', $host)
-            && ! preg_match('#\.test$#', $host)
-            && ! preg_match('#\.lab$#', $host)
-            && ! preg_match('#\.loc(al)?$#', $host)
-            && ! preg_match('#^192\.168#', $host);
+            !empty($host) // Si c'est vide, ca veut certainement dire qu'on est en CLI, or le CLI << n'est pas >> utilisé en ligne
+            && !in_array($host, ['localhost', '127.0.0.1'], true)
+            && !preg_match('#\.dev$#', $host)
+            && !preg_match('#\.test$#', $host)
+            && !preg_match('#\.lab$#', $host)
+            && !preg_match('#\.loc(al)?$#', $host)
+            && !preg_match('#^192\.168#', $host);
     }
 
     /**
@@ -64,7 +64,7 @@ 
     public static function isReallyWritable(string $file): bool
     {
         // If we're on a Unix server with safe_mode off we call is_writable
-        if (DIRECTORY_SEPARATOR === '/' || ! ini_get('safe_mode')) {
+        if (DIRECTORY_SEPARATOR === '/' || !ini_get('safe_mode')) {
             return is_writable($file);
         }
 
@@ -83,7 +83,7 @@ 
 
             return true;
         }
-        if (! is_file($file) || ($fp = @fopen($file, 'ab')) === false) {
+        if (!is_file($file) || ($fp = @fopen($file, 'ab')) === false) {
             return false;
         }
 
@@ -97,23 +97,23 @@ 
         $path  = parse_url($url);
         $query = '';
 
-        if (! empty($path['host'])) {
+        if (!empty($path['host'])) {
             $r = $path['scheme'] . '://';
-            if (! empty($path['user'])) {
+            if (!empty($path['user'])) {
                 $r .= $path['user'];
-                if (! empty($path['pass'])) {
+                if (!empty($path['pass'])) {
                     $r .= ':' . $path['pass'] . '@';
                 }
                 $r .= '@';
             }
-            if (! empty($path['host'])) {
+            if (!empty($path['host'])) {
                 $r .= $path['host'];
             }
-            if (! empty($path['port'])) {
+            if (!empty($path['port'])) {
                 $r .= ':' . $path['port'];
             }
             $url = $r . $path['path'];
-            if (! empty($path['query'])) {
+            if (!empty($path['query'])) {
                 $query = '?' . $path['query'];
             }
         }
@@ -137,12 +137,12 @@ 
         $non_displayables = [];
 
         if ($url_encoded) {
-            $non_displayables[] = '/%0[0-8bcef]/i';	// url encoded 00-08, 11, 12, 14, 15
-            $non_displayables[] = '/%1[0-9a-f]/i';	// url encoded 16-31
-            $non_displayables[] = '/%7f/i';	// url encoded 127
+            $non_displayables[] = '/%0[0-8bcef]/i'; // url encoded 00-08, 11, 12, 14, 15
+            $non_displayables[] = '/%1[0-9a-f]/i'; // url encoded 16-31
+            $non_displayables[] = '/%7f/i'; // url encoded 127
         }
 
-        $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
+        $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
         do {
             $str = preg_replace($non_displayables, '', $str, -1, $count);
@@ -185,7 +185,7 @@ 
                 return $data;
             }
 
-            if (! in_array($context, ['html', 'js', 'css', 'url', 'attr'], true)) {
+            if (!in_array($context, ['html', 'js', 'css', 'url', 'attr'], true)) {
                 throw new InvalidArgumentException('Invalid escape context provided.');
             }
 
@@ -196,7 +196,7 @@ 
             }
 
             static $escaper;
-            if (! $escaper) {
+            if (!$escaper) {
                 $escaper = new \Laminas\Escaper\Escaper($encoding);
             }
 
@@ -261,7 +261,7 @@ 
             $double  = true;
         }
 
-        return htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, $charset ?: $defaultCharset, $double);
+        return htmlspecialchars($text, ENT_QUOTES|ENT_SUBSTITUTE, $charset ?: $defaultCharset, $double);
     }
 
     /**
@@ -370,13 +370,13 @@ 
     {
         if ($key === 'HTTPS') {
             if (isset($_SERVER['HTTPS'])) {
-                return ! empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
+                return !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
             }
             if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-                return ! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https';
+                return !empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https';
             }
             if (isset($_SERVER['HTTP_FRONT_END_HTTPS'])) {
-                return ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off';
+                return !empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off';
             }
 
             return strpos(self::env('SCRIPT_URI'), 'https://') === 0;
@@ -413,7 +413,7 @@ 
                 $name     = self::env('SCRIPT_NAME');
                 $filename = self::env('SCRIPT_FILENAME');
                 $offset   = 0;
-                if (! strpos($name, '.php')) {
+                if (!strpos($name, '.php')) {
                     $offset = 4;
                 }
 
@@ -505,7 +505,7 @@ 
      */
     public static function deprecationWarning(string $message, int $stackFrame = 1)
     {
-        if (! (error_reporting() & E_USER_DEPRECATED)) {
+        if (!(error_reporting() & E_USER_DEPRECATED)) {
             return;
         }
 

src/Utilities/Arr.php

Spacing +32 added lines, -32 removed lines

@@ -63,7 +63,7 @@ 
     public static function check(array $data, string $path): bool
     {
         $results = self::extract($data, $path);
-        if (! is_array($results)) {
+        if (!is_array($results)) {
             return false;
         }
 
@@ -80,7 +80,7 @@ 
         foreach ($array as $values) {
             if ($values instanceof Collection) {
                 $values = $values->all();
-            } elseif (! is_array($values)) {
+            } elseif (!is_array($values)) {
                 continue;
             }
 
@@ -120,10 +120,10 @@ 
             return [];
         }
 
-        if (! empty($valuePath) && is_array($valuePath)) {
+        if (!empty($valuePath) && is_array($valuePath)) {
             $format = array_shift($valuePath);
             $vals   = self::format($data, $valuePath, $format);
-        } elseif (! empty($valuePath)) {
+        } elseif (!empty($valuePath)) {
             $vals = self::extract($data, $valuePath);
         }
         if (empty($vals)) {
@@ -136,14 +136,14 @@ 
 
         if ($groupPath !== null) {
             $group = self::extract($data, $groupPath);
-            if (! empty($group)) {
+            if (!empty($group)) {
                 $c = count($keys);
 
                 for ($i = 0; $i < $c; $i++) {
-                    if (! isset($group[$i])) {
+                    if (!isset($group[$i])) {
                         $group[$i] = 0;
                     }
-                    if (! isset($out[$group[$i]])) {
+                    if (!isset($out[$group[$i]])) {
                         $out[$group[$i]] = [];
                     }
                     $out[$group[$i]][$keys[$i]] = $vals[$i];
@@ -175,7 +175,7 @@ 
         }
         $stack = [];
 
-        while (! empty($needle)) {
+        while (!empty($needle)) {
             $key = key($needle);
             $val = $needle[$key];
             unset($needle[$key]);
@@ -184,14 +184,14 @@ 
                 $next = $data[$key];
                 unset($data[$key]);
 
-                if (! empty($val)) {
+                if (!empty($val)) {
                     $stack[] = [$val, $next];
                 }
-            } elseif (! array_key_exists($key, $data) || $data[$key] !== $val) {
+            } elseif (!array_key_exists($key, $data) || $data[$key] !== $val) {
                 return false;
             }
 
-            if (empty($needle) && ! empty($stack)) {
+            if (empty($needle) && !empty($stack)) {
                 [$needle, $data] = array_pop($stack);
             }
         }
@@ -271,7 +271,7 @@ 
         $results = [];
 
         foreach ($array as $key => $value) {
-            if (is_array($value) && ! empty($value)) {
+            if (is_array($value) && !empty($value)) {
                 $results = array_merge($results, static::dot($value, $prepend . $key . '.'));
             } else {
                 $results[$prepend . $key] = $value;
@@ -360,7 +360,7 @@ 
         }
 
         // Simple paths.
-        if (! preg_match('/[{\[]/', $path)) {
+        if (!preg_match('/[{\[]/', $path)) {
             return (array) self::get($data, $path);
         }
 
@@ -500,13 +500,13 @@ 
 
         reset($data);
 
-        while (! empty($data)) {
+        while (!empty($data)) {
             $key     = key($data);
             $element = $data[$key];
             unset($data[$key]);
 
-            if (is_array($element) && ! empty($element)) {
-                if (! empty($data)) {
+            if (is_array($element) && !empty($element)) {
+                if (!empty($data)) {
                     $stack[] = [$data, $path];
                 }
                 $data = $element;
@@ -516,7 +516,7 @@ 
                 $result[$path . $key] = $element;
             }
 
-            if (empty($data) && ! empty($stack)) {
+            if (empty($data) && !empty($stack)) {
                 [$data, $path] = array_pop($stack);
                 reset($data);
             }
@@ -597,7 +597,7 @@ 
         $extracted = [];
         $count     = count($paths);
 
-        if (! $count) {
+        if (!$count) {
             return;
         }
 
@@ -639,7 +639,7 @@ 
      */
     public static function get($data, $path, $default = null)
     {
-        if (! static::accessible($data)) {
+        if (!static::accessible($data)) {
             return $default;
         }
         if (is_string($path) || is_numeric($path)) {
@@ -697,7 +697,7 @@ 
     {
         $keys = (array) $keys;
 
-        if (! $array || $keys === []) {
+        if (!$array || $keys === []) {
             return false;
         }
 
@@ -754,7 +754,7 @@ 
 
                     continue;
                 }
-                if (! $conditions) {
+                if (!$conditions) {
                     $data[$k] = self::insert($v, $nextPath, $values);
                 }
             }
@@ -834,7 +834,7 @@ 
 
         while (($arg = next($args)) !== false) {
             foreach ((array) $arg as $key => $val) {
-                if (! empty($return[$key]) && is_array($return[$key]) && is_array($val)) {
+                if (!empty($return[$key]) && is_array($return[$key]) && is_array($val)) {
                     $return[$key] = self::merge($return[$key], $val);
                 } elseif (is_int($key) && isset($return[$key])) {
                     $return[] = $val;
@@ -1022,7 +1022,7 @@ 
             // If the key doesn't exist at this depth, we will just create an empty array
             // to hold the next value, allowing us to create the arrays to hold final
             // values at the correct depth. Then we'll keep digging into the array.
-            if (! isset($array[$key]) || ! is_array($array[$key])) {
+            if (!isset($array[$key]) || !is_array($array[$key])) {
                 $array[$key] = [];
             }
 
@@ -1060,7 +1060,7 @@ 
             $sub_key .= '.' . $key[$i];
         }
 
-        if (! isset($data[$key[0]])) {
+        if (!isset($data[$key[0]])) {
             $data[$key[0]] = [];
         }
 
@@ -1105,7 +1105,7 @@ 
      */
     public static function sortField(array $data, string $field, int $direction = self::SORT_ASC): array
     {
-        usort($data, static function ($a, $b) use ($field, $direction) {
+        usort($data, static function($a, $b) use ($field, $direction) {
             $cmp1 = self::_getSortField_($a, $field);
             $cmp2 = self::_getSortField_($b, $field);
 
@@ -1188,7 +1188,7 @@ 
      */
     protected static function _filter($var): bool
     {
-        return (bool) ($var === 0 || $var === '0' || ! empty($var));
+        return (bool) ($var === 0 || $var === '0' || !empty($var));
     }
 
     /**
@@ -1254,11 +1254,11 @@ 
             $val  = $cond['val'] ?? null;
 
             // Presence test.
-            if (empty($op) && empty($val) && ! isset($data[$attr])) {
+            if (empty($op) && empty($val) && !isset($data[$attr])) {
                 return false;
             }
             // Empty attribute = fail.
-            if (! (isset($data[$attr]) || array_key_exists($attr, $data))) {
+            if (!(isset($data[$attr]) || array_key_exists($attr, $data))) {
                 return false;
             }
             $prop = null;
@@ -1273,7 +1273,7 @@ 
             }
             // Pattern matches and other operators.
             if ($op === '=' && $val && $val[0] === '/') {
-                if (! preg_match($val, $prop)) {
+                if (!preg_match($val, $prop)) {
                     return false;
                 }
             } elseif (
@@ -1318,11 +1318,11 @@ 
 
                     return $data;
                 }
-                if (! isset($_list[$key])) {
+                if (!isset($_list[$key])) {
                     $_list[$key] = [];
                 }
                 $_list = &$_list[$key];
-                if (! is_array($_list)) {
+                if (!is_array($_list)) {
                     $_list = [];
                 }
             } elseif ($op === 'remove') {
@@ -1331,7 +1331,7 @@ 
 
                     return $data;
                 }
-                if (! isset($_list[$key])) {
+                if (!isset($_list[$key])) {
                     return $data;
                 }
                 $_list = &$_list[$key];

src/Utilities/Str.php

Spacing +25 added lines, -25 removed lines

@@ -14,7 +14,7 @@ 
 use BlitzPHP\Traits\Macroable;
 use Transliterator;
 
-if (! defined('MB_ENABLED')) {
+if (!defined('MB_ENABLED')) {
     if (extension_loaded('mbstring')) {
         define('MB_ENABLED', true);
         // mbstring.internal_encoding est obsolète à partir de PHP 5.6
@@ -27,7 +27,7 @@ 
         define('MB_ENABLED', false);
     }
 }
-if (! defined('ICONV_ENABLED')) {
+if (!defined('ICONV_ENABLED')) {
     if (extension_loaded('iconv')) {
         define('ICONV_ENABLED', true);
         // iconv.internal_encoding est obsolète à partir de PHP 5.6
@@ -112,13 +112,13 @@ 
     public static function cleanInsert(string $str, array $options): string
     {
         $clean = $options['clean'];
-        if (! $clean) {
+        if (!$clean) {
             return $str;
         }
         if ($clean === true) {
             $clean = ['method' => 'text'];
         }
-        if (! is_array($clean)) {
+        if (!is_array($clean)) {
             $clean = ['method' => $options['clean']];
         }
 
@@ -211,7 +211,7 @@ 
     public static function containsAll(string $haystack, array $needles): bool
     {
         foreach ($needles as $needle) {
-            if (! static::contains($haystack, $needle)) {
+            if (!static::contains($haystack, $needle)) {
                 return false;
             }
         }
@@ -411,7 +411,7 @@ 
             return $options['clean'] ? static::cleanInsert($str, $options) : $str;
         }
 
-        if (! isset($format)) {
+        if (!isset($format)) {
             $format = sprintf(
                 '/(?<!%s)%s%%s%s/',
                 preg_quote($options['escape'], '/'),
@@ -448,7 +448,7 @@ 
             $str      = str_replace($tmpHash, $tmpValue, $str);
         }
 
-        if (! isset($options['format']) && isset($options['before'])) {
+        if (!isset($options['format']) && isset($options['before'])) {
             $str = str_replace($options['escape'] . $options['before'], $options['before'], $str);
         }
 
@@ -749,8 +749,8 @@ 
         $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
         $replace = preg_replace_callback(
             $pattern,
-            static function ($match) use ($strlen) {
-                $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
+            static function($match) use ($strlen) {
+                $utf8 = html_entity_decode($match[0], ENT_HTML5|ENT_QUOTES, 'UTF-8');
 
                 return str_repeat(' ', $strlen($utf8, 'UTF-8'));
             },
@@ -810,7 +810,7 @@ 
         $result      = '';
 
         $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
-        $parts   = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $parts   = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
 
         foreach ($parts as $part) {
             $offset = 0;
@@ -831,7 +831,7 @@ 
             if ($offset !== 0 || $totalLength + $len > $length) {
                 if (
                     strpos($part, '&') === 0 && preg_match($pattern, $part)
-                    && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8')
+                    && $part !== html_entity_decode($part, ENT_HTML5|ENT_QUOTES, 'UTF-8')
                 ) {
                     // Entities cannot be passed substr.
                     continue;
@@ -886,7 +886,7 @@ 
         }
 
         $truncate = mb_substr($text, mb_strlen($text) - $length + mb_strlen($ellipsis));
-        if (! $exact) {
+        if (!$exact) {
             $spacepos = mb_strpos($truncate, ' ');
             $truncate = $spacepos === false ? '' : trim(mb_substr($truncate, $spacepos));
         }
@@ -941,7 +941,7 @@ 
             }
             if ($tmpOffset !== -1) {
                 $buffer .= substr($data, $offset, ($tmpOffset - $offset));
-                if (! $depth && $data[$tmpOffset] === $separator) {
+                if (!$depth && $data[$tmpOffset] === $separator) {
                     $results[] = $buffer;
                     $buffer    = '';
                 } else {
@@ -956,7 +956,7 @@ 
                     }
                 } else {
                     if ($data[$tmpOffset] === $leftBound) {
-                        if (! $open) {
+                        if (!$open) {
                             $depth++;
                             $open = true;
                         } else {
@@ -970,11 +970,11 @@ 
                 $offset    = $length + 1;
             }
         }
-        if (empty($results) && ! empty($buffer)) {
+        if (empty($results) && !empty($buffer)) {
             $results[] = $buffer;
         }
 
-        if (! empty($results)) {
+        if (!empty($results)) {
             return array_map('trim', $results);
         }
 
@@ -1014,7 +1014,7 @@ 
      */
     public static function transliterate(string $string, $transliterator = null)
     {
-        if (! $transliterator) {
+        if (!$transliterator) {
             $transliterator = static::$_defaultTransliterator ?: static::$_defaultTransliteratorId;
         }
 
@@ -1045,7 +1045,7 @@ 
         $default = [
             'ellipsis' => '...', 'exact' => true, 'html' => false, 'trimWidth' => false,
         ];
-        if (! empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') {
+        if (!empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') {
             $default['ellipsis'] = "\xe2\x80\xa6";
         }
         $options += $default;
@@ -1065,12 +1065,12 @@ 
 
             foreach ($tags as $tag) {
                 $contentLength = 0;
-                if (! in_array($tag[2], static::$_defaultHtmlNoCount, true)) {
+                if (!in_array($tag[2], static::$_defaultHtmlNoCount, true)) {
                     $contentLength = self::strlen($tag[3], $options);
                 }
 
                 if ($truncate === '') {
-                    if (! preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
+                    if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
                         if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
                             array_unshift($openTags, $tag[2]);
                         } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
@@ -1116,13 +1116,13 @@ 
 
         $result = self::substr($text, 0, $length - $ellipsisLength, $options);
 
-        if (! $options['exact']) {
+        if (!$options['exact']) {
             if (self::substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
                 $result = self::removeLastWord($result);
             }
 
             // If result is empty, then we don't need to count ellipsis in the cut.
-            if (! strlen($result)) {
+            if (!strlen($result)) {
                 $result = self::substr($text, 0, $length, $options);
             }
         }
@@ -1153,7 +1153,7 @@ 
     {
         preg_match('/^\s*+(?:\S++\s*+){1,' . $words . '}/u', $value, $matches);
 
-        if (! isset($matches[0]) || static::length($value) === static::length($matches[0])) {
+        if (!isset($matches[0]) || static::length($value) === static::length($matches[0])) {
             return $value;
         }
 
@@ -1303,7 +1303,7 @@ 
     {
         static $languageSpecific;
 
-        if (! isset($languageSpecific)) {
+        if (!isset($languageSpecific)) {
             $languageSpecific = [
                 'bg' => [
                     ['х', 'Х', 'щ', 'Щ', 'ъ', 'Ъ', 'ь', 'Ь'],
@@ -1314,7 +1314,7 @@ 
                     ['ae', 'oe', 'aa', 'Ae', 'Oe', 'Aa'],
                 ],
                 'de' => [
-                    ['ä',  'ö',  'ü',  'Ä',  'Ö',  'Ü'],
+                    ['ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü'],
                     ['ae', 'oe', 'ue', 'AE', 'OE', 'UE'],
                 ],
                 'he' => [