Merge branch 'MAGETWO-40818-Transactional-Email-Templates' of https:/…

…/github.corp.ebay.com/magento-api/magento2ce into MAGETWO-40818-Transactional-Email-Templates
magento · Aug 6, 2015 · aa4646f · aa4646f
2 parents 5a22902 + 88434b7
commit aa4646f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
@@ -105,21 +105,22 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
     private $filterFactory;
 
     /**
-     * Initialize dependencies
+     * Initialize dependencies.
      *
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Template\Config $emailConfig
-     * @param \Magento\Email\Model\TemplateFactory $templateFactory
+     * @param TemplateFactory $templateFactory
+     * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\UrlInterface $urlModel
-     * @param \Magento\Email\Model\Template\FilterFactory $filterFactory
-     * @param array $data optional generic object data
+     * @param Template\FilterFactory $filterFactory
+     * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */

diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
@@ -5,6 +5,7 @@
  */
 
 namespace Magento\Newsletter\Test\Unit\Model;
+
 use Magento\Framework\App\TemplateTypesInterface;
 
 /**