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

core/modules/search/src/Annotation/SearchPlugin.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Annotation\SearchPlugin.
- */
-
 namespace Drupal\search\Annotation;
 
 use Drupal\Component\Annotation\Plugin;

core/modules/search/src/Controller/SearchController.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Controller\SearchController.
- */
-
 namespace Drupal\search\Controller;
 
 use Drupal\Core\Cache\CacheableDependencyInterface;
@@ -12,7 +7,6 @@ use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\search\SearchPageInterface;
 use Drupal\search\SearchPageRepositoryInterface;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -47,14 +41,12 @@ class SearchController extends ControllerBase {
    *
    * @param \Drupal\search\SearchPageRepositoryInterface $search_page_repository
    *   The search page repository.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A logger instance.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
    */
-  public function __construct(SearchPageRepositoryInterface $search_page_repository, LoggerInterface $logger, RendererInterface $renderer) {
+  public function __construct(SearchPageRepositoryInterface $search_page_repository, RendererInterface $renderer) {
     $this->searchPageRepository = $search_page_repository;
-    $this->logger = $logger;
+    $this->logger = $this->getLogger('search');
     $this->renderer = $renderer;
   }
 
@@ -64,7 +56,6 @@ class SearchController extends ControllerBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('search.search_page_repository'),
-      $container->get('logger.factory')->get('search'),
       $container->get('renderer')
     );
   }

core/modules/search/src/Entity/SearchPage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Entity\SearchPage.
- */
-
 namespace Drupal\search\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;

core/modules/search/src/Form/ReindexConfirm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Form\ReindexConfirm.
- */
-
 namespace Drupal\search\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;

core/modules/search/src/Form/SearchBlockForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Form\SearchBlockForm.
- */
-
 namespace Drupal\search\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/modules/search/src/Form/SearchPageAddForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Form\SearchPageAddForm.
- */
-
 namespace Drupal\search\Form;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/search/src/Form/SearchPageEditForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Form\SearchPageEditForm.
- */
-
 namespace Drupal\search\Form;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/search/src/Form/SearchPageForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Form\SearchPageForm.
- */
-
 namespace Drupal\search\Form;
 
 use Drupal\Core\Entity\EntityForm;

core/modules/search/src/Form/SearchPageFormBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Form\SearchPageFormBase.
- */
-
 namespace Drupal\search\Form;
 
 use Drupal\Core\Entity\EntityForm;

core/modules/search/src/Plugin/Block/SearchBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\Block\SearchBlock.
- */
-
 namespace Drupal\search\Plugin\Block;
 
 use Drupal\Core\Access\AccessResult;

core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\ConfigurableSearchPluginBase.
- */
-
 namespace Drupal\search\Plugin;
 
 use Drupal\Component\Utility\NestedArray;

core/modules/search/src/Plugin/ConfigurableSearchPluginInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\ConfigurableSearchPluginInterface.
- */
-
 namespace Drupal\search\Plugin;
 
 use Drupal\Component\Plugin\ConfigurablePluginInterface;

core/modules/search/src/Plugin/Derivative/SearchLocalTask.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\Derivative\SearchLocalTask.
- */
-
 namespace Drupal\search\Plugin\Derivative;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;

core/modules/search/src/Plugin/SearchIndexingInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\SearchIndexingInterface.
- */
-
 namespace Drupal\search\Plugin;
 
 /**

core/modules/search/src/Plugin/SearchInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\SearchInterface.
- */
-
 namespace Drupal\search\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;

core/modules/search/src/Plugin/SearchPluginBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\SearchPluginBase.
- */
-
 namespace Drupal\search\Plugin;
 
 use Drupal\Core\Cache\RefinableCacheableDependencyInterface;

core/modules/search/src/Plugin/SearchPluginCollection.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\SearchPluginCollection.
- */
-
 namespace Drupal\search\Plugin;
 
 use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;

core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\migrate\destination\EntitySearchPage.
- */
-
 namespace Drupal\search\Plugin\migrate\destination;
 
 use Drupal\Core\Entity\EntityInterface;

core/modules/search/src/Plugin/migrate/process/SearchConfigurationRankings.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\migrate\process\SearchConfigurationRankings.
- */
-
 namespace Drupal\search\Plugin\migrate\process;
 
 use Drupal\migrate\ProcessPluginBase;

core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\migrate\process\d6\SearchConfigurationRankings.
- */
-
 namespace Drupal\search\Plugin\migrate\process\d6;
 
 use Drupal\migrate\ProcessPluginBase;

core/modules/search/src/Plugin/views/argument/Search.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\views\argument\Search.
- */
-
 namespace Drupal\search\Plugin\views\argument;
 
 use Drupal\views\Plugin\views\argument\ArgumentPluginBase;

core/modules/search/src/Plugin/views/field/Score.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\views\field\Score.
- */
-
 namespace Drupal\search\Plugin\views\field;
 
 use Drupal\views\Plugin\views\field\NumericField;

core/modules/search/src/Plugin/views/filter/Search.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\views\filter\Search.
- */
-
 namespace Drupal\search\Plugin\views\filter;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/search/src/Plugin/views/row/SearchRow.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\views\row\SearchRow.
- */
-
 namespace Drupal\search\Plugin\views\row;
 
 use Drupal\Core\Form\FormStateInterface;

core/modules/search/src/Plugin/views/sort/Score.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Plugin\views\sort\Score.
- */
-
 namespace Drupal\search\Plugin\views\sort;
 
 use Drupal\views\Plugin\views\sort\SortPluginBase;

core/modules/search/src/Routing/SearchPageRoutes.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Routing\SearchPageRoutes.
- */
-
 namespace Drupal\search\Routing;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;

core/modules/search/src/SearchPageAccessControlHandler.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\SearchPageAccessControlHandler.
- */
-
 namespace Drupal\search;
 
 use Drupal\Core\Access\AccessResult;
@@ -27,21 +22,21 @@ class SearchPageAccessControlHandler extends EntityAccessControlHandler {
     /** @var $entity \Drupal\search\SearchPageInterface */
     if (in_array($operation, array('delete', 'disable'))) {
       if ($entity->isDefaultSearch()) {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+        return AccessResult::forbidden()->addCacheableDependency($entity);
       }
       else {
-        return parent::checkAccess($entity, $operation, $account)->cacheUntilEntityChanges($entity);
+        return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
       }
     }
     if ($operation == 'view') {
       if (!$entity->status()) {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+        return AccessResult::forbidden()->addCacheableDependency($entity);
       }
       $plugin = $entity->getPlugin();
       if ($plugin instanceof AccessibleInterface) {
-        return $plugin->access($operation, $account, TRUE)->cacheUntilEntityChanges($entity);
+        return $plugin->access($operation, $account, TRUE)->addCacheableDependency($entity);
       }
-      return AccessResult::allowed()->cacheUntilEntityChanges($entity);
+      return AccessResult::allowed()->addCacheableDependency($entity);
     }
     return parent::checkAccess($entity, $operation, $account);
   }

core/modules/search/src/SearchPageInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\SearchPageInterface.
- */
-
 namespace Drupal\search;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;

core/modules/search/src/SearchPageListBuilder.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\SearchPageListBuilder.
- */
-
 namespace Drupal\search;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/modules/search/src/SearchPageRepository.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\SearchPageRepository.
- */
-
 namespace Drupal\search;
 
 use Drupal\Core\Config\ConfigFactoryInterface;

core/modules/search/src/SearchPageRepositoryInterface.php

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

core/modules/search/src/SearchPluginManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\SearchPluginManager.
- */
-
 namespace Drupal\search;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;

core/modules/search/src/SearchQuery.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\SearchQuery.
- *
- * Search query extender and helper functions.
- */
-
 namespace Drupal\search;
 
 use Drupal\Component\Utility\Unicode;
@@ -14,6 +7,8 @@ use Drupal\Core\Database\Query\SelectExtender;
 use Drupal\Core\Database\Query\SelectInterface;
 
 /**
+ * Search query extender and helper functions.
+ *
  * Performs a query on the full-text search index for a word or words.
  *
  * This query is used by search plugins that use the search index (not all

core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchAdvancedSearchFormTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchBlockTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchBlockTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**
@@ -78,7 +73,7 @@ class SearchBlockTest extends SearchTestBase {
     $this->assertEqual(
       $this->getUrl(),
       \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => $terms['keys']), 'absolute' => TRUE)),
-      'Submitted to correct url.'
+      'Submitted to correct URL.'
     );
 
     // Test an empty search via the block form, from the front page.
@@ -92,7 +87,7 @@ class SearchBlockTest extends SearchTestBase {
     $this->assertEqual(
       $this->getUrl(),
       \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => ''), 'absolute' => TRUE)),
-      'Redirected to correct url.'
+      'Redirected to correct URL.'
     );
 
     // Test that after entering a too-short keyword in the form, you can then

core/modules/search/src/Tests/SearchCommentCountToggleTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchCommentCountToggleTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;

core/modules/search/src/Tests/SearchCommentTest.php

@@ -1,16 +1,12 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchCommentTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\user\RoleInterface;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests integration searching comments.
@@ -59,7 +55,7 @@ class SearchCommentTest extends SearchTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -90,7 +86,7 @@ class SearchCommentTest extends SearchTestBase {
   function testSearchResultsComment() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Create basic_html format that escapes all HTML.
-    $basic_html_format = entity_create('filter_format', array(
+    $basic_html_format = FilterFormat::create(array(
       'format' => 'basic_html',
       'name' => 'Basic HTML',
       'weight' => 1,

core/modules/search/src/Tests/SearchConfigSettingsFormTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchConfigSettingsFormTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\Core\Url;

core/modules/search/src/Tests/SearchDateIntervalTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchDateIntervalTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;

core/modules/search/src/Tests/SearchEmbedFormTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchEmbedFormTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchExactTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchExactTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchExcerptTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchExcerptTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\simpletest\KernelTestBase;

core/modules/search/src/Tests/SearchKeywordsConditionsTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchKeywordsConditionsTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\Component\Utility\Html;

core/modules/search/src/Tests/SearchLanguageTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchLanguageTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\field\Entity\FieldStorageConfig;

core/modules/search/src/Tests/SearchMatchTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchMatchTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/search/src/Tests/SearchMultilingualEntityTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchMultilingualEntityTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\field\Entity\FieldStorageConfig;

core/modules/search/src/Tests/SearchNodeDiacriticsTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchNodeDiacriticsTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchNodePunctuationTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchNodePunctuationTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchNodeUpdateAndDeletionTest.
- */
 
 namespace Drupal\search\Tests;
 

core/modules/search/src/Tests/SearchNumberMatchingTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchNumberMatchingTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/search/src/Tests/SearchNumbersTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchNumbersTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\Core\Language\LanguageInterface;

core/modules/search/src/Tests/SearchPageCacheTagsTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchPageCacheTagsTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\Core\Cache\Cache;

core/modules/search/src/Tests/SearchPageOverrideTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchPageOverrideTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchPageTextTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchPageTextTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\Component\Utility\Html;

core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchPreprocessLangcodeTest.
- */
 
 namespace Drupal\search\Tests;
 

core/modules/search/src/Tests/SearchQueryAlterTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchQueryAlterTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchRankingTest.php

@@ -1,15 +1,11 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchRankingTest.
- */
-
 namespace Drupal\search\Tests;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Url;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Indexes content and tests ranking factors.
@@ -203,7 +199,7 @@ class SearchRankingTest extends SearchTestBase {
    * Test rankings of HTML tags.
    */
   public function testHTMLRankings() {
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
     ));

core/modules/search/src/Tests/SearchSetLocaleTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchSetLocaleTest.
- */
-
 namespace Drupal\search\Tests;
 
 /**

core/modules/search/src/Tests/SearchSimplifyTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchSimplifyTest.
- */
-
 namespace Drupal\search\Tests;
 use Drupal\Component\Utility\Unicode;
 

core/modules/search/src/Tests/SearchTestBase.php

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

core/modules/search/src/Tests/SearchTokenizerTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\SearchTokenizerTest.
- */
-
 namespace Drupal\search\Tests;
 use Drupal\Component\Utility\Unicode;
 

core/modules/search/src/ViewsSearchQuery.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\ViewsSearchQuery.
- */
-
 namespace Drupal\search;
 
 use Drupal\Core\Database\Query\Condition;

core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php

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

core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_extra_type\Plugin\Search\SearchExtraTypeSearch.
- */
-
 namespace Drupal\search_extra_type\Plugin\Search;
 
 use Drupal\Component\Utility\SafeMarkup;

core/modules/search/tests/modules/search_query_alter/search_query_alter.module

@@ -1,12 +1,12 @@
 <?php
 
-use Drupal\Core\Database\Query\AlterableInterface;
-
 /**
  * @file
  * Test module that alters search queries.
  */
 
+use Drupal\Core\Database\Query\AlterableInterface;
+
 /**
  * Implements hook_query_TAG_alter(): tag search_$type with $type node_search.
  */

core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchPageTest.
- */
-
-namespace Drupal\search\Tests\Migrate\d6;
+namespace Drupal\Tests\search\Kernel\Migrate\d6;
 
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\search\Entity\SearchPage;
 
 /**
@@ -57,10 +52,8 @@ class MigrateSearchPageTest extends MigrateDrupal6TestBase {
       ->condition('name', 'node_rank_comments')
       ->execute();
 
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = \Drupal::entityManager()
-      ->getStorage('migration')
-      ->loadUnchanged('search_page');
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('search_page');
     // Indicate we're rerunning a migration that's already run.
     $migration->getIdMap()->prepareUpdate();
     $this->executeMigration($migration);

core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchSettingsTest.
- */
-
-namespace Drupal\search\Tests\Migrate\d6;
+namespace Drupal\Tests\search\Kernel\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to search.settings.yml.

core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d7\MigrateSearchPageTest.
- */
-
-namespace Drupal\search\Tests\Migrate\d7;
+namespace Drupal\Tests\search\Kernel\Migrate\d7;
 
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\search\Entity\SearchPage;
 
 /**
@@ -59,10 +54,8 @@ class MigrateSearchPageTest extends MigrateDrupal7TestBase {
       ->condition('name', 'node_rank_comments')
       ->execute();
 
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = \Drupal::entityManager()
-      ->getStorage('migration')
-      ->loadUnchanged('search_page');
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('search_page');
     // Indicate we're rerunning a migration that's already run.
     $migration->getIdMap()->prepareUpdate();
     $this->executeMigration($migration);

core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchSettingsTest.php

@@ -1,13 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d7\MigrateSearchSettingsTest.
- */
+namespace Drupal\Tests\search\Kernel\Migrate\d7;
 
-namespace Drupal\search\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Search variables to configuration.

core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\search\Unit\SearchPluginCollectionTest.
- */
-
 namespace Drupal\Tests\search\Unit;
 
 use Drupal\search\Plugin\SearchPluginCollection;