From aafcd8d6cf2906e0170d6c87b4be7f124fa71d19 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 12 Apr 2020 23:37:47 +0100
Subject: [PATCH] Issue #3126784 by quietone, jungle:
\Drupal\ban\Plugin\migrate\destination\BlockedIP is not identical with its
filename BlockedIp.php
---
core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php | 4 ++--
.../{MigrateBlockedIPsTest.php => MigrateBlockedIpsTest.php} | 4 ++--
.../src/Kernel/Plugin/migrate/DestinationCategoryTest.php | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
rename core/modules/ban/tests/src/Kernel/Migrate/d7/{MigrateBlockedIPsTest.php => MigrateBlockedIpsTest.php} (87%)
diff --git a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
index 203905f27ad9..68f932c8028e 100644
--- a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
+++ b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
@@ -16,7 +16,7 @@
* id = "blocked_ip"
* )
*/
-class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterface {
+class BlockedIp extends DestinationBase implements ContainerFactoryPluginInterface {
/**
* The IP ban manager.
@@ -26,7 +26,7 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa
protected $banManager;
/**
- * Constructs a BlockedIP object.
+ * Constructs a BlockedIp object.
*
* @param array $configuration
* Plugin configuration.
diff --git a/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php b/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIpsTest.php
similarity index 87%
rename from core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
rename to core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIpsTest.php
index 48f35a7e1131..8c7fe971e902 100644
--- a/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
+++ b/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIpsTest.php
@@ -10,7 +10,7 @@
*
* @group ban
*/
-class MigrateBlockedIPsTest extends MigrateDrupal7TestBase {
+class MigrateBlockedIpsTest extends MigrateDrupal7TestBase {
use SchemaCheckTestTrait;
@@ -33,7 +33,7 @@ protected function setUp() {
/**
* Tests migration of blocked IPs.
*/
- public function testBlockedIPs() {
+ public function testBlockedIps() {
$this->assertTrue(\Drupal::service('ban.ip_manager')->isBanned('111.111.111.111'));
}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
index dde4d7d92bf7..22eebc7287d4 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
@@ -2,7 +2,7 @@
namespace Drupal\Tests\migrate_drupal\Kernel\Plugin\migrate;
-use Drupal\ban\Plugin\migrate\destination\BlockedIP;
+use Drupal\ban\Plugin\migrate\destination\BlockedIp;
use Drupal\color\Plugin\migrate\destination\Color;
use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
use Drupal\migrate\Plugin\migrate\destination\ComponentEntityDisplayBase;
@@ -121,7 +121,7 @@ protected function getContentClasses() {
return [
EntityContentBase::class,
UrlAlias::class,
- BlockedIP::class,
+ BlockedIp::class,
NodeCounter::class,
UserData::class,
];
--
GitLab