Merge pull request #12854 from Zuluru/master

Changes to allow user-specified PHP_SELF to take precedence

src/TestSuite/MiddlewareDispatcher.php

@@ -146,9 +146,12 @@ class MiddlewareDispatcher
             $spec['post'] = [];
         }
         $environment = array_merge(
-            array_merge($_SERVER, ['REQUEST_URI' => $spec['url'], 'PHP_SELF' => '/']),
+            array_merge($_SERVER, ['REQUEST_URI' => $spec['url']]),
             $spec['environment']
         );
+        if (strpos($environment['PHP_SELF'], 'phpunit') !== false) {
+            $environment['PHP_SELF'] = '/';
+        }
         $request = ServerRequestFactory::fromGlobals(
             $environment,
             $spec['query'],