Added ConnectorWrapper interface.

Added missing CachingConnector::__clone() method.
Added ImportConnector::findBaseConnector().
Changed CachingConnector to implement ConnectorWrapper.
Changed ImportConnector to clone its connector instead of relying on caller.
Fixed some ImportSpecification docblocks.

Author: Bilge

src/Connector/CachingConnector.php

@@ -10,7 +10,7 @@
 /**
  * Wraps a connector to cache fetched data using PSR-6-compliant objects.
  */
-class CachingConnector implements Connector
+class CachingConnector implements Connector, ConnectorWrapper
 {
     /**
      * @var Connector
@@ -37,6 +37,14 @@ public function __construct(
         $this->cacheKeyGenerator = $cacheKeyGenerator ?: new JsonCacheKeyGenerator;
     }
 
+    public function __clone()
+    {
+        $this->connector = clone $this->connector;
+
+        /* It doesn't make sense to clone the cache because we want cache state to be shared between imports.
+           We're also not cloning the CacheKeyGenerator because they're expected to be stateless algorithms. */
+    }
+
     /**
      * @param ConnectionContext $context
      * @param string $source
@@ -87,4 +95,9 @@ private function validateCacheKey($key)
             ));
         }
     }
+
+    public function getWrappedConnector()
+    {
+        return $this->connector;
+    }
 }

src/Connector/ConnectorWrapper.php

@@ -0,0 +1,15 @@
+<?php
+namespace ScriptFUSION\Porter\Connector;
+
+/**
+ * Designates a connector decorator object and provides a method to access the wrapped connector.
+ */
+interface ConnectorWrapper
+{
+    /**
+     * Gets the wrapped connector.
+     *
+     * @return Connector
+     */
+    public function getWrappedConnector();
+}

src/Connector/ImportConnector.php

@@ -10,7 +10,7 @@
  *
  * Do not store references to this connector that would prevent it expiring when an import operation ends.
  */
-final class ImportConnector
+final class ImportConnector implements ConnectorWrapper
 {
     private $connector;
 
@@ -22,7 +22,7 @@ public function __construct(Connector $connector, ConnectionContext $context)
             throw CacheUnavailableException::createUnsupported();
         }
 
-        $this->connector = $connector;
+        $this->connector = clone $connector;
         $this->context = $context;
     }
 
@@ -34,13 +34,29 @@ public function fetch($source)
     /**
      * Gets the wrapped connector. Useful for resources to reconfigure connector options during this import.
      *
-     * @return Connector
+     * @return Connector Wrapped connector.
      */
     public function getWrappedConnector()
     {
         return $this->connector;
     }
 
+    /**
+     * Finds the base connector by traversing the stack of wrapped connectors.
+     *
+     * @return Connector Base connector.
+     */
+    public function findBaseConnector()
+    {
+        $connector = $this->connector;
+
+        while ($connector instanceof ConnectorWrapper) {
+            $connector = $connector->getWrappedConnector();
+        }
+
+        return $connector;
+    }
+
     /**
      * Sets the exception handler to be called when a recoverable exception is thrown by Connector::fetch().
      *

src/Porter.php

@@ -119,7 +119,7 @@ private function fetch(ProviderResource $resource, $providerName, ConnectionCont
             );
         }
 
-        $records = $resource->fetch(new ImportConnector(clone $connector, $context));
+        $records = $resource->fetch(new ImportConnector($connector, $context));
 
         if (!$records instanceof \Iterator) {
             throw new ImportException(get_class($resource) . '::fetch() did not return an Iterator.');

src/Specification/ImportSpecification.php

@@ -80,7 +80,7 @@ final public function getResource()
     }
 
     /**
-     * Gets the provider name.
+     * Gets the provider service name.
      *
      * @return string Provider name.
      */
@@ -90,7 +90,7 @@ final public function getProviderName()
     }
 
     /**
-     * Sets the provider name.
+     * Sets the provider service name.
      *
      * @param string $providerName Provider name.
      *
@@ -211,7 +211,7 @@ final public function disableCache()
     }
 
     /**
-     * Gets the maximum number of fetch attempts per import.
+     * Gets the maximum number of fetch attempts per connection.
      *
      * @return int Maximum fetch attempts.
      */
@@ -221,7 +221,7 @@ final public function getMaxFetchAttempts()
     }
 
     /**
-     * Sets the maximum number of fetch attempts per import.
+     * Sets the maximum number of fetch attempts per connection before failure is considered permanent.
      *
      * @param int $attempts Maximum fetch attempts.
      *

test/Unit/Porter/Connector/ImportConnectorTest.php

@@ -55,7 +55,7 @@ public function testFetchCacheDisabled()
     public function testFetchCacheEnabled()
     {
         $connector = new ImportConnector(
-            \Mockery::mock(CachingConnector::class)
+            \Mockery::mock(CachingConnector::class, [\Mockery::mock(Connector::class)])
                 ->shouldReceive('fetch')
                 ->andReturn($output = 'foo')
                 ->getMock(),
@@ -79,7 +79,7 @@ public function testFetchCacheEnabledButNotAvailable()
     }
 
     /**
-     * Tests that getting the wrapped connector returns exactly the same connector as constructed with.
+     * Tests that getting the wrapped connector returns a clone of the original connector passed to the constructor.
      */
     public function testGetWrappedConnector()
     {
@@ -88,7 +88,8 @@ public function testGetWrappedConnector()
             FixtureFactory::buildConnectionContext()
         );
 
-        self::assertSame($wrappedConnector, $connector->getWrappedConnector());
+        self::assertNotSame($wrappedConnector, $connector->getWrappedConnector());
+        self::assertSame(get_class($wrappedConnector), get_class($connector->getWrappedConnector()));
     }
 
     /**