diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php index 1ab9fdb..18ae9ce 100644 --- a/core/lib/Drupal/Core/Config/ConfigManager.php +++ b/core/lib/Drupal/Core/Config/ConfigManager.php @@ -441,7 +441,8 @@ protected function callOnDependencyRemoval(ConfigEntityInterface $entity, array // Key the entity arrays by config dependency name to make searching easy. foreach (['config', 'content'] as $dependency_type) { $affected_dependencies[$dependency_type] = array_combine( - array_map(function ($entity) { return $entity->getConfigDependencyName(); }, $affected_dependencies[$dependency_type]), + array_map(function ($entity) { return $entity->getConfigDependencyName(); + }, $affected_dependencies[$dependency_type]), $affected_dependencies[$dependency_type] ); } diff --git a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php index 4396a39..16d36ee 100644 --- a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php +++ b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php @@ -68,7 +68,7 @@ public function get(EntityTypeInterface $entity_type, $conjunction) { */ public function getAggregate(EntityTypeInterface $entity_type, $conjunction) { throw new QueryException('Aggregation over configuration entities is not supported'); - } + } /** * Gets the key value store used to store fast lookups. diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php index 6b9be78..a0d13b1 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php @@ -128,7 +128,8 @@ public function __toString() { // Default fields are always placed first for consistency. $insert_fields = array_merge($this->defaultFields, $this->insertFields); - $insert_fields = array_map(function($f) { return $this->connection->escapeField($f); }, $insert_fields); + $insert_fields = array_map(function($f) { return $this->connection->escapeField($f); + }, $insert_fields); // If we're selecting from a SelectQuery, finish building the query and // pass it back, as any remaining options are irrelevant. diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php index 23c0264..17816e7 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php @@ -100,7 +100,8 @@ public function __toString() { // Default fields are always placed first for consistency. $insert_fields = array_merge($this->defaultFields, $this->insertFields); - $insert_fields = array_map(function($f) { return $this->connection->escapeField($f); }, $insert_fields); + $insert_fields = array_map(function($f) { return $this->connection->escapeField($f); + }, $insert_fields); $query = $comments . 'INSERT INTO {' . $this->table . '} (' . implode(', ', $insert_fields) . ') VALUES '; diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index b5fccbd..8411ae2 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -855,7 +855,8 @@ public function removeTranslation($langcode) { * {@inheritdoc} */ public function getTranslationLanguages($include_default = TRUE) { - $translations = array_filter($this->translations, function($translation) { return $translation['status']; }); + $translations = array_filter($this->translations, function($translation) { return $translation['status']; + }); unset($translations[LanguageInterface::LANGCODE_DEFAULT]); if ($include_default) { diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php index dea8865..740d9ea 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php @@ -129,8 +129,10 @@ protected function initFieldValues(ContentEntityInterface $entity, array $values */ public function createTranslation(ContentEntityInterface $entity, $langcode, array $values = []) { $translation = $entity->getTranslation($langcode); - $definitions = array_filter($translation->getFieldDefinitions(), function(FieldDefinitionInterface $definition) { return $definition->isTranslatable(); }); - $field_names = array_map(function(FieldDefinitionInterface $definition) { return $definition->getName(); }, $definitions); + $definitions = array_filter($translation->getFieldDefinitions(), function(FieldDefinitionInterface $definition) { return $definition->isTranslatable(); + }); + $field_names = array_map(function(FieldDefinitionInterface $definition) { return $definition->getName(); + }, $definitions); $values[$this->langcodeKey] = $langcode; $values[$this->getEntityType()->getKey('default_langcode')] = FALSE; $this->initFieldValues($translation, $values, $field_names); diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php index fbcaecb..183910d 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php @@ -234,7 +234,7 @@ protected function finish() { } foreach ($this->sqlGroupBy as $field) { $this->sqlQuery->groupBy($field); - } + } foreach ($this->sqlFields as $field) { $this->sqlQuery->addField($field[0], $field[1], isset($field[2]) ? $field[2] : NULL); } diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php index b229d3a..5bb65df 100644 --- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php +++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php @@ -291,9 +291,12 @@ public function requiresDedicatedTableStorage(FieldStorageDefinitionInterface $s */ public function getDedicatedTableNames() { $table_mapping = $this; - $definitions = array_filter($this->fieldStorageDefinitions, function($definition) use ($table_mapping) { return $table_mapping->requiresDedicatedTableStorage($definition); }); - $data_tables = array_map(function($definition) use ($table_mapping) { return $table_mapping->getDedicatedDataTableName($definition); }, $definitions); - $revision_tables = array_map(function($definition) use ($table_mapping) { return $table_mapping->getDedicatedRevisionTableName($definition); }, $definitions); + $definitions = array_filter($this->fieldStorageDefinitions, function($definition) use ($table_mapping) { return $table_mapping->requiresDedicatedTableStorage($definition); + }); + $data_tables = array_map(function($definition) use ($table_mapping) { return $table_mapping->getDedicatedDataTableName($definition); + }, $definitions); + $revision_tables = array_map(function($definition) use ($table_mapping) { return $table_mapping->getDedicatedRevisionTableName($definition); + }, $definitions); $dedicated_tables = array_merge(array_values($data_tables), array_values($revision_tables)); return $dedicated_tables; } diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php index d76c132..c5ba69d 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php @@ -1473,7 +1473,8 @@ protected function createEntitySchemaIndexes(array $entity_schema, FieldStorageD // involving them. Only indexes for which all columns exist are // actually created. $create = FALSE; - $specifier_columns = array_map(function($item) { return is_string($item) ? $item : reset($item); }, $specifier); + $specifier_columns = array_map(function($item) { return is_string($item) ? $item : reset($item); + }, $specifier); if (!isset($column_names) || array_intersect($specifier_columns, $column_names)) { $create = TRUE; foreach ($specifier_columns as $specifier_column_name) { @@ -1522,7 +1523,8 @@ protected function deleteEntitySchemaIndexes(array $entity_schema_data, FieldSto foreach ($index_keys as $key => $drop_method) { if (!empty($schema[$key])) { foreach ($schema[$key] as $name => $specifier) { - $specifier_columns = array_map(function($item) { return is_string($item) ? $item : reset($item); }, $specifier); + $specifier_columns = array_map(function($item) { return is_string($item) ? $item : reset($item); + }, $specifier); if (!isset($column_names) || array_intersect($specifier_columns, $column_names)) { $schema_handler->{$drop_method}($table_name, $name); } diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php index ca1835e..d4e95cf 100644 --- a/core/lib/Drupal/Core/Entity/entity.api.php +++ b/core/lib/Drupal/Core/Entity/entity.api.php @@ -893,7 +893,7 @@ function hook_entity_presave(Drupal\Core\Entity\EntityInterface $entity) { if ($entity instanceof ContentEntityInterface && $entity->isTranslatable()) { $route_match = \Drupal::routeMatch(); \Drupal::service('content_translation.synchronizer')->synchronizeFields($entity, $entity->language()->getId(), $route_match->getParameter('source_langcode')); - } + } } /** diff --git a/core/lib/Drupal/Core/Field/FieldItemList.php b/core/lib/Drupal/Core/Field/FieldItemList.php index ebdb276..6674411 100644 --- a/core/lib/Drupal/Core/Field/FieldItemList.php +++ b/core/lib/Drupal/Core/Field/FieldItemList.php @@ -264,7 +264,7 @@ public function generateSampleItems($count = 1) { $values[$delta] = $field_type_class::generateSampleValue($field_definition); } $this->setValue($values); - } + } /** * {@inheritdoc} diff --git a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php index c6a3840..f5d1c7f 100644 --- a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php +++ b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php @@ -37,7 +37,7 @@ class SiteSettingsForm extends FormBase { public function __construct($site_path, RendererInterface $renderer) { $this->sitePath = $site_path; $this->renderer = $renderer; -} + } /** * {@inheritdoc} diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php index f6dcde2..840fe74 100644 --- a/core/lib/Drupal/Core/Path/AliasManager.php +++ b/core/lib/Drupal/Core/Path/AliasManager.php @@ -283,7 +283,7 @@ protected function pathAliasWhitelistRebuild($path = NULL) { if (!empty($path)) { if ($this->whitelist->get(strtok($path, '/'))) { return; - } + } } $this->whitelist->clear(); } diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php index 09a1bf1..f008637 100644 --- a/core/lib/Drupal/Core/Render/Renderer.php +++ b/core/lib/Drupal/Core/Render/Renderer.php @@ -309,7 +309,8 @@ protected function doRender(&$elements, $is_root_call = FALSE) { if (count($elements['#lazy_builder']) !== 2) { throw new \DomainException('The #lazy_builder property must have an array as a value, containing two values: the callback, and the arguments for the callback.'); } - if (count($elements['#lazy_builder'][1]) !== count(array_filter($elements['#lazy_builder'][1], function($v) { return is_null($v) || is_scalar($v); }))) { + if (count($elements['#lazy_builder'][1]) !== count(array_filter($elements['#lazy_builder'][1], function($v) { return is_null($v) || is_scalar($v); + }))) { throw new \DomainException("A #lazy_builder callback's context may only contain scalar values or NULL."); } $children = Element::children($elements); diff --git a/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php b/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php index 346ea26..3d4d928 100644 --- a/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php +++ b/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php @@ -70,7 +70,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) { else { $elements[$delta] = ['#markup' => $item->value]; } - } + } return $elements; } diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php index 022b793..99c5398 100644 --- a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php +++ b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php @@ -110,6 +110,7 @@ public function testSettingsForm() { namespace { // @todo Delete after https://www.drupal.org/node/1858196 is in. if (!function_exists('drupal_set_message')) { - function drupal_set_message() {} + function drupal_set_message() { + } } } diff --git a/core/modules/big_pipe/src/Tests/BigPipeTest.php b/core/modules/big_pipe/src/Tests/BigPipeTest.php index 9ae960b..1b7016d 100644 --- a/core/modules/big_pipe/src/Tests/BigPipeTest.php +++ b/core/modules/big_pipe/src/Tests/BigPipeTest.php @@ -389,7 +389,8 @@ protected function assertSessionCookieExists($expected) { * Asserts whether a cookie exists on the client or not. */ protected function assertCookieExists($cookie_name, $expected, $cookie_label) { - $non_deleted_cookies = array_filter($this->cookies, function ($item) { return $item['value'] !== 'deleted'; }); + $non_deleted_cookies = array_filter($this->cookies, function ($item) { return $item['value'] !== 'deleted'; + }); $this->assertEqual($expected, isset($non_deleted_cookies[$cookie_name]), $expected ? "$cookie_label cookie exists." : "$cookie_label cookie does not exist."); } diff --git a/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php index eb52e50..e34cddf 100644 --- a/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php +++ b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php @@ -181,13 +181,17 @@ public function testMultipleSyncedValues() { // their delta. $delta_callbacks = array( // Continuous field values: all values are equal. - function($delta) { return TRUE; }, + function($delta) { return TRUE; + }, // Alternated field values: only the even ones are equal. - function($delta) { return $delta % 2 !== 0; }, + function($delta) { return $delta % 2 !== 0; + }, // Sparse field values: only the "middle" ones are equal. - function($delta) { return $delta === 1 || $delta === 2; }, + function($delta) { return $delta === 1 || $delta === 2; + }, // Sparse field values: only the "extreme" ones are equal. - function($delta) { return $delta === 0 || $delta === 3; }, + function($delta) { return $delta === 0 || $delta === 3; + }, ); foreach ($delta_callbacks as $delta_callback) { diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module index 2ad07a2..6ee9c7f 100644 --- a/core/modules/datetime/datetime.module +++ b/core/modules/datetime/datetime.module @@ -39,7 +39,7 @@ function datetime_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Dates can be displayed using the Plain or the Default formatter. The Plain formatter displays the date in the ISO 8601 format. If you choose the Default formatter, you can choose a format from a predefined list that can be managed on the Date and time formats page.', array(':date_format_list'=> \Drupal::url('entity.date_format.collection'))) . '
'; $output .= ''; return $output; - } + } } /** diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php index 1fc1d60..e67c05b 100644 --- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php +++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php @@ -578,7 +578,7 @@ function testDatelistWidget() { $this->drupalPostForm(NULL, $edit, t('Save')); $this->assertResponse(200); $this->assertOptionSelected("edit-$field_name-0-value-minute", '0', 'Correct minute selected.'); - } + } /** * The data provider for testing the validation of the datelist widget. diff --git a/core/modules/field_ui/src/Form/FieldConfigEditForm.php b/core/modules/field_ui/src/Form/FieldConfigEditForm.php index 827bf1b..ff6d157 100644 --- a/core/modules/field_ui/src/Form/FieldConfigEditForm.php +++ b/core/modules/field_ui/src/Form/FieldConfigEditForm.php @@ -167,7 +167,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { $default_value = $items->defaultValuesFormSubmit($form['default_value'], $form, $form_state); } $this->entity->setDefaultValue($default_value); -} + } /** * {@inheritdoc} diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 310eb26..1dd28de 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -1192,7 +1192,8 @@ function file_managed_file_save_upload($element, FormStateInterface $form_state) // Value callback expects FIDs to be keys. $files = array_filter($files); - $fids = array_map(function($file) { return $file->id(); }, $files); + $fids = array_map(function($file) { return $file->id(); + }, $files); return empty($files) ? array() : array_combine($fids, $files); } diff --git a/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php b/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php index 00d1890..277ad7c 100644 --- a/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php +++ b/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php @@ -25,7 +25,8 @@ protected function initializeIterator() { ->fields('nt', ['type']) ->execute() ->fetchCol(); - $variables = array_map(function($type) { return 'upload_' . $type; }, $node_types); + $variables = array_map(function($type) { return 'upload_' . $type; + }, $node_types); $max_filesize = $this->variableGet('upload_uploadsize_default', 1); $max_filesize = $max_filesize ? $max_filesize . 'MB' : ''; diff --git a/core/modules/filter/src/Plugin/DataType/FilterFormat.php b/core/modules/filter/src/Plugin/DataType/FilterFormat.php index 65bfa19..c560ae8 100644 --- a/core/modules/filter/src/Plugin/DataType/FilterFormat.php +++ b/core/modules/filter/src/Plugin/DataType/FilterFormat.php @@ -27,7 +27,8 @@ public function getPossibleValues(AccountInterface $account = NULL) { * {@inheritdoc} */ public function getPossibleOptions(AccountInterface $account = NULL) { - return array_map(function ($format) { return $format->label(); }, filter_formats()); + return array_map(function ($format) { return $format->label(); + }, filter_formats()); } /** @@ -42,6 +43,7 @@ public function getSettableValues(AccountInterface $account = NULL) { */ public function getSettableOptions(AccountInterface $account = NULL) { // @todo: Avoid calling functions but move to injected dependencies. - return array_map(function ($format) { return $format->label(); }, filter_formats($account)); + return array_map(function ($format) { return $format->label(); + }, filter_formats($account)); } } diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php index 6ec335e..983b350 100644 --- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php +++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php @@ -281,7 +281,8 @@ public function getHTMLRestrictions() { // allowed attribute values with a wildcard. A wildcard by itself // would mean whitelisting all possible attribute values. But in that // case, one would not specify an attribute value at all. - $allowed_attribute_values = array_filter($allowed_attribute_values, function ($value) use ($star_protector) { return $value !== '*'; }); + $allowed_attribute_values = array_filter($allowed_attribute_values, function ($value) use ($star_protector) { return $value !== '*'; + }); if (empty($allowed_attribute_values)) { // If the value is the empty string all values are allowed. diff --git a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php index 28e11bd..7359a1b 100644 --- a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php +++ b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php @@ -114,7 +114,7 @@ public function testMissingEffectPlugin() { } // There should be only the one message. $this->assertEqual($count, 1); - } + } /** * Test that missing action's causes failures. @@ -144,7 +144,7 @@ public function testInvalidCropValues() { $this->assertEqual(['error' => [ 'The Drupal 8 image crop effect does not support numeric values for x and y offsets. Use keywords to set crop effect offsets instead.' ]], $this->migrateMessages); - } + } /** * Assert that a given image effect is migrated. diff --git a/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php b/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php index 4ba4d2b..c85856b 100644 --- a/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php +++ b/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php @@ -216,7 +216,8 @@ protected function mockFailure($migration, array $row, $status = MigrateIdMapInt $migration = $this->getMigration($migration); } /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */ - $destination = array_map(function() { return NULL; }, $migration->getDestinationPlugin()->getIds()); + $destination = array_map(function() { return NULL; + }, $migration->getDestinationPlugin()->getIds()); $row = new Row($row, $migration->getSourcePlugin()->getIds()); $migration->getIdMap()->saveIdMapping($row, $destination, $status); } diff --git a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php index 705eed4..d5540cc 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php +++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php @@ -147,7 +147,8 @@ protected function getDatabase(array $database_contents, $connection_options = [ protected function createSchemaFromRow(array $row) { // SQLite uses loose ("affinity") typing, so it is OK for every column to be // a text field. - $fields = array_map(function() { return ['type' => 'text']; }, $row); + $fields = array_map(function() { return ['type' => 'text']; + }, $row); return ['fields' => $fields]; } diff --git a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php index d53934a..7f16804 100644 --- a/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php +++ b/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php @@ -158,6 +158,7 @@ protected function entityQueryExpects($count) { ->will($this->returnValue($this->entityQuery)); $this->entityQuery->expects($this->exactly($count + 1)) ->method('execute') - ->will($this->returnCallback(function () use (&$count) { return $count--;})); + ->will($this->returnCallback(function () use (&$count) { return $count--; + })); } } diff --git a/core/modules/migrate/tests/src/Unit/process/GetTest.php b/core/modules/migrate/tests/src/Unit/process/GetTest.php index bdbb551..a478acb 100644 --- a/core/modules/migrate/tests/src/Unit/process/GetTest.php +++ b/core/modules/migrate/tests/src/Unit/process/GetTest.php @@ -47,7 +47,8 @@ public function testTransformSourceArray() { $this->plugin->setSource(array('test1', 'test2')); $this->row->expects($this->exactly(2)) ->method('getSourceProperty') - ->will($this->returnCallback(function ($argument) use ($map) { return $map[$argument]; } )); + ->will($this->returnCallback(function ($argument) use ($map) { return $map[$argument]; + } )); $value = $this->plugin->transform(NULL, $this->migrateExecutable, $this->row, 'destinationproperty'); $this->assertSame($value, array('source_value1', 'source_value2')); } @@ -78,7 +79,8 @@ public function testTransformSourceArrayAt() { $this->plugin->setSource(array('test1', '@@test2', '@@test3', 'test4')); $this->row->expects($this->exactly(4)) ->method('getSourceProperty') - ->will($this->returnCallback(function ($argument) use ($map) { return $map[$argument]; } )); + ->will($this->returnCallback(function ($argument) use ($map) { return $map[$argument]; + } )); $value = $this->plugin->transform(NULL, $this->migrateExecutable, $this->row, 'destinationproperty'); $this->assertSame($value, array('source_value1', 'source_value2', 'source_value3', 'source_value4')); } diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php index 8c70551..cec7165 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php @@ -74,7 +74,7 @@ public function getSystemData() { } } return $this->systemData; - } + } /** * {@inheritdoc} diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 26995f4..ffc0b7e 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -754,7 +754,7 @@ function node_get_recent($number = 10) { // If not, restrict the query to published nodes. $query->condition('status', NODE_PUBLISHED); } - } + } $nids = $query ->sort('changed', 'DESC') ->range(0, $number) diff --git a/core/modules/node/src/Plugin/views/filter/Status.php b/core/modules/node/src/Plugin/views/filter/Status.php index 194df7a..c842584 100644 --- a/core/modules/node/src/Plugin/views/filter/Status.php +++ b/core/modules/node/src/Plugin/views/filter/Status.php @@ -18,7 +18,8 @@ public function adminSummary() { } protected function operatorForm(&$form, FormStateInterface $form_state) { } - public function canExpose() { return FALSE; } + public function canExpose() { return FALSE; + } public function query() { $table = $this->ensureMyTable(); diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php index f642d2d..4a2af59 100644 --- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php +++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php @@ -625,7 +625,8 @@ public function testFieldapiField() { $result = $this->drupalGetJSON('test/serialize/node-field'); $this->assertEqual(count($result[2]['body']), $node->body->count(), 'Expected count of values'); - $this->assertEqual($result[2]['body'], array_map(function($item) { return $item['value']; }, $node->body->getValue()), 'Expected raw body values found.'); + $this->assertEqual($result[2]['body'], array_map(function($item) { return $item['value']; + }, $node->body->getValue()), 'Expected raw body values found.'); } /** diff --git a/core/modules/serialization/src/Normalizer/NormalizerBase.php b/core/modules/serialization/src/Normalizer/NormalizerBase.php index 934093e..90d9b75 100644 --- a/core/modules/serialization/src/Normalizer/NormalizerBase.php +++ b/core/modules/serialization/src/Normalizer/NormalizerBase.php @@ -72,6 +72,6 @@ protected function checkFormat($format = NULL) { } return in_array($format, (array) $this->format); - } + } } diff --git a/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php index 1a3cbf2..3c732d6 100644 --- a/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php +++ b/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php @@ -70,6 +70,6 @@ public function buildForm(array $form, FormStateInterface $form_state) { ); return parent::buildForm($form, $form_state); - } + } } diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index fa85098..3054c66 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -548,7 +548,7 @@ protected function getAssertionCall() { substr($caller['function'], 0, 6) == 'assert')) { // We remove that call. array_shift($backtrace); - } + } return Error::getLastCaller($backtrace); } diff --git a/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php b/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php index 04a7e98..6f56143 100644 --- a/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php +++ b/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php @@ -87,7 +87,7 @@ public function testSimpleAJAXFormValue() { 'new' => $build_id_from_cache_second_ajax, ]; $this->assertCommand($commands, $expected, 'Build id change command issued on subsequent AJAX submissions'); - } + } /** * Tests a form that uses an #ajax callback. diff --git a/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php b/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php index b3c195d..88ff23d 100644 --- a/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php +++ b/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php @@ -59,7 +59,8 @@ public function testCacheContext() { * Asserts whether a session cookie is present on the client or not. */ function assertSessionCookieOnClient($expected_present) { - $non_deleted_cookies = array_filter($this->cookies, function ($item) { return $item['value'] !== 'deleted'; }); + $non_deleted_cookies = array_filter($this->cookies, function ($item) { return $item['value'] !== 'deleted'; + }); $this->assertEqual($expected_present, isset($non_deleted_cookies[$this->getSessionName()]), 'Session cookie exists.'); } diff --git a/core/modules/system/src/Tests/Update/UpdateScriptTest.php b/core/modules/system/src/Tests/Update/UpdateScriptTest.php index 3f4edff..1dbd294 100644 --- a/core/modules/system/src/Tests/Update/UpdateScriptTest.php +++ b/core/modules/system/src/Tests/Update/UpdateScriptTest.php @@ -242,7 +242,7 @@ function testSuccessfulMultilingualUpdateFunctionality() { 'id' => $language_code, 'label' => $this->randomMachineName(), ))->save(); - } + } $config = \Drupal::service('config.factory')->getEditable('language.negotiation'); // Ensure path prefix is used to determine the language. diff --git a/core/modules/system/tests/modules/httpkernel_test/src/HttpKernel/TestMiddleware.php b/core/modules/system/tests/modules/httpkernel_test/src/HttpKernel/TestMiddleware.php index 47842b7..ea9ce1d 100644 --- a/core/modules/system/tests/modules/httpkernel_test/src/HttpKernel/TestMiddleware.php +++ b/core/modules/system/tests/modules/httpkernel_test/src/HttpKernel/TestMiddleware.php @@ -35,7 +35,7 @@ class TestMiddleware implements HttpKernelInterface { public function __construct(HttpKernelInterface $kernel, $optional_argument = NULL) { $this->kernel = $kernel; $this->optionalArgument = $optional_argument; - } + } /** * {@inheritdoc} diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php index 2d0eb83..280b875 100644 --- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php @@ -82,7 +82,8 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o } } - public function hasExtraOptions() { return TRUE; } + public function hasExtraOptions() { return TRUE; + } /** * {@inheritdoc} diff --git a/core/modules/user/src/Tests/UserBlocksTest.php b/core/modules/user/src/Tests/UserBlocksTest.php index dff52b5..ede685b 100644 --- a/core/modules/user/src/Tests/UserBlocksTest.php +++ b/core/modules/user/src/Tests/UserBlocksTest.php @@ -51,7 +51,7 @@ function testUserLoginBlockVisibility() { $elements = $this->xpath('//div[contains(@class,"block-user-login-block") and @role="form"]'); if ($expected_visibility) { $this->assertTrue(!empty($elements), 'User login block in path "' . $path . '" should be visible'); - } + } else { $this->assertTrue(empty($elements), 'User login block in path "' . $path . '" should not be visible'); } diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php index 0fa89e5..bbb9d45 100644 --- a/core/modules/user/src/Tests/UserPasswordResetTest.php +++ b/core/modules/user/src/Tests/UserPasswordResetTest.php @@ -268,6 +268,6 @@ function testResetImpersonation() { $this->assertNoText($user2->getUsername(), 'The invalid password reset page does not show the user name.'); $this->assertUrl('user/password', array(), 'The user is redirected to the password reset request page.'); $this->assertText('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'); - } + } } diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php index 2e5249b..2100b6a 100644 --- a/core/modules/views/src/Plugin/views/HandlerBase.php +++ b/core/modules/views/src/Plugin/views/HandlerBase.php @@ -350,7 +350,8 @@ public function submitGroupByForm(&$form, FormStateInterface $form_state) { * If a handler has 'extra options' it will get a little settings widget and * another form called extra_options. */ - public function hasExtraOptions() { return FALSE; } + public function hasExtraOptions() { return FALSE; + } /** * Provide defaults for the handler. @@ -376,7 +377,8 @@ public function submitExtraOptionsForm($form, FormStateInterface $form_state) { /** * Determine if a handler can be exposed. */ - public function canExpose() { return FALSE; } + public function canExpose() { return FALSE; + } /** * Set new exposed option defaults when exposed setting is flipped @@ -546,24 +548,28 @@ public function isExposed() { /** * Returns TRUE if the exposed filter works like a grouped filter. */ - public function isAGroup() { return FALSE; } + public function isAGroup() { return FALSE; + } /** * Define if the exposed input has to be submitted multiple times. * This is TRUE when exposed filters grouped are using checkboxes as * widgets. */ - public function multipleExposedInput() { return FALSE; } + public function multipleExposedInput() { return FALSE; + } /** * Take input from exposed handlers and assign to this handler, if necessary. */ - public function acceptExposedInput($input) { return TRUE; } + public function acceptExposedInput($input) { return TRUE; + } /** * If set to remember exposed input in the session, store it there. */ - public function storeExposedInput($input, $status) { return TRUE; } + public function storeExposedInput($input, $status) { return TRUE; + } /** * {@inheritdoc} @@ -587,7 +593,8 @@ public function getJoin() { /** * {@inheritdoc} */ - public function validate() { return array(); } + public function validate() { return array(); + } /** * {@inheritdoc} diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php index 1cc52f3..c0855d9 100644 --- a/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -155,7 +155,8 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o * @return array * Returns the options of this handler/plugin. */ - protected function defineOptions() { return array(); } + protected function defineOptions() { return array(); + } /** * Fills up the options of the plugin with defaults. @@ -294,7 +295,8 @@ public function themeFunctions() { /** * {@inheritdoc} */ - public function validate() { return array(); } + public function validate() { return array(); + } /** * {@inheritdoc} diff --git a/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php b/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php index c3b1c86..db2e466 100644 --- a/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php +++ b/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php @@ -58,7 +58,8 @@ public function setArgument(ArgumentPluginBase $argument) { * Retrieve the options when this is a new access * control plugin */ - protected function defineOptions() { return array(); } + protected function defineOptions() { return array(); + } /** * Provide the default form for setting options. @@ -79,7 +80,8 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state, &$opti * Determine if the administrator has the privileges to use this * plugin */ - public function access() { return TRUE; } + public function access() { return TRUE; + } /** * If we don't have access to the form but are showing it anyway, ensure that diff --git a/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php b/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php index 109af50..2ed9269 100644 --- a/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php +++ b/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php @@ -53,7 +53,8 @@ public function setArgument(ArgumentPluginBase $argument) { /** * Retrieves the options when this is a new access control plugin. */ - protected function defineOptions() { return array(); } + protected function defineOptions() { return array(); + } /** * Provides the default form for setting options. @@ -73,7 +74,8 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state, &$opti /** * Determines if the administrator has the privileges to use this plugin. */ - public function access() { return TRUE; } + public function access() { return TRUE; + } /** * Blocks user input when the form is shown but we don´t have access. @@ -92,7 +94,8 @@ protected function checkAccess(&$form, $option_name) { /** * Performs validation for a given argument. */ - public function validateArgument($arg) { return TRUE; } + public function validateArgument($arg) { return TRUE; + } /** * Processes the summary arguments for displaying. diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php index 9ab56d8..b1e4e86 100644 --- a/core/modules/views/src/Plugin/views/display/Block.php +++ b/core/modules/views/src/Plugin/views/display/Block.php @@ -350,7 +350,7 @@ public function usesExposed() { return parent::usesExposed(); } return FALSE; - } + } /** * {@inheritdoc} diff --git a/core/modules/views/src/Plugin/views/display/DefaultDisplay.php b/core/modules/views/src/Plugin/views/display/DefaultDisplay.php index ec01d6a..1d25aeb 100644 --- a/core/modules/views/src/Plugin/views/display/DefaultDisplay.php +++ b/core/modules/views/src/Plugin/views/display/DefaultDisplay.php @@ -28,7 +28,8 @@ class DefaultDisplay extends DisplayPluginBase { * Determine if this display is the 'default' display which contains * fallback settings */ - public function isDefaultDisplay() { return TRUE; } + public function isDefaultDisplay() { return TRUE; + } /** * The default execute handler fully renders the view. diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index afb5c03..a253e62 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -234,7 +234,8 @@ public function destroy() { /** * {@inheritdoc} */ - public function isDefaultDisplay() { return FALSE; } + public function isDefaultDisplay() { return FALSE; + } /** * {@inheritdoc} @@ -665,17 +666,20 @@ protected function defineOptions() { /** * {@inheritdoc} */ - public function hasPath() { return FALSE; } + public function hasPath() { return FALSE; + } /** * {@inheritdoc} */ - public function usesLinkDisplay() { return !$this->hasPath(); } + public function usesLinkDisplay() { return !$this->hasPath(); + } /** * {@inheritdoc} */ - public function usesExposedFormInBlock() { return $this->hasPath(); } + public function usesExposedFormInBlock() { return $this->hasPath(); + } /** * {@inheritdoc} @@ -1475,7 +1479,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Show contextual links'), '#default_value' => $this->getOption('show_admin_links'), ); - break; + break; case 'use_more': $form['#title'] .= $this->t('Add a more link to the bottom of the display.'); $form['use_more'] = array( @@ -1870,7 +1874,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) { if (preg_match('/[^a-zA-Z0-9-_ ]/', $css_class)) { $form_state->setError($form['css_class'], $this->t('CSS classes must be alphanumeric or dashes only.')); } - break; + break; case 'display_id': if ($form_state->getValue('display_id')) { if (preg_match('/[^a-z0-9_]/', $form_state->getValue('display_id'))) { diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php index f7cbf1b..2c7b523 100644 --- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php @@ -173,7 +173,8 @@ public function adminSummary() { /** * Determine if a filter can be exposed. */ - public function canExpose() { return TRUE; } + public function canExpose() { return TRUE; + } /** * Determine if a filter can be converted into a group. @@ -301,7 +302,8 @@ protected function operatorForm(&$form, FormStateInterface $form_state) { * Provide a list of options for the default operator form. * Should be overridden by classes that don't override operatorForm */ - public function operatorOptions() { return array(); } + public function operatorOptions() { return array(); + } /** * Validate the operator form. diff --git a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php index 7dce053..c8f0561 100644 --- a/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php +++ b/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php @@ -52,6 +52,7 @@ public function adminLabel($short = FALSE) { return $this->getField(parent::adminLabel($short)); } - public function canGroup() { return FALSE; } + public function canGroup() { return FALSE; + } } diff --git a/core/modules/views/src/Plugin/views/sort/SortPluginBase.php b/core/modules/views/src/Plugin/views/sort/SortPluginBase.php index cd9555e..95c888c 100644 --- a/core/modules/views/src/Plugin/views/sort/SortPluginBase.php +++ b/core/modules/views/src/Plugin/views/sort/SortPluginBase.php @@ -28,7 +28,8 @@ /** * Determine if a sort can be exposed. */ - public function canExpose() { return TRUE; } + public function canExpose() { return TRUE; + } /** * Called to add the sort to a query. diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php index 34b3eea..aded455 100644 --- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php +++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php @@ -413,7 +413,8 @@ public function wizardSubmit(&$form, FormStateInterface $form_state, WizardInter * interfere with the sorts. If so it should build; if it returns * any non-TRUE value, normal sorting will NOT be added to the query. */ - public function buildSort() { return TRUE; } + public function buildSort() { return TRUE; + } /** * Called by the view builder to let the style build a second set of diff --git a/core/modules/views/src/Tests/Plugin/StyleGridTest.php b/core/modules/views/src/Tests/Plugin/StyleGridTest.php index 49bf67d..a790f7a 100644 --- a/core/modules/views/src/Tests/Plugin/StyleGridTest.php +++ b/core/modules/views/src/Tests/Plugin/StyleGridTest.php @@ -79,11 +79,16 @@ protected function assertGrid(ViewExecutable $view, $alignment, $columns) { } $width = '0'; switch ($columns) { - case 5: $width = '20'; break; - case 4: $width = '25'; break; - case 3: $width = '33.3333'; break; - case 2: $width = '50'; break; - case 1: $width = '100'; break; + case 5: $width = '20'; + break; + case 4: $width = '25'; + break; + case 3: $width = '33.3333'; + break; + case 2: $width = '50'; + break; + case 1: $width = '100'; + break; } // Ensure last column exists. $result = $this->xpath('//div[contains(@class, "views-col") and contains(@class, :columns) and starts-with(@style, :width)]', array(':columns' => 'col-' . $columns, ':width' => 'width: ' . $width)); diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php index 449474a..c1d04cf 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php +++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php @@ -90,7 +90,7 @@ public function build(ViewExecutable $view) { // @todo You could add a string representation of the query. $this->view->build_info['query'] = ""; $this->view->build_info['count_query'] = ""; -} + } /** * {@inheritdoc} diff --git a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php index 8c454b7..bfac310 100644 --- a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php @@ -78,7 +78,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) { array('name' => 'Meredith'), ); break; - } + } } else { switch ($granularity) { diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index c52b7c4..81dfc13 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -39,6 +39,7 @@ + diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php index 930dbe5..6891c17 100644 --- a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php +++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php @@ -177,4 +177,4 @@ public function testGetListenerPriority() // getListenerPriority(). } - } +} diff --git a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php index 92db2ac..0edd8f6 100644 --- a/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php @@ -268,13 +268,15 @@ public function providerTestFilter() { [0, 1, '', TRUE], NULL, [1 => 1, 3 => TRUE] ]; $data['1d-array-callable'] = [ - [0, 1, '', TRUE], function ($element) { return $element === ''; }, [2 => ''] + [0, 1, '', TRUE], function ($element) { return $element === ''; + }, [2 => ''] ]; $data['2d-array'] = [ [[0, 1, '', TRUE], [0, 1, 2, 3]], NULL, [0 => [1 => 1, 3 => TRUE], 1 => [1 => 1, 2 => 2, 3 => 3]], ]; $data['2d-array-callable'] = [ - [[0, 1, '', TRUE], [0, 1, 2, 3]], function ($element) { return is_array($element) || $element === 3; }, [0 => [], 1 => [3 => 3]], + [[0, 1, '', TRUE], [0, 1, 2, 3]], function ($element) { return is_array($element) || $element === 3; + }, [0 => [], 1 => [3 => 3]], ]; return $data; diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php index 6eabd37..195f390 100644 --- a/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php @@ -142,7 +142,8 @@ public function testValidateParameterTypes($token, $value) { // The following check might throw PHP fatals and notices, so we disable // error assertions. - set_error_handler(function () {return TRUE;}); + set_error_handler(function () {return TRUE; + }); $this->assertFalse($this->generator->validate($token, $value)); restore_error_handler(); } diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc index 00c781d..dd9a275 100644 --- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc +++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc @@ -5,4 +5,5 @@ * Include file for test module. */ -function module_handler_test_hook_include() {} +function module_handler_test_hook_include() { +} diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module index 18bf23c..ca75a18 100644 --- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module +++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module @@ -14,4 +14,5 @@ function module_handler_test_hook_info() { ); } -function module_handler_test_hook($arg) { return $arg; } +function module_handler_test_hook($arg) { return $arg; +} diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc index 718791b..e826f19 100644 --- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc +++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc @@ -5,4 +5,5 @@ * Include file for test module. */ -function module_handler_test_added_hook($arg) { return $arg; } +function module_handler_test_added_hook($arg) { return $arg; +} diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module index 0a46c33..5a08342 100644 --- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module +++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module @@ -5,4 +5,5 @@ * Test module. */ -function module_handler_test_added_helper($arg) { return $arg; } +function module_handler_test_added_helper($arg) { return $arg; +} diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module index 1555aec..066da95 100644 --- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module +++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module @@ -6,4 +6,5 @@ */ // return an array to test nested merge in invoke all. -function module_handler_test_all1_hook($arg) { return array($arg); } +function module_handler_test_all1_hook($arg) { return array($arg); +} diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module index 9275ce3..bd02cc7 100644 --- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module +++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module @@ -5,4 +5,5 @@ * Test module. */ -function module_handler_test_all2_hook($arg) { return $arg; } +function module_handler_test_all2_hook($arg) { return $arg; +} diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php index 65fb417..5fc65ad 100644 --- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php @@ -441,7 +441,7 @@ public function testGetTasksBuildWithCacheabilityMetadata() { // Ensure that all cacheability metadata is merged together. $this->assertEquals(['tag.example1', 'tag.example2'], $cacheability->getCacheTags()); $this->assertEquals(['context.example1', 'context.example2', 'route', 'user.permissions'], $cacheability->getCacheContexts()); - } + } protected function setupFactoryAndLocalTaskPlugins(array $definitions, $active_plugin_id) { $map = []; diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php index e8d11b7..67d6313 100644 --- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php +++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php @@ -328,7 +328,7 @@ public function testConditionalCacheContextBubblingSelfHealing() { '#access_callback' => function () use (&$current_user_role) { // Only role C can access this subtree. return $current_user_role === 'C'; - }, + }, '#cache' => [ 'contexts' => ['bar'], 'tags' => ['d'], diff --git a/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php b/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php index 639768d..3f9b7ae 100644 --- a/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php +++ b/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php @@ -138,5 +138,6 @@ public function testSetFormat() { } class StubNegotiationMiddleware extends NegotiationMiddleware { - public function getContentType(Request $request) { return parent::getContentType($request); } + public function getContentType(Request $request) { return parent::getContentType($request); + } } diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php index 183f570..3406a03 100644 --- a/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php +++ b/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php @@ -69,7 +69,7 @@ public function testToString() { ->with($text) ->willReturnCallback(function () { throw new \Exception('Yes you may.'); - }); + }); // We set a custom error handler because of https://github.com/sebastianbergmann/phpunit/issues/487 set_error_handler([$this, 'errorHandler']);