Zend\Currency cleanup

- s/CurrencyServiceInterface/CurrencyService/ - Updated code and tests to reflect the above
taat · Jul 7, 2010 · bc4d4ad · bc4d4ad
1 parent cbe66cc
commit bc4d4ad
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/library/Zend/Currency/Currency.php b/library/Zend/Currency/Currency.php
@@ -752,7 +752,7 @@ protected function _exchangeCurrency($value, $currency)
         $rate = 1;
         if ($currency !== $this->getShortName()) {
             $service = $this->getService();
-            if (!($service instanceof CurrencyServiceInterface)) {
+            if (!($service instanceof CurrencyService)) {
                 throw new Exception('No exchange service applied');
             }
 
@@ -766,7 +766,7 @@ protected function _exchangeCurrency($value, $currency)
     /**
      * Returns the set service class
      *
-     * @return Zend\Currency\CurrencyServiceInterface
+     * @return Zend\Currency\CurrencyService
      */
     public function getService()
     {
@@ -776,7 +776,7 @@ public function getService()
     /**
      * Sets a new exchange service
      *
-     * @param string|Zend\Currency\CurrencyServiceInterface $service Service class
+     * @param string|Zend\Currency\CurrencyService $service Service class
      * @return Zend\Currency\Currency
      */
     public function setService($service)
@@ -785,8 +785,8 @@ public function setService($service)
             $service = new $service;
         }
 
-        if (!($service instanceof CurrencyServiceInterface)) {
-            throw new Exception('A currency service must implement Zend\Currency\CurrencyServiceInterface');
+        if (!($service instanceof CurrencyService)) {
+            throw new Exception('A currency service must implement Zend\Currency\CurrencyService');
         }
 
         $this->_options['service'] = $service;

diff --git a/...end/Currency/CurrencyServiceInterface.php → library/Zend/Currency/CurrencyService.php b/...end/Currency/CurrencyServiceInterface.php → library/Zend/Currency/CurrencyService.php
@@ -32,7 +32,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 CurrencyServiceInterface
+interface CurrencyService
 {
     /**
      * Returns the actual exchange rate

diff --git a/tests/Zend/Currency/CurrencyTest.php b/tests/Zend/Currency/CurrencyTest.php
@@ -777,10 +777,10 @@ public function testExchangeValues()
 
         $this->assertEquals(null, $currency->getService());
         $currency->setService(new ExchangeTest());
-        $this->assertTrue($currency->getService() instanceof Currency\CurrencyServiceInterface);
+        $this->assertTrue($currency->getService() instanceof Currency\CurrencyService);
 
         $currency->setService('ZendTest\Currency\ExchangeTest');
-        $this->assertTrue($currency->getService() instanceof Currency\CurrencyServiceInterface);
+        $this->assertTrue($currency->getService() instanceof Currency\CurrencyService);
     }
 
     /**
@@ -811,7 +811,7 @@ public function testSetValueWithoutLocale()
 
         $this->assertEquals(null, $currency->getService());
         $currency->setService(new ExchangeTest());
-        $this->assertTrue($currency->getService() instanceof Currency\CurrencyServiceInterface);
+        $this->assertTrue($currency->getService() instanceof Currency\CurrencyService);
 
         $currency->setValue(100, 'USD');
         $this->assertEquals(50, $currency->getValue());

diff --git a/tests/Zend/Currency/ExchangeTest.php b/tests/Zend/Currency/ExchangeTest.php
@@ -33,7 +33,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Currency
  */
-class ExchangeTest implements \Zend\Currency\CurrencyServiceInterface
+class ExchangeTest implements \Zend\Currency\CurrencyService
 {
     /**
      * Test method for exchange rate
@@ -52,4 +52,4 @@ public function getRate($from, $to)
             return 1;
         }
     }
-}
+}
diff --git a/working/PHPNamespacer-MappedClasses.xml b/working/PHPNamespacer-MappedClasses.xml
@@ -1979,10 +1979,10 @@
    <mappedClass>
       <originalRelativeFilePath>Zend/Currency/CurrencyInterface.php</originalRelativeFilePath>
       <originalClassName>Zend_Currency_CurrencyInterface</originalClassName>
-      <newRelativeFilePath>Zend/Currency/CurrencyServiceInterface.php</newRelativeFilePath>
+      <newRelativeFilePath>Zend/Currency/CurrencyService.php</newRelativeFilePath>
       <newNamespace>Zend\Currency</newNamespace>
-      <newClassName>CurrencyServiceInterface</newClassName>
-      <newFullyQualifiedName>Zend\Currency\CurrencyServiceInterface</newFullyQualifiedName>
+      <newClassName>CurrencyService</newClassName>
+      <newFullyQualifiedName>Zend\Currency\CurrencyService</newFullyQualifiedName>
    </mappedClass>
    <mappedClass>
       <originalRelativeFilePath>Zend/Currency/Exception.php</originalRelativeFilePath>