las93 / venus3

bundles/lib/Date.php

Spacing +10 added lines, -10 removed lines

@@ -41,11 +41,11 @@ 
      */
     public static function getWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : Date
     {
-        $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+        $iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
         if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
+        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; } else { $iWeekInSeconds = 0; }
 
         $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift;
         $iTimestampLastDay = mktime(0, 0, 0, 1, 6, $iYear) + $iWeekInSeconds + $iShift + 604800;
@@ -156,12 +156,12 @@ 
      */
     public static function getMiddleWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : array
     {
-        $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
+        $iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear));
 
         if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
         else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
+        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; }
         else { $iWeekInSeconds = 0; }
 
         if (date('N') > 2) {
@@ -180,7 +180,7 @@ 
         if (preg_replace('/^([0-9]+)-[0-9]+-[0-9]+$/', '$1', $aDates[0]) != date('Y')) {
 
             $aDates[0] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', date('Y').'$1', $aDates[0]);
-            $aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y')+1).'$1', $aDates[1]);
+            $aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y') + 1).'$1', $aDates[1]);
         }
 
         return $aDates;
@@ -221,10 +221,10 @@ 
         $oDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $sDateTime);
         $iTimeStamp = time() - $oDateTime->getTimestamp();
 
-        if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
-        if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
-        if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
-        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
-        else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
+        if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp / 60).' '.$sMinutes.$sEndReturn; }
+        if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp / 3600).' '.$sHours.$sEndReturn; }
+        if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp / 86400).' '.$sDays.$sEndReturn; }
+        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp / 2592000).' '.$sMonths.$sEndReturn; }
+        else { return $sStartReturn.' '.(int)($iTimeStamp / 31536000).' '.$sYears.$sEndReturn; }
     }
 }

Braces +7 added lines, -29 removed lines

@@ -76,18 +76,7 @@ 
     {
         if ($sLanguage == 'fr') {
 
-            if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; }
-            else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; }
-            else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; }
-            else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; }
-            else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; }
-            else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; }
-            else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; }
-            else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; }
-            else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; }
-            else if ($sMonth == 10) { return 'Octobre'; }
-            else if ($sMonth == 11) { return 'Novembre'; }
-            else if ($sMonth == 12) { return 'Décembre'; }
+            if ($sMonth == '01' || $sMonth == 1) { return 'Janvier'; } else if ($sMonth == '02' || $sMonth == 2) { return 'Février'; } else if ($sMonth == '03' || $sMonth == 3) { return 'Mars'; } else if ($sMonth == '04' || $sMonth == 4) { return 'Avril'; } else if ($sMonth == '05' || $sMonth == 5) { return 'Mai'; } else if ($sMonth == '06' || $sMonth == 6) { return 'Juin'; } else if ($sMonth == '07' || $sMonth == 7) { return 'Juillet'; } else if ($sMonth == '08' || $sMonth == 8) { return 'Août'; } else if ($sMonth == '09' || $sMonth == 9) { return 'Septembre'; } else if ($sMonth == 10) { return 'Octobre'; } else if ($sMonth == 11) { return 'Novembre'; } else if ($sMonth == 12) { return 'Décembre'; }
         }
     }
 
@@ -103,13 +92,7 @@ 
     {
         if ($sLanguage == 'fr') {
 
-            if ($sDay == 0) { return 'dimanche'; }
-            else if ($sDay == 1) { return 'lundi'; }
-            else if ($sDay == 2) { return 'mardi'; }
-            else if ($sDay == 3) { return 'mercredi'; }
-            else if ($sDay == 4) { return 'jeudi'; }
-            else if ($sDay == 5) { return 'vendredi'; }
-            else if ($sDay == 6) { return 'samedi'; }
+            if ($sDay == 0) { return 'dimanche'; } else if ($sDay == 1) { return 'lundi'; } else if ($sDay == 2) { return 'mardi'; } else if ($sDay == 3) { return 'mercredi'; } else if ($sDay == 4) { return 'jeudi'; } else if ($sDay == 5) { return 'vendredi'; } else if ($sDay == 6) { return 'samedi'; }
         }
     }
 
@@ -136,8 +119,7 @@ 
             if ($iMonth == $aToday['mois']) {
 
                 if ($iDay > $aToday['jour']) { $iYears--; }
-            }
-            else {
+            } else {
 
                 $iYears--;
             }
@@ -158,18 +140,15 @@ 
     {
         $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear));
 
-        if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; }
-        else { $iShift = (8 - $iFirstDayInYear) * 86400; }
+        if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } else { $iShift = (8 - $iFirstDayInYear) * 86400; }
 
-        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; }
-        else { $iWeekInSeconds = 0; }
+        if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } else { $iWeekInSeconds = 0; }
 
         if (date('N') > 2) {
 
             $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift + 172800;
             $iTimestampLastDay = $iTimestamp + 604800;
-        }
-        else {
+        } else {
 
             $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift - 432000;
             $iTimestampLastDay = $iTimestamp + 604800;
@@ -224,7 +203,6 @@ 
         if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; }
         if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; }
         if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; }
-        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; }
-        else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
+        if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; } else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; }
     }
 }

bundles/lib/Form.php

Braces +1 added lines, -2 removed lines

@@ -180,8 +180,7 @@
 
             for ($i = 1; $i <= 31; $i++) {
 
-                if ($i < 10) { $aDay['0'.$i] = '0'.$i; }
-                else { $aDay[$i] = $i; }
+                if ($i < 10) { $aDay['0'.$i] = '0'.$i; } else { $aDay[$i] = $i; }
             }
 
             $this->_aElement[$sName.'_day'] = new Select($sName, $aDay);

bundles/core/UrlManager.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 
                         $aRoutes = array();
 
-                        foreach($oHost->routes as $sKey => $oRoute) {
+                        foreach ($oHost->routes as $sKey => $oRoute) {
 
                             if ($sKey === $sCode) {
 
@@ -133,8 +133,8 @@ 
             throw new \Exception();
         }
 
-        $sStringToEncode = str_replace(['à','á','â','ã','ä','ç','è','é','ê','ë','ì','í','î','ï','ñ','ò','ó','ô','õ','ö','ù','ú','û','ü','ý','ÿ','À','Á','Â','Ã','Ä','Ç','È','É','Ê','Ë','Ì','Í','Î','Ï','Ñ','Ò','Ó','Ô','Õ','Ö','Ù','Ú','Û','Ü','Ý'],
-            ['a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','u','u','u','u','y','y','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','U','U','U','U','Y'],
+        $sStringToEncode = str_replace(['à', 'á', 'â', 'ã', 'ä', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ù', 'Ú', 'Û', 'Ü', 'Ý'],
+            ['a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'n', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'N', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y'],
                 $sStringToEncode);
 
         $sStringToEncode = preg_replace('/[^a-zA-Z0-9_]+/', '_', preg_quote($sStringToEncode));