blitz-php / framework

src/Router/Dispatcher.php

Spacing +19 added lines, -19 removed lines

@@ -172,7 +172,7 @@ 
             $controller = $routes->getDefaultController();
         }
 
-        if (! $fullName && is_string($controller)) {
+        if (!$fullName && is_string($controller)) {
             $controller = str_replace($routes->getDefaultNamespace(), '', $controller);
         }
 
@@ -273,7 +273,7 @@ 
                 require_once $routes_file;
             }
         }
-        if (empty($routes) || ! ($routes instanceof RouteCollection)) {
+        if (empty($routes) || !($routes instanceof RouteCollection)) {
             $routes = Services::routes();
         }
 
@@ -283,14 +283,14 @@ 
         $routeMiddlewares = (array) $this->dispatchRoutes($routes);
 
         // The bootstrapping in a middleware
-        $this->middleware->append(function (ServerRequestInterface $request, ResponseInterface $response, callable $next): ResponseInterface {
+        $this->middleware->append(function(ServerRequestInterface $request, ResponseInterface $response, callable $next): ResponseInterface {
             $returned = $this->startController($request, $response);
 
             // Closure controller has run in startController().
-            if (! is_callable($this->controller)) {
+            if (!is_callable($this->controller)) {
                 $controller = $this->createController($request, $response);
 
-                if (! method_exists($controller, '_remap') && ! is_callable([$controller, $this->method], false)) {
+                if (!method_exists($controller, '_remap') && !is_callable([$controller, $this->method], false)) {
                     throw PageNotFoundException::methodNotFound($this->method);
                 }
 
@@ -328,7 +328,7 @@ 
          */
         $this->gatherOutput($this->middleware->handle($this->request));
 
-        if (! $returnResponse) {
+        if (!$returnResponse) {
             $this->sendResponse();
         }
 
@@ -376,14 +376,14 @@ 
             return;
         }
 
-        if (is_cli() && ! on_test()) {
+        if (is_cli() && !on_test()) {
             // @codeCoverageIgnoreStart
             // $this->request = Services::clirequest($this->config);
         // @codeCoverageIgnoreEnd
         }
 
         $version = $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1';
-        if (! is_numeric($version)) {
+        if (!is_numeric($version)) {
             $version = substr($version, strpos($version, '/') + 1);
         }
 
@@ -402,7 +402,7 @@ 
         // Supposons le succès jusqu'à preuve du contraire.
         $this->response = Services::response()->withStatus(200);
 
-        if (! is_cli() || on_test()) {
+        if (!is_cli() || on_test()) {
         }
 
         $this->response = $this->response->withProtocolVersion($this->request->getProtocolVersion());
@@ -438,7 +438,7 @@ 
     {
         if ($cachedResponse = Services::cache()->read($this->generateCacheName())) {
             $cachedResponse = unserialize($cachedResponse);
-            if (! is_array($cachedResponse) || ! isset($cachedResponse['output']) || ! isset($cachedResponse['headers'])) {
+            if (!is_array($cachedResponse) || !isset($cachedResponse['output']) || !isset($cachedResponse['headers'])) {
                 throw new FrameworkException('Error unserializing page cache');
             }
 
@@ -567,7 +567,7 @@ 
      */
     protected function determinePath(): string
     {
-        if (! empty($this->path)) {
+        if (!empty($this->path)) {
             return $this->path;
         }
 
@@ -575,7 +575,7 @@ 
             ? $this->request->getPath()
             : $this->request->getUri()->getPath();
    
-        return preg_replace('#^'.App::getUri()->getPath().'#i', '', $path);
+        return preg_replace('#^' . App::getUri()->getPath() . '#i', '', $path);
     }
 
     /**
@@ -621,7 +621,7 @@ 
         }
 
         // Essayez de charger automatiquement la classe
-        if (! class_exists($this->controller, true) || $this->method[0] === '_') {
+        if (!class_exists($this->controller, true) || $this->method[0] === '_') {
             throw PageNotFoundException::controllerNotFound($this->controller, $this->method);
         }
 
@@ -709,7 +709,7 @@ 
         // Affiche l'erreur 404
         $this->response = $this->response->withStatus($e->getCode());
 
-        if (! on_test()) {
+        if (!on_test()) {
             // @codeCoverageIgnoreStart
             if (ob_get_level() > 0) {
                 ob_end_flush();
@@ -721,7 +721,7 @@ 
             ob_end_flush(); // @codeCoverageIgnore
         }
 
-        throw PageNotFoundException::pageNotFound(! on_prod() || is_cli() ? $e->getMessage() : '');
+        throw PageNotFoundException::pageNotFound(!on_prod() || is_cli() ? $e->getMessage() : '');
     }
 
     /**
@@ -776,7 +776,7 @@ 
     public function storePreviousURL($uri)
     {
         // Ignorer les requêtes CLI
-        if (is_cli() && ! on_test()) {
+        if (is_cli() && !on_test()) {
             return; // @codeCoverageIgnore
         }
 
@@ -840,7 +840,7 @@ 
         $this->middleware->prepend($this->spoofRequestMethod());
 
         $middlewaresFile = CONFIG_PATH . 'middlewares.php';
-        if (file_exists($middlewaresFile) && ! in_array($middlewaresFile, get_included_files(), true)) {
+        if (file_exists($middlewaresFile) && !in_array($middlewaresFile, get_included_files(), true)) {
             $middleware = require $middlewaresFile;
             if (is_callable($middleware)) {
                 $middlewareQueue = $middleware($this->middleware, $this->request);
@@ -857,11 +857,11 @@ 
      */
     private function spoofRequestMethod(): callable
     {
-        return static function (ServerRequestInterface $request, ResponseInterface $response, callable $next) {
+        return static function(ServerRequestInterface $request, ResponseInterface $response, callable $next) {
             $post = $request->getParsedBody();
 
             // Ne fonctionne qu'avec les formulaires POST
-            if (strtoupper($request->getMethod()) === 'POST' && ! empty($post['_method'])) {
+            if (strtoupper($request->getMethod()) === 'POST' && !empty($post['_method'])) {
                 // Accepte seulement PUT, PATCH, DELETE
                 if (in_array(strtoupper($post['_method']), ['PUT', 'PATCH', 'DELETE'], true)) {
                     $request = $request->withMethod($post['_method']);

src/Http/ServerRequest.php

Spacing +20 added lines, -20 removed lines

@@ -257,7 +257,7 @@ 
         $this->cookies = $config['cookies'];
 
         if (isset($config['uri'])) {
-            if (! $config['uri'] instanceof UriInterface) {
+            if (!$config['uri'] instanceof UriInterface) {
                 throw new FrameworkException('The `uri` key must be an instance of ' . UriInterface::class);
             }
             $uri = $config['uri'];
@@ -397,7 +397,7 @@ 
         $ref = $this->getEnv('HTTP_REFERER');
 
         $base = /* Configure::read('App.fullBaseUrl') .  */ $this->webroot;
-        if (! empty($ref) && ! empty($base)) {
+        if (!empty($ref) && !empty($base)) {
             if ($local && strpos($ref, $base) === 0) {
                 $ref = substr($ref, strlen($base));
                 if ($ref === '' || strpos($ref, '//') === 0) {
@@ -409,7 +409,7 @@ 
 
                 return $ref;
             }
-            if (! $local) {
+            if (!$local) {
                 return $ref;
             }
         }
@@ -461,7 +461,7 @@ 
         }
 
         $type = strtolower($type);
-        if (! isset(static::$_detectors[$type])) {
+        if (!isset(static::$_detectors[$type])) {
             return false;
         }
         if ($args) {
@@ -540,7 +540,7 @@ 
         foreach ($detect['header'] as $header => $value) {
             $header = $this->getEnv('http_' . $header);
             if ($header !== null) {
-                if (! is_string($value) && ! is_bool($value) && is_callable($value)) {
+                if (!is_string($value) && !is_bool($value) && is_callable($value)) {
                     return $value($header);
                 }
 
@@ -613,7 +613,7 @@ 
     public function isAll(array $types): bool
     {
         foreach ($types as $type) {
-            if (! $this->is($type)) {
+            if (!$this->is($type)) {
                 return false;
             }
         }
@@ -716,7 +716,7 @@ 
     protected function normalizeHeaderName(string $name): string
     {
         $name = str_replace('-', '_', strtoupper($name));
-        if (! in_array($name, ['CONTENT_LENGTH', 'CONTENT_TYPE'], true)) {
+        if (!in_array($name, ['CONTENT_LENGTH', 'CONTENT_TYPE'], true)) {
             $name = 'HTTP_' . $name;
         }
 
@@ -899,8 +899,8 @@ 
         $new = clone $this;
 
         if (
-            ! is_string($method)
-            || ! preg_match('/^[!#$%&\'*+.^_`\|~0-9a-z-]+$/i', $method)
+            !is_string($method)
+            || !preg_match('/^[!#$%&\'*+.^_`\|~0-9a-z-]+$/i', $method)
         ) {
             throw new InvalidArgumentException(sprintf(
                 'Unsupported HTTP method "%s" provided',
@@ -1144,7 +1144,7 @@ 
                 }
             }
 
-            if (! isset($accept[$prefValue])) {
+            if (!isset($accept[$prefValue])) {
                 $accept[$prefValue] = [];
             }
             if ($prefValue) {
@@ -1222,7 +1222,7 @@ 
         if ($name === null) {
             return $this->data;
         }
-        if (! is_array($this->data) && $name) {
+        if (!is_array($this->data) && $name) {
             return $default;
         }
 
@@ -1363,7 +1363,7 @@ 
      */
     public function withProtocolVersion($version): self
     {
-        if (! preg_match('/^(1\.[01]|2(\.[0])?)$/', $version)) {
+        if (!preg_match('/^(1\.[01]|2(\.[0])?)$/', $version)) {
             throw new InvalidArgumentException("Unsupported protocol version '{$version}' provided");
         }
         $new           = clone $this;
@@ -1385,7 +1385,7 @@ 
     public function getEnv(string $key, ?string $default = null): ?string
     {
         $key = strtoupper($key);
-        if (! array_key_exists($key, $this->_environment)) {
+        if (!array_key_exists($key, $this->_environment)) {
             $this->_environment[$key] = env($key);
         }
 
@@ -1597,7 +1597,7 @@ 
         $file = Arr::get($this->uploadedFiles, $path);
         if (is_array($file)) {
             foreach ($file as $f) {
-                if (! ($f instanceof UploadedFile)) {
+                if (!($f instanceof UploadedFile)) {
                     return null;
                 }
             }
@@ -1605,7 +1605,7 @@ 
             return $file;
         }
 
-        if (! ($file instanceof UploadedFileInterface)) {
+        if (!($file instanceof UploadedFileInterface)) {
             return null;
         }
 
@@ -1653,7 +1653,7 @@ 
                 continue;
             }
 
-            if (! $file instanceof UploadedFileInterface) {
+            if (!$file instanceof UploadedFileInterface) {
                 throw new InvalidArgumentException("Invalid file at '{$path}{$key}'");
             }
         }
@@ -1704,7 +1704,7 @@ 
         }
 
         $host = $uri->getHost();
-        if (! $host) {
+        if (!$host) {
             return $new;
         }
         $port = $uri->getPort();
@@ -1812,7 +1812,7 @@ 
         $validLocales = config('app.supported_locales');
         // S'il ne s'agit pas d'un paramètre régional valide, définissez-le
         // aux paramètres régionaux par défaut du site.
-        if (! in_array($locale, $validLocales, true)) {
+        if (!in_array($locale, $validLocales, true)) {
             $locale = config('app.language');
         }
 
@@ -1912,7 +1912,7 @@ 
             $override = true;
         }
 
-        if ($override && ! in_array($this->_environment['REQUEST_METHOD'], ['PUT', 'POST', 'DELETE', 'PATCH'], true)) {
+        if ($override && !in_array($this->_environment['REQUEST_METHOD'], ['PUT', 'POST', 'DELETE', 'PATCH'], true)) {
             $data = [];
         }
 
@@ -1961,7 +1961,7 @@ 
      */
     protected function _processFiles(array $post, array $files): array
     {
-        if (! is_array($files)) {
+        if (!is_array($files)) {
             return $post;
         }
 

src/Helpers/assets.php

Indentation +83 added lines, -83 removed lines

@@ -21,14 +21,14 @@ 
      */
     function css_url(string $name) : string
     {
-		$name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'css/', '', htmlspecialchars($name));
+        $name = explode('?', $name)[0];
+        $name = str_replace(site_url() . 'css/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
             $name .=  (!preg_match('#\.css$#i', $name) ? '.css' : '');
             $filename = WEBROOT.'css'.DS.$name;
 
-			return site_url() . 'css/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'css/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.css$#i', $name) ? '.css' : '');
@@ -50,14 +50,14 @@ 
     function js_url(string $name) : string
     {
         $name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'js/', '', htmlspecialchars($name));
+        $name = str_replace(site_url() . 'js/', '', htmlspecialchars($name));
 
         if (is_localfile($name))
         {
             $name .=  (!preg_match('#\.js$#i', $name) ? '.js' : '');
             $filename = WEBROOT.'js'.DS.$name;
 
-			return site_url() . 'js/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'js/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.js$#i', $name) ? '.js' : '');
@@ -79,14 +79,14 @@ 
     function lib_css_url(string $name) : string
     {
         $name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'lib/', '', htmlspecialchars($name));
+        $name = str_replace(site_url() . 'lib/', '', htmlspecialchars($name));
 
         if (is_localfile($name))
         {
             $name .=  (!preg_match('#\.css$#i', $name) ? '.css' : '');
             $filename = WEBROOT.'lib'.DS.$name;
 
-			return site_url() . 'lib/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'lib/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.css$#i', $name) ? '.css' : '');
@@ -108,14 +108,14 @@ 
     function lib_js_url(string $name) : string
     {
         $name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'lib/', '', htmlspecialchars($name));
+        $name = str_replace(site_url() . 'lib/', '', htmlspecialchars($name));
 
         if (is_localfile($name))
         {
             $name .=  (!preg_match('#\.js$#i', $name) ? '.js' : '');
             $filename = WEBROOT.'lib'.DS.$name;
 
-			return site_url() . 'lib/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'lib/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.js$#i', $name) ? '.js' : '');
@@ -132,13 +132,13 @@ 
      * inclu une ou plusieurs feuilles de style css
      *
      * @param	string|string[]	$name nom du fichier dont on veut inserer
-	 * @param	bool $print Specifie si on affiche directement la sortie ou si on la retourne
+     * @param	bool $print Specifie si on affiche directement la sortie ou si on la retourne
      * @return	void|string
      */
     function lib_styles($name, bool $print = true)
     {
         $name = (array) $name;
-		$return = [];
+        $return = [];
 
         foreach ($name As $style)
         {
@@ -152,25 +152,25 @@ 
                 }
                 else if (is_localfile($style))
                 {
-					$return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
+                    $return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
                     $return[] = '<link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" /> -->';
                 }
-				else
-				{
-					$return[] = '<link rel="preload" type="text/css" href="'.lib_css_url($style).'" as="style">
+                else
+                {
+                    $return[] = '<link rel="preload" type="text/css" href="'.lib_css_url($style).'" as="style">
 						<link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" />';
-				}
+                }
             }
         }
 
-		$output = join("\n", $return);
+        $output = join("\n", $return);
 
-		if (false === $print)
-		{
-			return $output;
-		}
+        if (false === $print)
+        {
+            return $output;
+        }
 
-		echo $output;
+        echo $output;
     }
 }
 
@@ -190,7 +190,7 @@ 
     function lib_scripts($name, bool $print = true)
     {
         $name = (array) $name;
-		$return = [];
+        $return = [];
 
         foreach ($name As $script)
         {
@@ -203,24 +203,24 @@ 
                 }
                 else if (is_localfile($script))
                 {
-					$return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
+                    $return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
                     $return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script> -->';
                 }
-				else
-				{
-					$return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script>';
-				}
+                else
+                {
+                    $return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script>';
+                }
             }
         }
 
-		$output = join("\n", $return);
+        $output = join("\n", $return);
 
-		if (false === $print)
-		{
-			return $output;
-		}
+        if (false === $print)
+        {
+            return $output;
+        }
 
-		echo $output;
+        echo $output;
     }
 }
 
@@ -234,13 +234,13 @@ 
      * inclu une ou plusieurs feuilles de style css
      *
      * @param	string|string[]	$name nom du fichier dont on veut inserer
-	 * @param	bool $print Specifie si on affiche directement la sortie ou si on la retourne
+     * @param	bool $print Specifie si on affiche directement la sortie ou si on la retourne
      * @return	void|string
      */
     function styles($name, bool $print = true)
     {
         $name = (array) $name;
-		$return = [];
+        $return = [];
 
         foreach ($name As $style)
         {
@@ -249,30 +249,30 @@ 
                 $style = (!preg_match('#\.css$#i', $style) ? $style.'.css' : $style);
                 if (is_file(WEBROOT.'css'.DS.str_replace('/', DS, $style)))
                 {
-					$return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style">
+                    $return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style">
 						<link rel="stylesheet" type="text/css" href="'.css_url($style).'" />';
                 }
                 else if (is_localfile($style))
                 {
-					$return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
+                    $return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
                     $return[] = '<link rel="stylesheet" type="text/css" href="'.css_url($style).'" /> -->';
                 }
-				else
-				{
-					$return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style">
+                else
+                {
+                    $return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style">
 						<link rel="stylesheet" type="text/css" href="'.css_url($style).'" />';
-				}
+                }
             }
         }
 
-		$output = join("\n", $return);
+        $output = join("\n", $return);
 
-		if (false === $print)
-		{
-			return $output;
-		}
+        if (false === $print)
+        {
+            return $output;
+        }
 
-		echo $output;
+        echo $output;
     }
 }
 
@@ -292,7 +292,7 @@ 
     function scripts($name, bool $print = true)
     {
         $name = (array) $name;
-		$return = [];
+        $return = [];
 
         foreach ($name As $script)
         {
@@ -308,21 +308,21 @@ 
                     $return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
                     $return[] = '<script type="text/javascript" src="'.js_url($script).'"></script> -->';
                 }
-				else
-				{
-					$return[] = '<script type="text/javascript" src="'.js_url($script).'"></script>';
-				}
+                else
+                {
+                    $return[] = '<script type="text/javascript" src="'.js_url($script).'"></script>';
+                }
             }
         }
 
-		$output = join("\n", $return);
+        $output = join("\n", $return);
 
-		if (false === $print)
-		{
-			return $output;
-		}
+        if (false === $print)
+        {
+            return $output;
+        }
 
-		echo $output;
+        echo $output;
     }
 }
 
@@ -341,13 +341,13 @@ 
     function less_url(string $name) : string
     {
         $name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'less/', '', htmlspecialchars($name));
+        $name = str_replace(site_url() . 'less/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
             $name .=  (!preg_match('#\.less$#i', $name) ? '.less' : '');
             $filename = WEBROOT.'less'.DS.$name;
 
-			return site_url() . 'less/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'less/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.less$#i', $name) ? '.less' : '');
@@ -370,7 +370,7 @@ 
     function less_styles($name, bool $print = true)
     {
         $name = (array) $name;
-		$return = [];
+        $return = [];
 
         foreach ($name As $style)
         {
@@ -386,21 +386,21 @@ 
                     $return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
                     $return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" /> -->';
                 }
-				else
-				{
-					$return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" />';
-				}
+                else
+                {
+                    $return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" />';
+                }
             }
         }
 
-		$output = join("\n", $return);
+        $output = join("\n", $return);
 
-		if (false === $print)
-		{
-			return $output;
-		}
+        if (false === $print)
+        {
+            return $output;
+        }
 
-		echo $output;
+        echo $output;
     }
 }
 
@@ -423,12 +423,12 @@ 
         }
 
         $name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'img/', '', htmlspecialchars($name));
+        $name = str_replace(site_url() . 'img/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
             $filename = WEBROOT.'img'.DS.$name;
 
-			return site_url() . 'img/' . $name.((file_exists($filename) && $add_version) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'img/' . $name.((file_exists($filename) && $add_version) ? '?v='.filemtime($filename) : '');
         }
 
         return $name;
@@ -453,8 +453,8 @@ 
     {
         $return = '<img src="' . img_url($name) . '" alt="' . $alt . '"';
 
-		$noprint = isset($options['print']) AND $options['print'] == false;
-		unset($options['print']);
+        $noprint = isset($options['print']) AND $options['print'] == false;
+        unset($options['print']);
 
         foreach ($options As $key => $value)
         {
@@ -462,10 +462,10 @@ 
         }
         $return .= ' />';
 
-		if ($noprint === true)
-		{
-			return $return;
-		}
+        if ($noprint === true)
+        {
+            return $return;
+        }
 
         echo $return;
     }
@@ -489,12 +489,12 @@ 
         }
 
         $name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'docs/', '', htmlspecialchars($name));
+        $name = str_replace(site_url() . 'docs/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
             $filename = WEBROOT.'docs'.DS.$name;
 
-			return site_url() . 'docs/' . $name.((file_exists($filename && $add_version)) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'docs/' . $name.((file_exists($filename && $add_version)) ? '?v='.filemtime($filename) : '');
         }
 
         return $name;
@@ -519,7 +519,7 @@ 
         }
 
         $name = explode('?', $name)[0];
-		$name = str_replace(site_url() . 'videos/', '', htmlspecialchars($name));
+        $name = str_replace(site_url() . 'videos/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
             $filename = WEBROOT.'videos'.DS.$name;

Spacing +52 added lines, -52 removed lines

@@ -25,10 +25,10 @@ 
 		$name = str_replace(site_url() . 'css/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
-            $name .=  (!preg_match('#\.css$#i', $name) ? '.css' : '');
-            $filename = WEBROOT.'css'.DS.$name;
+            $name .= (!preg_match('#\.css$#i', $name) ? '.css' : '');
+            $filename = WEBROOT . 'css' . DS . $name;
 
-			return site_url() . 'css/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+			return site_url() . 'css/' . $name . ((file_exists($filename)) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.css$#i', $name) ? '.css' : '');
@@ -54,10 +54,10 @@ 
 
         if (is_localfile($name))
         {
-            $name .=  (!preg_match('#\.js$#i', $name) ? '.js' : '');
-            $filename = WEBROOT.'js'.DS.$name;
+            $name .= (!preg_match('#\.js$#i', $name) ? '.js' : '');
+            $filename = WEBROOT . 'js' . DS . $name;
 
-			return site_url() . 'js/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+			return site_url() . 'js/' . $name . ((file_exists($filename)) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.js$#i', $name) ? '.js' : '');
@@ -83,10 +83,10 @@ 
 
         if (is_localfile($name))
         {
-            $name .=  (!preg_match('#\.css$#i', $name) ? '.css' : '');
-            $filename = WEBROOT.'lib'.DS.$name;
+            $name .= (!preg_match('#\.css$#i', $name) ? '.css' : '');
+            $filename = WEBROOT . 'lib' . DS . $name;
 
-			return site_url() . 'lib/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+			return site_url() . 'lib/' . $name . ((file_exists($filename)) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.css$#i', $name) ? '.css' : '');
@@ -112,10 +112,10 @@ 
 
         if (is_localfile($name))
         {
-            $name .=  (!preg_match('#\.js$#i', $name) ? '.js' : '');
-            $filename = WEBROOT.'lib'.DS.$name;
+            $name .= (!preg_match('#\.js$#i', $name) ? '.js' : '');
+            $filename = WEBROOT . 'lib' . DS . $name;
 
-			return site_url() . 'lib/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+			return site_url() . 'lib/' . $name . ((file_exists($filename)) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.js$#i', $name) ? '.js' : '');
@@ -144,21 +144,21 @@ 
         {
             if (is_string($style))
             {
-                $style = (!preg_match('#\.css$#i', $style) ? $style.'.css' : $style);
-                if (is_file(WEBROOT.'lib'.DS.str_replace('/', DS, $style)))
+                $style = (!preg_match('#\.css$#i', $style) ? $style . '.css' : $style);
+                if (is_file(WEBROOT . 'lib' . DS . str_replace('/', DS, $style)))
                 {
-                    $return[] = '<link rel="preload" type="text/css" href="'.lib_css_url($style).'" as="style">
-						<link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" />';
+                    $return[] = '<link rel="preload" type="text/css" href="' . lib_css_url($style) . '" as="style">
+						<link rel="stylesheet" type="text/css" href="'.lib_css_url($style) . '" />';
                 }
                 else if (is_localfile($style))
                 {
 					$return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
-                    $return[] = '<link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" /> -->';
+                    $return[] = '<link rel="stylesheet" type="text/css" href="' . lib_css_url($style) . '" /> -->';
                 }
 				else
 				{
-					$return[] = '<link rel="preload" type="text/css" href="'.lib_css_url($style).'" as="style">
-						<link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" />';
+					$return[] = '<link rel="preload" type="text/css" href="' . lib_css_url($style) . '" as="style">
+						<link rel="stylesheet" type="text/css" href="'.lib_css_url($style) . '" />';
 				}
             }
         }
@@ -196,19 +196,19 @@ 
         {
             if (is_string($script))
             {
-                $script = (!preg_match('#\.js$#i', $script) ? $script.'.js' : $script);
-                if (is_file(WEBROOT.'lib'.DS.str_replace('/', DS, $script)))
+                $script = (!preg_match('#\.js$#i', $script) ? $script . '.js' : $script);
+                if (is_file(WEBROOT . 'lib' . DS . str_replace('/', DS, $script)))
                 {
-                    $return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script>';
+                    $return[] = '<script type="text/javascript" src="' . lib_js_url($script) . '"></script>';
                 }
                 else if (is_localfile($script))
                 {
 					$return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
-                    $return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script> -->';
+                    $return[] = '<script type="text/javascript" src="' . lib_js_url($script) . '"></script> -->';
                 }
 				else
 				{
-					$return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script>';
+					$return[] = '<script type="text/javascript" src="' . lib_js_url($script) . '"></script>';
 				}
             }
         }
@@ -246,21 +246,21 @@ 
         {
             if (is_string($style))
             {
-                $style = (!preg_match('#\.css$#i', $style) ? $style.'.css' : $style);
-                if (is_file(WEBROOT.'css'.DS.str_replace('/', DS, $style)))
+                $style = (!preg_match('#\.css$#i', $style) ? $style . '.css' : $style);
+                if (is_file(WEBROOT . 'css' . DS . str_replace('/', DS, $style)))
                 {
-					$return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style">
-						<link rel="stylesheet" type="text/css" href="'.css_url($style).'" />';
+					$return[] = '<link rel="preload" type="text/css" href="' . css_url($style) . '" as="style">
+						<link rel="stylesheet" type="text/css" href="'.css_url($style) . '" />';
                 }
                 else if (is_localfile($style))
                 {
 					$return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
-                    $return[] = '<link rel="stylesheet" type="text/css" href="'.css_url($style).'" /> -->';
+                    $return[] = '<link rel="stylesheet" type="text/css" href="' . css_url($style) . '" /> -->';
                 }
 				else
 				{
-					$return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style">
-						<link rel="stylesheet" type="text/css" href="'.css_url($style).'" />';
+					$return[] = '<link rel="preload" type="text/css" href="' . css_url($style) . '" as="style">
+						<link rel="stylesheet" type="text/css" href="'.css_url($style) . '" />';
 				}
             }
         }
@@ -296,21 +296,21 @@ 
 
         foreach ($name As $script)
         {
-            if(is_string($script))
+            if (is_string($script))
             {
-                $script = (!preg_match('#\.js$#i', $script) ? $script.'.js' : $script);
-                if (is_file(WEBROOT.'js'.DS.str_replace('/', DS, $script)))
+                $script = (!preg_match('#\.js$#i', $script) ? $script . '.js' : $script);
+                if (is_file(WEBROOT . 'js' . DS . str_replace('/', DS, $script)))
                 {
-                    $return[] = '<script type="text/javascript" src="'.js_url($script).'"></script>';
+                    $return[] = '<script type="text/javascript" src="' . js_url($script) . '"></script>';
                 }
                 else if (is_localfile($script))
                 {
                     $return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
-                    $return[] = '<script type="text/javascript" src="'.js_url($script).'"></script> -->';
+                    $return[] = '<script type="text/javascript" src="' . js_url($script) . '"></script> -->';
                 }
 				else
 				{
-					$return[] = '<script type="text/javascript" src="'.js_url($script).'"></script>';
+					$return[] = '<script type="text/javascript" src="' . js_url($script) . '"></script>';
 				}
             }
         }
@@ -344,10 +344,10 @@ 
 		$name = str_replace(site_url() . 'less/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
-            $name .=  (!preg_match('#\.less$#i', $name) ? '.less' : '');
-            $filename = WEBROOT.'less'.DS.$name;
+            $name .= (!preg_match('#\.less$#i', $name) ? '.less' : '');
+            $filename = WEBROOT . 'less' . DS . $name;
 
-			return site_url() . 'less/' . $name.((file_exists($filename)) ? '?v='.filemtime($filename) : '');
+			return site_url() . 'less/' . $name . ((file_exists($filename)) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name . (!preg_match('#\.less$#i', $name) ? '.less' : '');
@@ -376,19 +376,19 @@ 
         {
             if (is_string($style))
             {
-                $style = (!preg_match('#\.less$#i', $style) ? $style.'.less' : $style);
-                if (is_file(WEBROOT.'less'.DS.str_replace('/', DS, $style)))
+                $style = (!preg_match('#\.less$#i', $style) ? $style . '.less' : $style);
+                if (is_file(WEBROOT . 'less' . DS . str_replace('/', DS, $style)))
                 {
-                    $return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" />';
+                    $return[] = '<link rel="stylesheet" type="text/less" href="' . less_url($style) . '" />';
                 }
                 else if (is_localfile($style))
                 {
                     $return[] = "<!-- The specified file do not exist. we can not load it. \n\t";
-                    $return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" /> -->';
+                    $return[] = '<link rel="stylesheet" type="text/less" href="' . less_url($style) . '" /> -->';
                 }
 				else
 				{
-					$return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" />';
+					$return[] = '<link rel="stylesheet" type="text/less" href="' . less_url($style) . '" />';
 				}
             }
         }
@@ -426,9 +426,9 @@ 
 		$name = str_replace(site_url() . 'img/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
-            $filename = WEBROOT.'img'.DS.$name;
+            $filename = WEBROOT . 'img' . DS . $name;
 
-			return site_url() . 'img/' . $name.((file_exists($filename) && $add_version) ? '?v='.filemtime($filename) : '');
+			return site_url() . 'img/' . $name . ((file_exists($filename) && $add_version) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name;
@@ -458,7 +458,7 @@ 
 
         foreach ($options As $key => $value)
         {
-            $return .= ' '.$key.'="'.$value.'"';
+            $return .= ' ' . $key . '="' . $value . '"';
         }
         $return .= ' />';
 
@@ -492,9 +492,9 @@ 
 		$name = str_replace(site_url() . 'docs/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
-            $filename = WEBROOT.'docs'.DS.$name;
+            $filename = WEBROOT . 'docs' . DS . $name;
 
-			return site_url() . 'docs/' . $name.((file_exists($filename && $add_version)) ? '?v='.filemtime($filename) : '');
+			return site_url() . 'docs/' . $name . ((file_exists($filename && $add_version)) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name;
@@ -522,9 +522,9 @@ 
 		$name = str_replace(site_url() . 'videos/', '', htmlspecialchars($name));
 
         if (is_localfile($name)) {
-            $filename = WEBROOT.'videos'.DS.$name;
+            $filename = WEBROOT . 'videos' . DS . $name;
 
-            return site_url() . 'videos/' . $name.((file_exists($filename) && $add_version) ? '?v='.filemtime($filename) : '');
+            return site_url() . 'videos/' . $name . ((file_exists($filename) && $add_version) ? '?v=' . filemtime($filename) : '');
         }
 
         return $name;

src/Helpers/url.php

Spacing +23 added lines, -23 removed lines

@@ -24,7 +24,7 @@ 
 
 // =================================  ================================= //
 
-if (! function_exists('site_url')) {
+if (!function_exists('site_url')) {
     /**
      * Renvoie une URL de site telle que définie par la configuration de l'application.
      *
@@ -48,7 +48,7 @@ 
     }
 }
 
-if (! function_exists('base_url')) {
+if (!function_exists('base_url')) {
     /**
      * Renvoie l'URL de base telle que définie par la configuration de l'application.
      * Les URL de base sont des URL de site coupées sans la page d'index.
@@ -67,7 +67,7 @@ 
     }
 }
 
-if (! function_exists('current_url')) {
+if (!function_exists('current_url')) {
     /**
      * Renvoie l'URL complète (y compris les segments) de la page où cette fonction est placée
      *
@@ -94,7 +94,7 @@ 
     }
 }
 
-if (! function_exists('previous_url')) {
+if (!function_exists('previous_url')) {
     /**
      * Renvoie l'URL précédente sur laquelle se trouvait le visiteur actuel. Pour des raisons de sécurité
      * nous vérifions d'abord une variable de session enregistrée, si elle existe, et l'utilisons.
@@ -119,7 +119,7 @@ 
     }
 }
 
-if (! function_exists('uri_string')) {
+if (!function_exists('uri_string')) {
     /**
      * Renvoie la partie chemin de l'URL actuelle
      *
@@ -133,7 +133,7 @@ 
     }
 }
 
-if (! function_exists('index_page')) {
+if (!function_exists('index_page')) {
     /**
      * Renvoie la "index_page" de votre fichier de configuration
      */
@@ -143,7 +143,7 @@ 
     }
 }
 
-if (! function_exists('anchor')) {
+if (!function_exists('anchor')) {
     /**
      * Crée une ancre basée sur l'URL locale.
      *
@@ -168,7 +168,7 @@ 
     }
 }
 
-if (! function_exists('anchor_popup')) {
+if (!function_exists('anchor_popup')) {
     /**
      * Lien d'ancrage - Version contextuelle
      *
@@ -191,12 +191,12 @@ 
             return '<a href="' . $siteUrl . '" onclick="window.open(\'' . $siteUrl . "', '_blank'); return false;\">" . $title . '</a>';
         }
 
-        if (! is_array($attributes)) {
+        if (!is_array($attributes)) {
             $attributes = [$attributes];
 
             // Ref: http://www.w3schools.com/jsref/met_win_open.asp
             $windowName = '_blank';
-        } elseif (! empty($attributes['window_name'])) {
+        } elseif (!empty($attributes['window_name'])) {
             $windowName = $attributes['window_name'];
             unset($attributes['window_name']);
         } else {
@@ -216,7 +216,7 @@ 
     }
 }
 
-if (! function_exists('mailto')) {
+if (!function_exists('mailto')) {
     /**
      * Lien Mailto
      *
@@ -233,7 +233,7 @@ 
     }
 }
 
-if (! function_exists('safe_mailto')) {
+if (!function_exists('safe_mailto')) {
     /**
      * Lien Mailto codé
      *
@@ -322,7 +322,7 @@ 
     }
 }
 
-if (! function_exists('auto_link')) {
+if (!function_exists('auto_link')) {
     /**
      * Lien automatique
      *
@@ -337,7 +337,7 @@ 
     function auto_link(string $str, string $type = 'both', bool $popup = false): string
     {
         // Recherche et remplace tous les URLs.
-        if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE|PREG_SET_ORDER)) {
             // Définissez notre HTML cible si vous utilisez des liens contextuels.
             $target = ($popup) ? ' target="_blank"' : '';
 
@@ -368,7 +368,7 @@ 
     }
 }
 
-if (! function_exists('prep_url')) {
+if (!function_exists('prep_url')) {
     /**
      * Ajoute simplement la partie http:// ou https:// si aucun schéma n'est inclus.
      *
@@ -393,7 +393,7 @@ 
     }
 }
 
-if (! function_exists('url_title')) {
+if (!function_exists('url_title')) {
     /**
      * Créer un titre d'URL
      *
@@ -429,7 +429,7 @@ 
     }
 }
 
-if (! function_exists('mb_url_title')) {
+if (!function_exists('mb_url_title')) {
     /**
      * Créer un titre d'URL qui prend en compte les caractères accentués
      *
@@ -448,7 +448,7 @@ 
     }
 }
 
-if (! function_exists('url_to')) {
+if (!function_exists('url_to')) {
     /**
      * Obtenir l'URL complète et absolue d'une méthode de contrôleur
      * (avec arguments supplémentaires)
@@ -461,7 +461,7 @@ 
      */
     function url_to(string $controller, ...$args): string
     {
-        if (! $route = link_to($controller, ...$args)) {
+        if (!$route = link_to($controller, ...$args)) {
             $explode = explode('::', $controller);
 
             if (isset($explode[1])) {
@@ -475,7 +475,7 @@ 
     }
 }
 
-if (! function_exists('url_is')) {
+if (!function_exists('url_is')) {
     /**
      * Détermine si le chemin d'URL actuel contient le chemin donné.
      * Il peut contenir un caractère générique (*) qui autorisera tout caractère valide.
@@ -493,7 +493,7 @@ 
     }
 }
 
-if (! function_exists('link_active')) {
+if (!function_exists('link_active')) {
     /**
      * Lien actif dans la navbar
      * Un peut comme le router-active-link de vuejs
@@ -507,7 +507,7 @@ 
             return $active_class;
         }
     
-        if (! $exact && preg_match('#^' . $path . '/?#i', $current_section)) {
+        if (!$exact && preg_match('#^' . $path . '/?#i', $current_section)) {
             return $active_class;
         }
         
@@ -520,7 +520,7 @@ 
     }
 }
 
-if (! function_exists('clean_url')) {
+if (!function_exists('clean_url')) {
     function clean_url(string $url): string
     {
         return Helpers::cleanUrl($url);