Merge remote-tracking branch 'origin/master'

Author: Robert Kummer

src/Contracts/Repositories/Conditions/TakesConditions.php

@@ -45,6 +45,12 @@ function limit($limit);
      */
     function whereNotNull($field);
 
+    /**
+     * @param string $field
+     * @return $this
+     */
+    function whereNull($field);
+
     /**
      * @param string|\Closure $fieldOrClosure
      * @param string|mixed $operatorOrValue

src/Http/Controllers/JsonApiController.php

@@ -27,6 +27,7 @@
 use Ipunkt\LaravelJsonApi\Repositories\Conditions\LimitCondition;
 use Ipunkt\LaravelJsonApi\Repositories\Conditions\OffsetCondition;
 use Ipunkt\LaravelJsonApi\Repositories\Conditions\SortByCondition;
+use Ipunkt\LaravelJsonApi\Resources\ResourceDefinition;
 use Ipunkt\LaravelJsonApi\Resources\ResourceManager;
 use Ipunkt\LaravelJsonApi\Resources\ResourceNotDefinedException;
 use Symfony\Component\HttpKernel\Exception\HttpException;

src/Repositories/Conditions/ConditionApplier.php

@@ -39,13 +39,13 @@ public function addCondition(RepositoryCondition $condition)
     /**
      * returns condition by type
      *
-     * @param string $respositoryType
+     * @param string $repositoryType
      * @return Collection
      */
-    public function getConditionByType(string $respositoryType) : Collection
+    public function getConditionByType(string $repositoryType) : Collection
     {
-        return $this->conditions->filter(function (RepositoryCondition $condition) use ($respositoryType) {
-            return $condition instanceof $respositoryType;
+        return $this->conditions->filter(function (RepositoryCondition $condition) use ($repositoryType) {
+            return $condition instanceof $repositoryType;
         });
     }
 

src/Repositories/Conditions/ConditionTaker.php

@@ -91,6 +91,16 @@ function whereNotNull($field)
         return $this;
     }
 
+    /**
+     * @param string $field
+     * @return $this
+     */
+    function whereNull($field)
+    {
+        $this->builder = $this->builder->whereNull($field);
+        return $this;
+    }
+
     /**
      * @param string|\Closure $fieldOrClosure
      * @param string|mixed $operatorOrValue

src/Validation/ValidatesRequests.php

@@ -54,6 +54,24 @@ public function validate(RequestModel $request, array $rules, array $messages =
         }
     }
 
+    /**
+     * Validate the given request data with the given rules.
+     *
+     * @param  array $data
+     * @param  array $rules
+     * @param  array $messages
+     * @param  array $customAttributes
+     * @return void
+     */
+    public function validateData(array $data, array $rules, array $messages = [], array $customAttributes = [])
+    {
+        $validator = $this->getValidationFactory()->make($data, $rules, $messages, $customAttributes);
+
+        if ($validator->fails()) {
+            $this->throwValidationException(request(), $validator);
+        }
+    }
+    
     /**
      * Validate the given request with the given rules.
      *
@@ -94,4 +112,4 @@ protected function throwValidationException(Request $request, $validator)
             $request, $this->formatValidationErrors($validator)
         ));
     }
-}
+}