diff --git a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php index f456af0..1d6dd82 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php +++ b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php @@ -284,7 +284,10 @@ public function getIdMap() { } /** + * Get the highwater storage object. + * * @return \Drupal\Core\KeyValueStore\KeyValueStoreInterface + * The storage object. */ protected function getHighWaterStorage() { if (!isset($this->highwaterStorage)) { diff --git a/core/modules/migrate/lib/Drupal/migrate/MigrateBuildDependencyInterface.php b/core/modules/migrate/lib/Drupal/migrate/MigrateBuildDependencyInterface.php index e06c95c..dbf8694 100644 --- a/core/modules/migrate/lib/Drupal/migrate/MigrateBuildDependencyInterface.php +++ b/core/modules/migrate/lib/Drupal/migrate/MigrateBuildDependencyInterface.php @@ -19,6 +19,7 @@ * migration ids (for example node:page, node:article). * * @return array + * An array of migrations. */ public function buildDependencyMigration(array $migrations, array $dynamic_ids); } diff --git a/core/modules/migrate/lib/Drupal/migrate/MigratePassword.php b/core/modules/migrate/lib/Drupal/migrate/MigratePassword.php index fc8ed1c..ba42e8a 100644 --- a/core/modules/migrate/lib/Drupal/migrate/MigratePassword.php +++ b/core/modules/migrate/lib/Drupal/migrate/MigratePassword.php @@ -32,7 +32,8 @@ class MigratePassword implements PasswordInterface { /** * Builds the replacement password service class. * - * @param PasswordInterface $original_password + * @param \Drupal\Core\Password\PasswordInterface $original_password + * The password object. */ public function __construct(PasswordInterface $original_password) { $this->originalPassword = $original_password; diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigratePluginManager.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigratePluginManager.php index 69b2d4f..ece8f2a 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigratePluginManager.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigratePluginManager.php @@ -27,7 +27,8 @@ class MigratePluginManager extends DefaultPluginManager { * Constructs a MigratePluginManager object. * * @param string $type - * The type of the plugin: row, source, process, destination, entity_field, id_map. + * The type of the plugin: row, source, process, destination, entity_field, + * id_map. * @param \Traversable $namespaces * An object that implements \Traversable which contains the root paths * keyed by the corresponding namespace to look for plugin implementations. @@ -37,7 +38,7 @@ class MigratePluginManager extends DefaultPluginManager { * The language manager. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler to invoke the alter hook with. - * @param $annotation + * @param string $annotation * The annotation class name. */ public function __construct($type, \Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler, $annotation = 'Drupal\Component\Annotation\PluginID') { diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateProcessInterface.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateProcessInterface.php index 2af5466..d06050e 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateProcessInterface.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateProcessInterface.php @@ -19,7 +19,7 @@ /** * Performs the associated process. * - * @param $value + * @param mixed $value * The value to be transformed. * @param \Drupal\migrate\MigrateExecutable $migrate_executable * The migration in which this process is being executed. diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateSourceInterface.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateSourceInterface.php index da11d0b..6c55f27 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateSourceInterface.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateSourceInterface.php @@ -27,6 +27,7 @@ public function fields(); * Returns the iterator that will yield the row arrays to be processed. * * @return \Iterator + * The iterator object. * * @throws \Exception * Cannot obtain a valid iterator. diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php index 183cb7b..c9df406 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php @@ -36,6 +36,8 @@ protected $bundles; /** + * Construct a new entity. + * * @param array $configuration * A configuration array containing information about the plugin instance. * @param string $plugin_id @@ -73,9 +75,7 @@ public static function create(ContainerInterface $container, array $configuratio /** * Finds the entity type from configuration or plugin id. * - * @param $configuration - * The plugin configuration. - * @param $plugin_id + * @param string $plugin_id * The plugin id. * * @return string @@ -97,9 +97,13 @@ public function fields(MigrationInterface $migration = NULL) { /** * Creates or loads an entity. * - * @param Row $row + * @param \Drupal\migrate\Row $row + * The row object. * @param array $old_destination_id_values + * The old destination ids. + * * @return \Drupal\Core\Entity\EntityInterface + * The entity we're importing into. */ protected function getEntity(Row $row, array $old_destination_id_values) { $entity_id = $old_destination_id_values ? reset($old_destination_id_values) : $row->getDestinationProperty($this->getKey('id')); diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php index 8e4d14b..63e6ca8 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php @@ -75,7 +75,7 @@ public static function create(ContainerInterface $container, array $configuratio */ public function import(Row $row, array $old_destination_id_values = array()) { if ($all_instances = $this->fieldInfo->getInstances($this->storageController->getEntityTypeId())) { - /** @var \Drupal\Field\Entity\FieldInstanceConfig [] $instances */ + /** @var \Drupal\Field\Entity\FieldInstanceConfig[] $instances */ $instances = array(); if ($bundle_key = $this->getKey('bundle')) { $bundle = $row->getDestinationProperty($bundle_key); diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php index b9988e9..5ef70f1 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/id_map/Sql.php @@ -28,11 +28,18 @@ class Sql extends PluginBase implements MigrateIdMapInterface { /** - * Names of tables created for tracking the migration. + * The migration map table name. * * @var string */ - protected $mapTableName, $messageTableName; + protected $mapTableName; + + /** + * The message table name. + * + * @var string + */ + protected $messageTableName; /** * The migrate message. @@ -175,6 +182,7 @@ protected function destinationIdFields() { * The name of the database map table. * * @return string + * The map table name. */ public function mapTableName() { $this->init(); @@ -185,6 +193,7 @@ public function mapTableName() { * The name of the database message table. * * @return string + * The message table name. */ public function messageTableName() { $this->init(); @@ -192,7 +201,10 @@ public function messageTableName() { } /** + * Get the fully qualified map table name. + * * @return string + * The fully qualified map table name. */ public function getQualifiedMapTableName() { $database = $this->getDatabase(); @@ -205,6 +217,7 @@ public function getQualifiedMapTableName() { * Gets the database connection. * * @return \Drupal\Core\Database\Connection + * The database connection object. */ protected function getDatabase() { if (!isset($this->database)) { @@ -222,11 +235,11 @@ protected function init() { $this->initialized = TRUE; // Default generated table names, limited to 63 characters. $machine_name = str_replace(':', '__', $this->migration->id()); - $prefixLength = strlen($this->getDatabase()->tablePrefix()) ; + $prefix_length = strlen($this->getDatabase()->tablePrefix()); $this->mapTableName = 'migrate_map_' . Unicode::strtolower($machine_name); - $this->mapTableName = Unicode::substr($this->mapTableName, 0, 63 - $prefixLength); + $this->mapTableName = Unicode::substr($this->mapTableName, 0, 63 - $prefix_length); $this->messageTableName = 'migrate_message_' . Unicode::strtolower($machine_name); - $this->messageTableName = Unicode::substr($this->messageTableName, 0, 63 - $prefixLength); + $this->messageTableName = Unicode::substr($this->messageTableName, 0, 63 - $prefix_length); $this->ensureTables(); } } diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DedupeBase.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DedupeBase.php index 16d94eb..3ad5b99 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DedupeBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DedupeBase.php @@ -37,7 +37,11 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro /** * This is a query checking the existence of some value. * + * @param mixed $value + * The value to check. + * * @return bool + * TRUE if the value exists. */ abstract protected function exists($value); diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DefaultValue.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DefaultValue.php index d129bd9..1758e52 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DefaultValue.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/DefaultValue.php @@ -21,7 +21,7 @@ */ class DefaultValue extends ProcessPluginBase { - /** + /** * {@inheritdoc} */ public function transform($value, MigrateExecutable $migrate_executable, Row $row, $destination_property) { diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Extract.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Extract.php index 3c825b1..4ec792b 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Extract.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Extract.php @@ -39,4 +39,3 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro } } - diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Iterator.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Iterator.php index 4267c21..f0bfdef 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Iterator.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/Iterator.php @@ -49,6 +49,7 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro * The migrate executable helper class. * @param \Drupal\migrate\Row $row * The current row after processing. + * * @return mixed * The transformed key. */ diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/MachineName.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/MachineName.php index 15d95a2..80532bc 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/MachineName.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/MachineName.php @@ -41,7 +41,10 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro } /** + * Get the transliteration object. + * * @return \Drupal\Core\Transliteration\PHPTransliteration + * The transliteration object. */ protected function getTransliteration() { if (!isset($this->transliteration)) { @@ -51,4 +54,3 @@ protected function getTransliteration() { } } - diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/StaticMap.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/StaticMap.php index 455cb51..d8c1114 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/StaticMap.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/process/StaticMap.php @@ -56,4 +56,3 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro } } - diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/EmptySource.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/EmptySource.php index acd2067..705e93b 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/EmptySource.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/EmptySource.php @@ -38,6 +38,9 @@ public function __toString() { return ''; } + /** + * {@inheritdoc} + */ public function getIds() { $ids['id']['type'] = 'string'; return $ids; diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SourcePluginBase.php index c4f497d..66c0bfaf 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SourcePluginBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SourcePluginBase.php @@ -53,7 +53,7 @@ protected function getModuleHandler() { */ public function prepareRow(Row $row) { $result_hook = $this->getModuleHandler()->invokeAll('migrate_prepare_row', array($row, $this, $this->migration)); - $result_named_hook = $this->getModuleHandler()->invokeAll('migrate_'. $this->migration->id() . '_prepare_row', array($row, $this, $this->migration)); + $result_named_hook = $this->getModuleHandler()->invokeAll('migrate_' . $this->migration->id() . '_prepare_row', array($row, $this, $this->migration)); // If any of the hooks returned false, we want to skip the row. if (($result_hook && in_array(FALSE, $result_hook)) || ($result_named_hook && in_array(FALSE, $result_named_hook))) { return FALSE; diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SqlBase.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SqlBase.php index d6d2b97..8e2dfe6 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SqlBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/source/SqlBase.php @@ -39,14 +39,20 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi } /** - * @return \Drupal\Core\Database\Connection + * Print the query string when the object is used a string. + * + * @return string + * The query string. */ public function __toString() { return (string) $this->query; } /** + * Get the database connection object. + * * @return \Drupal\Core\Database\Connection + * The database connection. */ public function getDatabase() { if (!isset($this->database)) { diff --git a/core/modules/migrate/lib/Drupal/migrate/Row.php b/core/modules/migrate/lib/Drupal/migrate/Row.php index e9475f6..60cb02f 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Row.php +++ b/core/modules/migrate/lib/Drupal/migrate/Row.php @@ -235,7 +235,7 @@ public function getRawDestination() { * The name of a property on the destination. * * @return mixed - * The destination value. + * The destination value. */ public function getDestinationProperty($property) { return NestedArray::getValue($this->destination, explode('.', $property)); diff --git a/core/modules/migrate/lib/Drupal/migrate/Tests/MigrateTestBase.php b/core/modules/migrate/lib/Drupal/migrate/Tests/MigrateTestBase.php index f10320b..9a4b5bd 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Tests/MigrateTestBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Tests/MigrateTestBase.php @@ -52,7 +52,7 @@ protected function setUp() { $connection_info[$target]['prefix'] = array( // Simpletest uses 7 character prefixes at most so this can't cause // collisions. - 'default' => $value['prefix']['default'] .'0', + 'default' => $value['prefix']['default'] . '0', ); } Database::addConnectionInfo('migrate', 'default', $connection_info['default']); @@ -67,10 +67,12 @@ protected function tearDown() { } /** - * @param MigrationInterface $migration - * @param array $files + * Prepare the migration. * - * @return \Drupal\Core\Database\Connection + * @param \Drupal\migrate\Entity\MigrationInterface $migration + * The migration object. + * @param array $files + * An array of files. */ protected function prepare(MigrationInterface $migration, array $files = array()) { $this->loadDumps($files); @@ -79,6 +81,8 @@ protected function prepare(MigrationInterface $migration, array $files = array() /** * Load Drupal 6 database dumps to be used. * + * @param array $files + * An array of files. * @param string $method * The name of the method in the dump class to use. Defaults to load. */ @@ -97,6 +101,8 @@ protected function loadDumps($files, $method = 'load') { } /** + * Prepare the id mappings. + * * @param array $id_mappings * A list of id mappings keyed by migration ids. Each id mapping is a list * of two arrays, the first are source ids and the second are destination diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/ConditionResolver.php b/core/modules/migrate/tests/Drupal/migrate/Tests/ConditionResolver.php index 875f13e..a1504b7 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/ConditionResolver.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/ConditionResolver.php @@ -16,10 +16,12 @@ class ConditionResolver { * Match a row against a group of conditions. * * @param \Drupal\migrate\tests\DatabaseRowInterface $row - * + * The database row object. * @param \Drupal\Core\Database\Query\Condition $condition_group + * The condition group object. * * @return bool + * TRUE if there is a match. */ public static function matchGroup(DatabaseRowInterface $row, Condition $condition_group) { $conditions = $condition_group->conditions(); @@ -50,7 +52,6 @@ public static function matchGroup(DatabaseRowInterface $row, Condition $conditio * TRUE if the condition matches. * * @throws \Exception - * */ protected static function matchSingle(DatabaseRowInterface $row, array $condition) { $row_value = $row->getValue($condition['field']); diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRow.php b/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRow.php index 1c8cf76..63920aa 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRow.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRow.php @@ -9,11 +9,21 @@ class DatabaseRow implements DatabaseRowInterface { + /** + * Construct a new row. + * + * @param array $row + * The row data. + */ public function __construct(array $row) { $this->row = $row; } + /** + * {@inheritdoc} + */ public function getValue($field) { return $this->row[$field]; } + } diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowInterface.php b/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowInterface.php index cddfa8b..d49c030 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowInterface.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowInterface.php @@ -9,5 +9,14 @@ interface DatabaseRowInterface { - function getValue($field); + /** + * Get the field value from the row. + * + * @param mixed $field + * The field to get the value of. + * + * @return mixed + * The field value from the row. + */ + public function getValue($field); } diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowSelect.php b/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowSelect.php index d4772ab..911779f 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowSelect.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/DatabaseRowSelect.php @@ -9,12 +9,25 @@ class DatabaseRowSelect extends DatabaseRow { - public function __construct(array $row, array $fieldsWithTable, array $fields) { - $this->fieldsWithTable = $fieldsWithTable; + /** + * Construct a new database row. + * + * @param array $row + * The row data. + * @param array $fields_with_table + * The fields with a table. + * @param array $fields + * The fields. + */ + public function __construct(array $row, array $fields_with_table, array $fields) { + $this->fieldsWithTable = $fields_with_table; $this->fields = $fields; parent::__construct($row); } + /** + * {@inheritdoc} + */ public function getValue($field) { $field_info = isset($this->fieldsWithTable[$field]) ? $this->fieldsWithTable[$field] : $this->fields[$field]; if (array_key_exists($field_info['field'], $this->row[$field_info['table']]['result'])) { @@ -25,4 +38,5 @@ public function getValue($field) { } return $this->row[$field_info['table']][$index][$field_info['field']]; } + } diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/FakeSelect.php b/core/modules/migrate/tests/Drupal/migrate/Tests/FakeSelect.php index de2f546..fb6ffff 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/FakeSelect.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/FakeSelect.php @@ -301,6 +301,9 @@ protected function sortCallback($a, $b) { * The condition group to check. * @param array $rows * An array of rows excluding non-matching rows. + * + * @return \Drupal\migrate\Tests\ConditionResolver + * The condition resolver object. */ protected function resolveConditions(Condition $condition_group, array &$rows) { $fields_with_table = $this->fieldsWithTable; diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/FakeTruncate.php b/core/modules/migrate/tests/Drupal/migrate/Tests/FakeTruncate.php index c1007cd..2547b72 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/FakeTruncate.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/FakeTruncate.php @@ -18,7 +18,7 @@ class FakeTruncate { * @param array $database_contents * The database contents faked as an array. Each key is a table name, each * value is a list of table rows. - * @param $table + * @param string $table * The table to truncate. */ public function __construct(array &$database_contents, $table) { diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php index 1500618..577006f 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php @@ -257,11 +257,11 @@ public function testMessageSave() { $id_map->saveMessage(array($key), $message, $expected_result['level']); $message_row = $this->database->select($id_map->messageTableName(), 'message') ->fields('message') - ->condition('level',$expected_result['level']) - ->condition('message',$expected_result['message']) + ->condition('level', $expected_result['level']) + ->condition('message', $expected_result['message']) ->execute() ->fetchAssoc(); - $this->assertEquals($expected_result['message'], $message_row['message'], 'Message from database was read.'); + $this->assertEquals($expected_result['message'], $message_row['message'], 'Message from database was read.'); } // Insert with default level. diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateTestCase.php b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateTestCase.php index 91e9fb0..cf17b1d 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateTestCase.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateTestCase.php @@ -110,7 +110,7 @@ protected function getValue($row, $key) { protected function retrievalAssertHelper($expected_value, $actual_value, $message) { if (is_array($expected_value)) { foreach ($expected_value as $k => $v) { - $this->retrievalAssertHelper($v, $actual_value[$k], $message . '['. $k . ']'); + $this->retrievalAssertHelper($v, $actual_value[$k], $message . '[' . $k . ']'); } } else { diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/TestMigrateExecutable.php b/core/modules/migrate/tests/Drupal/migrate/Tests/TestMigrateExecutable.php index 1ddfebf..ad305f2 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/TestMigrateExecutable.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/TestMigrateExecutable.php @@ -109,7 +109,7 @@ public function getTotalProcessed() { /** * Allows access to protected processedSinceFeedback property. * - * @var int + * @return int * The value of the protected property. */ public function getProcessedSinceFeedback() { diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/process/ConcatTest.php b/core/modules/migrate/tests/Drupal/migrate/Tests/process/ConcatTest.php index 4c01ab7..22be55e 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/process/ConcatTest.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/process/ConcatTest.php @@ -65,6 +65,12 @@ class TestConcat extends Concat { public function __construct() { } + /** + * Set the delimiter. + * + * @param string $delimiter + * The new delimiter. + */ public function setDelimiter($delimiter) { $this->configuration['delimiter'] = $delimiter; }