Linting

composer.json

@@ -22,13 +22,18 @@
         "relay/relay": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0|^5.0",
-        "satooshi/php-coveralls": "^0.6",
-        "mockery/mockery": "^0.9"
+        "phpunit/phpunit": "^6.0|^7.0",
+        "satooshi/php-coveralls": "^2.0",
+        "mockery/mockery": "^1.1"
     },
     "autoload": {
         "psr-4": {
             "Proxy\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Proxy\\": "tests"
+        }
     }
 }

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

src/Adapter/AdapterInterface.php

@@ -1,16 +1,17 @@
-<?php namespace Proxy\Adapter;
+<?php
+
+namespace Proxy\Adapter;
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-interface AdapterInterface {
-
+interface AdapterInterface
+{
     /**
      * Send the request and return the response.
      *
      * @param  RequestInterface $request
      * @return ResponseInterface
      */
     public function send(RequestInterface $request);
-
 }

src/Adapter/Dummy/DummyAdapter.php

@@ -1,17 +1,15 @@
-<?php namespace Proxy\Adapter\Dummy;
+<?php
+
+namespace Proxy\Adapter\Dummy;
 
 use Proxy\Adapter\AdapterInterface;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response;
 
-class DummyAdapter implements AdapterInterface {
-
+class DummyAdapter implements AdapterInterface
+{
     /**
-     * Send the request and return the response.
-     *
-     * @param  RequestInterface $request
-     * @return ResponseInterface
+     * @inheritdoc
      */
     public function send(RequestInterface $request)
     {

src/Adapter/Guzzle/GuzzleAdapter.php

@@ -1,12 +1,13 @@
-<?php namespace Proxy\Adapter\Guzzle;
+<?php
+
+namespace Proxy\Adapter\Guzzle;
 
 use GuzzleHttp\Client;
 use Proxy\Adapter\AdapterInterface;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-class GuzzleAdapter implements AdapterInterface {
 
+class GuzzleAdapter implements AdapterInterface
+{
     /**
      * The Guzzle client instance.
      *
@@ -25,10 +26,7 @@ public function __construct(Client $client = null)
     }
 
     /**
-     * Send the request and return the response.
-     *
-     * @param  RequestInterface $request
-     * @return ResponseInterface
+     * @inheritdoc
      */
     public function send(RequestInterface $request)
     {

src/Exception/InvalidArgumentException.php

@@ -1,3 +1,7 @@
-<?php namespace Proxy\Exception;
+<?php
 
-class InvalidArgumentException extends \InvalidArgumentException {}
+namespace Proxy\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}

src/Exception/UnexpectedValueException.php

@@ -1,3 +1,7 @@
-<?php namespace Proxy\Exception;
+<?php
 
-class UnexpectedValueException extends \UnexpectedValueException {}
+namespace Proxy\Exception;
+
+class UnexpectedValueException extends \UnexpectedValueException
+{
+}

src/Factory.php

@@ -1,12 +1,12 @@
-<?php namespace Proxy;
+<?php
+
+namespace Proxy;
 
 use Proxy\Adapter\AdapterInterface;
 use Proxy\Exception\InvalidArgumentException;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-class Factory {
 
+class Factory
+{
     /**
      * The default adapter name.
      *
@@ -29,17 +29,6 @@ public static function create($adapter = null)
         return new Proxy($instance);
     }
 
-    /**
-     * Forward a request using the default adapter.
-     *
-     * @param  RequestInterface $request
-     * @return ResponseInterface
-     */
-    public static function forward(RequestInterface $request)
-    {
-        return static::create()->forward($request);
-    }
-
     /**
      * Get the default adapter name.
      *
@@ -71,12 +60,10 @@ protected static function createAdapter($adapter)
     {
         $class = '\\Proxy\\Adapter\\' . ucfirst($adapter) . '\\' . ucfirst($adapter) . 'Adapter';
 
-        if (class_exists($class))
-        {
+        if (class_exists($class)) {
             return new $class;
         }
 
         throw new InvalidArgumentException("Adapter [$adapter] not found.");
     }
-
 }

src/Filter/FilterInterface.php

@@ -1,17 +1,19 @@
-<?php namespace Proxy\Filter;
+<?php
+
+namespace Proxy\Filter;
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-interface FilterInterface {
-
+interface FilterInterface
+{
     /**
      * Apply filter to request and/or response.
      *
-     * @param  RequestInterface $response
-     * @param  ResponseInterface $response
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @param callable $next
      * @return ResponseInterface
      */
     public function __invoke(RequestInterface $request, ResponseInterface $response, callable $next);
-
 }

src/Filter/RemoveEncodingFilter.php

@@ -1,12 +1,13 @@
-<?php namespace Proxy\Filter;
+<?php
+
+namespace Proxy\Filter;
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class RemoveEncodingFilter implements FilterInterface {
-
+class RemoveEncodingFilter implements FilterInterface
+{
     const TRANSFER_ENCODING = 'transfer-encoding';
-
     const CONTENT_ENCODING = 'content-encoding';
 
     /**
@@ -20,5 +21,4 @@ public function __invoke(RequestInterface $request, ResponseInterface $response,
             ->withoutHeader(self::TRANSFER_ENCODING)
             ->withoutHeader(self::CONTENT_ENCODING);
     }
-
 }

src/Filter/RemoveLocationFilter.php

@@ -1,10 +1,12 @@
-<?php namespace Proxy\Filter;
+<?php
+
+namespace Proxy\Filter;
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class RemoveLocationFilter implements FilterInterface {
-
+class RemoveLocationFilter implements FilterInterface
+{
     const LOCATION = 'location';
 
     /**
@@ -14,14 +16,12 @@ public function __invoke(RequestInterface $request, ResponseInterface $response,
     {
         $response = $next($request, $response);
 
-        if ($response->hasHeader(self::LOCATION))
-        {
+        if ($response->hasHeader(self::LOCATION)) {
             $response = $response
                 ->withHeader('X-Proxy-Location', $response->getHeader(self::LOCATION))
                 ->withoutHeader(self::LOCATION);
         }
 
         return $response;
     }
-
 }

src/Filter/RewriteLocationFilter.php

@@ -1,10 +1,12 @@
-<?php namespace Proxy\Filter;
+<?php
+
+namespace Proxy\Filter;
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-class RewriteLocationFilter implements FilterInterface {
-
+class RewriteLocationFilter implements FilterInterface
+{
     const LOCATION = 'location';
 
     /**
@@ -14,15 +16,18 @@ public function __invoke(RequestInterface $request, ResponseInterface $response,
     {
         $response = $next($request, $response);
 
-        if ($response->hasHeader(self::LOCATION))
-        {
+        if ($response->hasHeader(self::LOCATION)) {
             $original = parse_url($response->getHeader(self::LOCATION));
 
             $target = rtrim(str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']), '/');
 
-            if (isset($original['path']))  $target .= $original['path'];
+            if (isset($original['path'])) {
+                $target .= $original['path'];
+            }
 
-            if (isset($original['query'])) $target .= '?' . $original['query'];
+            if (isset($original['query'])) {
+                $target .= '?' . $original['query'];
+            }
 
             $response = $response
                 ->withHeader('X-Proxy-Location', $response->getHeader(self::LOCATION))

src/Proxy.php

@@ -1,4 +1,6 @@
-<?php namespace Proxy;
+<?php
+
+namespace Proxy;
 
 use Proxy\Adapter\AdapterInterface;
 use Proxy\Exception\UnexpectedValueException;
@@ -8,8 +10,8 @@
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Uri;
 
-class Proxy {
-
+class Proxy
+{
     /**
      * The Request instance.
      *
@@ -59,12 +61,11 @@ public function forward(RequestInterface $request)
      *
      * @param  string $target
      * @throws UnexpectedValueException
-     * @return Response
+     * @return ResponseInterface
      */
     public function to($target)
     {
-        if (is_null($this->request))
-        {
+        if ($this->request === null) {
             throw new UnexpectedValueException('Missing request instance.');
         }
 
@@ -89,8 +90,7 @@ public function to($target)
 
         $stack = $this->filters;
 
-        $stack[] = function (RequestInterface $request, ResponseInterface $response, callable $next)
-        {
+        $stack[] = function (RequestInterface $request, ResponseInterface $response, callable $next) {
             $response = $this->adapter->send($request);
 
             return $next($request, $response);
@@ -123,5 +123,4 @@ public function getRequest()
     {
         return $this->request;
     }
-
 }

tests/Proxy/Adapter/Dummy/DummyAdapterTest.php

@@ -1,8 +1,12 @@
-<?php namespace Proxy\Adapter\Dummy;
+<?php
 
+namespace Proxy\Adapter\Dummy;
+
+use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\ServerRequestFactory;
+use PHPUnit\Framework\TestCase;
 
-class DummyAdapterTest extends \PHPUnit_Framework_TestCase
+class DummyAdapterTest extends TestCase
 {
     /**
      * @var DummyAdapter
@@ -21,6 +25,6 @@ public function adapter_returns_psr_response()
     {
         $response = $this->adapter->send(ServerRequestFactory::fromGlobals(), '/');
 
-        $this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
+        $this->assertInstanceOf(ResponseInterface::class, $response);
     }
 }