Merge pull request #39 from lexik/update_2.7

Update 2.7

Author: Cédric Girard

.travis.yml

@@ -7,9 +7,7 @@ php:
   - 5.6
 
 env:
-  - SYMFONY_VERSION=2.3.* DOCTRINE_ORM_VERSION=2.2.* DOCTRINE_BUNDLE_VERSION=1.2.*
-  - SYMFONY_VERSION=2.6.* DOCTRINE_ORM_VERSION=2.4.* DOCTRINE_BUNDLE_VERSION=1.4.*
-  - SYMFONY_VERSION=2.7.* DOCTRINE_ORM_VERSION=2.4.* DOCTRINE_BUNDLE_VERSION=1.5.*
+  - SYMFONY_VERSION=2.7.* DOCTRINE_ORM_VERSION=2.4.* DOCTRINE_BUNDLE_VERSION=1.4.*
 
 before_script:
   - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update

Adapter/DoctrineCurrencyAdapter.php

@@ -3,7 +3,6 @@
 namespace Lexik\Bundle\CurrencyBundle\Adapter;
 
 use Doctrine\ORM\EntityManager;
-use Exception;
 
 /**
  * @author Yoann Aparici <y.aparici@lexik.fr>
@@ -47,14 +46,21 @@ public function setManager(EntityManager $manager)
         $this->manager = $manager;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function offsetExists($index)
     {
         if (!$this->isInitialized()) {
             $this->initialize();
         }
+
         return parent::offsetExists($index);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function offsetGet($index)
     {
         if (!$this->isInitialized()) {
@@ -72,10 +78,13 @@ private function isInitialized()
         return $this->initialized;
     }
 
+    /**
+     * @throws Exception
+     */
     private function initialize()
     {
         if (!isset($this->manager)) {
-            throw new Exception('No ObjectManager set');
+            throw new \RuntimeException('No ObjectManager set on DoctrineCurrencyAdapter.');
         }
 
         $currencies = $this->manager

README.md

@@ -16,7 +16,7 @@ Add the bunde to your `composer.json` file:
 ```javascript
 require: {
     // ...
-    "lexik/currency-bundle": "1.1.*"
+    "lexik/currency-bundle": "~2.0"
     // ...
 }
 ```

Resources/config/adapters.xml

@@ -29,35 +29,23 @@
         <!-- Adapters -->
         <service id="lexik_currency.abstract_adapter" class="%lexik_currency.abstract_adapter.class%" abstract="true" />
 
-        <service id="lexik_currency.doctrine_adapter" 
-                 class="%lexik_currency.doctrine_adapter.class%"  
-                 parent="lexik_currency.abstract_adapter"
-                 factory-service="lexik_currency.adapter_factory"
-                 factory-method="createDoctrineAdapter"
-        >
+        <service id="lexik_currency.doctrine_adapter" class="%lexik_currency.doctrine_adapter.class%" parent="lexik_currency.abstract_adapter">
+            <factory service="lexik_currency.adapter_factory" method="createDoctrineAdapter" />
             <argument>%lexik_currency.doctrine_adapter.class%</argument>
             <argument>%lexik_currency.doctrine.orm.entity_manager%</argument>
             <tag name="lexik_currency.adapter" alias="doctrine_currency_adapter" />
         </service>
 
-        <service id="lexik_currency.ecb_adapter" 
-                 class="%lexik_currency.ecb_adapter.class%" 
-                 parent="lexik_currency.abstract_adapter"
-                 factory-service="lexik_currency.adapter_factory"
-                 factory-method="createEcbAdapter"
-        >
+        <service id="lexik_currency.ecb_adapter" class="%lexik_currency.ecb_adapter.class%" parent="lexik_currency.abstract_adapter">
+            <factory service="lexik_currency.adapter_factory" method="createEcbAdapter" />
             <call method="setEcbUrl">
                 <argument>%lexik_currency.ecb_url%</argument>
             </call>
             <tag name="lexik_currency.adapter" alias="ecb_currency_adapter" />
         </service>
 
-        <service id="lexik_currency.oer_adapter"
-                 class="%lexik_currency.oer_adapter.class%"
-                 parent="lexik_currency.abstract_adapter"
-                 factory-service="lexik_currency.adapter_factory"
-                 factory-method="createOerAdapter"
-        >
+        <service id="lexik_currency.oer_adapter" class="%lexik_currency.oer_adapter.class%" parent="lexik_currency.abstract_adapter">
+            <factory service="lexik_currency.adapter_factory" method="createOerAdapter" />
             <call method="setOerUrl">
                 <argument>%lexik_currency.oer_url%</argument>
             </call>
@@ -68,4 +56,4 @@
         </service>
     </services>
 
-</container>
+</container>

Tests/Unit/Adapter/AdapterFactoryTest.php

@@ -40,6 +40,9 @@ public function testCreateDoctrineAdapter()
         $this->assertInstanceOf('Lexik\Bundle\CurrencyBundle\Adapter\DoctrineCurrencyAdapter', $adapter);
         $this->assertEquals('USD', $adapter->getDefaultCurrency());
         $this->assertEquals(array('EUR'), $adapter->getManagedCurrencies());
+        $this->assertEquals(0, count($adapter));
+
+        $adapter['USD']; // force initialization
         $this->assertEquals(2, count($adapter));
     }
 }

composer.json

@@ -17,10 +17,9 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "~2.3"
+        "symfony/framework-bundle": "~2.7"
     },
     "autoload": {
-        "psr-0": { "Lexik\\Bundle\\CurrencyBundle": "" }
-    },
-    "target-dir": "Lexik/Bundle/CurrencyBundle"
+        "psr-4": { "Lexik\\Bundle\\CurrencyBundle\\": "" }
+    }
 }