Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

core/modules/ban/src/BanIpManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\BanIpManager.
- */
-
 namespace Drupal\ban;
 
 use Drupal\Core\Database\Connection;

core/modules/ban/src/BanIpManagerInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\BanIpManagerInterface.
- */
-
 namespace Drupal\ban;
 
 /**

core/modules/ban/src/BanMiddleware.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\BanMiddleware.
- */
-
 namespace Drupal\ban;
 
 use Drupal\Component\Utility\SafeMarkup;

core/modules/ban/src/Form/BanAdmin.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\Form\BanAdmin.
- */
-
 namespace Drupal\ban\Form;
 
 use Drupal\Core\Form\FormBase;

core/modules/ban/src/Form/BanDelete.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\Form\BanDelete.
- */
-
 namespace Drupal\ban\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
@@ -26,6 +21,13 @@ class BanDelete extends ConfirmFormBase {
    */
   protected $banIp;
 
+  /**
+   * The IP manager.
+   *
+   * @var \Drupal\ban\BanIpManagerInterface
+   */
+  protected $ipManager;
+
   /**
    * Constructs a new BanDelete object.
    *

core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php

@@ -1,15 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\Plugin\migrate\destination\BlockedIP.
- */
-
 namespace Drupal\ban\Plugin\migrate\destination;
 
 use Drupal\ban\BanIpManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -34,15 +29,15 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa
    * Constructs a BlockedIP object.
    *
    * @param array $configuration
-   *  Plugin configuration.
+   *   Plugin configuration.
    * @param string $plugin_id
-   *  The plugin ID.
+   *   The plugin ID.
    * @param mixed $plugin_definition
-   *  The plugin definiiton.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
-   *  The current migration.
+   *   The plugin definiiton.
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The current migration.
    * @param \Drupal\ban\BanIpManagerInterface $ban_manager
-   *  The IP manager service.
+   *   The IP manager service.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, BanIpManagerInterface $ban_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $migration);

core/modules/ban/src/Plugin/migrate/source/d7/BlockedIps.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\Plugin\migrate\source\d7\BlockedIps.
- */
-
 namespace Drupal\ban\Plugin\migrate\source\d7;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/ban/src/Tests/IpAddressBlockingTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\Tests\IpAddressBlockingTest.
- */
-
 namespace Drupal\ban\Tests;
 
 use Drupal\simpletest\WebTestBase;

core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\ban\Tests\Migrate\d7\MigrateBlockedIPsTest.
- */
-
-namespace Drupal\ban\Tests\Migrate\d7;
+namespace Drupal\Tests\ban\Kernel\Migrate\d7;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Migrate blocked IPs.

core/modules/ban/tests/src/Unit/BanMiddlewareTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\ban\Unit\BanMiddlewareTest.
- */
-
 namespace Drupal\Tests\ban\Unit;
 
 use Drupal\ban\BanMiddleware;

core/modules/ban/tests/src/Unit/Plugin/migrate/source/d7/BlockedIpsTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\ban\Unit\Plugin\migrate\source\d7\BlockedIpsTest.
- */
-
 namespace Drupal\Tests\ban\Unit\Plugin\migrate\source\d7;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;