Merge remote-tracking branch 'mainline/develop' into MAGETWO-67718

Author: buskamuza

app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php

@@ -119,7 +119,7 @@ public function addIdFilter($categoryIds)
                 $condition = ['in' => $ids];
             }
         }
-        $this->addFieldToFilter('entity_id', $condition);
+        $this->addFieldToFilter('main_table.entity_id', $condition);
         return $this;
     }
 

app/code/Magento/Contact/Controller/Index/Post.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
+use Psr\Log\LoggerInterface;
 
 class Post extends \Magento\Contact\Controller\Index
 {
@@ -32,22 +33,30 @@ class Post extends \Magento\Contact\Controller\Index
      */
     private $mail;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Context $context
      * @param ConfigInterface $contactsConfig
      * @param MailInterface $mail
      * @param DataPersistorInterface $dataPersistor
+     * @param LoggerInterface $logger
      */
     public function __construct(
         Context $context,
         ConfigInterface $contactsConfig,
         MailInterface $mail,
-        DataPersistorInterface $dataPersistor
+        DataPersistorInterface $dataPersistor,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context, $contactsConfig);
         $this->context = $context;
         $this->mail = $mail;
         $this->dataPersistor = $dataPersistor;
+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -70,8 +79,9 @@ public function execute()
             $this->messageManager->addErrorMessage($e->getMessage());
             $this->getDataPersistor()->set('contact_us', $this->getRequest()->getParams());
         } catch (\Exception $e) {
+            $this->logger->critical($e);
             $this->messageManager->addErrorMessage(
-                __('We can\'t process your request right now. Sorry, that\'s all we know.')
+                __('An error occurred while processing your form. Please try again later.')
             );
             $this->getDataPersistor()->set('contact_us', $this->getRequest()->getParams());
         }

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

@@ -7,7 +7,7 @@ define([
     'jquery',
     'jquery/ui',
     'catalogGallery',
-    'Magento_ProductVideo/js/load-player'
+    'loadPlayer'
 ], function ($) {
     'use strict';
 

dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php

@@ -101,7 +101,6 @@ protected function setUp()
         );
         $this->_validator = new \Magento\Framework\Code\Validator();
         $this->_validator->add(new \Magento\Framework\Code\Validator\ConstructorIntegrity());
-        $this->_validator->add(new \Magento\Framework\Code\Validator\ContextAggregation());
         $this->_validator->add(new \Magento\Framework\Code\Validator\TypeDuplication());
         $this->_validator->add(new \Magento\Framework\Code\Validator\ArgumentSequence());
         $this->_validator->add(new \Magento\Framework\Code\Validator\ConstructorArgumentTypes());