cviebrock / image-validator

src/ImageValidator.php

Doc Comments +3 added lines

@@ -238,6 +238,9 @@
 
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getImagePath( $value )
 	{
 

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'];
 		}
 

Braces +9 added lines, -8 removed lines

@@ -33,7 +33,9 @@ 
 		// Get the image dimension info, or fail.
 
 		$image_size = @getimagesize( $image );
-		if ($image_size===false) return false;
+		if ($image_size===false) {
+			return false;
+		}
 
 
 		// If only one dimension rule is passed, assume it applies to both height and width.
@@ -100,7 +102,9 @@ 
 		// Get the image dimension info, or fail.
 
 		$image_size = @getimagesize( $image );
-		if ($image_size===false) return false;
+		if ($image_size===false) {
+			return false;
+		}
 
 		$image_width = $image_size[0];
 		$image_height = $image_size[1];
@@ -188,15 +192,13 @@ 
 		{
 			$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'));
 			$pass = ($dimension >= $size1) && ($dimension <= $size2);
-		}
-		else if ( preg_match('/^([<=>]*)(\d+)$/', $rule, $matches) )
+		} else if ( preg_match('/^([<=>]*)(\d+)$/', $rule, $matches) )
 		{
 
 			$size = intval($matches[2]);
@@ -228,8 +230,7 @@ 
 					throw new \RuntimeException('Unknown image size validation rule: ' . $rule );
 			}
 
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('Unknown image size validation rule: ' . $rule );
 		}

src/ImageValidatorServiceProvider.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php namespace Cviebrock\ImageValidator;
 
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Validation\Factory;
 
 class ImageValidatorServiceProvider extends ServiceProvider
 {

Indentation +25 added lines, -25 removed lines

@@ -7,10 +7,10 @@ 
 {
 
 	/**
-	* Indicates if loading of the provider is deferred.
-	*
-	* @var bool
-	*/
+	 * Indicates if loading of the provider is deferred.
+	 *
+	 * @var bool
+	 */
 	protected $defer = false;
 
 	protected $rules = array(
@@ -20,10 +20,10 @@ 
 
 
 	/**
-	* Bootstrap the application events.
-	*
-	* @return void
-	*/
+	 * Bootstrap the application events.
+	 *
+	 * @return void
+	 */
 	public function boot()
 	{
 		$this->loadTranslationsFrom(__DIR__.'/../lang', 'image-validator');
@@ -48,17 +48,17 @@ 
 
 
 	/**
-	* Get the list of new rules being added to the validator.
-	* @return array
-	*/
+	 * Get the list of new rules being added to the validator.
+	 * @return array
+	 */
 	public function getRules()
 	{
 		return $this->rules;
 	}
 
 	/**
-	* Add new rules to the validator.
-	*/
+	 * Add new rules to the validator.
+	 */
 	protected function addNewRules()
 	{
 		foreach($this->getRules() as $rule)
@@ -69,10 +69,10 @@ 
 
 
 	/**
-	* Extend the validator with new rules.
-	* @param  string $rule
-	* @return void
-	*/
+	 * Extend the validator with new rules.
+	 * @param  string $rule
+	 * @return void
+	 */
 	protected function extendValidator($rule)
 	{
 		$method = studly_case($rule);
@@ -83,20 +83,20 @@ 
 
 
 	/**
-	* Register the service provider.
-	*
-	* @return void
-	*/
+	 * Register the service provider.
+	 *
+	 * @return void
+	 */
 	public function register()
 	{
 	}
 
 
 	/**
-	* Get the services provided by the provider.
-	*
-	* @return array
-	*/
+	 * Get the services provided by the provider.
+	 *
+	 * @return array
+	 */
 	public function provides()
 	{
 		return [];

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);
 	}
 
 

lang/zh-CN/validation.php

Indentation +9 added lines, -9 removed lines

@@ -1,15 +1,15 @@
 <?php
 
 return array(
-    'image_size'         => ':attribute 的宽度为 :width, 高度为 :height',
+	'image_size'         => ':attribute 的宽度为 :width, 高度为 :height',
     
-    'between'            => '必须在 :size1 和 :size2 像素之间',
-    'lessthan'           => '必须小于 :size 像素',
-    'lessthanorequal'    => '必须小于或等于 :size 像素',
-    'greaterthan'        => '必须大于 :size 像素',
-    'greaterthanorequal' => '必须大于或等于 :size 像素',
-    'equal'              => '必须等于 :size 像素',
-    'anysize'            => '可以为任意大小',
+	'between'            => '必须在 :size1 和 :size2 像素之间',
+	'lessthan'           => '必须小于 :size 像素',
+	'lessthanorequal'    => '必须小于或等于 :size 像素',
+	'greaterthan'        => '必须大于 :size 像素',
+	'greaterthanorequal' => '必须大于或等于 :size 像素',
+	'equal'              => '必须等于 :size 像素',
+	'anysize'            => '可以为任意大小',
     
-    'image_aspect'       => ':attribute 长宽比必须为 :aspect',
+	'image_aspect'       => ':attribute 长宽比必须为 :aspect',
 );

lang/tr/validation.php

Indentation +9 added lines, -9 removed lines

@@ -1,15 +1,15 @@
 <?php
 
 return array(
-    'image_size'          => ':attribute :width genişliği ve :height yüksekliği olmalıdır.',
+	'image_size'          => ':attribute :width genişliği ve :height yüksekliği olmalıdır.',
 
-    'between'            => ':size1 ve :size2 piksel aralığında',
-    'lessthan'           => ':size pikselden az',
-    'lessthanorequal'    => ':size piksele eşit veya az',
-    'greaterthan'        => ':size pikselden fazla',
-    'greaterthanorequal' => ':size piksele eşit veya fazla',
-    'equal'              => ':size piksel',
-    'anysize'            => 'herhangi bir',
+	'between'            => ':size1 ve :size2 piksel aralığında',
+	'lessthan'           => ':size pikselden az',
+	'lessthanorequal'    => ':size piksele eşit veya az',
+	'greaterthan'        => ':size pikselden fazla',
+	'greaterthanorequal' => ':size piksele eşit veya fazla',
+	'equal'              => ':size piksel',
+	'anysize'            => 'herhangi bir',
 
-    'image_aspect'       => ':attribute en/boy oranı :aspect olmalıdır.',
+	'image_aspect'       => ':attribute en/boy oranı :aspect olmalıdır.',
 );
\ No newline at end of file

lang/zh-tw/validation.php

Indentation +9 added lines, -9 removed lines

@@ -1,15 +1,15 @@
 <?php
 
 return array(
-    'image_size'          => ':attribute 欄位的寬度 :width, 而高度 :height',
+	'image_size'          => ':attribute 欄位的寬度 :width, 而高度 :height',
 
-    'between'            => '必須介於 :size1 與 :size2 像素之間',
-    'lessthan'           => '必須小於 :size 像素',
-    'lessthanorequal'    => '必須小於或等於 :size 像素',
-    'greaterthan'        => '必須大於 :size 像素',
-    'greaterthanorequal' => '必須大於或等於 :size 像素',
-    'equal'              => '必須等於 :size 像素',
-    'anysize'            => '可以是任意大小',
+	'between'            => '必須介於 :size1 與 :size2 像素之間',
+	'lessthan'           => '必須小於 :size 像素',
+	'lessthanorequal'    => '必須小於或等於 :size 像素',
+	'greaterthan'        => '必須大於 :size 像素',
+	'greaterthanorequal' => '必須大於或等於 :size 像素',
+	'equal'              => '必須等於 :size 像素',
+	'anysize'            => '可以是任意大小',
 
-    'image_aspect'       => ':attribute 欄位的長寬比必須是 :aspect',
+	'image_aspect'       => ':attribute 欄位的長寬比必須是 :aspect',
 );
\ No newline at end of file