Merge branch 'develop' into MAGETWO-63381

Author: Yevhen Miroshnychenko

.travis.yml

@@ -9,7 +9,7 @@ addons:
     - postfix
 language: php
 php:
-  - 5.6
+  - 5.6.29
   - 7.0
 env:
   global:

README.md

@@ -3,61 +3,14 @@
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 
-The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
+## Magento system requirements
+[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)
 
-<h2>New to Magento? Need some help?</h2>
-If you're not sure about the following, you probably need a little help before you start installing the Magento software:
+## Install Magento
+To install Magento, see either:
 
-*	Is the Magento software <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_magento-installed.html">installed already</a>?
-*	What's a <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>?
-*	Where's my <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it?
-*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">PHP</a>?
-*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">Apache</a>?
-*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">MySQL</a>?
-
-<h2>Step 1: Verify your prerequisites</h2>
-
-Use the following table to verify you have the correct prerequisites to install the Magento software.
-
-<table>
-	<tbody>
-		<tr>
-			<th>Prerequisite</th>
-			<th>How to check</th>
-			<th>For more information</th>
-		</tr>
-	<tr>
-		<td>Apache 2.2 or 2.4</td>
-		<td>Ubuntu: <code>apache2 -v</code><br>
-		CentOS: <code>httpd -v</code></td>
-		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
-	</tr>
-	<tr>
-		<td>PHP 5.6.x, 7.0.2, 7.0.4 or 7.0.6</td>
-		<td><code>php -v</code></td>
-		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
-	</tr>
-	<tr><td>MySQL 5.6.x</td>
-	<td><code>mysql -u [root user name] -p</code></td>
-	<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/mysql.html">MySQL</a></td>
-	</tr>
-</tbody>
-</table>
-
-<h2>Step 2: Prepare to install</h2>
-
-After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento software.
-
-1.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a>
-2.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a>
-
-<h2>Step 3: Install and verify the installation</h2>
-
-1.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/prepare-install.html">Update installation dependencies</a>
-2.	Install Magento:
-	*	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
-	*	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
-2.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/verify.html">Verify the installation</a>
+*	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
+*	[Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

@@ -16,6 +16,8 @@
 use Magento\Payment\Model\IframeConfigProvider;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Place
@@ -44,26 +46,36 @@ class Place extends Payment
      */
     protected $jsonHelper;
 
+    /**
+     * Logger for exception details
+     *
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Context $context
      * @param Registry $coreRegistry
      * @param DataFactory $dataFactory
      * @param CartManagementInterface $cartManagement
      * @param Onepage $onepageCheckout
      * @param JsonHelper $jsonHelper
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         Registry $coreRegistry,
         DataFactory $dataFactory,
         CartManagementInterface $cartManagement,
         Onepage $onepageCheckout,
-        JsonHelper $jsonHelper
+        JsonHelper $jsonHelper,
+        LoggerInterface $logger = null
     ) {
         $this->eventManager = $context->getEventManager();
         $this->cartManagement = $cartManagement;
         $this->onepageCheckout = $onepageCheckout;
         $this->jsonHelper = $jsonHelper;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
         parent::__construct($context, $coreRegistry, $dataFactory);
     }
 
@@ -127,9 +139,11 @@ protected function placeCheckoutOrder()
                 ]
             );
         } catch (LocalizedException $exception) {
+            $this->logger->critical($exception);
             $result->setData('error', true);
             $result->setData('error_messages', $exception->getMessage());
         } catch (\Exception $exception) {
+            $this->logger->critical($exception);
             $result->setData('error', true);
             $result->setData(
                 'error_messages',

app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php

@@ -20,6 +20,7 @@
 use Magento\Payment\Model\IframeConfigProvider;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class PlaceTest
@@ -94,6 +95,11 @@ class PlaceTest extends \PHPUnit_Framework_TestCase
      */
     protected $quoteMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     /**
      * @var CheckoutSession|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -152,6 +158,9 @@ protected function setUp()
             ->getMockBuilder(\Magento\Framework\App\Response\Http::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->loggerMock = $this
+            ->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->getMock();
 
         $this->objectManager = new ObjectManager($this);
         $this->placeOrderController = $this->objectManager->getObject(
@@ -165,6 +174,7 @@ protected function setUp()
                 'cartManagement' => $this->cartManagementMock,
                 'onepageCheckout' => $this->onepageCheckout,
                 'jsonHelper' => $this->jsonHelperMock,
+                'logger' => $this->loggerMock,
             ]
         );
     }
@@ -214,13 +224,15 @@ public function testExecute(
      * @param $controller
      * @param $quoteId
      * @param $result
+     * @param \Exception $exception Exception to check
      * @dataProvider textExecuteFailedPlaceOrderDataProvider
      */
     public function testExecuteFailedPlaceOrder(
         $paymentMethod,
         $controller,
         $quoteId,
-        $result
+        $result,
+        $exception
     ) {
         $this->requestMock->expects($this->at(0))
             ->method('getParam')
@@ -238,7 +250,11 @@ public function testExecuteFailedPlaceOrder(
 
         $this->cartManagementMock->expects($this->once())
             ->method('placeOrder')
-            ->willThrowException(new \Exception());
+            ->willThrowException($exception);
+
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->with($exception);
 
         $this->jsonHelperMock->expects($this->any())
             ->method('jsonEncode')
@@ -278,19 +294,35 @@ public function textExecuteDataProvider()
      */
     public function textExecuteFailedPlaceOrderDataProvider()
     {
-        $objectFailed = new \Magento\Framework\DataObject();
-        $objectFailed->setData('error', true);
-        $objectFailed->setData(
-            'error_messages',
-            __('An error occurred on the server. Please try to place the order again.')
+        $objectFailed1 = new \Magento\Framework\DataObject(
+            [
+                'error' => true,
+                'error_messages' => __('An error occurred on the server. Please try to place the order again.')
+            ]
+        );
+        $generalException = new \Exception('Exception logging will save the world!');
+        $localizedException = new LocalizedException(__('Electronic payments save the trees.'));
+        $objectFailed2 = new \Magento\Framework\DataObject(
+            [
+                'error' => true,
+                'error_messages' => $localizedException->getMessage()
+            ]
         );
 
         return [
             [
                 ['method' => 'authorizenet_directpost'],
                 IframeConfigProvider::CHECKOUT_IDENTIFIER,
                 1,
-                $objectFailed
+                $objectFailed1,
+                $generalException,
+            ],
+            [
+                ['method' => 'authorizenet_directpost'],
+                IframeConfigProvider::CHECKOUT_IDENTIFIER,
+                1,
+                $objectFailed2,
+                $localizedException,
             ],
         ];
     }

app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Backend\Block\Dashboard\Tab\Products;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+
 /**
  * Adminhtml dashboard most viewed products grid
  *
@@ -66,8 +69,14 @@ protected function _prepareCollection()
         );
 
         $this->setCollection($collection);
+        parent::_prepareCollection();
+
+        /** @var Product $product */
+        foreach ($collection as $product) {
+            $product->setPrice($product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue());
+        }
 
-        return parent::_prepareCollection();
+        return $this;
     }
 
     /**

app/code/Magento/Backend/i18n/en_US.csv

@@ -250,7 +250,7 @@ Minute,Minute
 "JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
 "To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
 "This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
-"Report Bugs","Report Bugs"
+"Report a Bug","Report a Bug"
 "Store View:","Store View:"
 "Stores Configuration","Stores Configuration"
 "Please confirm scope switching. All data that hasn\'t been saved will be lost.","Please confirm scope switching. All data that hasn\'t been saved will be lost."

app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml

@@ -8,5 +8,5 @@
 
 ?>
 <?php if ($block->getBugreportUrl()): ?>
-    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report Bugs') ?></a>
+    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report a Bug') ?></a>
 <?php endif; ?>

app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php

@@ -11,6 +11,8 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class PlaceOrder
@@ -22,22 +24,32 @@ class PlaceOrder extends AbstractAction
      */
     private $orderPlace;
 
+    /**
+     * Logger for exception details
+     *
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor
      *
      * @param Context $context
      * @param Config $config
      * @param Session $checkoutSession
      * @param Helper\OrderPlace $orderPlace
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         Config $config,
         Session $checkoutSession,
-        Helper\OrderPlace $orderPlace
+        Helper\OrderPlace $orderPlace,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context, $config, $checkoutSession);
         $this->orderPlace = $orderPlace;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -58,6 +70,7 @@ public function execute()
             /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
             return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
         } catch (\Exception $e) {
+            $this->logger->critical($e);
             $this->messageManager->addExceptionMessage($e, $e->getMessage());
         }
 

app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php

@@ -60,6 +60,11 @@ class PlaceOrderTest extends \PHPUnit_Framework_TestCase
      */
     private $placeOrder;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
@@ -94,11 +99,15 @@ protected function setUp()
             ->method('getMessageManager')
             ->willReturn($this->messageManagerMock);
 
+        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->placeOrder = new PlaceOrder(
             $contextMock,
             $this->configMock,
             $this->checkoutSessionMock,
-            $this->orderPlaceMock
+            $this->orderPlaceMock,
+            $this->loggerMock
         );
     }
 

app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml

@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="shipment_items">
-            <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="shipment_item_bundle" as="shipment_item_bundle" template="sales/shipment/view/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="bundle" as="bundle" template="sales/shipment/view/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>