Removed storage providers

lib/WebProvider.php

@@ -11,15 +11,11 @@
 
 namespace ICanBoogie\CLDR;
 
-use ICanBoogie\Storage\Storage;
-
 /**
  * Retrieves sections from the CLDR source using cURL.
  */
-class WebProvider implements Storage, Provider
+class WebProvider implements Provider
 {
-	use ProviderStorageBinding;
-
 	const DEFAULT_ORIGIN = "http://www.unicode.org/repos/cldr-aux/json/26/";
 
 	/**
@@ -42,15 +38,6 @@ public function __construct($origin = self::DEFAULT_ORIGIN)
 		$this->origin = $origin;
 	}
 
-	/**
-	 * @inheritdoc
-	 * @codeCoverageIgnore
-	 */
-	public function store($key, $value, $ttl = null)
-	{
-		# does nothing
-	}
-
 	/**
 	 * The section path, following the pattern "<identity>/<section>".
 	 *
@@ -60,7 +47,7 @@ public function store($key, $value, $ttl = null)
 	 *
 	 * @throws ResourceNotFound when the specified path does not exists on the CLDR source.
 	 */
-	public function retrieve($key)
+	public function provide($key)
 	{
 		$connection = $this->obtain_connection();
 
@@ -78,47 +65,6 @@ public function retrieve($key)
 		return json_decode($rc, true);
 	}
 
-	/**
-	 * The method does nothing.
-	 *
-	 * @inheritdoc
-	 * @codeCoverageIgnore
-	 */
-	public function eliminate($key)
-	{
-		# does nothing
-	}
-
-	/**
-	 * The method does nothing.
-	 *
-	 * @inheritdoc
-	 * @codeCoverageIgnore
-	 */
-	public function exists($key)
-	{
-		# does nothing
-	}
-
-	/**
-	 * The method does nothing.
-	 *
-	 * @inheritdoc
-	 * @codeCoverageIgnore
-	 */
-	public function clear()
-	{
-		# does nothing
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getIterator()
-	{
-		# does nothing
-	}
-
 	/**
 	 * Returns a reusable cURL connection.
 	 *

tests/CalendarTest.php

@@ -20,7 +20,7 @@ class CalendarTest extends \PHPUnit_Framework_TestCase
 
 	static public function setupBeforeClass()
 	{
-		$repository = new Repository(create_provider_collection());
+		$repository = new Repository(create_provider());
 		self::$calendar = $repository->locales['fr']->calendars['gregorian'];
 	}
 

tests/RepositoryTest.php

@@ -21,7 +21,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
 	 */
 	public function test_properties_instanceof($property, $expected)
 	{
-		$repository = new Repository(create_provider_collection());
+		$repository = new Repository(create_provider());
 		$instance = $repository->$property;
 		$this->assertInstanceOf($expected, $instance);
 		$this->assertSame($instance, $repository->$property);

tests/bootstrap.php

@@ -11,6 +11,11 @@
 
 namespace ICanBoogie\CLDR;
 
+use ICanBoogie\Storage\FileStorage;
+use ICanBoogie\Storage\RunTimeStorage;
+use ICanBoogie\Storage\Storage;
+use ICanBoogie\Storage\StorageCollection;
+
 $autoload = require __DIR__ . '/../vendor/autoload.php';
 $autoload->addPsr4(__NAMESPACE__ . '\\', __DIR__);
 
@@ -19,16 +24,93 @@
 	mkdir(__DIR__ . '/repository');
 }
 
+class ProviderCollection extends StorageCollection implements Provider
+{
+	/**
+	 * @inheritdoc
+	 */
+	public function provide($path)
+	{
+		return $this->retrieve($path);
+	}
+}
+
+class WebStorage implements Storage
+{
+	private $provider;
+
+	public function __construct(WebProvider $provider)
+	{
+		$this->provider = $provider;
+	}
+
+	/**
+	 * Checks if a key exists in a storage.
+	 *
+	 * @param $key
+	 *
+	 * @return bool `true` if the key exists, `false` otherwise.
+	 */
+	public function exists($key)
+	{
+		// TODO: Implement exists() method.
+	}
+
+	/**
+	 * Retrieves a value.
+	 *
+	 * @param string $key The key of the value.
+	 *
+	 * @return mixed|null The value associated with the key, or `null` if the key doesn't exists.
+	 */
+	public function retrieve($key)
+	{
+		return $this->provider->provide($key);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getIterator()
+	{
+		// TODO: Implement getIterator() method.
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function store($key, $value, $ttl = null)
+	{
+		// TODO: Implement store() method.
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function eliminate($key)
+	{
+		// TODO: Implement eliminate() method.
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function clear()
+	{
+		// TODO: Implement clear() method.
+	}
+}
+
 /**
  * @return Provider
  */
-function create_provider_collection()
+function create_provider()
 {
 	return new ProviderCollection([
 
-		new RunTimeProvider,
-		new FileProvider(__DIR__ . '/repository'),
-		new WebProvider
+		new RunTimeStorage,
+		new FileStorage(__DIR__ . '/repository'),
+		new WebStorage(new WebProvider)
 
 	]);
 }
@@ -42,7 +124,7 @@ function get_repository()
 
 	if (!$repository)
 	{
-		$repository = new Repository(create_provider_collection());
+		$repository = new Repository(create_provider());
 	}
 
 	return $repository;