Merge pull request #37 from poschi/master

Removed direct/hard dependency to database

Author: Cédric Girard

Diff for: Adapter/AbstractCurrencyAdapter.php

@@ -19,6 +19,11 @@ abstract class AbstractCurrencyAdapter extends \ArrayIterator
      */
     protected $managedCurrencies = array();
 
+    /**
+     * @var string
+     */
+    protected $currencyClass;
+
     /**
      * Set default currency
      *
@@ -75,7 +80,7 @@ public function setCurrencyClass($currencyClass)
      * @param mixed $index
      * @param Currency $newval
      */
-    public function offsetSet ($index, $newval)
+    public function offsetSet($index, $newval)
     {
         if (!$newval instanceof $this->currencyClass) {
             throw new \InvalidArgumentException(sprintf('$newval must be an instance of Currency, instance of "%s" given', get_class($newval)));

Diff for: Adapter/AdapterFactory.php

@@ -69,18 +69,10 @@ public function createDoctrineAdapter($adapterClass = null, $entityManagerName =
         if (null == $adapterClass) {
             $adapterClass = 'Lexik\Bundle\CurrencyBundle\Adapter\DoctrineCurrencyAdapter';
         }
-
         $adapter = $this->create($adapterClass);
 
         $em = $this->doctrine->getManager($entityManagerName);
-
-        $currencies = $em
-            ->getRepository($this->currencyClass)
-            ->findAll();
-
-        foreach ($currencies as $currency) {
-            $adapter[$currency->getCode()] = $currency;
-        }
+        $adapter->setManager($em);
 
         return $adapter;
     }

Diff for: Adapter/DoctrineCurrencyAdapter.php

@@ -2,12 +2,25 @@
 
 namespace Lexik\Bundle\CurrencyBundle\Adapter;
 
+use Doctrine\ORM\EntityManager;
+use Exception;
+
 /**
  * @author Yoann Aparici <[email protected]>
  * @author Cédric Girard <[email protected]>
  */
 class DoctrineCurrencyAdapter extends AbstractCurrencyAdapter
 {
+    /**
+     * @var ObjectManager
+     */
+    private $manager;
+
+    /**
+     * @var bool
+     */
+    private $initialized = false;
+
     /**
      * {@inheritdoc}
      */
@@ -25,4 +38,52 @@ public function getIdentifier()
     {
         return 'doctrine';
     }
+
+    /**
+     * @param EntityManager $manager
+     */
+    public function setManager(EntityManager $manager)
+    {
+        $this->manager = $manager;
+    }
+
+    public function offsetExists($index)
+    {
+        if (!$this->isInitialized()) {
+            $this->initialize();
+        }
+        return parent::offsetExists($index);
+    }
+
+    public function offsetGet($index)
+    {
+        if (!$this->isInitialized()) {
+            $this->initialize();
+        }
+
+        return parent::offsetGet($index);
+    }
+
+    /**
+     * @return bool
+     */
+    private function isInitialized()
+    {
+        return $this->initialized;
+    }
+
+    private function initialize()
+    {
+        if (!isset($this->manager)) {
+            throw new Exception('No ObjectManager set');
+        }
+
+        $currencies = $this->manager
+            ->getRepository($this->currencyClass)
+            ->findAll();
+
+        foreach ($currencies as $currency) {
+            $this[$currency->getCode()] = $currency;
+        }
+    }
 }