refactor Storage classes

Author: robocoder

lib/WebDriver/ClassLoader.php

@@ -401,7 +401,7 @@ public function touch()
      */
     public function localStorage()
     {
-        return Storage::factory('local', $this->url . '/local_storage', $this->w3c);
+        return new Storage\Local($this->url . '/local_storage', $this->w3c);
     }
 
     /**
@@ -412,7 +412,7 @@ public function localStorage()
      */
     public function sessionStorage()
     {
-        return Storage::factory('session', $this->url . '/session_storage', $this->w3c);
+        return new Storage\Session($this->url . '/session_storage', $this->w3c);
     }
 
     /**

lib/WebDriver/Session.php

@@ -20,20 +20,21 @@
  * @author Anthon Pang <apang@softwaredevelopment.ca>
  */
 
-namespace WebDriver;
+namespace WebDriver\Storage;
 
+use WebDriver\AbstractWebDriver;
 use WebDriver\Exception as WebDriverException;
 
 /**
- * WebDriver\Storage class
+ * WebDriver\AbstractStorage class
  *
  * @package WebDriver
  *
  * @method mixed getKey($key) Get key/value pair.
  * @method void deleteKey($key) Delete a specific key.
  * @method integer size() Get the number of items in the storage.
  */
-abstract class Storage extends AbstractWebDriver
+abstract class AbstractStorage extends AbstractWebDriver
 {
     /**
      * {@inheritdoc}
@@ -71,7 +72,7 @@ public function get()
     /**
      * Set specific key/value pair
      *
-     * @return \WebDriver\Storage
+     * @return \WebDriver\AbstractStorage
      *
      * @throw \WebDriver\Exception\UnexpectedParameters if unexpected parameters
      */
@@ -102,7 +103,7 @@ public function set()
     /**
      * Delete storage or a specific key
      *
-     * @return \WebDriver\Storage
+     * @return \WebDriver\AbstractStorage
      *
      * @throw \WebDriver\Exception\UnexpectedParameters if unexpected parameters
      */
@@ -124,28 +125,4 @@ public function delete()
 
         throw WebDriverException::factory(WebDriverException::UNEXPECTED_PARAMETERS);
     }
-
-    /**
-     * Factory method to create Storage objects
-     *
-     * @param string  $type 'local' or 'session' storage
-     * @param string  $url  URL
-     * @param boolean $w3c  Is W3C?
-     *
-     * @return \WebDriver\Storage
-     */
-    public static function factory($type, $url, $w3c = false)
-    {
-        // dynamically define custom storage classes
-        $className = ucfirst(strtolower($type));
-        $namespacedClassName = __CLASS__ . '\\' . $className;
-
-        if (! class_exists($namespacedClassName, false)) {
-            eval(
-                'namespace ' . __CLASS__ . '; final class ' . $className . ' extends \\' . __CLASS__ . '{}'
-            );
-        }
-
-        return new $namespacedClassName($url, $w3c);
-    }
 }

lib/WebDriver/Storage.php lib/WebDriver/Storage/AbstractStorage.phplib/WebDriver/Storage.php renamed to lib/WebDriver/Storage/AbstractStorage.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * Copyright 2011-2017 Anthon Pang. All Rights Reserved.
+ * Copyright 2021-2021 Anthon Pang. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,28 +20,13 @@
  * @author Anthon Pang <apang@softwaredevelopment.ca>
  */
 
-namespace Test\WebDriver;
-
-use WebDriver\Storage;
+namespace WebDriver\Storage;
 
 /**
- * Test WebDriver\Storage class
+ * WebDriver\Storage\Local class
  *
  * @package WebDriver
- *
- * @group Unit
  */
-class StorageTest extends \PHPUnit_Framework_TestCase
+final class Local extends AbstractStorage
 {
-    /**
-     * test factory()
-     */
-    public function testFactory()
-    {
-        $out = Storage::factory('Local', '/');
-        $this->assertTrue($out instanceof Storage\Local);
-
-        $out = Storage::factory('sEsSiOn', '/');
-        $this->assertTrue($out instanceof Storage\Session);
-    }
 }

test/Test/WebDriver/StorageTest.php lib/WebDriver/Storage/Local.phptest/Test/WebDriver/StorageTest.php renamed to lib/WebDriver/Storage/Local.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Copyright 2021-2021 Anthon Pang. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @package WebDriver
+ *
+ * @author Anthon Pang <apang@softwaredevelopment.ca>
+ */
+
+namespace WebDriver\Storage;
+
+/**
+ * WebDriver\Storage\Session class
+ *
+ * @package WebDriver
+ */
+final class Session extends AbstractStorage
+{
+}