Remove request_uri()

1. +++ b/core/lib/Drupal/Core/DrupalKernel.php
   @@ -872,7 +872,7 @@ protected function initializeRequestGlobals(Request $request) {
            // request_uri() returns a URI with the script name, resulting in
            // non-clean URLs unless
            // there's other code that intervenes.
   -        if (strpos(request_uri(TRUE) . '/', $base_path . $script_path) !== 0) {
   +        if (strpos($request->getPathInfo() . '/', $base_path . $script_path) !== 0) {
   

   Remove or update the comment too, please.

2. +++ b/core/lib/Drupal/Core/Form/FormBuilder.php
   @@ -301,9 +301,9 @@ public function rebuildForm($form_id, FormStateInterface &$form_state, $old_form
   +    // #action defaults to $reuqest->getRequestUri(), but in case of Ajax and
   +    // other partial rebuilds, the form is submitted to an alternate URL, and
   +    // the original #action needs to be retained.
   

   $reuqest? :-)

3. +++ b/core/modules/dblog/src/Tests/DbLogTest.php
   @@ -147,7 +147,7 @@ private function generateLogEntries($count, $type = 'custom', $severity = RfcLog
   -      'request_uri' => $base_root . request_uri(),
   +      'request_uri' => $base_root . \Drupal::request()->getRequestUri(),
   

   This in a test seems spurious to me. Tests should be request-agnostic, or able to be. In a test, why don't we just hard-code a request uri for testing purposes? That would be more stable and predictable and less prone to random weirdness.

4. +++ b/core/modules/locale/src/LocaleLookup.php
   @@ -95,6 +105,7 @@ public function __construct($langcode, $context, StringStorageInterface $string_
   @@ -142,7 +153,7 @@ protected function resolveCacheMiss($offset) {
   
   @@ -142,7 +153,7 @@ protected function resolveCacheMiss($offset) {
            'source' => $offset,
            'context' => $this->context,
            'version' => \Drupal::VERSION,
   -      ))->addLocation('path', $this->requestUri())->save();
   +      ))->addLocation('path', $this->requestStack->getCurrentRequest()->getRequestUri())->save();
          $value = TRUE;
        }
    
   @@ -177,11 +188,4 @@ protected function resolveCacheMiss($offset) {
   
   @@ -177,11 +188,4 @@ protected function resolveCacheMiss($offset) {
        return $value;
      }
    
   -  /**
   -   * Wraps request_uri().
   -   */
   -  protected function requestUri($omit_query_string = FALSE) {
   -    return request_uri($omit_query_string);
   -  }
   

   Technically we could leave the method in place, just change what it's wrapping. I'm fine either way.

We need a beta eval here, but I am +1 on allowing it.

some nitpicks

 ->setConstructorArgs(array('en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack))
      ->setMethods(array('persist'))

Should it have getRequestUri for setMethods?

use Drupal\Core\PageCache\RequestPolicyInterface;
use Symfony\Component\HttpFoundation\RequestStack;
use Composer\Autoload\ClassLoader;

While you are at it, some unused classes in DrupalKernel.php

use Drupal\Component\Datetime\DateTimePlus;
use Drupal\Component\Utility\Environment;
use Symfony\Component\ClassLoader\ApcClassLoader;
use Symfony\Component\HttpFoundation\Response;

some unused classes in bootstrap.inc

@dawehner -
I do use dreditor :)

We removed the getRequestUri method in this patch, so we can no longer mock that method.

I think you meant request_uri() removed from this patch

Mh, I still think we should not break other patches due to out of scope changes in this issue, so sorry I won't change that.

Maybe I need to change as how I review patches.

We need a change record for this. I consider this change a followup of the numerous criticals to remove Drupal's dependence on $_SERVER and use the symfony request object everywhere.

Committed d742115 and pushed to 8.0.x. Thanks!

Thanks for adding the beta evaluation to the issue summary. I agree that removing this is inline with moving to Symfony's request processing system and this issue should be considered a followup to that work.

-  // Prevent multiple slashes to avoid cross site requests via the Form API.
-  $uri = '/' . ltrim($uri, '/');

Removing that is problematic - see linked issue.