Verified Commit ec8fa02a authored by Dave Long's avatar Dave Long
Browse files

Issue #3420583 by mondrake: Change... 

Issue #3420583 by mondrake: Change ConfigEntityValidationTestBase::providerInvalidMachineNameCharacters and family to static
parent 8f38fc7e

core/modules/block/tests/src/Kernel/BlockValidationTest.php

+2 −2
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ public function testInvalidPluginId(): void { 
  /**

   * Block names are atypical in that they allow periods in the machine name.

   */

  public function providerInvalidMachineNameCharacters(): array {

  public static function providerInvalidMachineNameCharacters(): array {

    $cases = parent::providerInvalidMachineNameCharacters();

    // Remove the existing test case that verifies a machine name containing

    // periods is invalid.

    $this->assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);

    self::assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);

    unset($cases['INVALID: period separated']);

    // And instead add a test case that verifies it is allowed for blocks.

    $cases['VALID: period separated'] = ['period.separated', TRUE];

core/modules/shortcut/tests/src/Kernel/ShortcutSetValidationTest.php

+3 −3
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ protected function setUp(): void { 
  /**

   * Shortcut set IDs are atypical: they allow dashes and disallow underscores.

   */

  public function providerInvalidMachineNameCharacters(): array {

  public static function providerInvalidMachineNameCharacters(): array {

    $cases = parent::providerInvalidMachineNameCharacters();



    // Remove the existing test case that verifies a machine name containing

    // dashes is invalid.

    $this->assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);

    self::assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);

    unset($cases['INVALID: dash separated']);

    // And instead add a test case that verifies it is allowed for shortcut

    // sets.
@@ -48,7 +48,7 @@ public function providerInvalidMachineNameCharacters(): array { 


    // Remove the existing test case that verifies a machine name containing

    // underscores is valid.

    $this->assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);

    self::assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);

    unset($cases['VALID: underscore separated']);

    // And instead add a test case that verifies it is disallowed for shortcut

    // sets.

core/modules/system/tests/src/Kernel/Entity/ActionValidationTest.php

+2 −2
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ protected function setUp(): void { 
  /**

   * Action IDs are atypical in that they allow periods in the machine name.

   */

  public function providerInvalidMachineNameCharacters(): array {

  public static function providerInvalidMachineNameCharacters(): array {

    $cases = parent::providerInvalidMachineNameCharacters();

    // Remove the existing test case that verifies a machine name containing

    // periods is invalid.

    $this->assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);

    self::assertSame(['period.separated', FALSE], $cases['INVALID: period separated']);

    unset($cases['INVALID: period separated']);

    // And instead add a test case that verifies it is allowed for blocks.

    $cases['VALID: period separated'] = ['period.separated', TRUE];

core/modules/system/tests/src/Kernel/Entity/MenuValidationTest.php

+3 −3
Original line number Diff line number Diff line
@@ -35,19 +35,19 @@ protected function setUp(): void { 
  /**

   * Menu IDs are atypical: they allow dashes and disallow underscores.

   */

  public function providerInvalidMachineNameCharacters(): array {

  public static function providerInvalidMachineNameCharacters(): array {

    $cases = parent::providerInvalidMachineNameCharacters();



    // Remove the existing test case that verifies a machine name containing

    // dashes is invalid.

    $this->assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);

    self::assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);

    unset($cases['INVALID: dash separated']);

    // And instead add a test case that verifies it is allowed for menus.

    $cases['VALID: dash separated'] = ['dash-separated', TRUE];



    // Remove the existing test case that verifies a machine name containing

    // underscores is valid.

    $this->assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);

    self::assertSame(['underscore_separated', TRUE], $cases['VALID: underscore separated']);

    unset($cases['VALID: underscore separated']);

    // And instead add a test case that verifies it is disallowed for menus.

    $cases['INVALID: underscore separated'] = ['underscore_separated', FALSE];

core/modules/tour/tests/src/Kernel/TourValidationTest.php

+2 −2
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ protected function setUp(): void { 
  /**

   * Tour IDs are atypical in that they allow dashes in the machine name.

   */

  public function providerInvalidMachineNameCharacters(): array {

  public static function providerInvalidMachineNameCharacters(): array {

    $cases = parent::providerInvalidMachineNameCharacters();

    // Remove the existing test case that verifies a machine name containing

    // periods is invalid.

    $this->assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);

    self::assertSame(['dash-separated', FALSE], $cases['INVALID: dash separated']);

    unset($cases['INVALID: dash separated']);

    // And instead add a test case that verifies it is allowed for tours.

    $cases['VALID: dash separated'] = ['dash-separated', TRUE];