Merge remote-tracking branch 'mainline/2.1' into MAGETWO-54682-2.1

Author: kandy

app/code/Magento/Catalog/Setup/CategorySetup.php

@@ -66,6 +66,7 @@ public function getDefaultEntities()
     {
         return [
             'catalog_category' => [
+                'entity_type_id' => 3,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Category',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_category_entity',
@@ -334,6 +335,7 @@ public function getDefaultEntities()
                 ],
             ],
             'catalog_product' => [
+                'entity_type_id' => 4,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Product',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_product_entity',

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -246,6 +246,7 @@ define([
                 target = $(this.options.minicart.list),
                 outerHeight;
 
+            self.scrollHeight = 0;
             target.children().each(function () {
 
                 if ($(this).find('.options').length > 0) {
@@ -259,7 +260,7 @@ define([
                 self.scrollHeight += outerHeight;
             });
 
-            target.height(height);
+            target.parent().height(height);
         }
     });
 

app/code/Magento/Customer/Setup/CustomerSetup.php

@@ -126,6 +126,7 @@ public function getDefaultEntities()
     {
         $entities = [
             'customer' => [
+                'entity_type_id' => \Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Customer',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_entity',
@@ -338,6 +339,7 @@ public function getDefaultEntities()
                 ],
             ],
             'customer_address' => [
+                'entity_type_id' => \Magento\Customer\Api\AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Address',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_address_entity',

app/code/Magento/Eav/Setup/EavSetup.php

@@ -192,14 +192,21 @@ public function addEntityType($code, array $params)
             'additional_attribute_table' => $this->_getValue($params, 'additional_attribute_table'),
             'entity_attribute_collection' => $this->_getValue($params, 'entity_attribute_collection'),
         ];
+        if (isset($params['entity_type_id'])) {
+            $data['entity_type_id'] = $params['entity_type_id'];
+        }
 
         if ($this->getEntityType($code, 'entity_type_id')) {
             $this->updateEntityType($code, $data);
         } else {
             $this->setup->getConnection()->insert($this->setup->getTable('eav_entity_type'), $data);
         }
 
-        $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        if (isset($params['entity_type_id'])) {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName, null, $params['entity_type_id']);
+        } else {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        }
         $this->addAttributeGroup($code, $this->_defaultGroupName, $this->_generalGroupName);
 
         return $this;
@@ -310,16 +317,21 @@ public function getAttributeSetSortOrder($entityTypeId, $sortOrder = null)
      * @param int|string $entityTypeId
      * @param string $name
      * @param int $sortOrder
+     * @param int $setId
      * @return $this
      */
-    public function addAttributeSet($entityTypeId, $name, $sortOrder = null)
+    public function addAttributeSet($entityTypeId, $name, $sortOrder = null, $setId = null)
     {
         $data = [
             'entity_type_id' => $this->getEntityTypeId($entityTypeId),
             'attribute_set_name' => $name,
             'sort_order' => $this->getAttributeSetSortOrder($entityTypeId, $sortOrder),
         ];
 
+        if ($setId !== null) {
+            $data['attribute_set_id'] = $setId;
+        }
+
         $setId = $this->getAttributeSet($entityTypeId, $name, 'attribute_set_id');
         if ($setId) {
             $this->updateAttributeSet($entityTypeId, $setId, $data);

app/code/Magento/Sales/Setup/SalesSetup.php

@@ -214,27 +214,31 @@ public function getDefaultEntities()
     {
         $entities = [
             'order' => [
+                'entity_type_id' => 5,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order',
                 'table' => 'sales_order',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'invoice' => [
+                'entity_type_id' => 6,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Invoice',
                 'table' => 'sales_invoice',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'creditmemo' => [
+                'entity_type_id' => 7,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Creditmemo',
                 'table' => 'sales_creditmemo',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'shipment' => [
+                'entity_type_id' => 8,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Shipment',
                 'table' => 'sales_shipment',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',

app/code/Magento/Store/etc/di.xml

@@ -223,6 +223,7 @@
                     <item name="frontName" xsi:type="null" />
                     <item name="router" xsi:type="string">standard</item>
                 </item>
+                <item name="setup" xsi:type="null"/>
             </argument>
             <argument name="default" xsi:type="string">frontend</argument>
         </arguments>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php

@@ -60,7 +60,7 @@ public function __construct(FixtureFactory $fixtureFactory, $products, array $da
     public function run()
     {
         $products = [];
-        $productsDataSets = explode(',', $this->products);
+        $productsDataSets = is_array($this->products) ? $this->products : explode(',', $this->products);
         foreach ($productsDataSets as $key => $productDataSet) {
             $productDataSet = explode('::', $productDataSet);
             $fixtureClass = $productDataSet[0];

lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php

@@ -8,6 +8,9 @@
 
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 
+/**
+ * Class Compiled returns configuration cache information
+ */
 class Compiled implements ConfigLoaderInterface
 {
     /**
@@ -25,8 +28,12 @@ public function load($area)
         if (isset($this->configCache[$area])) {
             return $this->configCache[$area];
         }
-        $this->configCache[$area] = \unserialize(\file_get_contents(self::getFilePath($area)));
-        return $this->configCache[$area];
+        $filePath = self::getFilePath($area);
+        if (\file_exists($filePath)) {
+            $this->configCache[$area] = \unserialize(\file_get_contents($filePath));
+            return $this->configCache[$area];
+        }
+        return [];
     }
 
     /**

setup/src/Magento/Setup/Console/Command/UpgradeCommand.php

@@ -29,11 +29,6 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $installerFactory;
 
-    /**
-     * @var \Magento\Setup\Model\ObjectManagerProvider;
-     */
-    private $objectManagerProvider;
-
     /**
      * Constructor
      *
@@ -43,7 +38,6 @@ class UpgradeCommand extends AbstractSetupCommand
     public function __construct(InstallerFactory $installerFactory, ObjectManagerProvider $objectManagerProvider)
     {
         $this->installerFactory = $installerFactory;
-        $this->objectManagerProvider = $objectManagerProvider;
         parent::__construct();
     }
 
@@ -73,16 +67,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $areaCode = 'setup';
-        /** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-        $objectManager = $this->objectManagerProvider->get();
-        /** @var \Magento\Framework\App\State $appState */
-        $appState = $objectManager->get('Magento\Framework\App\State');
-        $appState->setAreaCode($areaCode);
-        /** @var \Magento\Framework\ObjectManager\ConfigLoaderInterface $configLoader */
-        $configLoader = $objectManager->get('Magento\Framework\ObjectManager\ConfigLoaderInterface');
-        $objectManager->configure($configLoader->load($areaCode));
-
         $keepGenerated = $input->getOption(self::INPUT_KEY_KEEP_GENERATED);
         $installer = $this->installerFactory->create(new ConsoleLogger($output));
         $installer->updateModulesSequence($keepGenerated);

setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php

@@ -7,35 +7,20 @@
 
 use Magento\Setup\Console\Command\UpgradeCommand;
 use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Framework\Console\Cli;
 
 class UpgradeCommandTest extends \PHPUnit_Framework_TestCase
 {
     public function testExecute()
     {
         $installerFactory = $this->getMock('Magento\Setup\Model\InstallerFactory', [], [], '', false);
         $objectManagerProvider = $this->getMock('\Magento\Setup\Model\ObjectManagerProvider', [], [], '', false);
-        $objectManager = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface');
-        $configLoader = $this->getMockForAbstractClass('Magento\Framework\ObjectManager\ConfigLoaderInterface');
-        $configLoader->expects($this->once())->method('load')->willReturn(['some_key' => 'some_value']);
-        $state = $this->getMock('Magento\Framework\App\State', [], [], '', false);
-        $state->expects($this->once())->method('setAreaCode')->with('setup');
-        $objectManagerProvider->expects($this->once())->method('get')->willReturn($objectManager);
-        $objectManager->expects($this->once())->method('configure');
-        $state->expects($this->once())->method('setAreaCode')->with('setup');
         $installer = $this->getMock('Magento\Setup\Model\Installer', [], [], '', false);
         $installer->expects($this->at(0))->method('updateModulesSequence');
         $installer->expects($this->at(1))->method('installSchema');
         $installer->expects($this->at(2))->method('installDataFixtures');
         $installerFactory->expects($this->once())->method('create')->willReturn($installer);
-
-        $objectManager->expects($this->exactly(2))
-            ->method('get')
-            ->will($this->returnValueMap([
-                ['Magento\Framework\App\State', $state],
-                ['Magento\Framework\ObjectManager\ConfigLoaderInterface', $configLoader]
-            ]));
-
         $commandTester = new CommandTester(new UpgradeCommand($installerFactory, $objectManagerProvider));
-        $commandTester->execute([]);
+        $this->assertSame(Cli::RETURN_SUCCESS, $commandTester->execute([]));
     }
 }