bfw-systems / bfw

src/fonctions/cli.php

Spacing +10 added lines, -10 removed lines

@@ -53,31 +53,31 @@ 
  */
 function displayMsg($msg, $colorTxt = null, $colorBg = null, $style = 'normal')
 {
-    if($colorTxt == null) {
+    if ($colorTxt == null) {
         echo $msg."\n";
         return;
     }
 
     //Gestion cas avec couleur
     $styleNum = styleForShell($style);
-    if($styleNum === false) {
+    if ($styleNum === false) {
         $styleNum = styleForShell('normal');
     }
 
     $colorTxtNum = colorForShell('white', 'txt');
-    if($colorTxt !== null) {
+    if ($colorTxt !== null) {
         $colorTxtNumArg = colorForShell($colorTxt, 'txt');
 
-        if($colorTxtNumArg !== false) {
+        if ($colorTxtNumArg !== false) {
             $colorTxtNum = $colorTxtNumArg;
         }
     }
 
     $colorBgNum = colorForShell('black', 'bg');
-    if($colorBg !== null) {
+    if ($colorBg !== null) {
         $colorBgNumArg = colorForShell($colorBg, 'bg');
 
-        if($colorBgNumArg !== false) {
+        if ($colorBgNumArg !== false) {
             $colorBgNum = $colorBgNumArg;
         }
     }
@@ -109,14 +109,14 @@ 
         'white'   => 7
     ];
 
-    if(!in_array($color, $colorList)) {
+    if (!in_array($color, $colorList)) {
         throw new Exception('Color '.$color.' is not available in function.');
     }
 
-    if($type === 'txt') {
+    if ($type === 'txt') {
         return $colorList[$color] + 30;
     }
-    elseif($type === 'bg') {
+    elseif ($type === 'bg') {
         return $colorList[$color] + 40;
     }
 
@@ -140,7 +140,7 @@ 
         'not-reverse'   => 27
     ];
     
-    if(!in_array($style, $styleList)) {
+    if (!in_array($style, $styleList)) {
         return false;
     }
     

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
 
     if($type === 'txt') {
         return $colorList[$color] + 30;
-    }
-    elseif($type === 'bg') {
+    } elseif($type === 'bg') {
         return $colorList[$color] + 40;
     }
 

src/class/Dates.php

Indentation +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
             $keywords->search,
             $keywords->replace,
             strtolower($match[3])
-         );
+            );
         
         $dateDepart = clone $this;
         parent::modify($match[1].$match[2].' '.$keyword);

Spacing +15 added lines, -15 removed lines

@@ -91,7 +91,7 @@ 
 
     public function getZone()
     {
-        return parent::format('P');;
+        return parent::format('P'); ;
     }
     
     public function modify($modify)
@@ -99,7 +99,7 @@ 
         $dateDepart = clone $this;
         parent::modify($modify);
         
-        if($dateDepart == $this) {
+        if ($dateDepart == $this) {
             return $this;
         }
         
@@ -142,7 +142,7 @@ 
         $match    = [];
         
         //Regex sur le paramètre pour récupéré le type de modification
-        if(preg_match('#(\+|\-)([0-9]+) ([a-z]+)#i', $modify, $match) !== 1) {
+        if (preg_match('#(\+|\-)([0-9]+) ([a-z]+)#i', $modify, $match) !== 1) {
             throw new Exceptio('Date::modify pattern not match.');
         }
         
@@ -155,7 +155,7 @@ 
         $dateDepart = clone $this;
         parent::modify($match[1].$match[2].' '.$keyword);
         
-        if($dateDepart == $this) {
+        if ($dateDepart == $this) {
             throw new Exception('Parameter '.$match[3].' is unknown.');
         }
     }
@@ -175,7 +175,7 @@ 
         $date  = $this->format('Y-m-d');
         $heure = $this->format('H:i:s');
         
-        if($returnArray) {
+        if ($returnArray) {
             return [$date, $heure];
         }
         
@@ -226,10 +226,10 @@ 
         $return  = [];
         
         $pos = false;
-        foreach($lst_all as $val) {
+        foreach ($lst_all as $val) {
             $pos = strpos($val, $continent);
             
-            if($pos !== false) {
+            if ($pos !== false) {
                 $return[] = $val;
             }
         }
@@ -247,11 +247,11 @@ 
             'time' => ''
         ];
         
-        if($actual == $this) {
+        if ($actual == $this) {
             //A l'instant
             
             $returnTxt->date = self::$humainReadableI18n['now'];
-        } elseif($actual->format('d') !== parent::format('d')) {
+        } elseif ($actual->format('d') !== parent::format('d')) {
             //Hier
             
             $returnTxt->date = self::$humainReadableI18n['yesterday'];
@@ -260,21 +260,21 @@ 
                                 .parent::format(
                                     self::$humainReadableFormats['time']
                                 );
-        } elseif($diff->days === 0) {
+        } elseif ($diff->days === 0) {
             //Aujourd'hui
             
             $returnTxt->date = self::$humainReadableI18n['since'];
             
-            if($diff->h === 0 && $diff->m === 0) {
+            if ($diff->h === 0 && $diff->m === 0) {
                 $returnTxt->date .= $diff->s.'s';
-            } elseif($diff->h === 0) {
+            } elseif ($diff->h === 0) {
                 $returnTxt->date .= $diff->s.'min';
             } else {
                 $returnTxt->date .= $diff->h.'h';
             }
         } else {
             $dateFormat = self::$humainReadableFormats['dateDifferentYear'];
-            if($actual->format('Y') === parent::format('Y')) {
+            if ($actual->format('Y') === parent::format('Y')) {
                 $dateFormat = self::$humainReadableFormats['dateSameYear'];
             }
             
@@ -291,11 +291,11 @@ 
         }
         
         $txtReturn = $returnTxt->date;
-        if($returnDateAndTime === true && $returnTxt->time !== '') {
+        if ($returnDateAndTime === true && $returnTxt->time !== '') {
             $txtReturn .= ' '.$returnTxt->time;
         }
         
-        if($toLower === true) {
+        if ($toLower === true) {
             $txtReturn = mb_strtolower($txtReturn);
         }
         

src/class/memcache/Memcache.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     
     protected function connectToServers()
     {
-        foreach($this->config['memcached']['server'] as $server)
+        foreach ($this->config['memcached']['server'] as $server)
         {
             $this->addServer($server['host'], $server['port']);
         }

src/class/memcache/Memcached.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     protected function connectToServers()
     {
         $addServers = [];
-        foreach($this->config['memcached']['server'] as $server)
+        foreach ($this->config['memcached']['server'] as $server)
         {
             $addServers[] = [$server['host'], $server['port']];
         }

src/class/Config.php

Spacing +15 added lines, -15 removed lines

@@ -20,29 +20,29 @@ 
         $this->loadAllConfigsFiles();
     }
     
-    protected function searchAllConfigsFiles($dirPath, $pathFromRoot='')
+    protected function searchAllConfigsFiles($dirPath, $pathFromRoot = '')
     {
-        if(!file_exists($dirPath)) {
+        if (!file_exists($dirPath)) {
             return;
         }
         
         $listFiles = array_diff(scandir($dirPath), ['.', '..']);
         
-        foreach($listFiles as $file) {
+        foreach ($listFiles as $file) {
             $keyFile  = $pathFromRoot.$file;
             $readPath = $dirPath.'/'.$file;
             
-            if(is_file($readPath)) {
+            if (is_file($readPath)) {
                 $this->configFiles[$keyFile] = $readPath;
                 continue;
             }
             
-            if(is_link($readPath)) {
+            if (is_link($readPath)) {
                 $this->configFiles[$keyFile] = realpath($readPath);
                 continue;
             }
             
-            if(is_dir($readPath)) {
+            if (is_dir($readPath)) {
                 $this->searchAllConfigsFiles($readPath, $pathFromRoot.'/');
                 continue;
             }
@@ -51,7 +51,7 @@ 
     
     protected function loadAllConfigsFiles()
     {
-        foreach($this->configFiles as $fileKey => $filePath)
+        foreach ($this->configFiles as $fileKey => $filePath)
         {
             $this->loadConfigFile($fileKey, $filePath);
         }
@@ -61,12 +61,12 @@ 
     {
         $fileExtension = pathinfo($filePath, PATHINFO_EXTENSION);
         
-        if($fileExtension === 'json') {
+        if ($fileExtension === 'json') {
             $this->loadJsonConfigFile($fileKey, $filePath);
             return;
         }
         
-        if($fileExtension === 'php') {
+        if ($fileExtension === 'php') {
             $this->loadPhpConfigFile($fileKey, $filePath);
             return;
         }
@@ -79,7 +79,7 @@ 
         $json   = file_get_contents($filePath);
         $config = json_decode($json);
         
-        if($config === null) {
+        if ($config === null) {
             throw new Exception(json_last_error_msg());
         }
         
@@ -91,25 +91,25 @@ 
         $this->config[$fileKey] = require($filePath);
     }
     
-    public function getConfig($key, $file=null)
+    public function getConfig($key, $file = null)
     {
         $nbConfigFile = count($this->config);
         
-        if($file === null && $nbConfigFile > 1) {
+        if ($file === null && $nbConfigFile > 1) {
             throw new Exception('Please indicate a file for get config '.$key);
         }
         
-        if($nbConfigFile === 1) {
+        if ($nbConfigFile === 1) {
             $file = key($this->config);
         }
         
-        if(!isset($this->config[$file])) {
+        if (!isset($this->config[$file])) {
             throw new Exception('The file '.$file.' not exist for config '.$key);
         }
         
         $config = &$this->config[$file];
         
-        if(!isset($config[$key])) {
+        if (!isset($config[$key])) {
             throw new Exception('The config key '.$key.' not exist in config');
         }
         

src/class/Options.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     
     public function getOption($optionKey)
     {
-        if(!isset($this->options[$optionKey])) {
+        if (!isset($this->options[$optionKey])) {
             throw new Exception('Option key '.$optionKey.' not exist.');
         }
         

src/class/Request.php

Spacing +6 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
     
     public static function getInstance()
     {
-        if(self::$instance === null) {
+        if (self::$instance === null) {
             self::$instance = new self;
         }
         
@@ -64,7 +64,7 @@ 
 
     public function getServerVar($keyName)
     {
-        if(!isset($_SERVER[$keyName])) {
+        if (!isset($_SERVER[$keyName])) {
             return '';
         }
 
@@ -92,7 +92,7 @@ 
         $firstLang = explode(';', $acceptLangs[0]);
         $lang = strtolower($firstLang[0]);
 
-        if(strpos($lang, '-') !== false)
+        if (strpos($lang, '-') !== false)
         {
             $minLang = explode('-', $lang);
             $lang    = $minLang[0];
@@ -119,13 +119,13 @@ 
         
         $this->ssl = false;
         
-        if(!empty($serverHttps) && $serverHttps !== 'off') {
+        if (!empty($serverHttps) && $serverHttps !== 'off') {
             $this->ssl = true;
         }
-        elseif(!empty($fwdProto) && $fwdProto === 'https') {
+        elseif (!empty($fwdProto) && $fwdProto === 'https') {
             $this->ssl = true;
         }
-        elseif(!empty($fwdSsl) && $fwdSsl === 'on') {
+        elseif (!empty($fwdSsl) && $fwdSsl === 'on') {
             $this->ssl = true;
         }
     }

Braces +2 added lines, -4 removed lines

@@ -121,11 +121,9 @@
         
         if(!empty($serverHttps) && $serverHttps !== 'off') {
             $this->ssl = true;
-        }
-        elseif(!empty($fwdProto) && $fwdProto === 'https') {
+        } elseif(!empty($fwdProto) && $fwdProto === 'https') {
             $this->ssl = true;
-        }
-        elseif(!empty($fwdSsl) && $fwdSsl === 'on') {
+        } elseif(!empty($fwdSsl) && $fwdSsl === 'on') {
             $this->ssl = true;
         }
     }

src/class/Subjects.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     {
         $key = array_search($observer, $this->observers, true);
         
-        if($key !== false) {
+        if ($key !== false) {
             unset($this->observers[$key]);
         }
         
@@ -28,7 +28,7 @@ 
     
     public function notify($action = '')
     {
-        foreach($this->observers as $observer) {
+        foreach ($this->observers as $observer) {
             $observer->update($this, $action);
         }
         

src/class/core/Errors.php

Spacing +10 added lines, -10 removed lines

@@ -54,14 +54,14 @@ 
         ];
         
         $erreurType = 'Unknown';
-        if(isset($map[$errSeverity])) {
+        if (isset($map[$errSeverity])) {
             $erreurType = $map[$errSeverity];
         }
         
         $errorRenderFcts = self::errorGetRender();
-        $errorRender      = $errorRenderFcts['default'];
+        $errorRender = $errorRenderFcts['default'];
         
-        if(PHP_SAPI === 'cli') {
+        if (PHP_SAPI === 'cli') {
             $errorRender = $errorRenderFcts['cli'];
         }
         
@@ -97,22 +97,22 @@ 
                     <p class="title">Niarf, a error is detected !</p>
                     <p class="info">'.$erreurType.' Error : <strong>'.$errMsg.'</strong> in '.$errFile.' at line '.$errLine.'</p>
                     <fieldset><pre>';
-                        foreach($backtrace as $i => $info) {
+                        foreach ($backtrace as $i => $info) {
                             echo '#'.$i.'  '.$info['function'];
                             
-                            if(isset($info['args']) && count($info['args']) > 0) {
+                            if (isset($info['args']) && count($info['args']) > 0) {
                                 echo '(';
                                 
-                                foreach($info['args'] as $iArgs => $args) {
-                                    if($iArgs > 0) {
+                                foreach ($info['args'] as $iArgs => $args) {
+                                    if ($iArgs > 0) {
                                         echo ', ';
                                     }
                                     
-                                    if(is_array($args) || is_object($args)) {
+                                    if (is_array($args) || is_object($args)) {
                                         echo gettype($args);
                                         
                                     }
-                                    elseif(is_null($args)) {
+                                    elseif (is_null($args)) {
                                         echo 'null';
                                     }
                                     else {
@@ -123,7 +123,7 @@ 
                                 echo ')';
                             }
                             
-                            if(isset($info['file'], $info['line'])) {
+                            if (isset($info['file'], $info['line'])) {
                                 echo ' called at ['.$info['file'].' line '.$info['line'].']';
                             }
                             echo "\n\n";

Braces +2 added lines, -4 removed lines

@@ -111,11 +111,9 @@
                                     if(is_array($args) || is_object($args)) {
                                         echo gettype($args);
                                         
-                                    }
-                                    elseif(is_null($args)) {
+                                    } elseif(is_null($args)) {
                                         echo 'null';
-                                    }
-                                    else {
+                                    } else {
                                         echo htmlentities($args);
                                     }
                                 }