fixed some insight violations

Author: Cédric Girard

Adapter/DoctrineCurrencyAdapter.php

@@ -2,8 +2,6 @@
 
 namespace Lexik\Bundle\CurrencyBundle\Adapter;
 
-use Doctrine\ORM\EntityManager;
-
 /**
  * @author Yoann Aparici <[email protected]>
  * @author Cédric Girard <[email protected]>
@@ -15,7 +13,7 @@ class DoctrineCurrencyAdapter extends AbstractCurrencyAdapter
      */
     public function attachAll()
     {
-
+        // nothing here
     }
 
     /**

Adapter/EcbCurrencyAdapter.php

@@ -2,8 +2,6 @@
 
 namespace Lexik\Bundle\CurrencyBundle\Adapter;
 
-use Symfony\Component\DomCrawler\Crawler;
-
 /**
  * @author Cédric Girard <[email protected]>
  * @author Yoann Aparici <[email protected]>
@@ -40,7 +38,6 @@ public function attachAll()
         $this[$euro->getCode()] = $euro;
 
         // Get other currencies
-        // @todo timeout + try catch
         $xml = @simplexml_load_file($this->ecbUrl);
 
         if ($xml instanceof \SimpleXMLElement) {

Adapter/OerCurrencyAdapter.php

@@ -3,7 +3,6 @@
 namespace Lexik\Bundle\CurrencyBundle\Adapter;
 
 use Lexik\Bundle\CurrencyBundle\Exception\CurrencyNotFoundException;
-use Symfony\Component\DomCrawler\Crawler;
 
 /**
  * Oer adapter, http://openexchangerates.org
@@ -35,7 +34,7 @@ public function setOerUrl($url)
 
 	/**
 	 * Sets the app-id
-	 * 
+	 *
 	 * @param string $appId
 	 */
 	public function setOerAppId($appId)

Command/ImportCurrencyCommand.php

@@ -2,8 +2,6 @@
 
 namespace Lexik\Bundle\CurrencyBundle\Command;
 
-use Lexik\Bundle\CurrencyBundle\Entity\Currency;
-
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

DependencyInjection/Compiler/AdapterPass.php

@@ -4,7 +4,6 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**

Tests/Unit/Twig/Extension/CurrencyExtensionTest.php

@@ -28,28 +28,29 @@ public function setUp()
 
         $factory = new AdapterFactory($this->doctrine, 'EUR', array('EUR', 'USD'), self::CURRENCY_ENTITY);
 
+        $translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
+        $translator->expects($this->any())
+            ->method('getLocale')
+            ->will($this->returnValue('fr'));
+
         $converter = new Converter($factory->createDoctrineAdapter());
 
         $this->container = new Container();
         $this->container->set('lexik_currency.converter', $converter);
-
-        $this->translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
-        $this->translator->expects($this->any())
-            ->method('getLocale')
-            ->will($this->returnValue('fr'));
+        $this->container->set('translator', $translator);
     }
 
     public function testConvert()
     {
-        $extension = new CurrencyExtension($this->translator, $this->container);
+        $extension = new CurrencyExtension($this->container);
 
         $this->assertEquals(11.27, $extension->convert(8.666, 'USD'));
         $this->assertEquals(8.67, $extension->convert(8.666, 'EUR'));
     }
 
     public function testFormat()
     {
-        $extension = new CurrencyExtension($this->translator, $this->container);
+        $extension = new CurrencyExtension($this->container);
 
         $this->assertEquals('8,67 €', $extension->format(8.666));
         $this->assertEquals('8,67 €', $extension->format(8.666, 'EUR'));
@@ -62,7 +63,7 @@ public function testFormat()
 
     public function testConvertAndFormat()
     {
-        $extension = new CurrencyExtension($this->translator, $this->container);
+        $extension = new CurrencyExtension($this->container);
 
         $this->assertEquals('11,27 $', $extension->convertAndFormat(8.666, 'USD'));
         $this->assertEquals('11,27 $', $extension->convertAndFormat(8.666, 'USD', false));

Twig/Extension/CurrencyExtension.php

@@ -3,8 +3,6 @@
 namespace Lexik\Bundle\CurrencyBundle\Twig\Extension;
 
 use Symfony\Component\DependencyInjection\Container;
-use Lexik\Bundle\CurrencyBundle\Converter\Converter;
-use Symfony\Component\Translation\TranslatorInterface;
 
 
 /**
@@ -15,11 +13,6 @@
  */
 class CurrencyExtension extends \Twig_Extension
 {
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
     /**
      * @var Container
      */
@@ -28,12 +21,10 @@ class CurrencyExtension extends \Twig_Extension
     /**
      * Construct.
      *
-     * @param TranslatorInterface $translator
-     * @param Container           $container  We need the entire container to lazy load the Converter
+     * @param Container $container  We need the entire container to lazy load the Converter
      */
-    public function __construct(TranslatorInterface $translator, Container $container)
+    public function __construct(Container $container)
     {
-        $this->translator = $translator;
         $this->container = $container;
     }
 
@@ -52,7 +43,7 @@ public function getFilters()
     /**
      * Return Currency Converter
      *
-     * @return Converter
+     * @return \Lexik\Bundle\CurrencyBundle\Converter\Converter
      */
     public function getConverter()
     {
@@ -88,7 +79,9 @@ public function format($value, $valueCurrency = null, $decimal = true, $symbol =
             $valueCurrency = $this->getConverter()->getDefaultCurrency();
         }
 
-        $formatter = new \NumberFormatter($this->translator->getLocale(), $symbol ? \NumberFormatter::CURRENCY : \NumberFormatter::PATTERN_DECIMAL);
+        $locale = $this->container->get('translator')->getLocale();
+
+        $formatter = new \NumberFormatter($locale, $symbol ? \NumberFormatter::CURRENCY : \NumberFormatter::PATTERN_DECIMAL);
         $value = $formatter->formatCurrency($value, $valueCurrency);
 
         if (!$decimal) {