knut7 / framework

src/Ballybran/Database/DatabaseDump.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
 
             foreach ($schemas as $schema) {
                 $schema = $schema['Create Table'];
-                if ($this->removeAI) $schema = preg_replace('/AUTO_INCREMENT=([0-9]+)(\s{0,1})/', '', $schema);
+                if ($this->removeAI) {
+                    $schema = preg_replace('/AUTO_INCREMENT=([0-9]+)(\s{0,1})/', '', $schema);
+                }
                 $this->ln($schema . ";\n\n");
             }
         }

src/Ballybran/Database/Drives/Database.php

Spacing +4 added lines, -4 removed lines

@@ -1024,19 +1024,19 @@ 
 
         $value = $this->format($value);
 
-        if ( null === $value ) {
+        if (null === $value) {
 
             return "NULL";
 
         }
 
-        if ( false === $value ) {
+        if (false === $value) {
 
             return "'0'";
 
         }
 
-        if ( true === $value ) {
+        if (true === $value) {
 
             return "'1'";
 
@@ -1099,7 +1099,7 @@ 
         $identifier = explode(".", $identifier);
 
         $identifier = array_map(
-            function ($part) use ($delimiter) {
+            function($part) use ($delimiter) {
                 return $delimiter . str_replace($delimiter, $delimiter . $delimiter, $part) . $delimiter;
             },
             $identifier

Braces +36 added lines, -12 removed lines

@@ -437,7 +437,9 @@ 
 
         $primary = $this->getPrimary($table);
 
-        if (is_array($primary)) return null;
+        if (is_array($primary)) {
+            return null;
+        }
 
         $table = $this->rewriteTable($table);
 
@@ -608,8 +610,12 @@ 
     function insert($table, $rows, $method = null)
     {
 
-        if (empty($rows)) return;
-        if (!isset($rows[0])) $rows = array($rows);
+        if (empty($rows)) {
+            return;
+        }
+        if (!isset($rows[0])) {
+            $rows = array($rows);
+        }
 
         if ($method === 'prepared') {
 
@@ -638,7 +644,9 @@ 
     {
 
         $columns = $this->getColumns($rows);
-        if (empty($columns)) return;
+        if (empty($columns)) {
+            return;
+        }
 
         $query = $this->insertHead($table, $columns);
         $query .= "( ?" . str_repeat(", ?", count($columns) - 1) . " )";
@@ -677,7 +685,9 @@ 
     {
 
         $columns = $this->getColumns($rows);
-        if (empty($columns)) return;
+        if (empty($columns)) {
+            return;
+        }
 
         $query = $this->insertHead($table, $columns);
         $lists = $this->valueLists($rows, $columns);
@@ -703,7 +713,9 @@ 
     {
 
         $columns = $this->getColumns($rows);
-        if (empty($columns)) return;
+        if (empty($columns)) {
+            return;
+        }
 
         $query = $this->insertHead($table, $columns);
         $lists = $this->valueLists($rows, $columns);
@@ -811,7 +823,9 @@ 
     function update($table, $data, $where = array(), $params = array())
     {
 
-        if (empty($data)) return;
+        if (empty($data)) {
+            return;
+        }
 
         $set = array();
 
@@ -821,8 +835,12 @@ 
 
         }
 
-        if (!is_array($where)) $where = array($where);
-        if (!is_array($params)) $params = array_slice(func_get_args(), 3);
+        if (!is_array($where)) {
+            $where = array($where);
+        }
+        if (!is_array($params)) {
+            $params = array_slice(func_get_args(), 3);
+        }
 
         $table = $this->rewriteTable($table);
         $query = "UPDATE " . $this->quoteIdentifier($table);
@@ -851,8 +869,12 @@ 
     function delete($table, $where = array(), $params = array())
     {
 
-        if (!is_array($where)) $where = array($where);
-        if (!is_array($params)) $params = array_slice(func_get_args(), 2);
+        if (!is_array($where)) {
+            $where = array($where);
+        }
+        if (!is_array($params)) {
+            $params = array_slice(func_get_args(), 2);
+        }
 
         $table = $this->rewriteTable($table);
         $query = "DELETE FROM " . $this->quoteIdentifier($table);
@@ -1094,7 +1116,9 @@ 
 
         $delimiter = $this->identifierDelimiter;
 
-        if (empty($delimiter)) return $identifier;
+        if (empty($delimiter)) {
+            return $identifier;
+        }
 
         $identifier = explode(".", $identifier);
 

src/Ballybran/Database/Drives/Result.php

Braces +9 added lines, -3 removed lines

@@ -111,7 +111,9 @@ 
 
         if ($where !== null) {
 
-            if (!is_array($params)) $params = array_slice(func_get_args(), 2);
+            if (!is_array($params)) {
+                $params = array_slice(func_get_args(), 2);
+            }
             $result = $result->where($where, $params);
 
         }
@@ -129,7 +131,9 @@ 
     function via($key)
     {
 
-        if (!$this->parent_) throw new \LogicException('Cannot set reference key on basic Result');
+        if (!$this->parent_) {
+            throw new \LogicException('Cannot set reference key on basic Result');
+        }
 
         $clone = clone $this;
 
@@ -155,7 +159,9 @@ 
     function execute()
     {
 
-        if (isset($this->rows)) return $this;
+        if (isset($this->rows)) {
+            return $this;
+        }
 
         if ($this->parent_) {
 

src/Ballybran/Database/QueryBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -146,7 +146,7 @@ 
                 'separator' => ',',
             ],
         ];
-        foreach($clausules as $key => $clausule) {
+        foreach ($clausules as $key => $clausule) {
             if (isset($this->clausules[$key])) {
                 $value = $this->clausules[$key];
                 if (is_array($value)) {
@@ -202,7 +202,7 @@ 
                 'separator' => ' ',
             ]
         ];
-        foreach($clausules as $key => $clausule) {
+        foreach ($clausules as $key => $clausule) {
             if (isset($this->clausules[$key])) {
                 $value = $this->clausules[$key];
                 if (is_array($value)) {
@@ -244,7 +244,7 @@ 
                 'separator' => ' ',
             ]
         ];
-        foreach($clausules as $key => $clausule) {
+        foreach ($clausules as $key => $clausule) {
             if (isset($this->clausules[$key])) {
                 $value = $this->clausules[$key];
                 if (is_array($value)) {

src/Ballybran/Database/Backup.php

Braces +8 added lines, -2 removed lines

@@ -97,7 +97,9 @@ 
 
                     if (stripos($rows[1], '(')) {
                         $type[$table][] = stristr($rows[1], '(', true);
-                    } else $type[$table][] = $rows[1];
+                    } else {
+                        $type[$table][] = $rows[1];
+                    }
 
                     $return .= $rows[0];
                     $count++;
@@ -125,7 +127,11 @@ 
 
                     if (isset($row[$j])) {
 //if number, take away "". else leave as string
-                        if (in_array($type[$table][$j], $numtypes)) $return .= $row[$j]; else $return .= '"' . $row[$j] . '"';
+                        if (in_array($type[$table][$j], $numtypes)) {
+                            $return .= $row[$j];
+                        } else {
+                            $return .= '"' . $row[$j] . '"';
+                        }
                     } else {
                         $return .= '""';
                     }

src/Ballybran/Helpers/vardump/BaseVarDumper.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
                 }
                 break;
             case 'object':
-                if ( false !== ($id = array_search($var, self::$_objects, true)) ) {
+                if (false !== ($id = array_search($var, self::$_objects, true))) {
                     self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
                 } elseif (self::$_depth <= $level) {
                     self::$_output .= get_class($var) . '(...)';

src/Ballybran/Helpers/Time/Timestamp.php

Indentation +3 added lines, -3 removed lines

@@ -25,8 +25,8 @@ 
 {
     private static $tempo_da_sessao;
 
-   public static function distanceOfTimeInWords($fromTime, $toTime = 0, $showLessThanAMinute = false)
-   {
+    public static function distanceOfTimeInWords($fromTime, $toTime = 0, $showLessThanAMinute = false)
+    {
     $distanceInSeconds = round(abs($toTime - strtotime($fromTime)));
     $distanceInMinutes = round($distanceInSeconds / 60);
 
@@ -127,7 +127,7 @@ 
         $now             = time();
         $unix_date         = strtotime($date);
 
-       // check validity of date
+        // check validity of date
         if(empty($unix_date)) {   
             return "Bad date";
         }

Spacing +15 added lines, -15 removed lines

@@ -95,7 +95,7 @@ 
         
     }
 
-    public static function setDataTime($data, string $strftime='%d %B %Y', string $format = 'Y-m-d H:i:s')
+    public static function setDataTime($data, string $strftime = '%d %B %Y', string $format = 'Y-m-d H:i:s')
     {
         $data = new \DateTime($data);
         $data_f = $data->format($format);
@@ -111,45 +111,45 @@ 
 
     public static function nicetime($date, array $translate = ["second", "minute", "hour", "day", "week", "month", "year", "decade"])
     {
-        if(empty($date)) {
+        if (empty($date)) {
             return "No date provided";
         }
-        if(!is_array($translate)) {
+        if (!is_array($translate)) {
             return "the expected value is not an array";
         }
-        if( 5 > count($translate)){
+        if (5 > count($translate)) {
             return "the matrix needs 5 to 8 values (second, minute, hour, day, week,month, year, decade)";
         }
 
         $periods         = $translate;
-        $lengths         = array("60","60","24","7","4.35","12","10");
+        $lengths         = array("60", "60", "24", "7", "4.35", "12", "10");
 
         $now             = time();
-        $unix_date         = strtotime($date);
+        $unix_date = strtotime($date);
 
        // check validity of date
-        if(empty($unix_date)) {   
+        if (empty($unix_date)) {   
             return "Bad date";
         }
 
     // is it future date or past date
-        if($now > $unix_date) {   
-            $difference     = $now - $unix_date;
-            $tense         = "ago";
+        if ($now > $unix_date) {   
+            $difference = $now - $unix_date;
+            $tense = "ago";
 
         } else {
-            $difference     = $unix_date - $now;
-            $tense         = "from now";
+            $difference = $unix_date - $now;
+            $tense = "from now";
         }
 
-        for($j = 0; $difference >= $lengths[$j] && $j < count($lengths)-1; $j++) {
+        for ($j = 0; $difference >= $lengths[$j] && $j < count($lengths) - 1; $j++) {
             $difference /= $lengths[$j];
         }
 
         $difference = round($difference);
 
-        if($difference != 1) {
-            $periods[$j].= "s";
+        if ($difference != 1) {
+            $periods[$j] .= "s";
         }
 
         return "$difference $periods[$j] {$tense}";

src/Ballybran/Helpers/Utility/Ucfirst.php

Indentation +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
         }
         return $abbreviation;
     }
-	/*
+    /*
 	* $string string
 	* example removeAccentsIstring( "Õ") output "O"
 	*/
@@ -100,13 +100,13 @@ 
     public static function removeAccents($string, $slug = false)
     {
         $string = strtolower($string);
-		// ASCII code of vowels
+        // ASCII code of vowels
         $ascii['a'] = range(224, 230);
         $ascii['e'] = range(232, 235);
         $ascii['i'] = range(236, 239);
         $ascii['o'] = array_merge(range(242, 246), array(240, 248));
         $ascii['u'] = range(249, 252);
-		// ASCII code for other characters
+        // ASCII code for other characters
         $ascii['b'] = array(223);
         $ascii['c'] = array(231);
         $ascii['d'] = array(208);
@@ -120,10 +120,10 @@ 
         $string = preg_replace(array_values($troca), array_keys($troca), $string);
         // Slug?
         if ($slug) {
-			// Swap anything that is not letter or number for a character ($slug)           
-			 $string = preg_replace('/[^a-z0-9]/i', $slug, $string);
-			// Removes repeated characters ($slug)             
-			$string = preg_replace('/' . $slug . '{2,}/i', $slug, $string);
+            // Swap anything that is not letter or number for a character ($slug)           
+                $string = preg_replace('/[^a-z0-9]/i', $slug, $string);
+            // Removes repeated characters ($slug)             
+            $string = preg_replace('/' . $slug . '{2,}/i', $slug, $string);
             $string = trim($string, $slug);
         }
         return $string;

Spacing +18 added lines, -18 removed lines

@@ -48,42 +48,42 @@
 
     public static function abbreviate($strString, $intLength = NULL)
     {
-        $defaultAbbrevLength = 8;   //Default abbreviation length if none is specified
+        $defaultAbbrevLength = 8; //Default abbreviation length if none is specified
 
         //Set up the string for processing
-        $strString = preg_replace("/[^A-Za-z0-9]/", '', $strString);    //Remove non-alphanumeric characters
-        $strString = ucfirst($strString);             //Capitalize the first character (helps with abbreviation calcs)
+        $strString = preg_replace("/[^A-Za-z0-9]/", '', $strString); //Remove non-alphanumeric characters
+        $strString = ucfirst($strString); //Capitalize the first character (helps with abbreviation calcs)
         $stringIndex = 0;
         //Figure out everything we need to know about the resulting abbreviation string
-        $uppercaseCount = preg_match_all('/[A-Z]/', $strString, $uppercaseLetters, PREG_OFFSET_CAPTURE);  //Record occurences of uppercase letters and their indecies in the $uppercaseLetters array, take note of how many there are
-        $targetLength = isset($intLength) ? intval($intLength) : $defaultAbbrevLength;                //Maximum length of the abbreviation
-        $uppercaseCount = $uppercaseCount > $targetLength ? $targetLength : $uppercaseCount;                  //If there are more uppercase letters than the target length, adjust uppercaseCount to ignore overflow
-        $targetWordLength = round($targetLength / intval($uppercaseCount));                                           //How many characters need to be taken from each uppercase-designated "word" in order to best meet the target length?
-        $abbrevLength = 0;          //How long the abbreviation currently is
-        $abbreviation = '';         //The actual abbreviation
+        $uppercaseCount = preg_match_all('/[A-Z]/', $strString, $uppercaseLetters, PREG_OFFSET_CAPTURE); //Record occurences of uppercase letters and their indecies in the $uppercaseLetters array, take note of how many there are
+        $targetLength = isset($intLength) ? intval($intLength) : $defaultAbbrevLength; //Maximum length of the abbreviation
+        $uppercaseCount = $uppercaseCount > $targetLength ? $targetLength : $uppercaseCount; //If there are more uppercase letters than the target length, adjust uppercaseCount to ignore overflow
+        $targetWordLength = round($targetLength / intval($uppercaseCount)); //How many characters need to be taken from each uppercase-designated "word" in order to best meet the target length?
+        $abbrevLength = 0; //How long the abbreviation currently is
+        $abbreviation = ''; //The actual abbreviation
         //Create respective arrays for the occurence indecies and the actual characters of uppercase characters within the string
         for ($i = 0; $i < $uppercaseCount; $i++) {
             //$ucIndicies[] = $uppercaseLetters[1];  //Not actually used. Could be used to calculate abbreviations more efficiently than the routine below by strictly considering indecies
             $ucLetters[] = $uppercaseLetters[0][$i][0];
         }
-        $characterDeficit = 0;              //Gets incremented when an uppercase letter is encountered before $targetCharsPerWord characters have been collected since the last UC char.
-        $wordIndex = $targetWordLength;         //HACK: keeps track of how many characters have been carried into the abbreviation since the last UC char
+        $characterDeficit = 0; //Gets incremented when an uppercase letter is encountered before $targetCharsPerWord characters have been collected since the last UC char.
+        $wordIndex = $targetWordLength; //HACK: keeps track of how many characters have been carried into the abbreviation since the last UC char
         while ($stringIndex < strlen($strString)) {  //Process the whole input string...
             if ($abbrevLength >= $targetLength)              //...unless the abbreviation has hit the target length cap
                 break;
-            $currentChar = $strString[$stringIndex++];    //Grab a character from the string, advance the string cursor
+            $currentChar = $strString[$stringIndex++]; //Grab a character from the string, advance the string cursor
             if (in_array($currentChar, $ucLetters)) {           //If handling a UC char, consider it a new word
-                $characterDeficit += $targetWordLength - $wordIndex;    //If UC chars are closer together than targetWordLength, keeps track of how many extra characters are required to fit the target length of the abbreviation
-                $wordIndex = 0;                                                           //Set the wordIndex to reflect a new word
+                $characterDeficit += $targetWordLength - $wordIndex; //If UC chars are closer together than targetWordLength, keeps track of how many extra characters are required to fit the target length of the abbreviation
+                $wordIndex = 0; //Set the wordIndex to reflect a new word
             } else if ($wordIndex >= $targetWordLength) {
                 if ($characterDeficit == 0)                //If the word is full and we're not short any characters, ignore the character
                     continue;
                 else
-                    $characterDefecit--;                        //If we are short some characters, decrement the defecit and carry on with adding the character to the abbreviation
+                    $characterDefecit--; //If we are short some characters, decrement the defecit and carry on with adding the character to the abbreviation
             }
-            $abbreviation .= $currentChar;  //Add the character to the abbreviation
-            $abbrevLength++;                        //Increment abbreviation length
-            $wordIndex++;                             //Increment the number of characters for this word
+            $abbreviation .= $currentChar; //Add the character to the abbreviation
+            $abbrevLength++; //Increment abbreviation length
+            $wordIndex++; //Increment the number of characters for this word
         }
         return $abbreviation;
     }

Braces +12 added lines, -5 removed lines

@@ -69,17 +69,22 @@ 
         $characterDeficit = 0;              //Gets incremented when an uppercase letter is encountered before $targetCharsPerWord characters have been collected since the last UC char.
         $wordIndex = $targetWordLength;         //HACK: keeps track of how many characters have been carried into the abbreviation since the last UC char
         while ($stringIndex < strlen($strString)) {  //Process the whole input string...
-            if ($abbrevLength >= $targetLength)              //...unless the abbreviation has hit the target length cap
+            if ($abbrevLength >= $targetLength) {
+                //...unless the abbreviation has hit the target length cap
                 break;
+            }
             $currentChar = $strString[$stringIndex++];    //Grab a character from the string, advance the string cursor
             if (in_array($currentChar, $ucLetters)) {           //If handling a UC char, consider it a new word
                 $characterDeficit += $targetWordLength - $wordIndex;    //If UC chars are closer together than targetWordLength, keeps track of how many extra characters are required to fit the target length of the abbreviation
                 $wordIndex = 0;                                                           //Set the wordIndex to reflect a new word
             } else if ($wordIndex >= $targetWordLength) {
-                if ($characterDeficit == 0)                //If the word is full and we're not short any characters, ignore the character
+                if ($characterDeficit == 0) {
+                    //If the word is full and we're not short any characters, ignore the character
                     continue;
-                else
-                    $characterDefecit--;                        //If we are short some characters, decrement the defecit and carry on with adding the character to the abbreviation
+                } else {
+                                    $characterDefecit--;
+                }
+                //If we are short some characters, decrement the defecit and carry on with adding the character to the abbreviation
             }
             $abbreviation .= $currentChar;  //Add the character to the abbreviation
             $abbrevLength++;                        //Increment abbreviation length
@@ -114,7 +119,9 @@ 
         $ascii['y'] = array(253, 255);
         foreach ($ascii as $key => $item) {
             $acentos = '';
-            foreach ($item AS $codigo) $acentos .= chr($codigo);
+            foreach ($item AS $codigo) {
+                $acentos .= chr($codigo);
+            }
             $troca[$key] = '/[' . $acentos . ']/i';
         }
         $string = preg_replace(array_values($troca), array_keys($troca), $string);

src/Ballybran/Helpers/Utility/Assets.php

Indentation +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
                 return sprintf($template, $file) . "\n";
             }
         } else {
-             return sprintf($template, $files) . "\n";
+                return sprintf($template, $files) . "\n";
         }
     }
 
@@ -54,7 +54,7 @@ 
     {
         if (is_array($files)) {
             foreach ($files as $key => $value) {
-               echo static::resource($value, 'js');
+                echo static::resource($value, 'js');
             }
         } else {
             echo static::resource($files, 'js');