MAGETWO-34528: Contribution of Sprint 24 Work to Mainline

- Dependency test and static error fixes

Author: mazhalai

app/code/Magento/Fedex/composer.json

@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta9",
         "magento/module-shipping": "0.42.0-beta9",
         "magento/module-directory": "0.42.0-beta9",
         "magento/module-catalog": "0.42.0-beta9",

app/code/Magento/OfflineShipping/composer.json

@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta9",
         "magento/module-backend": "0.42.0-beta9",
         "magento/module-shipping": "0.42.0-beta9",
         "magento/module-catalog": "0.42.0-beta9",

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

@@ -9,13 +9,6 @@
 <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
 <preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
 <preference for="Magento\Framework\App\Response\RedirectInterface" type="Magento\Store\App\Response\Redirect" />
-    <type name="Magento\Framework\Module\Updater\SetupFactory">
-        <arguments>
-            <argument name="resourceTypes" xsi:type="array">
-                <item name="store_setup" xsi:type="string">Magento\Framework\Module\DataSetup</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Config\ScopePool">
         <arguments>
             <argument name="readerPool" xsi:type="object">Magento\Store\Model\Config\Reader\ReaderPool\Proxy</argument>

dev/tests/static/testsuite/Magento/Test/Legacy/InstallUpgradeTest.php

@@ -51,10 +51,8 @@ function ($file) {
                     'Invalid directory. Please convert data/sql scripts to a class within module\'s Setup folder'
                 );
             },
-            $this->convertArray(Files::init()->getFiles(
-                    [BP . '/app/code/*/*/sql', BP . '/app/code/*/*/data'],
-                    '*.php'
-                )
+            $this->convertArray(
+                Files::init()->getFiles([BP . '/app/code/*/*/sql', BP . '/app/code/*/*/data'], '*.php')
             )
         );
     }

setup/src/Magento/Setup/Model/InstallerFactory.php

@@ -29,7 +29,8 @@ class InstallerFactory
      * @param ServiceLocatorInterface $serviceLocator
      * @param ResourceFactory $resourceFactory
      */
-    public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFactory $resourceFactory) {
+    public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFactory $resourceFactory)
+    {
         $this->serviceLocator = $serviceLocator;
         $this->resourceFactory = $resourceFactory;
     }