Added ExponentialBackoffErrorHandler for Http and Soap connectors.

composer.json

@@ -11,7 +11,7 @@
     "php": ">=5.5",
     "scriptfusion/mapper": "^1|^0",
     "scriptfusion/static-class": "^1",
-    "codelegance/retry": "^1",
+    "scriptfusion/retry-error-handlers": "^1",
     "psr/cache": "^1",
     "zendframework/zend-uri": "^2"
   },

src/Porter/Cache/CacheAdvice.php

@@ -8,25 +8,23 @@
  */
 final class CacheAdvice extends AbstractEnumeration
 {
-    const
-        /**
-         * @var string An object should be cached if a cache is available.
-         */
-        SHOULD_CACHE = 'SHOULD_CACHE',
+    /**
+     * @var string An object should be cached if a cache is available.
+     */
+    const SHOULD_CACHE = 'SHOULD_CACHE';
 
-        /**
-         * @var string An object should not be cached even if a cache is available.
-         */
-        SHOULD_NOT_CACHE = 'SHOULD_NOT_CACHE',
+    /**
+     * @var string An object should not be cached even if a cache is available.
+     */
+    const SHOULD_NOT_CACHE = 'SHOULD_NOT_CACHE';
 
-        /**
-         * @var string An object must be cached otherwise a fatal error may occur.
-         */
-        MUST_CACHE = 'MUST_CACHE',
+    /**
+     * @var string An object must be cached otherwise a fatal error may occur.
+     */
+    const MUST_CACHE = 'MUST_CACHE';
 
-        /**
-         * @var string An object must not be cached otherwise a fatal error may occur.
-         */
-        MUST_NOT_CACHE = 'MUST_NOT_CACHE'
-    ;
+    /**
+     * @var string An object must not be cached otherwise a fatal error may occur.
+     */
+    const MUST_NOT_CACHE = 'MUST_NOT_CACHE';
 }

src/Porter/Net/Http/HttpConnectionException.php

@@ -0,0 +1,10 @@
+<?php
+namespace ScriptFUSION\Porter\Net\Http;
+
+/**
+ * The exception that is thrown when an HTTP connection error occurs.
+ */
+class HttpConnectionException extends \RuntimeException
+{
+    // Intentionally empty.
+}

src/Porter/Net/Http/HttpConnector.php

@@ -4,6 +4,7 @@
 use ScriptFUSION\Porter\Connector\CachingConnector;
 use ScriptFUSION\Porter\Net\UrlBuilder;
 use ScriptFUSION\Porter\Options\EncapsulatedOptions;
+use ScriptFUSION\Retry\ErrorHandler\ExponentialBackoffErrorHandler;
 
 class HttpConnector extends CachingConnector
 {
@@ -26,16 +27,22 @@ public function fetchFreshData($source, EncapsulatedOptions $options = null)
             throw new \RuntimeException('Options must be an instance of HttpOptions.');
         }
 
-        return file_get_contents(
-            $this->getOrCreateUrlBuilder()->buildUrl($source, $options ? $options->getQueryParameters() : []),
-            false,
-            stream_context_create([
-                'http' => array_merge(
-                    $this->options->extractHttpContextOptions(),
-                    $options ? $options->extractHttpContextOptions() : []
-                ),
-            ])
-        );
+        return \ScriptFUSION\Retry\retry(5, function () use ($source, $options) {
+            if (false === $response = @file_get_contents(
+                $this->getOrCreateUrlBuilder()->buildUrl($source, $options ? $options->getQueryParameters() : []),
+                false,
+                stream_context_create([
+                    'http' => array_merge(
+                        $this->options->extractHttpContextOptions(),
+                        $options ? $options->extractHttpContextOptions() : []
+                    ),
+                ])
+            )) {
+                throw new HttpConnectionException(error_get_last()['message']);
+            }
+
+            return $response;
+        }, new ExponentialBackoffErrorHandler);
     }
 
     private function getOrCreateUrlBuilder()

src/Porter/Net/Soap/SoapConnector.php

@@ -4,6 +4,7 @@
 use ScriptFUSION\Porter\Connector\CachingConnector;
 use ScriptFUSION\Porter\Options\EncapsulatedOptions;
 use ScriptFUSION\Porter\Type\ObjectType;
+use ScriptFUSION\Retry\ErrorHandler\ExponentialBackoffErrorHandler;
 
 class SoapConnector extends CachingConnector
 {
@@ -28,9 +29,9 @@ public function fetchFreshData($source, EncapsulatedOptions $options = null)
         $params = array_merge($this->options->getParameters(), $options ? $options->getParameters() : []);
 
         return ObjectType::toArray(
-            \igorw\retry(5, function () use ($source, $params) {
+            \ScriptFUSION\Retry\retry(5, function () use ($source, $params) {
                 return $this->client->$source($params);
-            })
+            }, new ExponentialBackoffErrorHandler)
         );
     }
 }