catch correct exception, matters now that httplug has been fixed

Author: dbu

src/Exception/ProxyUnreachableException.php

@@ -11,7 +11,7 @@
 
 namespace FOS\HttpCache\Exception;
 
-use Http\Client\Exception\RequestException;
+use Http\Client\Exception\NetworkException;
 
 /**
  * Thrown when a request to the reverse caching proxy fails to establish a
@@ -20,11 +20,9 @@
 class ProxyUnreachableException extends \RuntimeException implements HttpCacheException
 {
     /**
-     * @param RequestException $requestException
-     *
      * @return ProxyUnreachableException
      */
-    public static function proxyUnreachable(RequestException $requestException)
+    public static function proxyUnreachable(NetworkException $requestException)
     {
         $message = sprintf(
             'Request to caching proxy at %s failed with message "%s"',

src/ProxyClient/HttpDispatcher.php

@@ -20,7 +20,7 @@
 use Http\Client\Common\Plugin\ErrorPlugin;
 use Http\Client\Common\PluginClient;
 use Http\Client\Exception\HttpException;
-use Http\Client\Exception\RequestException;
+use Http\Client\Exception\NetworkException;
 use Http\Client\HttpAsyncClient;
 use Http\Discovery\HttpAsyncClientDiscovery;
 use Http\Discovery\UriFactoryDiscovery;
@@ -152,7 +152,7 @@ public function flush()
                 $promise->wait();
             } catch (HttpException $exception) {
                 $exceptions->add(ProxyResponseException::proxyResponse($exception));
-            } catch (RequestException $exception) {
+            } catch (NetworkException $exception) {
                 $exceptions->add(ProxyUnreachableException::proxyUnreachable($exception));
             } catch (\Exception $exception) {
                 // @codeCoverageIgnoreStart

tests/Unit/CacheInvalidatorTest.php

@@ -24,7 +24,7 @@
 use FOS\HttpCache\ProxyClient\ProxyClient;
 use FOS\HttpCache\ProxyClient\Varnish;
 use Http\Client\Exception\HttpException;
-use Http\Client\Exception\RequestException;
+use Http\Client\Exception\NetworkException;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery\MockInterface;
 use PHPUnit\Framework\TestCase;
@@ -211,7 +211,7 @@ public function testProxyClientExceptionsAreLogged()
         $failedRequest = \Mockery::mock(RequestInterface::class)
             ->shouldReceive('getHeaderLine')->with('Host')->andReturn('127.0.0.1')
             ->getMock();
-        $clientException = new RequestException('Couldn\'t connect to host', $failedRequest);
+        $clientException = new NetworkException('Couldn\'t connect to host', $failedRequest);
 
         $unreachableException = ProxyUnreachableException::proxyUnreachable($clientException);
 

tests/Unit/ProxyClient/HttpDispatcherTest.php

@@ -17,7 +17,7 @@
 use FOS\HttpCache\Exception\ProxyUnreachableException;
 use FOS\HttpCache\ProxyClient\HttpDispatcher;
 use Http\Client\Exception\HttpException;
-use Http\Client\Exception\RequestException;
+use Http\Client\Exception\NetworkException;
 use Http\Client\HttpAsyncClient;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Discovery\UriFactoryDiscovery;
@@ -133,7 +133,7 @@ public function exceptionProvider()
                 '400',
             ],
             [
-                new RequestException('test', $request),
+                new NetworkException('test', $request),
                 ProxyUnreachableException::class,
                 'bla.com',
             ],