Schlaefer / Saito

app/Controller/SearchesController.php

Doc Comments +3 added lines

@@ -180,6 +180,9 @@
 			return Sanitize::escape($string, $this->Entry->useDbConfig);
 		}
 
+		/**
+		 * @param string[] $params
+		 */
 		protected function _filterQuery($params) {
 			$this->request->query = array_intersect_key($this->request->query,
 					array_fill_keys($params, 1));

app/Lib/Saito/Test/AssertTrait.php

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
 			return $this->assertEquals($count, $length, "Failed XPath. Expected '$path' to be found $count times instead of $length.");
 		}
 
+		/**
+		 * @param string $path
+		 */
 		public function assertNotXPath($html, $path) {
 			return !$this->assertXPath($html, $path, 0);
 		}

app/Lib/Saito/Test/ControllerTestCase.php

Doc Comments +9 added lines

@@ -48,6 +48,9 @@ 
 			unset($_ENV['HTTP_X_REQUESTED_WITH']);
 		}
 
+		/**
+		 * @param string $agent
+		 */
 		protected function _setUserAgent($agent) {
 			if (isset($this->_env['HTTP_USER_AGENT'])) {
 				$this->_env['HTTP_USER_AGENT'] = $_ENV['HTTP_USER_AGENT'];
@@ -63,6 +66,9 @@ 
 			}
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		protected function _loginUser($id) {
 			// see: http://stackoverflow.com/a/10411128/1372085
 			$this->_logoutUser();
@@ -100,6 +106,9 @@ 
 			endif;
 		}
 
+		/**
+		 * @param string $name
+		 */
 		protected function _notImplementedOnDatasource($name) {
 			$mc = $this->controller->modelClass;
 			$Ds = $this->controller->{$mc}->getDataSource();

app/Lib/Saito/Test/SecurityMockTrait.php

Doc Comments +3 added lines

@@ -4,6 +4,9 @@
 
 	trait SecurityMockTrait {
 
+		/**
+		 * @param string $controller
+		 */
 		public function generate($controller, $mocks = []) {
 			$byPassSecurity = false;
 			if (!isset($mocks['components']['Security'])) {

app/Model/UserIgnore.php

Doc Comments +12 added lines, -2 removed lines

@@ -29,6 +29,10 @@ 
 		 */
 		public $duration = 8035200;
 
+		/**
+		 * @param integer $userId
+		 * @param integer $blockedUserId
+		 */
 		public function ignore($userId, $blockedUserId) {
 			$exists = $this->_get($userId, $blockedUserId);
 			if ($exists) {
@@ -62,6 +66,9 @@ 
 			]);
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		public function ignoredBy($id) {
 			return $this->find(
 				'all',
@@ -72,6 +79,9 @@ 
 			);
 		}
 
+		/**
+		 * @param integer $userId
+		 */
 		public function deleteUser($userId) {
 			$success = $this->deleteAll(['user_id' => $userId], false);
 			$success = $success && $this->deleteAll(['blocked_user_id' => $userId], false);
@@ -81,8 +91,8 @@ 
 		/**
 		 * counts how many users ignore the user with ID $id
 		 *
-		 * @param $id
-		 * @return array
+		 * @param integer $id
+		 * @return integer
 		 */
 		public function countIgnored($id) {
 			return count($this->getIgnored($id));

app/Plugin/Embedly/Vendor/Embedly.php

Doc Comments +3 added lines, -3 removed lines

@@ -169,7 +169,7 @@ 
     /**
      *
      * @param string $version
-     * @param array $action
+     * @param string $action
      * @param array $params
      * @return object
      */
@@ -291,7 +291,7 @@ 
     /**
      *
      * @param resource $ch
-     * @param array $headers
+     * @param string[] $headers
      * @return void
      */
     protected function setCurlOptions(&$ch, $headers = array())
@@ -333,7 +333,7 @@ 
 
     /**
      *
-     * @param stdClass $o
+     * @param \stdClass $o
      * @return string
      */
     public static function reg_imploder(\stdClass $o)

app/Plugin/FileUpload/Vendor/uploader.php

Doc Comments +3 added lines, -2 removed lines

@@ -94,6 +94,7 @@ 
     * Preform requested target patch checks depending on the unique setting
     *
     * @var string chosen filename target_path
+    * @param string $target_path
     * @return string of resulting target_path
     * @access private
     */
@@ -217,7 +218,7 @@ 
   /**
     * Checks if there is a file uploaded
     *
-    * @return void
+    * @return boolean
     * @access public
     * @param file array of uploaded file (optional)
     */
@@ -293,7 +294,7 @@ 
   }
 
   /**
-    * @return boolean true if errors were detected.
+    * @return integer true if errors were detected.
     */
   function hasErrors(){
     return count($this->errors);

Braces +10 added lines, -15 removed lines

@@ -72,12 +72,10 @@ 
         $Model = ClassRegistry::init($this->options['fileModel']);
         if(method_exists($Model, $this->options['fileNameFunction'])){
           $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
-        }
-        elseif(function_exists($this->options['fileNameFunction'])){
+        } elseif(function_exists($this->options['fileNameFunction'])){
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
-      }
-      else {
+      } else {
         if(function_exists($this->options['fileNameFunction'])){
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
@@ -140,8 +138,7 @@ 
     if(move_uploaded_file($this->file['tmp_name'], $target_path)){
       $this->finalFile = basename($target_path);
       return $this->finalFile;
-    }
-    else{
+    } else{
       $this->_error('Unable to save temp file to file system.');
       return false;
     }
@@ -154,7 +151,9 @@ 
     * @return void
     */
   function setFile($file = null){
-    if($file) $this->file = $file;
+    if($file) {
+        $this->file = $file;
+    }
   }
 
   /**
@@ -203,8 +202,7 @@ 
         if(is_array($types) && !in_array($this->file['type'], $types)){
           $this->_error("{$this->file['type']} is not an allowed type.");
           return false;
-        }
-        else {
+        } else {
           return true;
         }
       }
@@ -226,8 +224,7 @@ 
     if($this->hasUpload() && $this->file){
       if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
         return true;
-      }
-      else {
+      } else {
         $this->_error($this->uploadErrors[$this->file['error']]);
       }
     }
@@ -246,11 +243,9 @@ 
     if($this->hasUpload() && $this->file){
       if(!$this->options['maxFileSize']){ //We don't want to test maxFileSize
         return true;
-      }
-      elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
+      } elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
         return true;
-      }
-      else {
+      } else {
         // $this->_error("File exceeds {$this->options['maxFileSize']} byte limit.");
 				$this->_error("File exceeds size limit.");
       }

app/Plugin/FileUpload/View/Helper/FileUploadHelper.php

Doc Comments +13 added lines, -13 removed lines

@@ -99,7 +99,7 @@ 
     * @param Array|Int $options takes an array of options passed to the image helper, or an integer representing the width of the image to display
     *         options: width = 100 (default), if width is set along with autoResize the uploaded image will be resized.
     * @access public
-    * @return mixed html tag, url string, or false if unable to find image.
+    * @return string|false html tag, url string, or false if unable to find image.
     */
   function image($name, $options = array()){
     $this->fileName = $name;
@@ -329,7 +329,7 @@ 
 		 * Constructor
 		 *
 		 * @param [String $imgFile] Image File Name
-		 * @return RESIZEIMAGE (Class Object)
+		 * @return false|null (Class Object)
 		 */
 		function __construct($imgFile=""){
 			if (!function_exists("imagecreate")){
@@ -356,7 +356,7 @@ 
 		 * Set image file name
 		 *
 		 * @param String $imgFile
-		 * @return void
+		 * @return boolean
 		 */
 		function setImage($imgFile){
 			$this->imgFile=$imgFile;
@@ -374,7 +374,7 @@ 
 		 * Resize a image to given width and height and keep it's current width and height ratio
 		 *
 		 * @param Number $imgwidth
-		 * @param Numnber $imgheight
+		 * @param integer $imgheight
 		 * @param String $newfile
 		 */
 		function resize_limitwh($imgwidth,$imgheight,$newfile=NULL){
@@ -394,9 +394,9 @@ 
     /**
 		 * Resize an image to given percentage.
 		 *
-		 * @param Number $percent
+		 * @param integer $percent
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize_percentage($percent=100,$newfile=NULL)	{
 			$newWidth=($this->imgWidth*$percent)/100;
@@ -407,10 +407,10 @@ 
     /**
 		 * Resize an image to given X and Y percentage.
 		 *
-		 * @param Number $xpercent
-		 * @param Number $ypercent
+		 * @param integer $xpercent
+		 * @param integer $ypercent
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)		{
 			$newWidth=($this->imgWidth*$xpercent)/100;
@@ -421,10 +421,10 @@ 
 		/**
 		 * Resize an image to given width and height
 		 *
-		 * @param Number $width
-		 * @param Number $height
+		 * @param integer $width
+		 * @param integer $height
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize($width,$height,$newfile=NULL){
 			if(empty($this->imgFile)){
@@ -483,7 +483,7 @@ 
 		 * @param Number $width
 		 * @param Number $height
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function _resize($width,$height,$newfile=NULL){
 			if (!function_exists("imagecreate")){

Braces +32 added lines, -39 removed lines

@@ -115,8 +115,7 @@ 
     $img = false;
     if(is_string($name)){
       $img = $this->_getImageByName();
-    }
-    elseif(is_int($name)){
+    } elseif(is_int($name)){
       $img = $this->_getImageById();
     }
 
@@ -145,8 +144,7 @@ 
       unset($options['model'], $options['var']);
 
       return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
-    }
-    else {
+    } else {
       return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
     }
   }
@@ -166,8 +164,7 @@ 
     if(!empty($upload)){
       $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
       return $this->_getImageByName();
-    }
-    else{
+    } else{
       return false;
     }
   }
@@ -180,8 +177,7 @@ 
   function _getFullPath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return WWW_ROOT . $this->_getUploadPath();
     }
   }
@@ -194,8 +190,7 @@ 
   function _getImagePath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return '/' . $this->_getUploadPath();
     }
   }
@@ -227,7 +222,9 @@ 
     */
   function _getImageByName(){
     //only proceed if we actually have the file in question
-    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
+    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) {
+        return false;
+    }
 
     //resize if we have resize on, a width, and if it doesn't already exist.
     if($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))){
@@ -257,8 +254,7 @@ 
     $this->newImage = new RResizeImage($this->_getFullPath());
     if($this->newImage->imgWidth > $this->options['width']){
       $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
-    }
-    else {
+    } else {
       //$this->autoResize = false;
     }
   }
@@ -272,12 +268,10 @@ 
     if(!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0){
       if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
         $image = $this->_getImagePath();
-      }
-      else {
+      } else {
         $image = $this->_getResizeNameOrPath($this->_getImagePath());
       }
-    }
-    else {
+    } else {
       $image = $this->_getImagePath();
     }
 
@@ -285,13 +279,14 @@ 
     //unset the default options
     unset($options['resizedDir'], $options['uploadDir'], $options['imagePathOnly'], $options['autoResize'], $options['resizeThumbOnly']);
     //unset width only if we're not an outsourced image, we have resize turned on, or we don't have a width to begin with.
-    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) unset($options['width']);
+    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) {
+        unset($options['width']);
+    }
 
     //return the impage path or image html
     if($this->options['imagePathOnly']){
       return $image;
-    }
-    else {
+    } else {
       return $this->Html->image($image, $options);
     }
   }
@@ -435,8 +430,12 @@ 
 				$this->_error="Could not resize given image";
 				return false;
 			}
-			if($width<=0)	$width=$this->imgWidth;
-			if($height<=0) $height=$this->imgHeight;
+			if($width<=0) {
+			    $width=$this->imgWidth;
+			}
+			if($height<=0) {
+			    $height=$this->imgHeight;
+			}
 
 			return $this->_resize($width,$height,$newfile);
 		}
@@ -461,11 +460,9 @@ 
 			$this->_getImageInfo();
 			if($this->imgType=='GIF'){
 				$this->_img=@imagecreatefromgif($this->imgFile);
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				$this->_img=@imagecreatefromjpeg($this->imgFile);
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				$this->_img=@imagecreatefrompng($this->imgFile);
 			}
 
@@ -497,7 +494,9 @@ 
 			if($this->imgType=='GIF' || $this->imgType=='PNG')	{
 				/** Code to keep transparency of image **/
 				$colorcount = imagecolorstotal($this->_img);
-				if ($colorcount == 0) $colorcount = 256;
+				if ($colorcount == 0) {
+				    $colorcount = 256;
+				}
 				imagetruecolortopalette($newimg,true,$colorcount);
 				imagepalettecopy($newimg,$this->_img);
 				$transparentcolor = imagecolortransparent($this->_img);
@@ -511,8 +510,7 @@ 
 				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
         }
-			}
-			elseif(!empty($newfile)){
+			} elseif(!empty($newfile)){
 				if(!@preg_match("/\..*+$/",@basename($newfile))){
 					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 					   $newfile=$newfile.$matches[0];
@@ -523,26 +521,21 @@ 
 			if($this->imgType=='GIF'){
 				if(!empty($newfile)){
           @imagegif($newimg,$newfile);
-        }
-				else {
+        } else {
 					@header("Content-type: image/gif");
 					@imagegif($newimg);
 				}
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				if(!empty($newfile)){
 					@imagejpeg($newimg,$newfile);
-        }
-				else	{
+        } else	{
 					@header("Content-type: image/jpeg");
 					@imagejpeg($newimg);
 				}
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				if(!empty($newfile)){
 					@imagepng($newimg,$newfile);
-        }
-				else{
+        } else{
 					@header("Content-type: image/png");
 					@imagepng($newimg);
 				}

app/Plugin/Install/Controller/InstallController.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
  * credentials or create the missing database
  * Create the database file and insert the submitted details
  *
- * @return void
+ * @return null|CakeResponse
  * @access public
  */
 	public function database() {

Braces +2 added lines, -4 removed lines

@@ -132,8 +132,7 @@ 
 		try {
 			@ConnectionManager::create('default', $config);
 			$db = ConnectionManager::getDataSource('default');
-		}
-		catch (MissingConnectionException $e) {
+		} catch (MissingConnectionException $e) {
 			$this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
 			$this->redirect(array('action' => 'database'));
 		}
@@ -196,8 +195,7 @@ 
 					$create = $db->createSchema($schema, $table);
 					try {
 						$db->execute($create);
-					}
-					catch (PDOException $e) {
+					} catch (PDOException $e) {
 						$this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
 						$this->redirect(array('action' => 'database'));
 					}