Verified Commit 803da73c authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2937515 by Spokje, quietone, idebr, longwave, SherFengChong,... 

Issue #2937515 by Spokje, quietone, idebr, longwave, SherFengChong, anweshasinha, borisson_, mfernea, xjm, bbrala, daffie, Berdir: Fix Drupal.Array.Array.[ArrayClosingIndentation, ArrayIndentation] coding standard
parent b8ac0d98

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

+2 −3
Original line number Diff line number Diff line
@@ -325,8 +325,7 @@ public function getAllCollectionNames() { 
    try {

      return $this->connection->query('SELECT DISTINCT [collection] FROM {' . $this->connection->escapeTable($this->table) . '} WHERE [collection] <> :collection ORDER by [collection]', [

        ':collection' => StorageInterface::DEFAULT_COLLECTION,

        ]

      )->fetchCol();

      ])->fetchCol();

    }

    catch (\Exception $e) {

      return [];

core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php

+5 −4
Original line number Diff line number Diff line
@@ -19,14 +19,15 @@ public function __construct(TranslationInterface $string_translation) { 
    $this->stringTranslation = $string_translation;



    $title = $this->t('Drupal already installed');

    $replacements = [

      ':base-url' => $GLOBALS['base_url'],

      ':update-url' => $GLOBALS['base_path'] . 'update.php',

    ];

    $message = $this->t('<ul>

<li>To start over, you must empty your existing database and copy <em>default.settings.php</em> over <em>settings.php</em>.</li>

<li>To upgrade an existing installation, proceed to the <a href=":update-url">update script</a>.</li>

<li>View your <a href=":base-url">existing site</a>.</li>

</ul>', [

      ':base-url' => $GLOBALS['base_url'],

      ':update-url' => $GLOBALS['base_path'] . 'update.php',

    ]);

</ul>', $replacements);

    parent::__construct($message, $title);

  }

core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ protected function setUp(): void { 
      'administer blocks',

      'administer themes',

      'search content',

      ]

    );

    ]);



    $this->drupalLogin($this->adminUser);

    $this->drupalPlaceBlock('search_form_block');

core/modules/book/src/BookOutlineStorage.php

+1 −2
Original line number Diff line number Diff line
@@ -133,8 +133,7 @@ public function insert($link, $parents) { 
        'bid' => $link['bid'],

        'pid' => $link['pid'],

        'weight' => $link['weight'],

        ] + $parents

      )

      ] + $parents)

      ->execute();

  }

core/modules/comment/src/CommentStorage.php

+12 −11
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ public function getNewCommentPageNumber($total_comments, $new_comments, Fieldabl 
          ':field_name' => $field_name,

          ':entity_type' => $entity->getEntityTypeId(),

          ':thread' => $first_thread,

      ])->fetchField();

        ]

      )->fetchField();

    }



    return $comments_per_page > 0 ? (int) ($count / $comments_per_page) : 0;