MAGETWO-38686: Merge and Fix Builds

Alexander Paliarush · Alexander Paliarush · commit 7abb63e0a8f6 · 2015-06-18T11:21:29.000+03:00
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -329,11 +329,11 @@ public function initialize($overriddenParams = [], $loadTestExtensionAttributes
                 '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\TestFramework\Mail\Template\TransportBuilderMock',
             ]
         ];
         if ($loadTestExtensionAttributes) {
-            array_merge(
+            $objectManagerConfiguration = array_merge(
                 $objectManagerConfiguration,
                 [
                     'Magento\Framework\Api\ExtensionAttribute\Config\Reader' => [

Original file line number	Diff line number	Diff line change
`@@ -329,11 +329,11 @@ public function initialize($overriddenParams = [], $loadTestExtensionAttributes`
`329`	`329`	`'Magento\Framework\App\State' => 'Magento\TestFramework\App\State',`
`330`	`330`	`'Magento\Framework\Mail\TransportInterface' => 'Magento\TestFramework\Mail\TransportInterfaceMock',`
`331`	`331`	`'Magento\Framework\Mail\Template\TransportBuilder'`
`332`		`- => 'Magento\TestFramework\Mail\Template\TransportBuilderMock',`
	`332`	`+ => 'Magento\TestFramework\Mail\Template\TransportBuilderMock',`
`333`	`333`	`]`
`334`	`334`	`];`
`335`	`335`	`if ($loadTestExtensionAttributes) {`
`336`		`- array_merge(`
	`336`	`+ $objectManagerConfiguration = array_merge(`
`337`	`337`	`$objectManagerConfiguration,`
`338`	`338`	`[`
`339`	`339`	`'Magento\Framework\Api\ExtensionAttribute\Config\Reader' => [`