MAGETWO-37464: Merge and Fix Builds

 - fix build failures

Author: Cari Spruiell

app/code/Magento/Backend/App/Action/Plugin/Authentication.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\Exception\AuthenticationException;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Authentication
 {
     /**

app/code/Magento/Backend/App/BackendApp.php

@@ -70,4 +70,4 @@ public function getAclResource()
     {
         return $this->aclResourceName;
     }
-}
+}

app/code/Magento/Backend/App/BackendAppList.php

@@ -59,4 +59,4 @@ public function getBackendApp($appName)
         }
         return null;
     }
-}
+}

app/code/Magento/Backend/Controller/Adminhtml/BackendApp/Redirect.php

@@ -62,4 +62,4 @@ protected function _isAllowed()
         }
         return true;
     }
-}
+}

app/code/Magento/Backend/Model/Session/AdminConfig.php

@@ -44,10 +44,10 @@ class AdminConfig extends Config
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Stdlib\String $stringHelper
      * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Backend\App\BackendAppList $backendAppList
      * @param Filesystem $filesystem
      * @param DeploymentConfig $deploymentConfig
      * @param string $scopeType
+     * @param \Magento\Backend\App\BackendAppList $backendAppList
      * @param FrontNameResolver $frontNameResolver
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $lifetimePath
@@ -59,10 +59,10 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Stdlib\String $stringHelper,
         \Magento\Framework\App\RequestInterface $request,
-        \Magento\Backend\App\BackendAppList $backendAppList,
         Filesystem $filesystem,
         DeploymentConfig $deploymentConfig,
         $scopeType,
+        \Magento\Backend\App\BackendAppList $backendAppList,
         FrontNameResolver $frontNameResolver,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         $lifetimePath = self::XML_PATH_COOKIE_LIFETIME,
@@ -95,7 +95,7 @@ private function extractAdminPath()
     {
         $backendApp = $this->backendAppList->getCurrentApp();
         $cookiePath = null;
-        $baseUrl = $parsedUrl = parse_url($this->_storeManager->getStore()->getBaseUrl(), PHP_URL_PATH);
+        $baseUrl = parse_url($this->_storeManager->getStore()->getBaseUrl(), PHP_URL_PATH);
         if (!$backendApp) {
             $cookiePath = $baseUrl . $this->_frontNameResolver->getFrontName();
             return $cookiePath;

setup/src/Magento/Setup/Controller/Index.php

@@ -36,9 +36,9 @@ public function indexAction()
     {
         if ($this->objectManager->get('Magento\Framework\App\DeploymentConfig')->isAvailable()) {
             $this->objectManager->create(
-                'Magento\Backend\Model\Auth\Session', [
-                'sessionConfig' => $this->objectManager->get('Magento\Backend\Model\Session\AdminConfig')
-            ]);
+                'Magento\Backend\Model\Auth\Session',
+                ['sessionConfig' => $this->objectManager->get('Magento\Backend\Model\Session\AdminConfig')]
+            );
             if (!$this->objectManager->get('Magento\Backend\Model\Auth')->isLoggedIn()) {
                 $view = new ViewModel();
                 $view->setTemplate('/error/401.phtml');