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

core/modules/action/src/ActionAddForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\ActionAddForm.
- */
-
 namespace Drupal\action;
 
 use Drupal\Component\Utility\Crypt;

core/modules/action/src/ActionEditForm.php

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

core/modules/action/src/ActionFormBase.php

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

core/modules/action/src/ActionListBuilder.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\ActionListBuilder.
- */
-
 namespace Drupal\action;
 
 use Drupal\Core\Action\ActionManager;

core/modules/action/src/Form/ActionAdminManageForm.php

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

core/modules/action/src/Form/ActionDeleteForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\Form\ActionDeleteForm.
- */
-
 namespace Drupal\action\Form;
 
 use Drupal\Core\Entity\EntityDeleteForm;

core/modules/action/src/Plugin/Action/EmailAction.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\Plugin\Action\EmailAction.
- */
-
 namespace Drupal\action\Plugin\Action;
 
 use Drupal\Component\Render\PlainTextOutput;

core/modules/action/src/Plugin/Action/GotoAction.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\Plugin\Action\GotoAction.
- */
-
 namespace Drupal\action\Plugin\Action;
 
 use Drupal\Component\Utility\UrlHelper;

core/modules/action/src/Plugin/Action/MessageAction.php

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

core/modules/action/src/Plugin/migrate/source/Action.php

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

core/modules/action/src/Tests/ActionUninstallTest.php

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

core/modules/action/src/Tests/BulkFormTest.php

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

core/modules/action/src/Tests/ConfigurationTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\Tests\ConfigurationTest.
- */
-
 namespace Drupal\action\Tests;
 
 use Drupal\Component\Utility\Crypt;

core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionConfigsTest.
- */
-
-namespace Drupal\action\Tests\Migrate\d6;
+namespace Drupal\Tests\action\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 action.settings.yml.

core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionsTest.
- */
-
-namespace Drupal\action\Tests\Migrate\d6;
+namespace Drupal\Tests\action\Kernel\Migrate\d6;
 
 use Drupal\system\Entity\Action;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of action items.

core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\action\Tests\Migrate\d7\MigrateActionsTest.
- */
-
-namespace Drupal\action\Tests\Migrate\d7;
+namespace Drupal\Tests\action\Kernel\Migrate\d7;
 
 use Drupal\system\Entity\Action;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of action items.

core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\action\Unit\Menu\ActionLocalTasksTest.
- */
-
 namespace Drupal\Tests\action\Unit\Menu;
 
 use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;

core/modules/action/tests/src/Unit/Plugin/migrate/source/ActionTest.php

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

core/modules/aggregator/aggregator.install

@@ -17,7 +17,7 @@ function aggregator_requirements($phase) {
   );
   if (!$has_curl) {
     $requirements['curl']['severity'] = REQUIREMENT_ERROR;
-    $requirements['curl']['description'] = t('The Aggregator module could not be installed because the PHP <a href=":curl_url">cURL</a> library is not available.', array(':curl_url' => 'http://php.net/manual/curl.setup.php'));
+    $requirements['curl']['description'] = t('The Aggregator module could not be installed because the PHP <a href="http://php.net/manual/curl.setup.php">cURL</a> library is not available.');
   }
   return $requirements;
 }

core/modules/aggregator/aggregator.module

@@ -109,7 +109,7 @@ function aggregator_entity_extra_field_info() {
       ),
       'feed_icon' => array(
         'label' => t('Feed icon'),
-        'description' => t('An icon that links to the feed url'),
+        'description' => t('An icon that links to the feed URL'),
         'weight' => 6,
       ),
     ),

core/modules/aggregator/src/AggregatorFeedViewsData.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\AggregatorFeedViewsData.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\views\EntityViewsData;

core/modules/aggregator/src/AggregatorItemViewsData.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\AggregatorItemViewsData.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\views\EntityViewsData;

core/modules/aggregator/src/Annotation/AggregatorFetcher.php

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

core/modules/aggregator/src/Annotation/AggregatorParser.php

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

core/modules/aggregator/src/Annotation/AggregatorProcessor.php

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

core/modules/aggregator/src/Controller/AggregatorController.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Controller\AggregatorController.
- */
-
 namespace Drupal\aggregator\Controller;
 
 use Drupal\Component\Utility\Xss;

core/modules/aggregator/src/Entity/Feed.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Entity\Feed.
- */
-
 namespace Drupal\aggregator\Entity;
 
 use Drupal\Core\Entity\ContentEntityBase;

core/modules/aggregator/src/Entity/Item.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Entity\Item.
- */
-
 namespace Drupal\aggregator\Entity;
 
 use Drupal\Core\Cache\Cache;

core/modules/aggregator/src/FeedAccessControlHandler.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedAccessControlHandler.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Access\AccessResult;

core/modules/aggregator/src/FeedForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedForm.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\ContentEntityForm;
@@ -21,9 +16,7 @@ class FeedForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $feed = $this->entity;
-    $insert = (bool) $feed->id();
-    $feed->save();
-    if ($insert) {
+    if ($feed->save() == SAVED_UPDATED) {
       drupal_set_message($this->t('The feed %feed has been updated.', array('%feed' => $feed->label())));
       $form_state->setRedirectUrl($feed->urlInfo('canonical'));
     }

core/modules/aggregator/src/FeedHtmlRouteProvider.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedHtmlRouteProvider.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\EntityTypeInterface;

core/modules/aggregator/src/FeedInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedInterface.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\ContentEntityInterface;

core/modules/aggregator/src/FeedStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedStorage.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;

core/modules/aggregator/src/FeedStorageInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedStorageInterface.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\ContentEntityStorageInterface;

core/modules/aggregator/src/FeedStorageSchema.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedStorageSchema.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;

core/modules/aggregator/src/FeedViewBuilder.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\FeedViewBuilder.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/aggregator/src/Form/FeedDeleteForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Form\FeedDeleteForm.
- */
-
 namespace Drupal\aggregator\Form;
 
 use Drupal\Core\Entity\ContentEntityDeleteForm;

core/modules/aggregator/src/Form/FeedItemsDeleteForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Form\FeedItemsDeleteForm.
- */
-
 namespace Drupal\aggregator\Form;
 
 use Drupal\Core\Entity\ContentEntityConfirmFormBase;

core/modules/aggregator/src/Form/OpmlFeedAdd.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Form\OpmlFeedAdd.
- */
-
 namespace Drupal\aggregator\Form;
 
 use Drupal\aggregator\FeedStorageInterface;

core/modules/aggregator/src/Form/SettingsForm.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Form\SettingsForm.
- */
-
 namespace Drupal\aggregator\Form;
 
 use Drupal\aggregator\Plugin\AggregatorPluginManager;

core/modules/aggregator/src/ItemInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\ItemInterface.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\ContentEntityInterface;

core/modules/aggregator/src/ItemStorage.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\ItemStorage.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\Query\QueryInterface;

core/modules/aggregator/src/ItemStorageInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\ItemStorageInterface.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\ContentEntityStorageInterface;

core/modules/aggregator/src/ItemStorageSchema.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\ItemStorageSchema.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;

core/modules/aggregator/src/ItemViewBuilder.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\ItemViewBuilder.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\Core\Entity\EntityViewBuilder;

core/modules/aggregator/src/ItemsImporter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\ItemsImporter.
- */
-
 namespace Drupal\aggregator;
 
 use Drupal\aggregator\Plugin\AggregatorPluginManager;

core/modules/aggregator/src/ItemsImporterInterface.php

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

core/modules/aggregator/src/Plugin/AggregatorPluginManager.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\AggregatorPluginManager.
- */
-
 namespace Drupal\aggregator\Plugin;
 
 use Drupal\Core\Cache\CacheBackendInterface;

core/modules/aggregator/src/Plugin/AggregatorPluginSettingsBase.php

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

core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\Block\AggregatorFeedBlock.
- */
-
 namespace Drupal\aggregator\Plugin\Block;
 
 use Drupal\aggregator\FeedStorageInterface;

core/modules/aggregator/src/Plugin/FetcherInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\FetcherInterface.
- */
-
 namespace Drupal\aggregator\Plugin;
 
 use Drupal\aggregator\FeedInterface;

core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\Field\FieldFormatter\AggregatorTitleFormatter.
- */
-
 namespace Drupal\aggregator\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldDefinitionInterface;

core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorXSSFormatter.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\Field\FieldFormatter\AggregatorXSSFormatter.
- */
-
 namespace Drupal\aggregator\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldItemListInterface;

core/modules/aggregator/src/Plugin/ParserInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\ParserInterface.
- */
-
 namespace Drupal\aggregator\Plugin;
 
 use Drupal\aggregator\FeedInterface;

core/modules/aggregator/src/Plugin/ProcessorInterface.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\ProcessorInterface.
- */
-
 namespace Drupal\aggregator\Plugin;
 
 use Drupal\aggregator\FeedInterface;

core/modules/aggregator/src/Plugin/QueueWorker/AggregatorRefresh.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\QueueWorker\AggregatorRefresh.
- */
-
 namespace Drupal\aggregator\Plugin\QueueWorker;
 
 use Drupal\aggregator\FeedInterface;

core/modules/aggregator/src/Plugin/Validation/Constraint/FeedTitleConstraint.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\Validation\Constraint\FeedTitleConstraint.
- */
-
 namespace Drupal\aggregator\Plugin\Validation\Constraint;
 
 use Drupal\Core\Validation\Plugin\Validation\Constraint\UniqueFieldConstraint;

core/modules/aggregator/src/Plugin/Validation/Constraint/FeedUrlConstraint.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\Validation\Constraint\FeedUrlConstraint.
- */
-
 namespace Drupal\aggregator\Plugin\Validation\Constraint;
 
 use Drupal\Core\Validation\Plugin\Validation\Constraint\UniqueFieldConstraint;

core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\aggregator\fetcher\DefaultFetcher.
- */
-
 namespace Drupal\aggregator\Plugin\aggregator\fetcher;
 
 use Drupal\aggregator\Plugin\FetcherInterface;

core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\aggregator\parser\DefaultParser.
- */
-
 namespace Drupal\aggregator\Plugin\aggregator\parser;
 
 use Drupal\aggregator\Plugin\ParserInterface;

core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php

@@ -1,12 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\aggregator\processor\DefaultProcessor.
- */
-
 namespace Drupal\aggregator\Plugin\aggregator\processor;
 
+use Drupal\aggregator\Entity\Item;
 use Drupal\aggregator\ItemStorageInterface;
 use Drupal\aggregator\Plugin\AggregatorPluginSettingsBase;
 use Drupal\aggregator\Plugin\ProcessorInterface;
@@ -215,7 +211,7 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
         $entry = reset($entry);
       }
       else {
-        $entry = entity_create('aggregator_item', array('langcode' => $feed->language()->getId()));
+        $entry = Item::create(array('langcode' => $feed->language()->getId()));
       }
       if ($item['timestamp']) {
         $entry->setPostedTime($item['timestamp']);

core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\migrate\source\AggregatorFeed.
- */
-
 namespace Drupal\aggregator\Plugin\migrate\source;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
@@ -37,8 +32,8 @@ class AggregatorFeed extends DrupalSqlBase {
       'url' => $this->t('URL to the feed.'),
       'refresh' => $this->t('Refresh frequency in seconds.'),
       'checked' => $this->t('Last-checked unix timestamp.'),
-      'link' => $this->t('Parent website of feed.'),
-      'description' => $this->t('Parent website\'s description fo the feed.'),
+      'link' => $this->t('Parent website of the feed.'),
+      'description' => $this->t("Parent website's description of the feed."),
       'image' => $this->t('An image representing the feed.'),
       'etag' => $this->t('Entity tag HTTP response header.'),
       'modified' => $this->t('When the feed was last modified.'),

core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php

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

core/modules/aggregator/src/Plugin/views/argument/Fid.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\views\argument\Fid.
- */
-
 namespace Drupal\aggregator\Plugin\views\argument;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/aggregator/src/Plugin/views/argument/Iid.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\views\argument\Iid.
- */
-
 namespace Drupal\aggregator\Plugin\views\argument;
 
 use Drupal\Core\Entity\EntityManagerInterface;

core/modules/aggregator/src/Plugin/views/row/Rss.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Plugin\views\row\Rss.
- */
-
 namespace Drupal\aggregator\Plugin\views\row;
 
 use Drupal\views\Plugin\views\row\RssPluginBase;

core/modules/aggregator/src/Tests/AddFeedTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\AddFeedTest.
- */
-
 namespace Drupal\aggregator\Tests;
 
 /**
@@ -28,7 +23,7 @@ class AddFeedTest extends AggregatorTestBase {
     $feed->refreshItems();
 
     // Check feed data.
-    $this->assertUrl(\Drupal::url('aggregator.feed_add', [], ['absolute' => TRUE]), [], 'Directed to correct url.');
+    $this->assertUrl(\Drupal::url('aggregator.feed_add', [], ['absolute' => TRUE]), [], 'Directed to correct URL.');
     $this->assertTrue($this->uniqueFeed($feed->label(), $feed->getUrl()), 'The feed is unique.');
 
     // Check feed source.

core/modules/aggregator/src/Tests/AggregatorAdminTest.php

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

core/modules/aggregator/src/Tests/AggregatorCronTest.php

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

core/modules/aggregator/src/Tests/AggregatorRenderingTest.php

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

core/modules/aggregator/src/Tests/AggregatorTestBase.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\AggregatorTestBase.
- */
-
 namespace Drupal\aggregator\Tests;
 
 use Drupal\aggregator\Entity\Feed;
@@ -137,7 +132,7 @@ abstract class AggregatorTestBase extends WebTestBase {
       'url' => $feed_url,
       'refresh' => '900',
     );
-    return entity_create('aggregator_feed', $values);
+    return Feed::create($values);
   }
 
   /**

core/modules/aggregator/src/Tests/DeleteFeedItemTest.php

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

core/modules/aggregator/src/Tests/DeleteFeedTest.php

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

core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php

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

core/modules/aggregator/src/Tests/FeedCacheTagsTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\FeedCacheTagsTest.
- */
-
 namespace Drupal\aggregator\Tests;
 
 use Drupal\aggregator\Entity\Feed;

core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php

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

core/modules/aggregator/src/Tests/FeedLanguageTest.php

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

core/modules/aggregator/src/Tests/FeedParserTest.php

@@ -1,13 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\FeedParserTest.
- */
-
 namespace Drupal\aggregator\Tests;
 
 use Drupal\Core\Url;
+use Drupal\aggregator\Entity\Feed;
 
 /**
  * Tests the built-in feed parser with valid feed samples.
@@ -89,7 +85,7 @@ class FeedParserTest extends AggregatorTestBase {
    */
   public function testRedirectFeed() {
     $redirect_url = Url::fromRoute('aggregator_test.redirect')->setAbsolute()->toString();
-    $feed = entity_create('aggregator_feed', array('url' => $redirect_url, 'title' => $this->randomMachineName()));
+    $feed = Feed::create(array('url' => $redirect_url, 'title' => $this->randomMachineName()));
     $feed->save();
     $feed->refreshItems();
 
@@ -103,7 +99,7 @@ class FeedParserTest extends AggregatorTestBase {
   public function testInvalidFeed() {
     // Simulate a typo in the URL to force a curl exception.
     $invalid_url = 'http:/www.drupal.org';
-    $feed = entity_create('aggregator_feed', array('url' => $invalid_url, 'title' => $this->randomMachineName()));
+    $feed = Feed::create(array('url' => $invalid_url, 'title' => $this->randomMachineName()));
     $feed->save();
 
     // Update the feed. Use the UI to be able to check the message easily.

core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\FeedProcessorPluginTest.
- */
-
 namespace Drupal\aggregator\Tests;
 
 use Drupal\aggregator\Entity\Feed;

core/modules/aggregator/src/Tests/ImportOpmlTest.php

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

core/modules/aggregator/src/Tests/ItemCacheTagsTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\ItemCacheTagsTest.
- */
-
 namespace Drupal\aggregator\Tests;
 
 use Drupal\aggregator\Entity\Feed;

core/modules/aggregator/src/Tests/UpdateFeedItemTest.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\UpdateFeedItemTest.
- */
-
 namespace Drupal\aggregator\Tests;
 use Drupal\aggregator\Entity\Feed;
 

core/modules/aggregator/src/Tests/UpdateFeedTest.php

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

core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\aggregator_test\Controller\AggregatorTestRssController.
- */
 
 namespace Drupal\aggregator_test\Controller;
 
@@ -59,7 +55,7 @@ class AggregatorTestRssController extends ControllerBase {
     $response->headers->set('Content-Type', 'application/rss+xml; charset=utf-8');
 
     // Read actual feed from file.
-    $file_name = drupal_get_path('module', 'aggregator_test') . '/aggregator_test_rss091.xml';
+    $file_name = __DIR__ . '/../../aggregator_test_rss091.xml';
     $handle = fopen($file_name, 'r');
     $feed = fread($handle, filesize($file_name));
     fclose($handle);

core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/fetcher/TestFetcher.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator_test\Plugin\aggregator\fetcher\TestFetcher.
- */
-
 namespace Drupal\aggregator_test\Plugin\aggregator\fetcher;
 
 use Drupal\aggregator\Plugin\FetcherInterface;

core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/parser/TestParser.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator_test\Plugin\aggregator\parser\TestParser.
- */
-
 namespace Drupal\aggregator_test\Plugin\aggregator\parser;
 
 use Drupal\aggregator\Plugin\ParserInterface;

core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator_test\Plugin\aggregator\processor\TestProcessor.
- */
-
 namespace Drupal\aggregator_test\Plugin\aggregator\processor;
 
 use Drupal\aggregator\Plugin\AggregatorPluginSettingsBase;

core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php

@@ -1,15 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\AggregatorTitleTest.
- */
-
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Kernel;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
-use Drupal\simpletest\KernelTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 
 /**
@@ -24,7 +19,7 @@ class AggregatorTitleTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = ['file', 'field', 'options', 'aggregator'];
+  public static $modules = ['file', 'field', 'options', 'aggregator', 'system'];
 
   /**
    * The field name that is tested.
@@ -43,6 +38,8 @@ class AggregatorTitleTest extends KernelTestBase {
     $this->installEntitySchema('aggregator_feed');
     $this->installEntitySchema('aggregator_item');
 
+    \Drupal::service('router.builder')->rebuild();
+
     $this->fieldName = 'title';
   }
 
@@ -69,25 +66,25 @@ class AggregatorTitleTest extends KernelTestBase {
     $build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
     $result = $this->render($build);
 
-    $this->assertTrue(strpos($result, 'testing title'));
-    $this->assertTrue(strpos($result, 'href="' . $aggregator_feed->getUrl()) . '"');
+    $this->assertContains('testing title', $result);
+    $this->assertContains('href="' . $aggregator_feed->getUrl() . '"', $result);
 
     $build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
     $result = $this->render($build);
-    $this->assertTrue(strpos($result, 'testing title') === 0);
-    $this->assertTrue(strpos($result, $aggregator_feed->getUrl()) === FALSE);
+    $this->assertContains('testing title', $result);
+    $this->assertNotContains($aggregator_feed->getUrl(), $result);
 
     // Verify aggregator item title with and without links.
     $build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' =>TRUE]]);
     $result = $this->render($build);
 
-    $this->assertTrue(strpos($result, 'test title'));
-    $this->assertTrue(strpos($result, 'href="' . $aggregator_item->getLink()) . '"');
+    $this->assertContains('test title', $result);
+    $this->assertContains('href="' . $aggregator_item->getLink() . '"', $result);
 
     $build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
     $result = $this->render($build);
-    $this->assertTrue(strpos($result, 'test title') === 0);
-    $this->assertTrue(strpos($result, $aggregator_item->getLink()) === FALSE);
+    $this->assertContains('test title', $result);
+    $this->assertNotContains($aggregator_item->getLink(), $result);
   }
 
 }

core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php

@@ -1,21 +1,16 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\FeedValidationTest.
- */
-
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Kernel;
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
 
 /**
  * Tests feed validation constraints.
  *
  * @group aggregator
  */
-class FeedValidationTest extends EntityUnitTestBase {
+class FeedValidationTest extends EntityKernelTestBase {
 
   /**
    * Modules to install.

core/modules/aggregator/tests/src/Kernel/ItemWithoutFeedTest.php

@@ -1,11 +1,6 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\ItemWithoutFeedTest.
- */
-
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Kernel;
 
 use Drupal\aggregator\Entity\Item;
 use Drupal\KernelTests\KernelTestBase;

core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\MigrateAggregatorStubTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate;
+namespace Drupal\tests\aggregator\Kernel\Migrate;
 
 use Drupal\migrate\MigrateException;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
 /**

core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorConfigsTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d6;
+namespace Drupal\Tests\aggregator\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 aggregator.settings.yml.

core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorFeedTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d6;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of aggregator feeds.

core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorItemTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorItemTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d6;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
 
 use Drupal\aggregator\Entity\Item;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests migration of aggregator items.

core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorFeedTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d7;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Test migration to aggregator_feed entities.

core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorItemTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorItemTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d7;
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
 
 use Drupal\aggregator\Entity\Item;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of aggregator items.

core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorSettingsTest.php

@@ -1,13 +1,8 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorSettingsTest.
- */
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
 
-namespace Drupal\aggregator\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
  * Tests migration of Aggregator's variables to configuration.

core/modules/aggregator/tests/src/Kernel/Views/AggregatorFeedViewsFieldAccessTest.php

@@ -1,14 +1,9 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Views\AggregatorFeedViewsFieldAccessTest.
- */
-
-namespace Drupal\aggregator\Tests\Views;
+namespace Drupal\Tests\aggregator\Kernel\Views;
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
 
 /**
  * Tests base field access in Views for the aggregator_feed entity.

core/modules/aggregator/tests/src/Kernel/Views/AggregatorItemViewsFieldAccessTest.php

@@ -1,15 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Views\AggregatorItemViewsFieldAccessTest.
- */
-
-namespace Drupal\aggregator\Tests\Views;
+namespace Drupal\Tests\aggregator\Kernel\Views;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
 
 /**
  * Tests base field access in Views for the aggregator_item entity.

core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php

@@ -1,25 +1,20 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Views\IntegrationTest.
- */
-
-namespace Drupal\aggregator\Tests\Views;
+namespace Drupal\Tests\aggregator\Kernel\Views;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Url;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
 
 /**
  * Tests basic integration of views data from the aggregator module.
  *
  * @group aggregator
  */
-class IntegrationTest extends ViewKernelTestBase {
+class IntegrationTest extends ViewsKernelTestBase {
 
   /**
    * Modules to install.
@@ -52,7 +47,7 @@ class IntegrationTest extends ViewKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
     $this->installEntitySchema('aggregator_item');
@@ -120,7 +115,7 @@ class IntegrationTest extends ViewKernelTestBase {
       $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
         return $view->field['title']->advancedRender($row);
       });
-      $this->assertEqual($output, $expected_link, 'Ensure the right link is generated');
+      $this->assertEqual($output, $expected_link->getGeneratedLink(), 'Ensure the right link is generated');
 
       $expected_author = Xss::filter($items[$iid]->getAuthor(), _aggregator_allowed_tags());
       $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {