Merge branch 'hotfix/ZF2-11/tool_framework_client_storage' of https:/…

…/github.com/sasezaki/zf2 into hotfix/zf2-11

library/Zend/Tool/Framework/Client/Storage.php

@@ -25,7 +25,6 @@
 namespace Zend\Tool\Framework\Client;
 
 /**
- * @uses       \Zend\Loader
  * @uses       \Zend\Tool\Framework\Client\Storage\Adapter
  * @category   Zend
  * @package    Zend_Tool
@@ -49,11 +48,6 @@ public function __construct($options = array())
 
     public function setAdapter($adapter)
     {
-        if (is_string($adapter)) {
-            $storageAdapterClass = 'Zend\Tool\Framework\Client\Storage\\' . ucfirst($adapter);
-            \Zend\Loader::loadClass($storageAdapterClass);
-            $adapter = new $storageAdapterClass();
-        }
         $this->_adapter = $adapter;
     }
 

library/Zend/Tool/Framework/Client/Storage/Directory.php

@@ -40,7 +40,7 @@ class Directory implements Adapter
     public function __construct($directoryPath)
     {
         if (!file_exists($directoryPath)) {
-            throw new \Zend\Tool\Framework\Client\Exception(__CLASS__ . ': the supplied directory does not exist');
+            throw new Exception\UnexpectedValueException(__CLASS__ . ': the supplied directory does not exist');
         }
         $this->_directoryPath = $directoryPath;
     }

library/Zend/Tool/Framework/Client/Storage/Exception.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Tool
+ * @subpackage Framework
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+namespace Zend\Tool\Framework\Client\Storage;
+
+/**
+ * @category   Zend
+ * @package    Zend_Tool
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Exception
+{
+}

library/Zend/Tool/Framework/Client/Storage/Exception/UnexpectedValueException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\Tool\Framework\Client\Storage\Exception;
+
+class UnexpectedValueException
+    extends \UnexpectedValueException
+    implements \Zend\Tool\Framework\Client\Storage\Exception
+{
+}

tests/Zend/Tool/Framework/Client/Storage/DirectoryTest.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Tool
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+namespace ZendTest\Tool\Framework\Client;
+use Zend\Tool\Framework\Client\Storage\Directory,
+    Zend\Tool\Framework\Client\Storage\Exception\UnexpectedValueException;
+
+/**
+ * @category   Zend
+ * @package    Zend_Tool
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ *
+ * @group Zend_Tool
+ * @group Zend_Tool_Framework
+ * @group Zend_Tool_Framework_Client
+ * @group Zend_Tool_Framework_Client_Storage
+ */
+class DirectoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testNonExistsDirectory()
+    {
+        try {
+            $directory = new Directory(__DIR__.DIRECTORY_SEPARATOR.'nonexists');
+            $this->fail('RuntimeException was expected but not thrown');
+        } catch (UnexpectedValueException $ue) {
+        } 
+    }
+}

tests/Zend/Tool/Framework/Client/StorageTest.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Tool
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+namespace ZendTest\Tool\Framework\Client;
+use Zend\Tool\Framework\Client\Storage;
+
+/**
+ * @category   Zend
+ * @package    Zend_Tool
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ *
+ * @group Zend_Tool
+ * @group Zend_Tool_Framework
+ * @group Zend_Tool_Framework_Client
+ */
+class StorageTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Zend\Tool\Framework\Client\Storage
+     */
+    protected $storage = null;
+
+    public function setup()
+    {
+        $this->storage = new Storage();
+    }
+
+    public function getStorageDirectory()
+    {
+        return __DIR__.DIRECTORY_SEPARATOR.'_files'. DIRECTORY_SEPARATOR .'storagedirectory';
+    }
+
+    public function testNoAdapterStorageIsNotEnabled()
+    {
+        $this->assertFalse($this->storage->isEnabled());
+    }
+
+    public function testPassingArrayToConstructor()
+    {
+        $directory = new Storage\Directory($this->getStorageDirectory());
+        $storage = new Storage(array('adapter' => $directory));
+        $this->assertTrue($storage->isEnabled());
+    }
+}

tests/Zend/Tool/Framework/Client/_files/storagedirectory/empty

@@ -0,0 +1 @@
+