MAGETWO-38686: Merge and Fix Builds

Author: arkadiych

dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php

@@ -863,46 +863,46 @@ private function createGroup($group)
     public function testSearchGroupsDataProvider()
     {
         return [
-            ['tax_class_id', '3', []],
-            ['tax_class_id', '0', null],
+            ['tax_class_id', 3, []],
+            ['tax_class_id', 0, null],
             ['code', md5(mt_rand(0, 10000000000) . time()), null],
             [
                 'id',
-                '0',
+                0,
                 [
-                    'id' => '0',
+                    'id' => 0,
                     'code' => 'NOT LOGGED IN',
-                    'tax_class_id' => '3',
+                    'tax_class_id' => 3,
                     'tax_class_name' => 'Retail Customer'
                 ]
             ],
             [
                 'code',
                 'General',
                 [
-                    'id' => '1',
+                    'id' => 1,
                     'code' => 'General',
-                    'tax_class_id' => '3',
+                    'tax_class_id' => 3,
                     'tax_class_name' => 'Retail Customer'
                 ]
             ],
             [
                 'id',
-                '2',
+                2,
                 [
-                    'id' => '2',
+                    'id' => 2,
                     'code' => 'Wholesale',
-                    'tax_class_id' => '3',
+                    'tax_class_id' => 3,
                     'tax_class_name' => 'Retail Customer'
                 ]
             ],
             [
                 'code',
                 'Retailer',
                 [
-                    'id' => '3',
+                    'id' => 3,
                     'code' => 'Retailer',
-                    'tax_class_id' => '3',
+                    'tax_class_id' => 3,
                     'tax_class_name' => 'Retail Customer'
                 ]
             ]

dev/tests/integration/framework/Magento/TestFramework/Application.php

@@ -267,9 +267,10 @@ public function isInstalled()
      * Initialize application
      *
      * @param array $overriddenParams
+     * @param bool $loadTestExtensionAttributes
      * @return void
      */
-    public function initialize($overriddenParams = [])
+    public function initialize($overriddenParams = [], $loadTestExtensionAttributes = false)
     {
         $overriddenParams[\Magento\Framework\App\State::PARAM_MODE] = $this->_appMode;
         $overriddenParams = $this->_customizeParams($overriddenParams);
@@ -323,21 +324,27 @@ public function initialize($overriddenParams = [])
 
         Helper\Bootstrap::setObjectManager($objectManager);
 
-        $objectManager->configure(
-            [
-                'preferences' => [
-                    'Magento\Framework\App\State' => 'Magento\TestFramework\App\State',
-                    'Magento\Framework\Mail\TransportInterface' => 'Magento\TestFramework\Mail\TransportInterfaceMock',
-                    'Magento\Framework\Mail\Template\TransportBuilder'
-                        => 'Magento\TestFramework\Mail\Template\TransportBuilderMock',
-                ],
-                'Magento\Framework\Api\ExtensionAttribute\Config\Reader' => [
-                    'arguments' => [
-                        'fileResolver' => ['instance' => 'Magento\TestFramework\Api\Config\Reader\FileResolver'],
-                    ],
-                ],
+        $objectManagerConfiguration = [
+            'preferences' => [
+                'Magento\Framework\App\State' => 'Magento\TestFramework\App\State',
+                'Magento\Framework\Mail\TransportInterface' => 'Magento\TestFramework\Mail\TransportInterfaceMock',
+                'Magento\Framework\Mail\Template\TransportBuilder'
+                => 'Magento\TestFramework\Mail\Template\TransportBuilderMock',
             ]
-        );
+        ];
+        if ($loadTestExtensionAttributes) {
+            array_merge(
+                $objectManagerConfiguration,
+                [
+                    'Magento\Framework\Api\ExtensionAttribute\Config\Reader' => [
+                        'arguments' => [
+                            'fileResolver' => ['instance' => 'Magento\TestFramework\Api\Config\Reader\FileResolver'],
+                        ],
+                    ],
+                ]
+            );
+        }
+        $objectManager->configure($objectManagerConfiguration);
 
         /** Register event observer of Integration Framework */
         /** @var \Magento\Framework\Event\Config\Data $eventConfigData */
@@ -375,7 +382,7 @@ public function initialize($overriddenParams = [])
     public function reinitialize(array $overriddenParams = [])
     {
         $this->_resetApp();
-        $this->initialize($overriddenParams);
+        $this->initialize($overriddenParams, true);
     }
 
     /**

dev/tests/integration/framework/bootstrap.php

@@ -71,7 +71,7 @@
     if (!$application->isInstalled()) {
         $application->install();
     }
-    $application->initialize();
+    $application->initialize([], true);
 
     \Magento\TestFramework\Helper\Bootstrap::setInstance(new \Magento\TestFramework\Helper\Bootstrap($bootstrap));