cviebrock / image-validator

src/ImageValidator.php

Spacing +30 added lines, -30 removed lines

@@ -28,17 +28,17 @@ 
 	public function validateImageSize($attribute, $value, $parameters)
 	{
 
-		$image = $this->getImagePath( $value );
+		$image = $this->getImagePath($value);
 
 		// Get the image dimension info, or fail.
 
-		$image_size = @getimagesize( $image );
+		$image_size = @getimagesize($image);
 		if ($image_size===false) return false;
 
 
 		// If only one dimension rule is passed, assume it applies to both height and width.
 
-		if ( !isset($parameters[1]) )
+		if (!isset($parameters[1]))
 		{
 			$parameters[1] = $parameters[0];
 		}
@@ -51,8 +51,8 @@ 
 		// 	">300"            - dimension must be greater than 300 pixels
 		// 	">=300"           - dimension must be greater than or equal to 300 pixels
 
-		$width_check  = $this->checkDimension( $parameters[0], $image_size[0] );
-		$height_check = $this->checkDimension( $parameters[1], $image_size[1] );
+		$width_check  = $this->checkDimension($parameters[0], $image_size[0]);
+		$height_check = $this->checkDimension($parameters[1], $image_size[1]);
 
 		return $width_check['pass'] && $height_check['pass'];
 
@@ -70,15 +70,15 @@ 
 	public function replaceImageSize($message, $attribute, $rule, $parameters)
 	{
 
-		$width = $height = $this->checkDimension( $parameters[0] );
-		if ( isset($parameters[1]) )
+		$width = $height = $this->checkDimension($parameters[0]);
+		if (isset($parameters[1]))
 		{
-			$height = $this->checkDimension( $parameters[1] );
+			$height = $this->checkDimension($parameters[1]);
 		}
 
 		return str_replace(
-			array( ':width', ':height' ),
-			array( $width['message'], $height['message'] ),
+			array(':width', ':height'),
+			array($width['message'], $height['message']),
 			$message
 		);
 
@@ -95,11 +95,11 @@ 
 	public function validateImageAspect($attribute, $value, $parameters)
 	{
 
-		$image = $this->getImagePath( $value );
+		$image = $this->getImagePath($value);
 
 		// Get the image dimension info, or fail.
 
-		$image_size = @getimagesize( $image );
+		$image_size = @getimagesize($image);
 		if ($image_size===false) return false;
 
 		$image_width = $image_size[0];
@@ -117,7 +117,7 @@ 
 
 		$both_orientations = false;
 
-		if (substr($parameters[0],0,1)=='~')
+		if (substr($parameters[0], 0, 1)=='~')
 		{
 			$parameters[0] = substr($parameters[0], 1);
 			$both_orientations = true;
@@ -134,19 +134,19 @@ 
 
 		if ($aspect_width==0 || $aspect_height==0)
 		{
-			throw new \RuntimeException('Aspect is zero or infinite: ' . $parameters[0] );
+			throw new \RuntimeException('Aspect is zero or infinite: ' . $parameters[0]);
 		}
 
 		$check = ($image_width * $aspect_height) / $aspect_width;
 
-		if (round($check) == $image_height)
+		if (round($check)==$image_height)
 		{
 			return true;
 		}
 
-		if ( $both_orientations ) {
+		if ($both_orientations) {
 			$check = ($image_width * $aspect_width) / $aspect_height;
-			if (round($check) == $image_height)
+			if (round($check)==$image_height)
 			{
 				return true;
 			}
@@ -168,7 +168,7 @@ 
 	 */
 	public function replaceImageAspect($message, $attribute, $rule, $parameters)
 	{
-		return str_replace( ':aspect', join(':', $parameters), $message );
+		return str_replace(':aspect', join(':', $parameters), $message);
 	}
 
 
@@ -179,24 +179,24 @@ 
 	 * @param  integer $dimension
 	 * @return array
 	 */
-	protected function checkDimension($rule, $dimension=0)
+	protected function checkDimension($rule, $dimension = 0)
 	{
 
 		$dimension = intval($dimension);
 
-		if ($rule == '*')
+		if ($rule=='*')
 		{
 			$message = $this->translator->trans('image-validator::validation.anysize');
 			$pass = true;
 		}
-		else if ( preg_match('/^(\d+)\-(\d+)$/', $rule, $matches) )
+		else if (preg_match('/^(\d+)\-(\d+)$/', $rule, $matches))
 		{
 			$size1 = intval($matches[1]);
 			$size2 = intval($matches[2]);
-			$message = $this->translator->trans('image-validator::validation.between', compact('size1','size2'));
+			$message = $this->translator->trans('image-validator::validation.between', compact('size1', 'size2'));
 			$pass = ($dimension >= $size1) && ($dimension <= $size2);
 		}
-		else if ( preg_match('/^([<=>]*)(\d+)$/', $rule, $matches) )
+		else if (preg_match('/^([<=>]*)(\d+)$/', $rule, $matches))
 		{
 
 			$size = intval($matches[2]);
@@ -222,33 +222,33 @@ 
 				case '=':
 				case '':
 					$message = $this->translator->trans('image-validator::validation.equal', compact('size'));
-					$pass = $dimension == $size;
+					$pass = $dimension==$size;
 					break;
 				default:
-					throw new \RuntimeException('Unknown image size validation rule: ' . $rule );
+					throw new \RuntimeException('Unknown image size validation rule: ' . $rule);
 			}
 
 		}
 		else
 		{
-			throw new \RuntimeException('Unknown image size validation rule: ' . $rule );
+			throw new \RuntimeException('Unknown image size validation rule: ' . $rule);
 		}
 
-		return compact('message','pass');
+		return compact('message', 'pass');
 
 	}
 
-	protected function getImagePath( $value )
+	protected function getImagePath($value)
 	{
 
 		// if were passed an instance of UploadedFile, return the path
-		if ( $value instanceof UploadedFile )
+		if ($value instanceof UploadedFile)
 		{
 			return $value->getPathname();
 		}
 
 		// if we're passed a PHP file upload array, return the "tmp_name"
-		if ( is_array($value) && array_get($value, 'tmp_name') !== null) {
+		if (is_array($value) && array_get($value, 'tmp_name')!==null) {
 			return $value['tmp_name'];
 		}
 

src/ImageValidatorServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -26,13 +26,13 @@ 
 	*/
 	public function boot()
 	{
-		$this->loadTranslationsFrom(__DIR__.'/../lang', 'image-validator');
+		$this->loadTranslationsFrom(__DIR__ . '/../lang', 'image-validator');
 		
 		$messages = trans('image-validator::validation');
 
 		$this->app->bind('Cviebrock\ImageValidator\ImageValidator', function($app) use ($messages)
 		{
-			$validator = new ImageValidator($app['translator'], [], [], $messages );
+			$validator = new ImageValidator($app['translator'], [], [], $messages);
 
 			if (isset($app['validation.presence']))
 			{
@@ -61,7 +61,7 @@ 
 	*/
 	protected function addNewRules()
 	{
-		foreach($this->getRules() as $rule)
+		foreach ($this->getRules() as $rule)
 		{
 			$this->extendValidator($rule);
 		}
@@ -76,9 +76,9 @@ 
 	protected function extendValidator($rule)
 	{
 		$method = studly_case($rule);
-		$translation = $this->app['translator']->trans('image-validator::validation.'.$rule);
+		$translation = $this->app['translator']->trans('image-validator::validation.' . $rule);
 		$this->app['validator']->extend($rule, 'Cviebrock\ImageValidator\ImageValidator@validate' . $method, $translation);
-		$this->app['validator']->replacer($rule, 'Cviebrock\ImageValidator\ImageValidator@replace' . $method );
+		$this->app['validator']->replacer($rule, 'Cviebrock\ImageValidator\ImageValidator@replace' . $method);
 	}