Merge branch 'develop' into PR

Mykhailo Miroshnikov · Mykhailo Miroshnikov · commit 45a99b00726f · 2015-03-20T18:51:53.000+02:00
diff --git a/app/code/Magento/Bundle/Model/Resource/Indexer/Price.php b/app/code/Magento/Bundle/Model/Resource/Indexer/Price.php
@@ -529,27 +529,6 @@ protected function _prepareBundlePrice($entityIds = null)
         $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED, $entityIds);
         $this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC, $entityIds);
 
-        /**
-         * Add possibility modify prices from external events
-         */
-        $select = $this->_getWriteAdapter()->select()->join(
-            ['wd' => $this->_getWebsiteDateTable()],
-            'i.website_id = wd.website_id',
-            []
-        );
-        $this->_eventManager->dispatch(
-            'prepare_catalog_product_price_index_table',
-            [
-                'index_table' => ['i' => $this->_getBundlePriceTable()],
-                'select' => $select,
-                'entity_id' => 'i.entity_id',
-                'customer_group_id' => 'i.customer_group_id',
-                'website_id' => 'i.website_id',
-                'website_date' => 'wd.website_date',
-                'update_fields' => ['price', 'min_price', 'max_price']
-            ]
-        );
-
         $this->_calculateBundleOptionPrice();
         $this->_applyCustomOption();
 
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
@@ -318,28 +318,6 @@ protected function _prepareFinalPriceData($entityIds = null)
 
         $query = $select->insertFromSelect($this->_getDefaultFinalPriceTable(), [], false);
         $write->query($query);
-
-        /**
-         * Add possibility modify prices from external events
-         */
-        $select = $write->select()->join(
-            ['wd' => $this->_getWebsiteDateTable()],
-            'i.website_id = wd.website_id',
-            []
-        );
-        $this->_eventManager->dispatch(
-            'prepare_catalog_product_price_index_table',
-            [
-                'index_table' => ['i' => $this->_getDefaultFinalPriceTable()],
-                'select' => $select,
-                'entity_id' => 'i.entity_id',
-                'customer_group_id' => 'i.customer_group_id',
-                'website_id' => 'i.website_id',
-                'website_date' => 'wd.website_date',
-                'update_fields' => ['price', 'min_price', 'max_price']
-            ]
-        );
-
         return $this;
     }
 
diff --git a/app/code/Magento/CatalogRule/Model/Observer.php b/app/code/Magento/CatalogRule/Model/Observer.php
@@ -47,11 +47,6 @@ class Observer
      */
     protected $_customerSession;
 
-    /**
-     * @var Price
-     */
-    protected $_productPrice;
-
     /**
      * @var \Magento\CatalogRule\Model\Resource\Rule\CollectionFactory
      */
@@ -86,7 +81,6 @@ class Observer
      * @param Resource\RuleFactory $resourceRuleFactory
      * @param Resource\Rule $resourceRule
      * @param Resource\Rule\CollectionFactory $ruleCollectionFactory
-     * @param Price $productPrice
      * @param StoreManagerInterface $storeManager
      * @param TimezoneInterface $localeDate
      * @param CustomerModelSession $customerSession
@@ -100,7 +94,6 @@ public function __construct(
         Resource\RuleFactory $resourceRuleFactory,
         Resource\Rule $resourceRule,
         Resource\Rule\CollectionFactory $ruleCollectionFactory,
-        Rule\Product\Price $productPrice,
         StoreManagerInterface $storeManager,
         TimezoneInterface $localeDate,
         CustomerModelSession $customerSession,
@@ -111,7 +104,6 @@ public function __construct(
         $this->_resourceRuleFactory = $resourceRuleFactory;
         $this->_resourceRule = $resourceRule;
         $this->_ruleCollectionFactory = $ruleCollectionFactory;
-        $this->_productPrice = $productPrice;
         $this->_storeManager = $storeManager;
         $this->_localeDate = $localeDate;
         $this->_customerSession = $customerSession;
@@ -215,36 +207,6 @@ public function flushPriceCache()
         $this->_rulePrices = [];
     }
 
-    /**
-     * Calculate minimal final price with catalog rule price
-     *
-     * @param EventObserver $observer
-     * @return $this
-     */
-    public function prepareCatalogProductPriceIndexTable(EventObserver $observer)
-    {
-        $select = $observer->getEvent()->getSelect();
-
-        $indexTable = $observer->getEvent()->getIndexTable();
-        $entityId = $observer->getEvent()->getEntityId();
-        $customerGroupId = $observer->getEvent()->getCustomerGroupId();
-        $websiteId = $observer->getEvent()->getWebsiteId();
-        $websiteDate = $observer->getEvent()->getWebsiteDate();
-        $updateFields = $observer->getEvent()->getUpdateFields();
-
-        $this->_productPrice->applyPriceRuleToIndexTable(
-            $select,
-            $indexTable,
-            $entityId,
-            $customerGroupId,
-            $websiteId,
-            $updateFields,
-            $websiteDate
-        );
-
-        return $this;
-    }
-
     /**
      * @param EventObserver $observer
      * @return $this
diff --git a/app/code/Magento/CatalogRule/etc/events.xml b/app/code/Magento/CatalogRule/etc/events.xml
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -2042,9 +2042,7 @@ public function addMessage($message, $index = 'error')
             return $this;
         }
 
-        if (is_string($message)) {
-            $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);
-        }
+        $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);
 
         $messages[$index] = $message;
         $this->setData('messages', $messages);
diff --git a/app/code/Magento/Sales/Controller/Guest/PrintAction.php b/app/code/Magento/Sales/Controller/Guest/PrintAction.php
@@ -6,6 +6,21 @@
  */
 namespace Magento\Sales\Controller\Guest;
 
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
+
 class PrintAction extends \Magento\Sales\Controller\AbstractController\PrintAction
 {
+    /**
+     * @param Context $context
+     * @param OrderLoader $orderLoader
+     * @param PageFactory $resultPageFactory
+     */
+    public function __construct(
+        Context $context,
+        \Magento\Sales\Controller\Guest\OrderLoader $orderLoader,
+        PageFactory $resultPageFactory
+    ) {
+        parent::__construct($context, $orderLoader, $resultPageFactory);
+    }
 }
diff --git a/app/code/Magento/Sales/Controller/Guest/Reorder.php b/app/code/Magento/Sales/Controller/Guest/Reorder.php
@@ -6,6 +6,23 @@
  */
 namespace Magento\Sales\Controller\Guest;
 
+use Magento\Framework\App\Action;
+use Magento\Framework\Controller\Result\RedirectFactory;
+
 class Reorder extends \Magento\Sales\Controller\AbstractController\Reorder
 {
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Sales\Controller\Guest\OrderLoader $orderLoader
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Sales\Controller\Guest\OrderLoader $orderLoader,
+        \Magento\Framework\Registry $registry,
+        RedirectFactory $resultRedirectFactory
+    ) {
+        parent::__construct($context, $orderLoader, $registry, $resultRedirectFactory);
+    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2149,4 +2149,5 @@
     ['loadCollectionAttributes', 'Magento\Eav\Model\Config'],
     ['_isCacheEnabled', 'Magento\Eav\Model\Config'],
     ['_createCustomerAttribute', '\Magento\Customer\Model\Customer'],
+    ['prepareCatalogProductPriceIndexTable', 'Magento\CatalogRule\Model\Observer'],
 ];
diff --git a/lib/internal/Magento/Framework/Message/AbstractMessage.php b/lib/internal/Magento/Framework/Message/AbstractMessage.php
@@ -47,7 +47,7 @@ abstract public function getType();
      */
     public function getText()
     {
-        return $this->text;
+        return (string)$this->text;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
@@ -31,18 +31,18 @@ public function setUp()
      * covers \Magento\Framework\Message\AbstractMessage::setText
      * @dataProvider setTextGetTextProvider
      */
-    public function testSetTextGetText($text)
+    public function testSetTextGetText($text, $resultText)
     {
         $this->model->setText($text);
-        $this->assertEquals($text, $this->model->getText());
+        $this->assertEquals($resultText, $this->model->getText());
     }
 
     /**
      * @return array
      */
     public function setTextGetTextProvider()
     {
-        return [[''], ['some text']];
+        return [['', ''], ['some text', 'some text'], [new \Magento\Framework\Phrase('some text'), 'some text']];
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2042,9 +2042,7 @@ public function addMessage($message, $index = 'error')`
`2042`	`2042`	`return $this;`
`2043`	`2043`	`}`
`2044`	`2044`
`2045`		`- if (is_string($message)) {`
`2046`		`- $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);`
`2047`		`- }`
	`2045`	`+ $message = $this->messageFactory->create(\Magento\Framework\Message\MessageInterface::TYPE_ERROR, $message);`
`2048`	`2046`
`2049`	`2047`	`$messages[$index] = $message;`
`2050`	`2048`	`$this->setData('messages', $messages);`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ abstract public function getType();`
`47`	`47`	`*/`
`48`	`48`	`public function getText()`
`49`	`49`	`{`
`50`		`- return $this->text;`
	`50`	`+ return (string)$this->text;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -31,18 +31,18 @@ public function setUp()`
`31`	`31`	`* covers \Magento\Framework\Message\AbstractMessage::setText`
`32`	`32`	`* @dataProvider setTextGetTextProvider`
`33`	`33`	`*/`
`34`		`- public function testSetTextGetText($text)`
	`34`	`+ public function testSetTextGetText($text, $resultText)`
`35`	`35`	`{`
`36`	`36`	`$this->model->setText($text);`
`37`		`- $this->assertEquals($text, $this->model->getText());`
	`37`	`+ $this->assertEquals($resultText, $this->model->getText());`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* @return array`
`42`	`42`	`*/`
`43`	`43`	`public function setTextGetTextProvider()`
`44`	`44`	`{`
`45`		`- return [[''], ['some text']];`
	`45`	`+ return [['', ''], ['some text', 'some text'], [new \Magento\Framework\Phrase('some text'), 'some text']];`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`