Tidying up the contracts a bit more.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Http/Parser/Parser.php renamed to src/Contract/Http/Parser.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Dingo\Api\Http\Parser;
+namespace Dingo\Api\Contract\Http;
 
-use Illuminate\Http\Request;
+use Illuminate\Http\Request as IlluminateRequest;
 
 interface Parser
 {
@@ -13,5 +13,5 @@ interface Parser
      *
      * @return mixed
      */
-    public function parse(Request $request);
+    public function parse(IlluminateRequest $request);
 }

src/Contract/Http/Validation/Validator.php renamed to src/Contract/Http/Validator.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Dingo\Api\Contract\Http\Validation;
+namespace Dingo\Api\Contract\Http;
 
-use Illuminate\Http\Request;
+use Illuminate\Http\Request as IlluminateRequest;
 
 interface Validator
 {
@@ -13,5 +13,5 @@ interface Validator
      *
      * @return bool
      */
-    public function validate(Request $request);
+    public function validate(IlluminateRequest $request);
 }

src/Http/Parser/Accept.php

@@ -3,6 +3,7 @@
 namespace Dingo\Api\Http\Parser;
 
 use Illuminate\Http\Request;
+use Dingo\Api\Contract\Http\Parser;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 class Accept implements Parser

src/Http/RequestValidator.php

@@ -3,8 +3,8 @@
 namespace Dingo\Api\Http;
 
 use Illuminate\Container\Container;
+use Dingo\Api\Contract\Http\Validator;
 use Illuminate\Http\Request as IlluminateRequest;
-use Dingo\Api\Contract\Http\Validation\Validator as ValidatorInterface;
 
 class RequestValidator
 {
@@ -87,7 +87,7 @@ public function validateRequest(IlluminateRequest $request)
         foreach ($this->validators as $validator) {
             $validator = $this->container->make($validator);
 
-            if ($validator instanceof ValidatorInterface && $validator->validate($request)) {
+            if ($validator instanceof Validator && $validator->validate($request)) {
                 $passed = true;
             }
         }

src/Http/Validation/Accept.php

@@ -3,7 +3,7 @@
 namespace Dingo\Api\Http\Validation;
 
 use Illuminate\Http\Request;
-use Dingo\Api\Contract\Http\Validation\Validator;
+use Dingo\Api\Contract\Http\Validator;
 use Dingo\Api\Http\Parser\Accept as AcceptParser;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 

src/Http/Validation/Domain.php

@@ -3,7 +3,7 @@
 namespace Dingo\Api\Http\Validation;
 
 use Illuminate\Http\Request;
-use Dingo\Api\Contract\Http\Validation\Validator;
+use Dingo\Api\Contract\Http\Validator;
 
 class Domain implements Validator
 {

src/Http/Validation/Prefix.php

@@ -3,7 +3,7 @@
 namespace Dingo\Api\Http\Validation;
 
 use Illuminate\Http\Request;
-use Dingo\Api\Contract\Http\Validation\Validator;
+use Dingo\Api\Contract\Http\Validator;
 
 class Prefix implements Validator
 {

tests/Stubs/HttpValidatorStub.php

@@ -3,7 +3,7 @@
 namespace Dingo\Api\Tests\Stubs;
 
 use Illuminate\Http\Request;
-use Dingo\Api\Contract\Http\Validation\Validator;
+use Dingo\Api\Contract\Http\Validator;
 
 class HttpValidatorStub implements Validator
 {