Zend\Validator\Barcode cleanup

- s/AdapterInterface/Adapter/g
dynamicguy · Jul 6, 2010 · 718443a · 718443a
1 parent 98933fd
commit 718443a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/...nd/Validator/Barcode/AdapterInterface.php → library/Zend/Validator/Barcode/Adapter.php b/...nd/Validator/Barcode/AdapterInterface.php → library/Zend/Validator/Barcode/Adapter.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface AdapterInterface
+interface Adapter
 {
     /**
      * Checks the length of a barcode
@@ -67,7 +67,7 @@ public function getCheck();
      * Sets the checksum validation
      *
      * @param  boolean $check
-     * @return Zend_Validate_Barcode_Adapter Provides fluid interface
+     * @return Zend\Validate\Barcode\Adapter Provides fluid interface
      */
     public function setCheck($check);
 }
diff --git a/library/Zend/Validator/Barcode/AdapterAbstract.php b/library/Zend/Validator/Barcode/AdapterAbstract.php
@@ -25,14 +25,13 @@
 namespace Zend\Validator\Barcode;
 
 /**
- * @uses       \Zend\Validator\Barcode\AdapterInterface
+ * @uses       \Zend\Validator\Barcode\Adapter
  * @category   Zend
  * @package    Zend_Validate
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class AdapterAbstract
-    implements AdapterInterface
+abstract class AdapterAbstract implements Adapter
 {
     /**
      * Allowed barcode lengths

diff --git a/library/Zend/Validator/Barcode/Barcode.php b/library/Zend/Validator/Barcode/Barcode.php
@@ -130,18 +130,13 @@ public function getAdapter()
     public function setAdapter($adapter, $options = null)
     {
         $adapter = ucfirst(strtolower($adapter));
-//        if (\Zend\Loader::isReadable('Zend/Validate/Barcode/' . $adapter. '.php')) {
-            $adapter = '\\Zend\\Validator\\Barcode\\' . $adapter;
-//        }
-//
-//        if (!class_exists($adapter)) {
-            \Zend\Loader::loadClass($adapter);
-//        }
+        $adapter = '\\Zend\\Validator\\Barcode\\' . $adapter;
+        \Zend\Loader::loadClass($adapter);
 
         $this->_adapter = new $adapter($options);
-        if (!$this->_adapter instanceof AdapterInterface) {
+        if (!$this->_adapter instanceof Adapter) {
             throw new Validator\Exception(
-                "Adapter " . $adapter . " does not implement Zend\\Validate\\Barcode\\AdapterInterface"
+                "Adapter " . $adapter . " does not implement Zend\\Validate\\Barcode\\Adapter"
             );
         }
 

diff --git a/working/PHPNamespacer-MappedClasses.xml b/working/PHPNamespacer-MappedClasses.xml
@@ -16163,10 +16163,10 @@
    <mappedClass>
       <originalRelativeFilePath>Zend/Validate/Barcode/AdapterInterface.php</originalRelativeFilePath>
       <originalClassName>Zend_Validate_Barcode_AdapterInterface</originalClassName>
-      <newRelativeFilePath>Zend/Validator/Barcode/AdapterInterface.php</newRelativeFilePath>
+      <newRelativeFilePath>Zend/Validator/Barcode/Adapter.php</newRelativeFilePath>
       <newNamespace>Zend\Validator\Barcode</newNamespace>
-      <newClassName>AdapterInterface</newClassName>
-      <newFullyQualifiedName>Zend\Validator\Barcode\AdapterInterface</newFullyQualifiedName>
+      <newClassName>Adapter</newClassName>
+      <newFullyQualifiedName>Zend\Validator\Barcode\Adapter</newFullyQualifiedName>
    </mappedClass>
    <mappedClass>
       <originalRelativeFilePath>Zend/Validate/Barcode/Code25.php</originalRelativeFilePath>