Merge remote-tracking branch 'remotes/dev/release'

oroinc · Jan 30, 2014 · 0275c27 · 0275c27
2 parents e705379 + 6f64136
commit 0275c27
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Oro/Bundle/EntityConfigBundle/Form/EventListener/ConfigSubscriber.php b/src/Oro/Bundle/EntityConfigBundle/Form/EventListener/ConfigSubscriber.php
@@ -2,7 +2,7 @@
 
 namespace Oro\Bundle\EntityConfigBundle\Form\EventListener;
 
-use Oro\Bundle\TranslationBundle\Translation\OrmTranslationMetadataCache;
+use Oro\Bundle\TranslationBundle\Translation\DynamicTranslationMetadataCache;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 use Symfony\Component\Form\FormEvent;
@@ -39,19 +39,19 @@ class ConfigSubscriber implements EventSubscriberInterface
     protected $em;
 
     /**
-     * @var OrmTranslationMetadataCache
+     * @var DynamicTranslationMetadataCache
      */
     protected $dbTranslationMetadataCache;
 
     /**
      * @param ConfigManager               $configManager
      * @param Translator                  $translator
-     * @param OrmTranslationMetadataCache $dbTranslationMetadataCache
+     * @param DynamicTranslationMetadataCache $dbTranslationMetadataCache
      */
     public function __construct(
         ConfigManager $configManager,
         Translator $translator,
-        OrmTranslationMetadataCache $dbTranslationMetadataCache
+        DynamicTranslationMetadataCache $dbTranslationMetadataCache
     ) {
         $this->configManager              = $configManager;
         $this->translator                 = $translator;

diff --git a/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigType.php b/src/Oro/Bundle/EntityConfigBundle/Form/Type/ConfigType.php
@@ -14,7 +14,7 @@
 use Oro\Bundle\EntityConfigBundle\Entity\OptionSet;
 use Oro\Bundle\EntityConfigBundle\Form\EventListener\ConfigSubscriber;
 use Oro\Bundle\EntityConfigBundle\Provider\PropertyConfigContainer;
-use Oro\Bundle\TranslationBundle\Translation\OrmTranslationMetadataCache;
+use Oro\Bundle\TranslationBundle\Translation\DynamicTranslationMetadataCache;
 
 class ConfigType extends AbstractType
 {
@@ -29,19 +29,19 @@ class ConfigType extends AbstractType
     protected $translator;
 
     /**
-     * @var OrmTranslationMetadataCache
+     * @var DynamicTranslationMetadataCache
      */
     protected $dbTranslationMetadataCache;
 
     /**
      * @param ConfigManager $configManager
      * @param Translator    $translator
-     * @param OrmTranslationMetadataCache $dbTranslationMetadataCache
+     * @param DynamicTranslationMetadataCache $dbTranslationMetadataCache
      */
     public function __construct(
         ConfigManager $configManager,
         Translator $translator,
-        OrmTranslationMetadataCache $dbTranslationMetadataCache
+        DynamicTranslationMetadataCache $dbTranslationMetadataCache
     ) {
         $this->configManager              = $configManager;
         $this->translator                 = $translator;