Merge pull request #27 from mapb1990/master

Compatibility with laravel 5.4

Author: andersao

composer.json

@@ -10,13 +10,13 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "~5.0|~5.1",
-        "illuminate/validation": "~5.0|~5.1"
+        "illuminate/support": "~5.4",
+        "illuminate/validation": "~5.4"
     },
     "autoload": {
         "psr-4": {
             "Prettus\\Validator\\": "src/Prettus/Validator/"
         }
     },
-    "minimum-stability": "stable"
+    "minimum-stability": "dev"
 }

src/Prettus/Validator/AbstractValidator.php

@@ -8,8 +8,8 @@
  * Class AbstractValidator
  * @package Prettus\Validator
  */
-abstract class AbstractValidator implements ValidatorInterface {
-
+abstract class AbstractValidator implements ValidatorInterface
+{
     /**
      * @var int
      */
@@ -64,7 +64,8 @@ abstract class AbstractValidator implements ValidatorInterface {
      * @param $id
      * @return $this
      */
-    public function setId($id){
+    public function setId($id)
+    {
         $this->id = $id;
         return $this;
     }
@@ -108,7 +109,7 @@ public function errorsBag()
      * @param string $action
      * @return boolean
      */
-    abstract public function passes( $action = null );
+    abstract public function passes($action = null);
 
     /**
      * Pass the data and the rules to the validator or throws ValidatorException
@@ -119,8 +120,8 @@ abstract public function passes( $action = null );
      */
     public function passesOrFail($action = null)
     {
-        if(  !$this->passes($action) ){
-            throw new ValidatorException( $this->errorsBag() );
+        if (!$this->passes($action)) {
+            throw new ValidatorException($this->errorsBag());
         }
 
         return true;
@@ -134,11 +135,11 @@ public function passesOrFail($action = null)
      * @param null $action
      * @return array
      */
-    public function getRules($action = null){
-
+    public function getRules($action = null)
+    {
         $rules = $this->rules;
 
-        if( isset($this->rules[$action]) ){
+        if (isset($this->rules[$action])) {
             $rules = $this->rules[$action];
         }
 
@@ -162,14 +163,15 @@ public function setRules(array $rules)
      *
      * @return array
      */
-    public function getMessages(){
-
+    public function getMessages()
+    {
         return $this->messages;
     }
 
     /**
      * Set Custom error messages for Validation
      *
+     * @param array $messages
      * @return $this
      */
     public function setMessages(array $messages)
@@ -183,14 +185,15 @@ public function setMessages(array $messages)
      *
      * @return array
      */
-    public function getAttributes(){
-
+    public function getAttributes()
+    {
         return $this->attributes;
     }
 
     /**
      * Set Custom error attributes for Validation
      *
+     * @param array $attributes
      * @return $this
      */
     public function setAttributes(array $attributes)
@@ -208,33 +211,28 @@ public function setAttributes(array $attributes)
      */
     protected function parserValidationRules($rules, $id = null)
     {
-
-        if($id === null)
-        {
+        if (null === $id) {
             return $rules;
         }
 
-        array_walk($rules, function(&$rules, $field) use ($id)
-        {
-            if(!is_array($rules))
-            {
+        array_walk($rules, function (&$rules, $field) use ($id) {
+            if (!is_array($rules)) {
                 $rules = explode("|", $rules);
             }
 
-            foreach($rules as $ruleIdx => $rule)
-            {
+            foreach ($rules as $ruleIdx => $rule) {
                 // get name and parameters
                 @list($name, $params) = array_pad(explode(":", $rule), 2, null);
 
                 // only do someting for the unique rule
-                if(strtolower($name) != "unique") {
+                if (strtolower($name) != "unique") {
                     continue; // continue in foreach loop, nothing left to do here
                 }
 
                 $p = array_map("trim", explode(",", $params));
 
                 // set field name to rules key ($field) (laravel convention)
-                if(!isset($p[1])) {
+                if (!isset($p[1])) {
                     $p[1] = $field;
                 }
 
@@ -248,5 +246,4 @@ protected function parserValidationRules($rules, $id = null)
 
         return $rules;
     }
-
-}
+}

src/Prettus/Validator/Contracts/ValidatorInterface.php

@@ -7,8 +7,8 @@
  * Interface ValidatorInterface
  * @package Prettus\Validator\Contracts
  */
-interface ValidatorInterface {
-
+interface ValidatorInterface
+{
     const RULE_CREATE = 'create';
     const RULE_UPDATE = 'update';
 
@@ -34,8 +34,7 @@ public function with(array $input);
      * @param string $action
      * @return boolean
      */
-    public function passes( $action = null );
-
+    public function passes($action = null);
 
     /**
      * Pass the data and the rules to the validator or throws ValidatorException
@@ -44,7 +43,7 @@ public function passes( $action = null );
      * @param string $action
      * @return boolean
      */
-    public function passesOrFail( $action = null );
+    public function passesOrFail($action = null);
 
     /**
      * Errors
@@ -77,4 +76,4 @@ public function setRules(array $rules);
      * @return array
      */
     public function getRules($action = null);
-}
+}

src/Prettus/Validator/Exceptions/ValidatorException.php

@@ -8,8 +8,8 @@
  * Class ValidatorException
  * @package Prettus\Validator\Exceptions
  */
-class ValidatorException extends \Exception implements Jsonable, Arrayable {
-
+class ValidatorException extends \Exception implements Jsonable, Arrayable
+{
     /**
      * @var MessageBag
      */
@@ -18,14 +18,16 @@ class ValidatorException extends \Exception implements Jsonable, Arrayable {
     /**
      * @param MessageBag $messageBag
      */
-    public function __construct(MessageBag $messageBag){
+    public function __construct(MessageBag $messageBag)
+    {
         $this->messageBag = $messageBag;
     }
 
     /**
      * @return MessageBag
      */
-    public function getMessageBag(){
+    public function getMessageBag()
+    {
         return $this->messageBag;
     }
 
@@ -52,5 +54,4 @@ public function toJson($options = 0)
     {
         return json_encode($this->toArray(), $options);
     }
-
-}
+}

src/Prettus/Validator/LaravelValidator.php

@@ -1,13 +1,13 @@
 <?php namespace Prettus\Validator;
 
-use Illuminate\Validation\Factory;
+use Illuminate\Contracts\Validation\Factory;
 
 /**
  * Class LaravelValidator
  * @package Prettus\Validator
  */
-class LaravelValidator extends AbstractValidator {
-
+class LaravelValidator extends AbstractValidator
+{
     /**
      * Validator
      *
@@ -18,7 +18,7 @@ class LaravelValidator extends AbstractValidator {
     /**
      * Construct
      *
-     * @param \Illuminate\Validation\Factory $validator
+     * @param \Illuminate\Contracts\Validation\Factory $validator
      */
     public function __construct(Factory $validator)
     {
@@ -38,13 +38,11 @@ public function passes($action = null)
         $attributes = $this->getAttributes();
         $validator  = $this->validator->make($this->data, $rules, $messages, $attributes);
 
-        if( $validator->fails() )
-        {
+        if ($validator->fails()) {
             $this->errors = $validator->messages();
             return false;
         }
 
         return true;
     }
-
-}
+}