MAGETWO-32365: [GITHUB] "web setup wizard is not accessible" error message but the setup wizard is actually accessible #920

- fixed detecting if Setup application is available when DOCUMENT_ROOT has trailing slash

Author: Anton Makarenko

dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php

@@ -180,6 +180,14 @@ public function isAvailableDataProvider()
                 ],
                 false
             ],
+            'root within doc root, existent sub-directory, trailing slash' => [
+                [
+                    'DOCUMENT_ROOT' => dirname(__DIR__) . DIRECTORY_SEPARATOR,
+                    'SCRIPT_FILENAME' => __FILE__,
+                    SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'
+                ],
+                true
+            ],
         ];
     }
 }

lib/internal/Magento/Framework/App/SetupInfo.php

@@ -56,7 +56,7 @@ public function __construct($server, $projectRoot = '')
         if (empty($server['DOCUMENT_ROOT'])) {
             throw new \InvalidArgumentException('DOCUMENT_ROOT variable is unavailable.');
         }
-        $this->docRoot = str_replace('\\', '/', $server['DOCUMENT_ROOT']);
+        $this->docRoot = rtrim(str_replace('\\', '/', $server['DOCUMENT_ROOT']), '/');
         $this->projectRoot = $projectRoot ?: $this->detectProjectRoot();
         $this->projectRoot = str_replace('\\', '/', $this->projectRoot);
     }