reginaldojunior / winners

app/View/Helper/ExcelHelper.php

Doc Comments +6 added lines

@@ -30,6 +30,9 @@ 
          return true; 
     } 
      
+    /**
+     * @param string $title
+     */
     function _title($title) { 
         $this->objPHPExcel->getActiveSheet()->setCellValue('A2', $title); 
     } 
@@ -71,6 +74,9 @@ 
         } 
     } 
              
+    /**
+     * @param string $title
+     */
     function _output($title, $type = 'Excel5') { 
 		if ($type == 'Excel5') {
 			header("Content-type: application/vnd.ms-excel");  

Indentation +46 added lines, -46 removed lines

@@ -6,47 +6,47 @@ 
 class ExcelHelper extends AppHelper { 
      
 	var $objPHPExcel;
-    var $writer; 
-    var $sheet; 
-    var $data; 
-    var $blacklist = array(); 
+	var $writer; 
+	var $sheet; 
+	var $data; 
+	var $blacklist = array(); 
      
-    public function excelHelper() {
+	public function excelHelper() {
 	$this->log('run this'); 
 		$this->objPHPExcel = new PHPExcel();
        
-        //$this->objPHPExcel->getActiveSheet() = $this->objPHPExcel->getActiveSheet(); 
-    } 
+		//$this->objPHPExcel->getActiveSheet() = $this->objPHPExcel->getActiveSheet(); 
+	} 
                   
-    function generate($data, $title = 'Report') { 
-         $this->data = $data; 
+	function generate($data, $title = 'Report') { 
+		 $this->data = $data; 
 
 
 
-         $this->_title($title); 
+		 $this->_title($title); 
 //         $this->_headers(); 
 //         $this->_rows(); 
-         $this->_output($title); 
-         return true; 
-    } 
+		 $this->_output($title); 
+		 return true; 
+	} 
      
-    function _title($title) { 
-        $this->objPHPExcel->getActiveSheet()->setCellValue('A2', $title); 
-    } 
+	function _title($title) { 
+		$this->objPHPExcel->getActiveSheet()->setCellValue('A2', $title); 
+	} 
 
-    function _headers() { 
-        $i=0; 
+	function _headers() { 
+		$i=0; 
 
 		$this->log($this->data);
 
-        foreach ($this->data[0] as $field => $value) { 
-            if (!in_array($field,$this->blacklist)) { 
+		foreach ($this->data[0] as $field => $value) { 
+			if (!in_array($field,$this->blacklist)) { 
 	
-                $columnName = Inflector::humanize($field); 
-                $this->objPHPExcel->getActiveSheet()->getCellByColumnAndRow($i++, 4, $columnName); 
+				$columnName = Inflector::humanize($field); 
+				$this->objPHPExcel->getActiveSheet()->getCellByColumnAndRow($i++, 4, $columnName); 
 
-            } 
-        } 
+			} 
+		} 
 		/**
         $this->objPHPExcel->getActiveSheet()->getStyle('A4')->getFont()->setBold(true); 
         $this->objPHPExcel->getActiveSheet()->getStyle('A4')->getFill()->setFillType(PHPExcel_Style_Fill::FILL_SOLID); 
@@ -55,42 +55,42 @@ 
         for ($j=1; $j<$i; $j++) { 
             $this->objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($j))->setAutoSize(true); 
         } 
-        ***/
-    } 
+		 ***/
+	} 
          
-    function _rows() { 
-        $i=5; 
-        foreach ($this->data as $row) { 
-            $j=0; 
-            foreach ($row as $field => $value) { 
-                if(!in_array($field,$this->blacklist)) { 
-                    $this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++,$i, $value); 
-                } 
-            } 
-            $i++; 
-        } 
-    } 
+	function _rows() { 
+		$i=5; 
+		foreach ($this->data as $row) { 
+			$j=0; 
+			foreach ($row as $field => $value) { 
+				if(!in_array($field,$this->blacklist)) { 
+					$this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++,$i, $value); 
+				} 
+			} 
+			$i++; 
+		} 
+	} 
              
-    function _output($title, $type = 'Excel5') { 
+	function _output($title, $type = 'Excel5') { 
 		if ($type == 'Excel5') {
 			header("Content-type: application/vnd.ms-excel");  
-	        header('Content-Disposition: attachment;filename="'.$title.'.xls"'); 
-	        header('Cache-Control: max-age=0'); 
+			header('Content-Disposition: attachment;filename="'.$title.'.xls"'); 
+			header('Cache-Control: max-age=0'); 
 			$this->writer = PHPExcel_IOFactory::createWriter($this->objPHPExcel, 'Excel5');
 			
 			
 		} else if ($type == 'CSV') {
 			header("Content-type: text/csv");  
-	        header('Content-Disposition: attachment;filename="'.$title.'.csv"'); 
-	        header('Cache-Control: max-age=0'); 
+			header('Content-Disposition: attachment;filename="'.$title.'.csv"'); 
+			header('Cache-Control: max-age=0'); 
 			$this->writer = PHPExcel_IOFactory::createWriter($this->objPHPExcel, 'CSV');
 	        
 		}
 		
 		
-        //$this->writer->setTempDir(TMP); 
-        $this->writer->save('php://output'); 
-    } 
+		//$this->writer->setTempDir(TMP); 
+		$this->writer->save('php://output'); 
+	} 
 }
 
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-include_once(APP . 'Vendor' . DS . 'PHPExcel' . DS . 'IOFactory.php');
-include_once(APP . 'Vendor' . DS . 'PHPExcel' . DS . 'PHPExcel.php');
+include_once(APP.'Vendor'.DS.'PHPExcel'.DS.'IOFactory.php');
+include_once(APP.'Vendor'.DS.'PHPExcel'.DS.'PHPExcel.php');
 
 class ExcelHelper extends AppHelper { 
      
@@ -35,12 +35,12 @@ 
     } 
 
     function _headers() { 
-        $i=0; 
+        $i = 0; 
 
 		$this->log($this->data);
 
         foreach ($this->data[0] as $field => $value) { 
-            if (!in_array($field,$this->blacklist)) { 
+            if ( ! in_array($field, $this->blacklist)) { 
 	
                 $columnName = Inflector::humanize($field); 
                 $this->objPHPExcel->getActiveSheet()->getCellByColumnAndRow($i++, 4, $columnName); 
@@ -59,12 +59,12 @@ 
     } 
          
     function _rows() { 
-        $i=5; 
+        $i = 5; 
         foreach ($this->data as $row) { 
-            $j=0; 
+            $j = 0; 
             foreach ($row as $field => $value) { 
-                if(!in_array($field,$this->blacklist)) { 
-                    $this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++,$i, $value); 
+                if ( ! in_array($field, $this->blacklist)) { 
+                    $this->objPHPExcel->getActiveSheet()->setCellValueByColumnAndRow($j++, $i, $value); 
                 } 
             } 
             $i++; 

lib/Cake/basics.php

Doc Comments +9 added lines, -9 removed lines

@@ -456,7 +456,7 @@ 
  *   all files in app/tmp/cache/views will be deleted
  * @param string $type Directory in tmp/cache defaults to view directory
  * @param string $ext The file extension you are deleting
- * @return true if files found and deleted false otherwise
+ * @return boolean if files found and deleted false otherwise
  */
 	function clearCache($params = null, $type = 'views', $ext = '.php') {
 		if (is_string($params) || $params === null) {
@@ -547,7 +547,7 @@ 
  *
  * @param string $singular Text to translate
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return mixed translated string
+ * @return null|string translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__
  */
 	function __($singular, $args = null) {
@@ -577,7 +577,7 @@ 
  * @param string $plural Plural text
  * @param integer $count Count
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return mixed plural form of translated string
+ * @return null|string plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
  */
 	function __n($singular, $plural, $count, $args = null) {
@@ -605,7 +605,7 @@ 
  * @param string $domain Domain
  * @param string $msg String to translate
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @return null|string string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d
  */
 	function __d($domain, $msg, $args = null) {
@@ -636,7 +636,7 @@ 
  * @param string $plural Plural
  * @param integer $count Count
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return plural form of translated string
+ * @return null|string form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
  */
 	function __dn($domain, $singular, $plural, $count, $args = null) {
@@ -678,7 +678,7 @@ 
  * @param string $msg Message to translate
  * @param integer $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @return null|string string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
  */
 	function __dc($domain, $msg, $category, $args = null) {
@@ -724,7 +724,7 @@ 
  * @param integer $count Count
  * @param integer $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return plural form of translated string
+ * @return null|string form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
  */
 	function __dcn($domain, $singular, $plural, $count, $category, $args = null) {
@@ -762,7 +762,7 @@ 
  * @param string $msg String to translate
  * @param integer $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
- * @return translated string
+ * @return null|string string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c
  */
 	function __c($msg, $category, $args = null) {
@@ -805,7 +805,7 @@ 
  * Searches include path for files.
  *
  * @param string $file File to look for
- * @return Full path to file if exists, otherwise false
+ * @return string|false path to file if exists, otherwise false
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#fileExistsInPath
  */
 	function fileExistsInPath($file) {

Indentation +14 added lines, -14 removed lines

@@ -844,18 +844,18 @@
 
 
 function receber_data($data, $dia = true, $mes = true, $ano = true, $hora = false, $minuto = false, $segundo = false) {
-    if ($hora || $minuto || $segundo) {
-        $data = explode(' ', $data);
-        $_hora = $data[1];
-        $data = $data[0];
-
-        $_hora = explode(':', $_hora);
-        $_hora = ($hora ? $_hora[0] : '') . ($minuto ? ($hora ? ':' : '') . $_hora[1] : '') . ($segundo ? ($hora || $minuto ? ':' : '') . $_hora[2] : '');
-    }
-    $recebe = explode('-', $data);
-    if (isset($recebe[2]) && isset($recebe[1])) {
-        $data = ($dia ? $recebe[2] : '') . ($mes ? ($dia ? '/' : '') . $recebe[1] : '') . ($ano ? ($mes || $dia ? '/' : '') . $recebe[0] : '');
-    }
-
-    return $data . (isset($_hora) ? ' ' . $_hora : '');
+	if ($hora || $minuto || $segundo) {
+		$data = explode(' ', $data);
+		$_hora = $data[1];
+		$data = $data[0];
+
+		$_hora = explode(':', $_hora);
+		$_hora = ($hora ? $_hora[0] : '') . ($minuto ? ($hora ? ':' : '') . $_hora[1] : '') . ($segundo ? ($hora || $minuto ? ':' : '') . $_hora[2] : '');
+	}
+	$recebe = explode('-', $data);
+	if (isset($recebe[2]) && isset($recebe[1])) {
+		$data = ($dia ? $recebe[2] : '') . ($mes ? ($dia ? '/' : '') . $recebe[1] : '') . ($ano ? ($mes || $dia ? '/' : '') . $recebe[0] : '');
+	}
+
+	return $data . (isset($_hora) ? ' ' . $_hora : '');
 }

Spacing +63 added lines, -63 removed lines

@@ -29,7 +29,7 @@ 
 	define('MONTH', 2592000);
 	define('YEAR', 31536000);
 
-if (!function_exists('config')) {
+if ( ! function_exists('config')) {
 
 /**
  * Loads configuration files. Receives a set of configuration files
@@ -46,8 +46,8 @@ 
 		$count = count($args);
 		$included = 0;
 		foreach ($args as $arg) {
-			if (file_exists(APP . 'Config' . DS . $arg . '.php')) {
-				include_once APP . 'Config' . DS . $arg . '.php';
+			if (file_exists(APP.'Config'.DS.$arg.'.php')) {
+				include_once APP.'Config'.DS.$arg.'.php';
 				$included++;
 			}
 		}
@@ -56,7 +56,7 @@ 
 
 }
 
-if (!function_exists('debug')) {
+if ( ! function_exists('debug')) {
 
 /**
  * Prints out debug information about given variable.
@@ -120,7 +120,7 @@ 
 
 }
 
-if (!function_exists('sortByKey')) {
+if ( ! function_exists('sortByKey')) {
 
 /**
  * Sorts given $array by key $sortBy.
@@ -133,7 +133,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#sortByKey
  */
 	function sortByKey(&$array, $sortBy, $order = 'asc', $type = SORT_NUMERIC) {
-		if (!is_array($array)) {
+		if ( ! is_array($array)) {
 			return null;
 		}
 
@@ -155,7 +155,7 @@ 
 
 }
 
-if (!function_exists('h')) {
+if ( ! function_exists('h')) {
 
 /**
  * Convenience method for htmlspecialchars.
@@ -177,9 +177,9 @@ 
 			return $texts;
 		} elseif (is_object($text)) {
 			if (method_exists($text, '__toString')) {
-				$text = (string)$text;
+				$text = (string) $text;
 			} else {
-				$text = '(object)' . get_class($text);
+				$text = '(object)'.get_class($text);
 			}
 		} elseif (is_bool($text)) {
 			return $text;
@@ -200,7 +200,7 @@ 
 
 }
 
-if (!function_exists('pluginSplit')) {
+if ( ! function_exists('pluginSplit')) {
 
 /**
  * Splits a dot syntax plugin name into its plugin and class name.
@@ -227,7 +227,7 @@ 
 
 }
 
-if (!function_exists('pr')) {
+if ( ! function_exists('pr')) {
 
 /**
  * print_r() convenience function
@@ -252,7 +252,7 @@ 
 
 }
 
-if (!function_exists('am')) {
+if ( ! function_exists('am')) {
 
 /**
  * Merge a group of arrays
@@ -268,7 +268,7 @@ 
 		$r = array();
 		$args = func_get_args();
 		foreach ($args as $a) {
-			if (!is_array($a)) {
+			if ( ! is_array($a)) {
 				$a = array($a);
 			}
 			$r = array_merge($r, $a);
@@ -278,7 +278,7 @@ 
 
 }
 
-if (!function_exists('env')) {
+if ( ! function_exists('env')) {
 
 /**
  * Gets an environment variable from available sources, and provides emulation
@@ -293,7 +293,7 @@ 
 	function env($key) {
 		if ($key === 'HTTPS') {
 			if (isset($_SERVER['HTTPS'])) {
-				return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+				return ( ! empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
 			}
 			return (strpos(env('SCRIPT_URI'), 'https://') === 0);
 		}
@@ -329,7 +329,7 @@ 
 				$name = env('SCRIPT_NAME');
 				$filename = env('SCRIPT_FILENAME');
 				$offset = 0;
-				if (!strpos($name, '.php')) {
+				if ( ! strpos($name, '.php')) {
 					$offset = 4;
 				}
 				return substr($filename, 0, -(strlen($name) + $offset));
@@ -343,9 +343,9 @@ 
 				$count = count($parts);
 
 				if ($count === 1) {
-					return '.' . $host;
+					return '.'.$host;
 				} elseif ($count === 2) {
-					return '.' . $host;
+					return '.'.$host;
 				} elseif ($count === 3) {
 					$gTLD = array(
 						'aero',
@@ -371,18 +371,18 @@ 
 						'xxx'
 					);
 					if (in_array($parts[1], $gTLD)) {
-						return '.' . $host;
+						return '.'.$host;
 					}
 				}
 				array_shift($parts);
-				return '.' . implode('.', $parts);
+				return '.'.implode('.', $parts);
 		}
 		return null;
 	}
 
 }
 
-if (!function_exists('cache')) {
+if ( ! function_exists('cache')) {
 
 /**
  * Reads/writes temporary data to cache files or session.
@@ -400,19 +400,19 @@ 
 		}
 		$now = time();
 
-		if (!is_numeric($expires)) {
+		if ( ! is_numeric($expires)) {
 			$expires = strtotime($expires, $now);
 		}
 
 		switch (strtolower($target)) {
 			case 'cache':
-				$filename = CACHE . $path;
+				$filename = CACHE.$path;
 				break;
 			case 'public':
-				$filename = WWW_ROOT . $path;
+				$filename = WWW_ROOT.$path;
 				break;
 			case 'tmp':
-				$filename = TMP . $path;
+				$filename = TMP.$path;
 				break;
 		}
 		$timediff = $expires - $now;
@@ -446,7 +446,7 @@ 
 
 }
 
-if (!function_exists('clearCache')) {
+if ( ! function_exists('clearCache')) {
 
 /**
  * Used to delete files in the cache directories, or clear contents of cache directories
@@ -461,22 +461,22 @@ 
 	function clearCache($params = null, $type = 'views', $ext = '.php') {
 		if (is_string($params) || $params === null) {
 			$params = preg_replace('/\/\//', '/', $params);
-			$cache = CACHE . $type . DS . $params;
+			$cache = CACHE.$type.DS.$params;
 
-			if (is_file($cache . $ext)) {
+			if (is_file($cache.$ext)) {
 				//@codingStandardsIgnoreStart
-				@unlink($cache . $ext);
+				@unlink($cache.$ext);
 				//@codingStandardsIgnoreEnd
 				return true;
 			} elseif (is_dir($cache)) {
-				$files = glob($cache . '*');
+				$files = glob($cache.'*');
 
 				if ($files === false) {
 					return false;
 				}
 
 				foreach ($files as $file) {
-					if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
+					if (is_file($file) && strrpos($file, DS.'empty') !== strlen($file) - 6) {
 						//@codingStandardsIgnoreStart
 						@unlink($file);
 						//@codingStandardsIgnoreEnd
@@ -485,8 +485,8 @@ 
 				return true;
 			}
 			$cache = array(
-				CACHE . $type . DS . '*' . $params . $ext,
-				CACHE . $type . DS . '*' . $params . '_*' . $ext
+				CACHE.$type.DS.'*'.$params.$ext,
+				CACHE.$type.DS.'*'.$params.'_*'.$ext
 			);
 			$files = array();
 			while ($search = array_shift($cache)) {
@@ -499,7 +499,7 @@ 
 				return false;
 			}
 			foreach ($files as $file) {
-				if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
+				if (is_file($file) && strrpos($file, DS.'empty') !== strlen($file) - 6) {
 					//@codingStandardsIgnoreStart
 					@unlink($file);
 					//@codingStandardsIgnoreEnd
@@ -518,7 +518,7 @@ 
 
 }
 
-if (!function_exists('stripslashes_deep')) {
+if ( ! function_exists('stripslashes_deep')) {
 
 /**
  * Recursively strips slashes from all values in an array
@@ -540,7 +540,7 @@ 
 
 }
 
-if (!function_exists('__')) {
+if ( ! function_exists('__')) {
 
 /**
  * Returns a translated string if one is found; Otherwise, the submitted message.
@@ -551,7 +551,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__
  */
 	function __($singular, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 
@@ -559,7 +559,7 @@ 
 		$translated = I18n::translate($singular);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 1);
 		}
 		return vsprintf($translated, $args);
@@ -567,7 +567,7 @@ 
 
 }
 
-if (!function_exists('__n')) {
+if ( ! function_exists('__n')) {
 
 /**
  * Returns correct plural form of message identified by $singular and $plural for count $count.
@@ -581,7 +581,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
  */
 	function __n($singular, $plural, $count, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 
@@ -589,7 +589,7 @@ 
 		$translated = I18n::translate($singular, $plural, null, 6, $count);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 3);
 		}
 		return vsprintf($translated, $args);
@@ -597,7 +597,7 @@ 
 
 }
 
-if (!function_exists('__d')) {
+if ( ! function_exists('__d')) {
 
 /**
  * Allows you to override the current domain for a single message lookup.
@@ -609,14 +609,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d
  */
 	function __d($domain, $msg, $args = null) {
-		if (!$msg) {
+		if ( ! $msg) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 2);
 		}
 		return vsprintf($translated, $args);
@@ -624,7 +624,7 @@ 
 
 }
 
-if (!function_exists('__dn')) {
+if ( ! function_exists('__dn')) {
 
 /**
  * Allows you to override the current domain for a single plural message lookup.
@@ -640,14 +640,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
  */
 	function __dn($domain, $singular, $plural, $count, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, 6, $count);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 4);
 		}
 		return vsprintf($translated, $args);
@@ -655,7 +655,7 @@ 
 
 }
 
-if (!function_exists('__dc')) {
+if ( ! function_exists('__dc')) {
 
 /**
  * Allows you to override the current domain for a single message lookup.
@@ -682,14 +682,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
  */
 	function __dc($domain, $msg, $category, $args = null) {
-		if (!$msg) {
+		if ( ! $msg) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain, $category);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 3);
 		}
 		return vsprintf($translated, $args);
@@ -697,7 +697,7 @@ 
 
 }
 
-if (!function_exists('__dcn')) {
+if ( ! function_exists('__dcn')) {
 
 /**
  * Allows you to override the current domain for a single plural message lookup.
@@ -728,14 +728,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
  */
 	function __dcn($domain, $singular, $plural, $count, $category, $args = null) {
-		if (!$singular) {
+		if ( ! $singular) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, $category, $count);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 5);
 		}
 		return vsprintf($translated, $args);
@@ -743,7 +743,7 @@ 
 
 }
 
-if (!function_exists('__c')) {
+if ( ! function_exists('__c')) {
 
 /**
  * The category argument allows a specific category of the locale settings to be used for fetching a message.
@@ -766,14 +766,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c
  */
 	function __c($msg, $category, $args = null) {
-		if (!$msg) {
+		if ( ! $msg) {
 			return;
 		}
 		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, null, $category);
 		if ($args === null) {
 			return $translated;
-		} elseif (!is_array($args)) {
+		} elseif ( ! is_array($args)) {
 			$args = array_slice(func_get_args(), 2);
 		}
 		return vsprintf($translated, $args);
@@ -781,7 +781,7 @@ 
 
 }
 
-if (!function_exists('LogError')) {
+if ( ! function_exists('LogError')) {
 
 /**
  * Shortcut to Log::write.
@@ -799,7 +799,7 @@ 
 
 }
 
-if (!function_exists('fileExistsInPath')) {
+if ( ! function_exists('fileExistsInPath')) {
 
 /**
  * Searches include path for files.
@@ -811,7 +811,7 @@ 
 	function fileExistsInPath($file) {
 		$paths = explode(PATH_SEPARATOR, ini_get('include_path'));
 		foreach ($paths as $path) {
-			$fullPath = $path . DS . $file;
+			$fullPath = $path.DS.$file;
 
 			if (file_exists($fullPath)) {
 				return $fullPath;
@@ -824,7 +824,7 @@ 
 
 }
 
-if (!function_exists('convertSlash')) {
+if ( ! function_exists('convertSlash')) {
 
 /**
  * Convert forward slashes to underscores and removes first and last underscores in a string
@@ -850,12 +850,12 @@ 
         $data = $data[0];
 
         $_hora = explode(':', $_hora);
-        $_hora = ($hora ? $_hora[0] : '') . ($minuto ? ($hora ? ':' : '') . $_hora[1] : '') . ($segundo ? ($hora || $minuto ? ':' : '') . $_hora[2] : '');
+        $_hora = ($hora ? $_hora[0] : '').($minuto ? ($hora ? ':' : '').$_hora[1] : '').($segundo ? ($hora || $minuto ? ':' : '').$_hora[2] : '');
     }
     $recebe = explode('-', $data);
     if (isset($recebe[2]) && isset($recebe[1])) {
-        $data = ($dia ? $recebe[2] : '') . ($mes ? ($dia ? '/' : '') . $recebe[1] : '') . ($ano ? ($mes || $dia ? '/' : '') . $recebe[0] : '');
+        $data = ($dia ? $recebe[2] : '').($mes ? ($dia ? '/' : '').$recebe[1] : '').($ano ? ($mes || $dia ? '/' : '').$recebe[0] : '');
     }
 
-    return $data . (isset($_hora) ? ' ' . $_hora : '');
+    return $data.(isset($_hora) ? ' '.$_hora : '');
 }

lib/Cake/bootstrap.php

Doc Comments +5 added lines, -5 removed lines

@@ -214,7 +214,7 @@ 
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or false if $needle is not found.
+ * @return string|false The portion of $haystack, or false if $needle is not found.
  */
 	function mb_stristr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::stristr($haystack, $needle, $part);
@@ -268,7 +268,7 @@ 
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strrchr($haystack, $needle, $part);
@@ -288,7 +288,7 @@ 
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strrichr($haystack, $needle, $part);
@@ -345,7 +345,7 @@ 
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
  * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
- * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ * @return string|false The portion of $haystack, or true if $needle is not found.
  */
 	function mb_strstr($haystack, $needle, $part = false, $encoding = null) {
 		return Multibyte::strstr($haystack, $needle, $part);
@@ -424,7 +424,7 @@ 
  * @param string $str The string being encoded
  * @param string $charset specifies the name of the character set in which str is represented in.
  *    The default value is determined by the current NLS setting (mbstring.language).
- * @param string $transfer_encoding specifies the scheme of MIME encoding.
+ * @param string $transferEncoding specifies the scheme of MIME encoding.
  *    It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
  * @param string $linefeed specifies the EOL (end-of-line) marker with which
  *    mb_encode_mimeheader() performs line-folding

Spacing +50 added lines, -50 removed lines

@@ -20,124 +20,124 @@ 
 
 define('TIME_START', microtime(true));
 
-if (!defined('E_DEPRECATED')) {
+if ( ! defined('E_DEPRECATED')) {
 	define('E_DEPRECATED', 8192);
 }
 
-if (!defined('E_USER_DEPRECATED')) {
+if ( ! defined('E_USER_DEPRECATED')) {
 	define('E_USER_DEPRECATED', E_USER_NOTICE);
 }
 error_reporting(E_ALL & ~E_DEPRECATED);
 
-if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+if ( ! defined('CAKE_CORE_INCLUDE_PATH')) {
 	define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(__FILE__)));
 }
 
-if (!defined('CORE_PATH')) {
-	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+if ( ! defined('CORE_PATH')) {
+	define('CORE_PATH', CAKE_CORE_INCLUDE_PATH.DS);
 }
 
-if (!defined('WEBROOT_DIR')) {
+if ( ! defined('WEBROOT_DIR')) {
 	define('WEBROOT_DIR', 'webroot');
 }
 
 /**
  * Path to the cake directory.
  */
-	define('CAKE', CORE_PATH . 'Cake' . DS);
+	define('CAKE', CORE_PATH.'Cake'.DS);
 
 /**
  * Path to the application's directory.
  */
-if (!defined('APP')) {
-	define('APP', ROOT . DS . APP_DIR . DS);
+if ( ! defined('APP')) {
+	define('APP', ROOT.DS.APP_DIR.DS);
 }
 
 /**
  * Path to the application's libs directory.
  */
-	define('APPLIBS', APP . 'Lib' . DS);
+	define('APPLIBS', APP.'Lib'.DS);
 
 /**
  * Path to the public CSS directory.
  */
-if (!defined('CSS')) {
-	define('CSS', WWW_ROOT . 'css' . DS);
+if ( ! defined('CSS')) {
+	define('CSS', WWW_ROOT.'css'.DS);
 }
 
 /**
  * Path to the public JavaScript directory.
  */
-if (!defined('JS')) {
-	define('JS', WWW_ROOT . 'js' . DS);
+if ( ! defined('JS')) {
+	define('JS', WWW_ROOT.'js'.DS);
 }
 
 /**
  * Path to the public images directory.
  */
-if (!defined('IMAGES')) {
-	define('IMAGES', WWW_ROOT . 'img' . DS);
+if ( ! defined('IMAGES')) {
+	define('IMAGES', WWW_ROOT.'img'.DS);
 }
 
 /**
  * Path to the tests directory.
  */
-if (!defined('TESTS')) {
-	define('TESTS', APP . 'Test' . DS);
+if ( ! defined('TESTS')) {
+	define('TESTS', APP.'Test'.DS);
 }
 
 /**
  * Path to the temporary files directory.
  */
-if (!defined('TMP')) {
-	define('TMP', APP . 'tmp' . DS);
+if ( ! defined('TMP')) {
+	define('TMP', APP.'tmp'.DS);
 }
 
 /**
  * Path to the logs directory.
  */
-if (!defined('LOGS')) {
-	define('LOGS', TMP . 'logs' . DS);
+if ( ! defined('LOGS')) {
+	define('LOGS', TMP.'logs'.DS);
 }
 
 /**
  * Path to the cache files directory. It can be shared between hosts in a multi-server setup.
  */
-if (!defined('CACHE')) {
-	define('CACHE', TMP . 'cache' . DS);
+if ( ! defined('CACHE')) {
+	define('CACHE', TMP.'cache'.DS);
 }
 
 /**
  * Path to the vendors directory.
  */
-if (!defined('VENDORS')) {
-	define('VENDORS', ROOT . DS . 'vendors' . DS);
+if ( ! defined('VENDORS')) {
+	define('VENDORS', ROOT.DS.'vendors'.DS);
 }
 
 /**
  * Web path to the public images directory.
  */
-if (!defined('IMAGES_URL')) {
+if ( ! defined('IMAGES_URL')) {
 	define('IMAGES_URL', 'img/');
 }
 
 /**
  * Web path to the CSS files directory.
  */
-if (!defined('CSS_URL')) {
+if ( ! defined('CSS_URL')) {
 	define('CSS_URL', 'css/');
 }
 
 /**
  * Web path to the js files directory.
  */
-if (!defined('JS_URL')) {
+if ( ! defined('JS_URL')) {
 	define('JS_URL', 'js/');
 }
 
-require CAKE . 'basics.php';
-require CAKE . 'Core' . DS . 'App.php';
-require CAKE . 'Error' . DS . 'exceptions.php';
+require CAKE.'basics.php';
+require CAKE.'Core'.DS.'App.php';
+require CAKE.'Error'.DS.'exceptions.php';
 
 spl_autoload_register(array('App', 'load'));
 
@@ -151,7 +151,7 @@ 
 /**
  * Full URL prefix
  */
-if (!defined('FULL_BASE_URL')) {
+if ( ! defined('FULL_BASE_URL')) {
 	$s = null;
 	if (env('HTTPS')) {
 		$s = 's';
@@ -160,7 +160,7 @@ 
 	$httpHost = env('HTTP_HOST');
 
 	if (isset($httpHost)) {
-		define('FULL_BASE_URL', 'http' . $s . '://' . $httpHost);
+		define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost);
 		Configure::write('App.fullBaseUrl', FULL_BASE_URL);
 	}
 	unset($httpHost, $s);
@@ -176,15 +176,15 @@ 
 
 if (function_exists('mb_internal_encoding')) {
 	$encoding = Configure::read('App.encoding');
-	if (!empty($encoding)) {
+	if ( ! empty($encoding)) {
 		mb_internal_encoding($encoding);
 	}
-	if (!empty($encoding) && function_exists('mb_regex_encoding')) {
+	if ( ! empty($encoding) && function_exists('mb_regex_encoding')) {
 		mb_regex_encoding($encoding);
 	}
 }
 
-if (!function_exists('mb_stripos')) {
+if ( ! function_exists('mb_stripos')) {
 
 /**
  * Find position of first occurrence of a case-insensitive string.
@@ -202,7 +202,7 @@ 
 
 }
 
-if (!function_exists('mb_stristr')) {
+if ( ! function_exists('mb_stristr')) {
 
 /**
  * Finds first occurrence of a string within another, case insensitive.
@@ -222,7 +222,7 @@ 
 
 }
 
-if (!function_exists('mb_strlen')) {
+if ( ! function_exists('mb_strlen')) {
 
 /**
  * Get string length.
@@ -238,7 +238,7 @@ 
 
 }
 
-if (!function_exists('mb_strpos')) {
+if ( ! function_exists('mb_strpos')) {
 
 /**
  * Find position of first occurrence of a string.
@@ -256,7 +256,7 @@ 
 
 }
 
-if (!function_exists('mb_strrchr')) {
+if ( ! function_exists('mb_strrchr')) {
 
 /**
  * Finds the last occurrence of a character in a string within another.
@@ -276,7 +276,7 @@ 
 
 }
 
-if (!function_exists('mb_strrichr')) {
+if ( ! function_exists('mb_strrichr')) {
 
 /**
  * Finds the last occurrence of a character in a string within another, case insensitive.
@@ -296,7 +296,7 @@ 
 
 }
 
-if (!function_exists('mb_strripos')) {
+if ( ! function_exists('mb_strripos')) {
 
 /**
  * Finds position of last occurrence of a string within another, case insensitive
@@ -314,7 +314,7 @@ 
 
 }
 
-if (!function_exists('mb_strrpos')) {
+if ( ! function_exists('mb_strrpos')) {
 
 /**
  * Find position of last occurrence of a string in a string.
@@ -333,7 +333,7 @@ 
 
 }
 
-if (!function_exists('mb_strstr')) {
+if ( ! function_exists('mb_strstr')) {
 
 /**
  * Finds first occurrence of a string within another
@@ -353,7 +353,7 @@ 
 
 }
 
-if (!function_exists('mb_strtolower')) {
+if ( ! function_exists('mb_strtolower')) {
 
 /**
  * Make a string lowercase
@@ -368,7 +368,7 @@ 
 
 }
 
-if (!function_exists('mb_strtoupper')) {
+if ( ! function_exists('mb_strtoupper')) {
 
 /**
  * Make a string uppercase
@@ -383,7 +383,7 @@ 
 
 }
 
-if (!function_exists('mb_substr_count')) {
+if ( ! function_exists('mb_substr_count')) {
 
 /**
  * Count the number of substring occurrences
@@ -399,7 +399,7 @@ 
 
 }
 
-if (!function_exists('mb_substr')) {
+if ( ! function_exists('mb_substr')) {
 
 /**
  * Get part of string
@@ -416,7 +416,7 @@ 
 
 }
 
-if (!function_exists('mb_encode_mimeheader')) {
+if ( ! function_exists('mb_encode_mimeheader')) {
 
 /**
  * Encode string for MIME header

lib/Cake/Cache/CacheEngine.php

Doc Comments +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
  * to decide whether actually delete the keys or just simulate it to achieve
  * the same result.
  *
- * @param string $groups name of the group to be cleared
+ * @param string $group name of the group to be cleared
  * @return boolean
  */
 	public function clearGroup($group) {
@@ -161,7 +161,7 @@ 
  * Generates a safe key for use with cache engine storage engines.
  *
  * @param string $key the key passed over
- * @return mixed string $key or false
+ * @return false|string string $key or false
  */
 	public function key($key) {
 		if (empty($key)) {

Spacing +4 added lines, -4 removed lines

@@ -52,11 +52,11 @@ 
 			'groups' => array()
 		);
 		$this->settings = $settings;
-		if (!empty($this->settings['groups'])) {
+		if ( ! empty($this->settings['groups'])) {
 			sort($this->settings['groups']);
 			$this->_groupPrefix = str_repeat('%s_', count($this->settings['groups']));
 		}
-		if (!is_numeric($this->settings['duration'])) {
+		if ( ! is_numeric($this->settings['duration'])) {
 			$this->settings['duration'] = strtotime($this->settings['duration']) - time();
 		}
 		return true;
@@ -169,12 +169,12 @@ 
 		}
 
 		$prefix = '';
-		if (!empty($this->_groupPrefix)) {
+		if ( ! empty($this->_groupPrefix)) {
 			$prefix = vsprintf($this->_groupPrefix, $this->groups());
 		}
 
 		$key = preg_replace('/[\s]+/', '_', strtolower(trim(str_replace(array(DS, '/', '.'), '_', strval($key)))));
-		return $prefix . $key;
+		return $prefix.$key;
 	}
 
 }

lib/Cake/Cache/Engine/FileEngine.php

Doc Comments +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
  * Write data for key into cache
  *
  * @param string $key Identifier for the data
- * @param mixed $data Data to be cached
+ * @param string $data Data to be cached
  * @param integer $duration How long to cache the data, in seconds
  * @return boolean True if the data was successfully cached, false on failure
  */
@@ -391,7 +391,7 @@ 
  * Generates a safe key for use with cache engine storage engines.
  *
  * @param string $key the key passed over
- * @return mixed string $key or false
+ * @return false|string string $key or false
  */
 	public function key($key) {
 		if (empty($key)) {

Spacing +25 added lines, -25 removed lines

@@ -84,7 +84,7 @@ 
 		if (substr($this->settings['path'], -1) !== DS) {
 			$this->settings['path'] .= DS;
 		}
-		if (!empty($this->_groupPrefix)) {
+		if ( ! empty($this->_groupPrefix)) {
 			$this->_groupPrefix = str_replace('_', DS, $this->_groupPrefix);
 		}
 		return $this->_active();
@@ -109,7 +109,7 @@ 
  * @return boolean True if the data was successfully cached, false on failure
  */
 	public function write($key, $data, $duration) {
-		if ($data === '' || !$this->_init) {
+		if ($data === '' || ! $this->_init) {
 			return false;
 		}
 
@@ -123,7 +123,7 @@ 
 			$lineBreak = "\r\n";
 		}
 
-		if (!empty($this->settings['serialize'])) {
+		if ( ! empty($this->settings['serialize'])) {
 			if ($this->settings['isWindows']) {
 				$data = str_replace('\\', '\\\\\\\\', serialize($data));
 			} else {
@@ -132,7 +132,7 @@ 
 		}
 
 		$expires = time() + $duration;
-		$contents = $expires . $lineBreak . $data . $lineBreak;
+		$contents = $expires.$lineBreak.$data.$lineBreak;
 
 		if ($this->settings['lock']) {
 			$this->_File->flock(LOCK_EX);
@@ -155,7 +155,7 @@ 
  * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
  */
 	public function read($key) {
-		if (!$this->_init || $this->_setKey($key) === false) {
+		if ( ! $this->_init || $this->_setKey($key) === false) {
 			return false;
 		}
 
@@ -187,11 +187,11 @@ 
 
 		$data = trim($data);
 
-		if ($data !== '' && !empty($this->settings['serialize'])) {
+		if ($data !== '' && ! empty($this->settings['serialize'])) {
 			if ($this->settings['isWindows']) {
 				$data = str_replace('\\\\\\\\', '\\', $data);
 			}
-			$data = unserialize((string)$data);
+			$data = unserialize((string) $data);
 		}
 		return $data;
 	}
@@ -203,7 +203,7 @@ 
  * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
  */
 	public function delete($key) {
-		if ($this->_setKey($key) === false || !$this->_init) {
+		if ($this->_setKey($key) === false || ! $this->_init) {
 			return false;
 		}
 		$path = $this->_File->getRealPath();
@@ -221,7 +221,7 @@ 
  * @return boolean True if the cache was successfully cleared, false otherwise
  */
 	public function clear($check) {
-		if (!$this->_init) {
+		if ( ! $this->_init) {
 			return false;
 		}
 		$this->_File = null;
@@ -242,8 +242,8 @@ 
 				continue;
 			}
 
-			$path = $path->getRealPath() . DS;
-			if (!in_array($path, $cleared)) {
+			$path = $path->getRealPath().DS;
+			if ( ! in_array($path, $cleared)) {
 				$this->_clearDirectory($path, $now, $threshold);
 				$cleared[] = $path;
 			}
@@ -262,7 +262,7 @@ 
 	protected function _clearDirectory($path, $now, $threshold) {
 		$prefixLength = strlen($this->settings['prefix']);
 
-		if (!is_dir($path)) {
+		if ( ! is_dir($path)) {
 			return;
 		}
 
@@ -271,11 +271,11 @@ 
 			if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) {
 				continue;
 			}
-			$filePath = $path . $entry;
-			if (!file_exists($filePath) || is_dir($filePath)) {
+			$filePath = $path.$entry;
+			if ( ! file_exists($filePath) || is_dir($filePath)) {
 				continue;
 			}
-			$file = new SplFileObject($path . $entry, 'r');
+			$file = new SplFileObject($path.$entry, 'r');
 
 			if ($threshold) {
 				$mtime = $file->getMTime();
@@ -283,7 +283,7 @@ 
 				if ($mtime > $threshold) {
 					continue;
 				}
-				$expires = (int)$file->current();
+				$expires = (int) $file->current();
 
 				if ($expires > $now) {
 					continue;
@@ -334,17 +334,17 @@ 
  */
 	protected function _setKey($key, $createKey = false) {
 		$groups = null;
-		if (!empty($this->_groupPrefix)) {
+		if ( ! empty($this->_groupPrefix)) {
 			$groups = vsprintf($this->_groupPrefix, $this->groups());
 		}
-		$dir = $this->settings['path'] . $groups;
+		$dir = $this->settings['path'].$groups;
 
-		if (!is_dir($dir)) {
+		if ( ! is_dir($dir)) {
 			mkdir($dir, 0775, true);
 		}
-		$path = new SplFileInfo($dir . $key);
+		$path = new SplFileInfo($dir.$key);
 
-		if (!$createKey && !$path->isFile()) {
+		if ( ! $createKey && ! $path->isFile()) {
 			return false;
 		}
 		if (empty($this->_File) || $this->_File->getBaseName() !== $key) {
@@ -357,7 +357,7 @@ 
 			}
 			unset($path);
 
-			if (!$exists && !chmod($this->_File->getPathname(), (int)$this->settings['mask'])) {
+			if ( ! $exists && ! chmod($this->_File->getPathname(), (int) $this->settings['mask'])) {
 				trigger_error(__d(
 					'cake_dev', 'Could not apply permission mask "%s" on cache file "%s"',
 					array($this->_File->getPathname(), $this->settings['mask'])), E_USER_WARNING);
@@ -375,11 +375,11 @@ 
 		$dir = new SplFileInfo($this->settings['path']);
 		if (Configure::read('debug')) {
 			$path = $dir->getPathname();
-			if (!is_dir($path)) {
+			if ( ! is_dir($path)) {
 				mkdir($path, 0775, true);
 			}
 		}
-		if ($this->_init && !($dir->isDir() && $dir->isWritable())) {
+		if ($this->_init && ! ($dir->isDir() && $dir->isWritable())) {
 			$this->_init = false;
 			trigger_error(__d('cake_dev', '%s is not writable', $this->settings['path']), E_USER_WARNING);
 			return false;
@@ -412,7 +412,7 @@ 
 		$directoryIterator = new RecursiveDirectoryIterator($this->settings['path']);
 		$contents = new RecursiveIteratorIterator($directoryIterator, RecursiveIteratorIterator::CHILD_FIRST);
 		foreach ($contents as $object) {
-			$containsGroup = strpos($object->getPathName(), DS . $group . DS) !== false;
+			$containsGroup = strpos($object->getPathName(), DS.$group.DS) !== false;
 			$hasPrefix = true;
 			if (strlen($this->settings['prefix']) !== 0) {
 				$hasPrefix = strpos($object->getBaseName(), $this->settings['prefix']) === 0;

lib/Cake/Cache/Engine/RedisEngine.php

Doc Comments +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
  *
  * @param string $key Identifier for the data
  * @param integer $offset How much to increment
- * @return New incremented value, false otherwise
+ * @return integer incremented value, false otherwise
  * @throws CacheException when you try to increment with compress = true
  */
 	public function increment($key, $offset = 1) {
@@ -145,7 +145,7 @@ 
  *
  * @param string $key Identifier for the data
  * @param integer $offset How much to subtract
- * @return New decremented value, false otherwise
+ * @return integer decremented value, false otherwise
  * @throws CacheException when you try to decrement with compress = true
  */
 	public function decrement($key, $offset = 1) {

Spacing +12 added lines, -12 removed lines

@@ -52,7 +52,7 @@ 
  * @return boolean True if the engine has been successfully initialized, false if not
  */
 	public function init($settings = array()) {
-		if (!class_exists('Redis')) {
+		if ( ! class_exists('Redis')) {
 			return false;
 		}
 		parent::init(array_merge(array(
@@ -101,7 +101,7 @@ 
  * @return boolean True if the data was successfully cached, false on failure
  */
 	public function write($key, $value, $duration) {
-		if (!is_int($value)) {
+		if ( ! is_int($value)) {
 			$value = serialize($value);
 		}
 		if ($duration === 0) {
@@ -120,7 +120,7 @@ 
 	public function read($key) {
 		$value = $this->_Redis->get($key);
 		if (ctype_digit($value)) {
-			$value = (int)$value;
+			$value = (int) $value;
 		}
 		if ($value !== false && is_string($value)) {
 			$value = unserialize($value);
@@ -137,7 +137,7 @@ 
  * @throws CacheException when you try to increment with compress = true
  */
 	public function increment($key, $offset = 1) {
-		return (int)$this->_Redis->incrBy($key, $offset);
+		return (int) $this->_Redis->incrBy($key, $offset);
 	}
 
 /**
@@ -149,7 +149,7 @@ 
  * @throws CacheException when you try to decrement with compress = true
  */
 	public function decrement($key, $offset = 1) {
-		return (int)$this->_Redis->decrBy($key, $offset);
+		return (int) $this->_Redis->decrBy($key, $offset);
 	}
 
 /**
@@ -172,7 +172,7 @@ 
 		if ($check) {
 			return true;
 		}
-		$keys = $this->_Redis->getKeys($this->settings['prefix'] . '*');
+		$keys = $this->_Redis->getKeys($this->settings['prefix'].'*');
 		$this->_Redis->del($keys);
 
 		return true;
@@ -188,12 +188,12 @@ 
 	public function groups() {
 		$result = array();
 		foreach ($this->settings['groups'] as $group) {
-			$value = $this->_Redis->get($this->settings['prefix'] . $group);
-			if (!$value) {
+			$value = $this->_Redis->get($this->settings['prefix'].$group);
+			if ( ! $value) {
 				$value = 1;
-				$this->_Redis->set($this->settings['prefix'] . $group, $value);
+				$this->_Redis->set($this->settings['prefix'].$group, $value);
 			}
-			$result[] = $group . $value;
+			$result[] = $group.$value;
 		}
 		return $result;
 	}
@@ -205,14 +205,14 @@ 
  * @return boolean success
  */
 	public function clearGroup($group) {
-		return (bool)$this->_Redis->incr($this->settings['prefix'] . $group);
+		return (bool) $this->_Redis->incr($this->settings['prefix'].$group);
 	}
 
 /**
  * Disconnects from the redis server
  */
 	public function __destruct() {
-		if (!$this->settings['persistent']) {
+		if ( ! $this->settings['persistent']) {
 			$this->_Redis->close();
 		}
 	}

lib/Cake/Configure/IniReader.php

Doc Comments +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 /**
  * Converts a value into the ini equivalent
  *
- * @param mixed $value to export.
+ * @param mixed $val to export.
  * @return string String value for ini file.
  */
 	protected function _value($val) {

Spacing +8 added lines, -8 removed lines

@@ -77,8 +77,8 @@ 
  *     all sections in the ini file.
  */
 	public function __construct($path = null, $section = null) {
-		if (!$path) {
-			$path = APP . 'Config' . DS;
+		if ( ! $path) {
+			$path = APP.'Config'.DS;
 		}
 		$this->_path = $path;
 		$this->_section = $section;
@@ -101,12 +101,12 @@ 
 		}
 
 		$file = $this->_getFilePath($key);
-		if (!is_file($file)) {
+		if ( ! is_file($file)) {
 			throw new ConfigureException(__d('cake_dev', 'Could not load configuration file: %s', $file));
 		}
 
 		$contents = parse_ini_file($file, true);
-		if (!empty($this->_section) && isset($contents[$this->_section])) {
+		if ( ! empty($this->_section) && isset($contents[$this->_section])) {
 			$values = $this->_parseNestedValues($contents[$this->_section]);
 		} else {
 			$values = array();
@@ -165,7 +165,7 @@ 
 			if (is_array($value)) {
 				$kValues = Hash::flatten($value, '.');
 				foreach ($kValues as $k2 => $v) {
-					$result[] = "$k2 = " . $this->_value($v);
+					$result[] = "$k2 = ".$this->_value($v);
 				}
 			}
 			if ($isSection) {
@@ -194,7 +194,7 @@ 
 		if ($val === false) {
 			return 'false';
 		}
-		return (string)$val;
+		return (string) $val;
 	}
 
 /**
@@ -218,9 +218,9 @@ 
 		}
 
 		if ($plugin) {
-			$file = App::pluginPath($plugin) . 'Config' . DS . $key;
+			$file = App::pluginPath($plugin).'Config'.DS.$key;
 		} else {
-			$file = $this->_path . $key;
+			$file = $this->_path.$key;
 		}
 
 		return $file;

lib/Cake/Console/Command/AclShell.php

Doc Comments +2 added lines, -2 removed lines

@@ -356,7 +356,7 @@ 
 /**
  * Initialize ACL database.
  *
- * @return mixed
+ * @return boolean
  */
 	public function initdb() {
 		return $this->dispatchShell('schema create DbAcl');
@@ -365,7 +365,7 @@ 
 /**
  * Get the option parser.
  *
- * @return void
+ * @return ConsoleOptionParser
  */
 	public function getOptionParser() {
 		$parser = parent::getOptionParser();

Spacing +29 added lines, -29 removed lines

@@ -71,27 +71,27 @@ 
 
 		$class = Configure::read('Acl.classname');
 		list($plugin, $class) = pluginSplit($class, true);
-		App::uses($class, $plugin . 'Controller/Component/Acl');
-		if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($class, 'DbAcl')) {
+		App::uses($class, $plugin.'Controller/Component/Acl');
+		if ( ! in_array($class, array('DbAcl', 'DB_ACL')) && ! is_subclass_of($class, 'DbAcl')) {
 			$out = "--------------------------------------------------\n";
-			$out .= __d('cake_console', 'Error: Your current CakePHP configuration is set to an ACL implementation other than DB.') . "\n";
-			$out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script') . "\n";
+			$out .= __d('cake_console', 'Error: Your current CakePHP configuration is set to an ACL implementation other than DB.')."\n";
+			$out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script')."\n";
 			$out .= "--------------------------------------------------\n";
-			$out .= __d('cake_console', 'Current ACL Classname: %s', $class) . "\n";
+			$out .= __d('cake_console', 'Current ACL Classname: %s', $class)."\n";
 			$out .= "--------------------------------------------------\n";
 			$this->err($out);
 			return $this->_stop();
 		}
 
 		if ($this->command) {
-			if (!config('database')) {
+			if ( ! config('database')) {
 				$this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.'));
 				$this->args = null;
 				return $this->DbConfig->execute();
 			}
-			require_once APP . 'Config' . DS . 'database.php';
+			require_once APP.'Config'.DS.'database.php';
 
-			if (!in_array($this->command, array('initdb'))) {
+			if ( ! in_array($this->command, array('initdb'))) {
 				$collection = new ComponentCollection();
 				$this->Acl = new AclComponent($collection);
 				$controller = new Controller();
@@ -120,7 +120,7 @@ 
 		$class = ucfirst($this->args[0]);
 		$parent = $this->parseIdentifier($this->args[1]);
 
-		if (!empty($parent) && $parent !== '/' && $parent !== 'root') {
+		if ( ! empty($parent) && $parent !== '/' && $parent !== 'root') {
 			$parent = $this->_getNodeId($class, $parent);
 		} else {
 			$parent = null;
@@ -130,7 +130,7 @@ 
 		if (is_string($data) && $data !== '/') {
 			$data = array('alias' => $data);
 		} elseif (is_string($data)) {
-			$this->error(__d('cake_console', '/ can not be used as an alias!') . __d('cake_console', "	/ is the root, please supply a sub alias"));
+			$this->error(__d('cake_console', '/ can not be used as an alias!').__d('cake_console', "	/ is the root, please supply a sub alias"));
 		}
 
 		$data['parent_id'] = $parent;
@@ -157,12 +157,12 @@ 
 		}
 
 		if ($this->Acl->{$class}->find('all', array('conditions' => $identifier))) {
-			if (!$this->Acl->{$class}->deleteAll($identifier)) {
-				$this->error(__d('cake_console', 'Node Not Deleted. ') . __d('cake_console', 'There was an error deleting the %s.', $class) . "\n");
+			if ( ! $this->Acl->{$class}->deleteAll($identifier)) {
+				$this->error(__d('cake_console', 'Node Not Deleted. ').__d('cake_console', 'There was an error deleting the %s.', $class)."\n");
 			}
 			$this->out(__d('cake_console', '<success>%s deleted.</success>', $class), 2);
 		} else {
-			$this->error(__d('cake_console', 'Node Not Deleted. ') . __d('cake_console', 'There was an error deleting the %s. Node does not exist.', $class) . "\n");
+			$this->error(__d('cake_console', 'Node Not Deleted. ').__d('cake_console', 'There was an error deleting the %s. Node does not exist.', $class)."\n");
 		}
 	}
 
@@ -183,10 +183,10 @@ 
 			)
 		);
 		$this->Acl->{$class}->create();
-		if (!$this->Acl->{$class}->save($data)) {
+		if ( ! $this->Acl->{$class}->save($data)) {
 			$this->out(__d('cake_console', 'Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.'));
 		} else {
-			$this->out(__d('cake_console', 'Node parent set to %s', $this->args[2]) . "\n");
+			$this->out(__d('cake_console', 'Node parent set to %s', $this->args[2])."\n");
 		}
 	}
 
@@ -227,9 +227,9 @@ 
 		$indent = str_repeat('  ', $indent);
 		$data = $node[$class];
 		if ($data['alias']) {
-			$this->out($indent . "[" . $data['id'] . "] " . $data['alias']);
+			$this->out($indent."[".$data['id']."] ".$data['alias']);
 		} else {
-			$this->out($indent . "[" . $data['id'] . "] " . $data['model'] . '.' . $data['foreign_key']);
+			$this->out($indent."[".$data['id']."] ".$data['model'].'.'.$data['foreign_key']);
 		}
 	}
 
@@ -305,18 +305,18 @@ 
 			$identity = $this->parseIdentifier($this->args[1]);
 
 			$topNode = $this->Acl->{$class}->find('first', array(
-				'conditions' => array($class . '.id' => $this->_getNodeId($class, $identity))
+				'conditions' => array($class.'.id' => $this->_getNodeId($class, $identity))
 			));
 
 			$nodes = $this->Acl->{$class}->find('all', array(
 				'conditions' => array(
-					$class . '.lft >=' => $topNode[$class]['lft'],
-					$class . '.lft <=' => $topNode[$class]['rght']
+					$class.'.lft >=' => $topNode[$class]['lft'],
+					$class.'.lft <=' => $topNode[$class]['rght']
 				),
-				'order' => $class . '.lft ASC'
+				'order' => $class.'.lft ASC'
 			));
 		} else {
-			$nodes = $this->Acl->{$class}->find('all', array('order' => $class . '.lft ASC'));
+			$nodes = $this->Acl->{$class}->find('all', array('order' => $class.'.lft ASC'));
 		}
 
 		if (empty($nodes)) {
@@ -326,7 +326,7 @@ 
 				$this->error(__d('cake_console', '%s not found', $this->args[0]), __d('cake_console', 'No tree returned.'));
 			}
 		}
-		$this->out($class . ' tree:');
+		$this->out($class.' tree:');
 		$this->hr();
 
 		$stack = array();
@@ -334,7 +334,7 @@ 
 
 		foreach ($nodes as $n) {
 			$stack[] = $n;
-			if (!empty($last)) {
+			if ( ! empty($last)) {
 				$end = end($stack);
 				if ($end[$class]['rght'] > $last) {
 					foreach ($stack as $k => $v) {
@@ -523,13 +523,13 @@ 
  * @return boolean Success
  */
 	public function nodeExists() {
-		if (!isset($this->args[0]) || !isset($this->args[1])) {
+		if ( ! isset($this->args[0]) || ! isset($this->args[1])) {
 			return false;
 		}
 		$dataVars = $this->_dataVars($this->args[0]);
 		extract($dataVars);
 		$key = is_numeric($this->args[1]) ? $dataVars['secondary_id'] : 'alias';
-		$conditions = array($class . '.' . $key => $this->args[1]);
+		$conditions = array($class.'.'.$key => $this->args[1]);
 		$possibility = $this->Acl->{$class}->find('all', compact('conditions'));
 		if (empty($possibility)) {
 			$this->error(__d('cake_console', '%s not found', $this->args[1]), __d('cake_console', 'No tree returned.'));
@@ -592,7 +592,7 @@ 
 			$aco = $this->parseIdentifier($aco);
 		}
 		$action = '*';
-		if (isset($this->args[2]) && !in_array($this->args[2], array('', 'all'))) {
+		if (isset($this->args[2]) && ! in_array($this->args[2], array('', 'all'))) {
 			$action = $this->args[2];
 		}
 		return compact('aro', 'aco', 'action', 'aroName', 'acoName');
@@ -605,14 +605,14 @@ 
  * @return array Variables
  */
 	protected function _dataVars($type = null) {
-		if (!$type) {
+		if ( ! $type) {
 			$type = $this->args[0];
 		}
 		$vars = array();
 		$class = ucwords($type);
 		$vars['secondary_id'] = (strtolower($class) === 'aro') ? 'foreign_key' : 'object_id';
 		$vars['data_name'] = $type;
-		$vars['table_name'] = $type . 's';
+		$vars['table_name'] = $type.'s';
 		$vars['class'] = $class;
 		return $vars;
 	}

lib/Cake/Console/Command/SchemaShell.php

Doc Comments +2 added lines, -2 removed lines

@@ -411,7 +411,7 @@ 
  * @param array $contents
  * @param string $event
  * @param CakeSchema $Schema
- * @return void
+ * @return null|false
  */
 	protected function _run($contents, $event, CakeSchema $Schema) {
 		if (empty($contents)) {
@@ -454,7 +454,7 @@ 
 /**
  * get the option parser
  *
- * @return void
+ * @return ConsoleOptionParser
  */
 	public function getOptionParser() {
 		$plugin = array(

Spacing +32 added lines, -32 removed lines

@@ -56,9 +56,9 @@ 
 		Configure::write('Cache.disable', 1);
 
 		$name = $path = $connection = $plugin = null;
-		if (!empty($this->params['name'])) {
+		if ( ! empty($this->params['name'])) {
 			$name = $this->params['name'];
-		} elseif (!empty($this->args[0]) && $this->args[0] !== 'snapshot') {
+		} elseif ( ! empty($this->args[0]) && $this->args[0] !== 'snapshot') {
 			$name = $this->params['name'] = $this->args[0];
 		}
 
@@ -79,14 +79,14 @@ 
 		}
 		$file = $this->params['file'];
 
-		if (!empty($this->params['path'])) {
+		if ( ! empty($this->params['path'])) {
 			$path = $this->params['path'];
 		}
 
-		if (!empty($this->params['connection'])) {
+		if ( ! empty($this->params['connection'])) {
 			$connection = $this->params['connection'];
 		}
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$plugin = $this->params['plugin'];
 			if (empty($name)) {
 				$name = $plugin;
@@ -103,12 +103,12 @@ 
  * @return void
  */
 	public function view() {
-		$File = new File($this->Schema->path . DS . $this->params['file']);
+		$File = new File($this->Schema->path.DS.$this->params['file']);
 		if ($File->exists()) {
 			$this->out($File->read());
 			return $this->_stop();
 		}
-		$file = $this->Schema->path . DS . $this->params['file'];
+		$file = $this->Schema->path.DS.$this->params['file'];
 		$this->err(__d('cake_console', 'Schema file (%s) could not be found.', $file));
 		return $this->_stop();
 	}
@@ -124,7 +124,7 @@ 
 		$options = array();
 		if ($this->params['force']) {
 			$options['models'] = false;
-		} elseif (!empty($this->params['models'])) {
+		} elseif ( ! empty($this->params['models'])) {
 			$options['models'] = String::tokenize($this->params['models']);
 		}
 
@@ -133,7 +133,7 @@ 
 			$snapshot = true;
 		}
 
-		if (!$snapshot && file_exists($this->Schema->path . DS . $this->params['file'])) {
+		if ( ! $snapshot && file_exists($this->Schema->path.DS.$this->params['file'])) {
 			$snapshot = true;
 			$prompt = __d('cake_console', "Schema file exists.\n [O]verwrite\n [S]napshot\n [Q]uit\nWould you like to do?");
 			$result = strtolower($this->in($prompt, array('o', 's', 'q'), 's'));
@@ -153,7 +153,7 @@ 
 
 		Configure::write('Cache.disable', $cacheDisable);
 
-		if (!empty($this->params['exclude']) && !empty($content)) {
+		if ( ! empty($this->params['exclude']) && ! empty($content)) {
 			$excluded = String::tokenize($this->params['exclude']);
 			foreach ($excluded as $table) {
 				unset($content['tables'][$table]);
@@ -171,9 +171,9 @@ 
 			}
 
 			$count = 0;
-			if (!empty($result[1])) {
+			if ( ! empty($result[1])) {
 				foreach ($result[1] as $file) {
-					if (preg_match('/' . preg_quote($fileName) . '(?:[_\d]*)?\.php$/', $file)) {
+					if (preg_match('/'.preg_quote($fileName).'(?:[_\d]*)?\.php$/', $file)) {
 						$count++;
 					}
 				}
@@ -185,7 +185,7 @@ 
 				}
 			}
 
-			$content['file'] = $fileName . '_' . $count . '.php';
+			$content['file'] = $fileName.'_'.$count.'.php';
 		}
 
 		if ($this->Schema->write($content)) {
@@ -208,11 +208,11 @@ 
 	public function dump() {
 		$write = false;
 		$Schema = $this->Schema->load();
-		if (!$Schema) {
+		if ( ! $Schema) {
 			$this->err(__d('cake_console', 'Schema could not be loaded'));
 			return $this->_stop();
 		}
-		if (!empty($this->params['write'])) {
+		if ( ! empty($this->params['write'])) {
 			if ($this->params['write'] == 1) {
 				$write = Inflector::underscore($this->Schema->name);
 			} else {
@@ -220,7 +220,7 @@ 
 			}
 		}
 		$db = ConnectionManager::getDataSource($this->Schema->connection);
-		$contents = "\n\n" . $db->dropSchema($Schema) . "\n\n" . $db->createSchema($Schema);
+		$contents = "\n\n".$db->dropSchema($Schema)."\n\n".$db->createSchema($Schema);
 
 		if ($write) {
 			if (strpos($write, '.sql') === false) {
@@ -229,7 +229,7 @@ 
 			if (strpos($write, DS) !== false) {
 				$File = new File($write, true);
 			} else {
-				$File = new File($this->Schema->path . DS . $write, true);
+				$File = new File($this->Schema->path.DS.$write, true);
 			}
 
 			if ($File->write($contents)) {
@@ -270,14 +270,14 @@ 
  */
 	protected function _loadSchema() {
 		$name = $plugin = null;
-		if (!empty($this->params['name'])) {
+		if ( ! empty($this->params['name'])) {
 			$name = $this->params['name'];
 		}
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$plugin = $this->params['plugin'];
 		}
 
-		if (!empty($this->params['dry'])) {
+		if ( ! empty($this->params['dry'])) {
 			$this->_dry = true;
 			$this->out(__d('cake_console', 'Performing a dry run.'));
 		}
@@ -287,16 +287,16 @@ 
 			'plugin' => $plugin,
 			'connection' => $this->params['connection'],
 		);
-		if (!empty($this->params['snapshot'])) {
+		if ( ! empty($this->params['snapshot'])) {
 			$fileName = rtrim($this->Schema->file, '.php');
-			$options['file'] = $fileName . '_' . $this->params['snapshot'] . '.php';
+			$options['file'] = $fileName.'_'.$this->params['snapshot'].'.php';
 		}
 
 		$Schema = $this->Schema->load($options);
 
-		if (!$Schema) {
+		if ( ! $Schema) {
 			$this->err(__d('cake_console', 'The chosen schema could not be loaded. Attempted to load:'));
-			$this->err(__d('cake_console', 'File: %s', $this->Schema->path . DS . $this->Schema->file));
+			$this->err(__d('cake_console', 'File: %s', $this->Schema->path.DS.$this->Schema->file));
 			$this->err(__d('cake_console', 'Name: %s', $this->Schema->name));
 			return $this->_stop();
 		}
@@ -320,7 +320,7 @@ 
 
 		$drop = $create = array();
 
-		if (!$table) {
+		if ( ! $table) {
 			foreach ($Schema->tables as $table => $fields) {
 				$drop[$table] = $db->dropSchema($Schema, $table);
 				$create[$table] = $db->createSchema($Schema, $table);
@@ -334,7 +334,7 @@ 
 			return $this->_stop();
 		}
 
-		$this->out("\n" . __d('cake_console', 'The following table(s) will be dropped.'));
+		$this->out("\n".__d('cake_console', 'The following table(s) will be dropped.'));
 		$this->out(array_keys($drop));
 
 		if ($this->in(__d('cake_console', 'Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n') === 'y') {
@@ -342,7 +342,7 @@ 
 			$this->_run($drop, 'drop', $Schema);
 		}
 
-		$this->out("\n" . __d('cake_console', 'The following table(s) will be created.'));
+		$this->out("\n".__d('cake_console', 'The following table(s) will be created.'));
 		$this->out(array_keys($create));
 
 		if ($this->in(__d('cake_console', 'Are you sure you want to create the table(s)?'), array('y', 'n'), 'y') === 'y') {
@@ -394,7 +394,7 @@ 
 			return $this->_stop();
 		}
 
-		$this->out("\n" . __d('cake_console', 'The following statements will run.'));
+		$this->out("\n".__d('cake_console', 'The following statements will run.'));
 		$this->out(array_map('trim', $contents));
 		if ($this->in(__d('cake_console', 'Are you sure you want to alter the tables?'), array('y', 'n'), 'n') === 'y') {
 			$this->out();
@@ -429,19 +429,19 @@ 
 					$this->out(__d('cake_console', 'Dry run for %s :', $table));
 					$this->out($sql);
 				} else {
-					if (!$Schema->before(array($event => $table))) {
+					if ( ! $Schema->before(array($event => $table))) {
 						return false;
 					}
 					$error = null;
 					try {
 						$db->execute($sql);
 					} catch (PDOException $e) {
-						$error = $table . ': ' . $e->getMessage();
+						$error = $table.': '.$e->getMessage();
 					}
 
 					$Schema->after(array($event => $table, 'errors' => $error));
 
-					if (!empty($error)) {
+					if ( ! empty($error)) {
 						$this->err($error);
 					} else {
 						$this->out(__d('cake_console', '%s updated.', $table));
@@ -468,7 +468,7 @@ 
 		);
 		$path = array(
 			'help' => __d('cake_console', 'Path to read and write schema.php'),
-			'default' => APP . 'Config' . DS . 'Schema'
+			'default' => APP.'Config'.DS.'Schema'
 		);
 		$file = array(
 			'help' => __d('cake_console', 'File name to read and write.'),