Verified Commit b194e0af authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3319582 by mondrake, Spokje, longwave, mallezie: Fix calls to methods... 

Issue #3319582 by mondrake, Spokje, longwave, mallezie: Fix calls to methods with too many parameters passed in

(cherry picked from commit 3485d805718435f0595f95217076a00d97151752)
parent b98e5102

core/includes/batch.inc

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ function _batch_progress_page() { 
    print $fallback;



    // Perform actual processing.

    [$percentage, $message, $label] = _batch_process($batch);

    [$percentage, $message, $label] = _batch_process();

    if ($percentage == 100) {

      $new_op = 'finished';

    }

core/includes/install.inc

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) { 
            break;



          case 'array_index':

            if (_drupal_rewrite_settings_is_array_index($type, $value)) {

            if (_drupal_rewrite_settings_is_array_index($type)) {

              $index = trim($value, '\'"');

              $state = 'right_bracket';

            }
@@ -633,7 +633,7 @@ function drupal_install_system($install_state) { 
  // its dependencies, and here the dependencies will be installed as well.

  if ($provider !== 'core') {

    $autoload = $connection->getConnectionOptions()['autoload'] ?? '';

    if (($pos = strpos($autoload, 'src/Driver/Database/')) !== FALSE) {

    if (strpos($autoload, 'src/Driver/Database/') !== FALSE) {

      $kernel->getContainer()->get('module_installer')->install([$provider], TRUE);

    }

  }

core/lib/Drupal/Component/Gettext/PoStreamReader.php

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ private function readLine() { 
        $quoted = $this->parseQuoted($line);

        if ($quoted === FALSE) {

          // The message id must be wrapped in quotes.

          $this->errors[] = new FormattableMarkup('The translation stream %uri contains an error: invalid format for "msgid" on line %line.', $log_vars, $log_vars);

          $this->errors[] = new FormattableMarkup('The translation stream %uri contains an error: invalid format for "msgid" on line %line.', $log_vars);

          return FALSE;

        }

core/lib/Drupal/Component/Utility/Variable.php

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public static function export($var, $prefix = '') { 
        // Don't export keys if the array is non associative.

        $export_keys = array_values($var) != $var;

        foreach ($var as $key => $value) {

          $output .= '  ' . ($export_keys ? static::export($key) . ' => ' : '') . static::export($value, '  ', FALSE) . ",\n";

          $output .= '  ' . ($export_keys ? static::export($key) . ' => ' : '') . static::export($value, '  ') . ",\n";

        }

        $output .= ')';

      }

core/lib/Drupal/Core/Config/ConfigInstaller.php

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public function installOptionalConfig(StorageInterface $storage = NULL, $depende 


    // Create the optional configuration if there is any left after filtering.

    if (!empty($config_to_create)) {

      $this->createConfiguration(StorageInterface::DEFAULT_COLLECTION, $config_to_create, TRUE);

      $this->createConfiguration(StorageInterface::DEFAULT_COLLECTION, $config_to_create);

    }

  }