diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 35af8e0..76ca79c 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1767,7 +1767,7 @@ function drupal_common_theme() { 'render element' => 'page', ), 'maintenance_task_list' => array( - 'variables' => array('items' => NULL, 'active' => NULL, 'variant' => NULL), + 'variables' => array('items' => NULL, 'active' => NULL, 'variant' => NULL), ), 'authorize_report' => array( 'variables' => ['messages' => [], 'attributes' => []], diff --git a/core/lib/Drupal/Core/Cache/CacheFactory.php b/core/lib/Drupal/Core/Cache/CacheFactory.php index a8a5c41..a5acf7c 100644 --- a/core/lib/Drupal/Core/Cache/CacheFactory.php +++ b/core/lib/Drupal/Core/Cache/CacheFactory.php @@ -14,7 +14,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerAwareTrait; -class CacheFactory implements CacheFactoryInterface, ContainerAwareInterface { +class CacheFactory implements CacheFactoryInterface, ContainerAwareInterface { use ContainerAwareTrait; diff --git a/core/lib/Drupal/Core/Field/FieldFilteredMarkup.php b/core/lib/Drupal/Core/Field/FieldFilteredMarkup.php index 8dcadca..d2c69e0 100644 --- a/core/lib/Drupal/Core/Field/FieldFilteredMarkup.php +++ b/core/lib/Drupal/Core/Field/FieldFilteredMarkup.php @@ -61,7 +61,7 @@ public static function create($string) { * A list of allowed tags. */ public static function allowedTags() { - return ['a', 'b', 'big', 'code', 'del', 'em', 'i', 'ins', 'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img']; + return ['a', 'b', 'big', 'code', 'del', 'em', 'i', 'ins', 'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img']; } /** diff --git a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php index 14bd16b..cd605bc 100644 --- a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php +++ b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php @@ -30,7 +30,7 @@ public function connect() { * {@inheritdoc} */ protected function copyFileJailed($source, $destination) { - if (!@ftp_put($this->connection, $destination, $source, FTP_BINARY)) { + if (!@ftp_put($this->connection, $destination, $source, FTP_BINARY)) { throw new FileTransferException("Cannot move @source to @destination", NULL, array("@source" => $source, "@destination" => $destination)); } } diff --git a/core/lib/Drupal/Core/Theme/ThemeInitialization.php b/core/lib/Drupal/Core/Theme/ThemeInitialization.php index d0c9166..88c06e2 100644 --- a/core/lib/Drupal/Core/Theme/ThemeInitialization.php +++ b/core/lib/Drupal/Core/Theme/ThemeInitialization.php @@ -267,7 +267,7 @@ public function getActiveTheme(Extension $theme, array $base_themes = []) { */ protected function getExtensions() { if (!isset($this->extensions)) { - $this->extensions = array_merge($this->moduleHandler->getModuleList(), $this->themeHandler->listInfo()); + $this->extensions = array_merge($this->moduleHandler->getModuleList(), $this->themeHandler->listInfo()); } return $this->extensions; } diff --git a/core/lib/Drupal/Core/TypedData/TypedDataManager.php b/core/lib/Drupal/Core/TypedData/TypedDataManager.php index be5bcd4..adf91c9 100644 --- a/core/lib/Drupal/Core/TypedData/TypedDataManager.php +++ b/core/lib/Drupal/Core/TypedData/TypedDataManager.php @@ -260,7 +260,7 @@ public function getDefaultConstraints(DataDefinitionInterface $definition) { $constraints['NotNull'] = array(); } // Check if the class provides allowed values. - if (is_subclass_of($definition->getClass(),'Drupal\Core\TypedData\OptionsProviderInterface')) { + if (is_subclass_of($definition->getClass(), 'Drupal\Core\TypedData\OptionsProviderInterface')) { $constraints['AllowedValues'] = array(); } return $constraints; diff --git a/core/lib/Drupal/Core/Utility/Error.php b/core/lib/Drupal/Core/Utility/Error.php index ecadc9b..965fbac 100644 --- a/core/lib/Drupal/Core/Utility/Error.php +++ b/core/lib/Drupal/Core/Utility/Error.php @@ -52,7 +52,7 @@ public static function decodeException($exception) { // The first element in the stack is the call, the second element gives us // the caller. We skip calls that occurred in one of the classes of the // database layer or in one of its global functions. - $db_functions = array('db_query', 'db_query_range'); + $db_functions = array('db_query', 'db_query_range'); while (!empty($backtrace[1]) && ($caller = $backtrace[1]) && ((isset($caller['class']) && (strpos($caller['class'], 'Query') !== FALSE || strpos($caller['class'], 'Database') !== FALSE || strpos($caller['class'], 'PDO') !== FALSE)) || in_array($caller['function'], $db_functions))) { diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php index f7b3ffe..3adefe0 100644 --- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php +++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php @@ -265,7 +265,7 @@ public function testBlockRendering() { $result = $this->xpath('//div[contains(@class, "region-sidebar-first")]/div[contains(@class, "block-views")]/h2'); $this->assertTrue(empty($result), 'The title is not visible.'); - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:system.site', 'config:views.view.test_view_block' ,'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:system.site', 'config:views.view.test_view_block' , 'rendered'])); } /** @@ -291,7 +291,7 @@ public function testBlockEmptyRendering() { $this->assertEqual(0, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'))); // Ensure that the view cachability metadata is propagated even, for an // empty block. - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' ,'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered'])); $this->assertCacheContexts(['url.query_args:_wrapper_format']); // Add a header displayed on empty result. @@ -309,7 +309,7 @@ public function testBlockEmptyRendering() { $this->drupalGet($url); $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'))); - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' ,'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered'])); $this->assertCacheContexts(['url.query_args:_wrapper_format']); // Hide the header on empty results. @@ -327,7 +327,7 @@ public function testBlockEmptyRendering() { $this->drupalGet($url); $this->assertEqual(0, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'))); - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' ,'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered'])); $this->assertCacheContexts(['url.query_args:_wrapper_format']); // Add an empty text. @@ -344,7 +344,7 @@ public function testBlockEmptyRendering() { $this->drupalGet($url); $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'))); - $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' ,'rendered'])); + $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered'])); $this->assertCacheContexts(['url.query_args:_wrapper_format']); } diff --git a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php b/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php index bd943ee..44f7c75 100644 --- a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php +++ b/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php @@ -24,7 +24,7 @@ class RevisionRelationshipsTest extends ViewTestBase { * * @var array */ - public static $modules = array('block_content' ,'block_content_test_views'); + public static $modules = array('block_content' , 'block_content_test_views'); /** * Views used by this test. diff --git a/core/modules/comment/src/Tests/CommentPreviewTest.php b/core/modules/comment/src/Tests/CommentPreviewTest.php index 2a9b197..8d4985a 100644 --- a/core/modules/comment/src/Tests/CommentPreviewTest.php +++ b/core/modules/comment/src/Tests/CommentPreviewTest.php @@ -129,7 +129,7 @@ public function testCommentPreviewDuplicateSubmission() { * Tests comment edit, preview, and save. */ function testCommentEditPreviewSave() { - $web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'skip comment approval', 'edit own comments')); + $web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'skip comment approval', 'edit own comments')); $this->drupalLogin($this->adminUser); $this->setCommentPreview(DRUPAL_OPTIONAL); $this->setCommentForm(TRUE); diff --git a/core/modules/comment/src/Tests/Views/CommentLinksTest.php b/core/modules/comment/src/Tests/Views/CommentLinksTest.php index d58c7fe..90269a1 100644 --- a/core/modules/comment/src/Tests/Views/CommentLinksTest.php +++ b/core/modules/comment/src/Tests/Views/CommentLinksTest.php @@ -47,7 +47,7 @@ public function testLinkApprove() { $view = Views::getView('test_comment'); $view->setDisplay(); - $view->displayHandlers->get('default')->overrideOption('fields', [ + $view->displayHandlers->get('default')->overrideOption('fields', [ 'approve_comment' => [ 'table' => 'comment', 'field' => 'approve_comment', @@ -134,7 +134,7 @@ public function testLinkReply() { $view = Views::getView('test_comment'); $view->setDisplay(); - $view->displayHandlers->get('default')->overrideOption('fields', [ + $view->displayHandlers->get('default')->overrideOption('fields', [ 'replyto_comment' => [ 'table' => 'comment', 'field' => 'replyto_comment', diff --git a/core/modules/config/src/Tests/ConfigDiffTest.php b/core/modules/config/src/Tests/ConfigDiffTest.php index 372970f..1f32b27 100644 --- a/core/modules/config/src/Tests/ConfigDiffTest.php +++ b/core/modules/config/src/Tests/ConfigDiffTest.php @@ -92,7 +92,7 @@ function testDiff() { $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, $config_name); // Prove the fields match. $edits = $diff->getEdits(); - $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.'); + $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.'); $this->assertEqual(count($edits), 1, 'There is one item in the diff'); // Rename the entity. @@ -102,11 +102,11 @@ function testDiff() { $diff = \Drupal::service('config.manager')->diff($active, $sync, 'config_test.dynamic.' . $new_test_entity_id, $config_name); $edits = $diff->getEdits(); - $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.'); - $this->assertEqual($edits[1]->type, 'change', 'The second item in the diff is a change.'); + $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.'); + $this->assertEqual($edits[1]->type, 'change', 'The second item in the diff is a change.'); $this->assertEqual($edits[1]->orig, array('id: ' . $new_test_entity_id)); $this->assertEqual($edits[1]->closing, array('id: ' . $test_entity_id)); - $this->assertEqual($edits[2]->type, 'copy', 'The third item in the diff is a copy.'); + $this->assertEqual($edits[2]->type, 'copy', 'The third item in the diff is a copy.'); $this->assertEqual(count($edits), 3, 'There are three items in the diff.'); } @@ -132,16 +132,16 @@ function testCollectionDiff() { // Test the fields match in the default collection diff. $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name); $edits = $diff->getEdits(); - $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.'); + $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.'); $this->assertEqual(count($edits), 1, 'There is one item in the diff'); // Test that the differences are detected when diffing the collection. $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, NULL, 'test'); $edits = $diff->getEdits(); - $this->assertEqual($edits[0]->type, 'change', 'The second item in the diff is a copy.'); + $this->assertEqual($edits[0]->type, 'change', 'The second item in the diff is a copy.'); $this->assertEqual($edits[0]->orig, array('foo: bar')); $this->assertEqual($edits[0]->closing, array('foo: baz')); - $this->assertEqual($edits[1]->type, 'copy', 'The second item in the diff is a copy.'); + $this->assertEqual($edits[1]->type, 'copy', 'The second item in the diff is a copy.'); } } diff --git a/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php b/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php index 36697a5..f3aba3b 100644 --- a/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php +++ b/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php @@ -87,7 +87,7 @@ function testInstallProfileConfigOverwrite() { // type does not exist. $optional_dir = drupal_get_path('module', 'testing_config_overrides') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY; $optional_storage = new FileStorage($optional_dir); - foreach (['config_test.dynamic.dotted.default', 'config_test.dynamic.override','config_test.dynamic.override_unmet'] as $id) { + foreach (['config_test.dynamic.dotted.default', 'config_test.dynamic.override', 'config_test.dynamic.override_unmet'] as $id) { $this->assertTrue(\Drupal::config($id)->isNew(), "The config_test entity $id contained in the profile's optional directory does not exist."); // Make that we don't get false positives from the assertion above. $this->assertTrue($optional_storage->exists($id), "The config_test entity $id does exist in the profile's optional directory."); diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php index b96819e..8cbb695 100644 --- a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php +++ b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php @@ -22,7 +22,7 @@ class ConfigLanguageOverrideTest extends KernelTestBase { * * @var array */ - public static $modules = array('user', 'language', 'config_test', 'system', 'field'); + public static $modules = array('user', 'language', 'config_test', 'system', 'field'); /** * {@inheritdoc} diff --git a/core/modules/contact/tests/src/Unit/Plugin/migrate/source/ContactCategoryTest.php b/core/modules/contact/tests/src/Unit/Plugin/migrate/source/ContactCategoryTest.php index 874b052..1d16d49 100644 --- a/core/modules/contact/tests/src/Unit/Plugin/migrate/source/ContactCategoryTest.php +++ b/core/modules/contact/tests/src/Unit/Plugin/migrate/source/ContactCategoryTest.php @@ -30,7 +30,7 @@ class ContactCategoryTest extends MigrateSqlSourceTestCase { array( 'cid' => 1, 'category' => 'contact category value 1', - 'recipients' => array('admin@example.com','user@example.com'), + 'recipients' => array('admin@example.com', 'user@example.com'), 'reply' => 'auto reply value 1', 'weight' => 0, 'selected' => 0, @@ -38,7 +38,7 @@ class ContactCategoryTest extends MigrateSqlSourceTestCase { array( 'cid' => 2, 'category' => 'contact category value 2', - 'recipients' => array('admin@example.com','user@example.com'), + 'recipients' => array('admin@example.com', 'user@example.com'), 'reply' => 'auto reply value 2', 'weight' => 0, 'selected' => 0, diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php index a066e6a..a71d69d 100644 --- a/core/modules/field/field.api.php +++ b/core/modules/field/field.api.php @@ -78,7 +78,7 @@ function hook_field_storage_config_update_forbid(\Drupal\field\FieldStorageConfi // Forbid any update that removes allowed values with actual data. $allowed_values = $field_storage->getSetting('allowed_values'); $prior_allowed_values = $prior_field_storage->getSetting('allowed_values'); - $lost_keys = array_keys(array_diff_key($prior_allowed_values,$allowed_values)); + $lost_keys = array_keys(array_diff_key($prior_allowed_values, $allowed_values)); if (_options_values_in_use($field_storage->getTargetEntityTypeId(), $field_storage->getName(), $lost_keys)) { throw new \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', array('@field_name' => $field_storage->getName()))); } diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php index 2be9223..3c2496e 100755 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php @@ -34,7 +34,7 @@ public function query() { 'type', 'module', )) - ->condition('fci.entity_type','node'); + ->condition('fci.entity_type', 'node'); $query->join('field_config', 'fc', 'fci.field_id = fc.id'); return $query; } diff --git a/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php b/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php index fc76278..6ecb328 100644 --- a/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php +++ b/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php @@ -62,7 +62,7 @@ protected function setUp() { $this->installEntitySchema('entity_test_mul'); // Create reference from entity_test to entity_test_mul. - $this->createEntityReferenceField('entity_test','entity_test','field_test_data','field_test_data','entity_test_mul'); + $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_data', 'field_test_data', 'entity_test_mul'); // Create reference from entity_test_mul to entity_test. $this->createEntityReferenceField('entity_test_mul', 'entity_test_mul', 'field_data_test', 'field_data_test', 'entity_test'); diff --git a/core/modules/field/src/Tests/FieldDataCountTest.php b/core/modules/field/src/Tests/FieldDataCountTest.php index 9edbbdb..bbb0cd9 100644 --- a/core/modules/field/src/Tests/FieldDataCountTest.php +++ b/core/modules/field/src/Tests/FieldDataCountTest.php @@ -80,8 +80,8 @@ public function testEntityCountAndHasData() { // Create 12 entities to ensure that the purging works as expected. for ($i=0; $i < 12; $i++) { $entity = entity_create('entity_test'); - $entity->field_int[] = mt_rand(1,99); - $entity->field_int[] = mt_rand(1,99); + $entity->field_int[] = mt_rand(1, 99); + $entity->field_int[] = mt_rand(1, 99); $entity->name[] = $this->randomMachineName(); $entity->save(); } diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php index 1eb5ad6..47b8bbd 100644 --- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php +++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php @@ -39,22 +39,22 @@ public function testFields() { // Integer field. $field_storage = FieldStorageConfig::load('node.field_test_two'); - $this->assertIdentical("integer", $field_storage->getType(), t('Field type is @fieldtype. It should be integer.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("integer", $field_storage->getType(), t('Field type is @fieldtype. It should be integer.', array('@fieldtype' => $field_storage->getType()))); // Float field. $field_storage = FieldStorageConfig::load('node.field_test_three'); - $this->assertIdentical("decimal", $field_storage->getType(), t('Field type is @fieldtype. It should be decimal.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("decimal", $field_storage->getType(), t('Field type is @fieldtype. It should be decimal.', array('@fieldtype' => $field_storage->getType()))); // Link field. $field_storage = FieldStorageConfig::load('node.field_test_link'); - $this->assertIdentical("link", $field_storage->getType(), t('Field type is @fieldtype. It should be link.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("link", $field_storage->getType(), t('Field type is @fieldtype. It should be link.', array('@fieldtype' => $field_storage->getType()))); // File field. $field_storage = FieldStorageConfig::load('node.field_test_filefield'); - $this->assertIdentical("file", $field_storage->getType(), t('Field type is @fieldtype. It should be file.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("file", $field_storage->getType(), t('Field type is @fieldtype. It should be file.', array('@fieldtype' => $field_storage->getType()))); $field_storage = FieldStorageConfig::load('node.field_test_imagefield'); - $this->assertIdentical("image", $field_storage->getType(), t('Field type is @fieldtype. It should be image.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("image", $field_storage->getType(), t('Field type is @fieldtype. It should be image.', array('@fieldtype' => $field_storage->getType()))); $settings = $field_storage->getSettings(); $this->assertIdentical('file', $settings['target_type']); $this->assertIdentical('public', $settings['uri_scheme']); @@ -62,15 +62,15 @@ public function testFields() { // Phone field. $field_storage = FieldStorageConfig::load('node.field_test_phone'); - $this->assertIdentical("telephone", $field_storage->getType(), t('Field type is @fieldtype. It should be telephone.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("telephone", $field_storage->getType(), t('Field type is @fieldtype. It should be telephone.', array('@fieldtype' => $field_storage->getType()))); // Date field. $field_storage = FieldStorageConfig::load('node.field_test_datetime'); - $this->assertIdentical("datetime", $field_storage->getType(), t('Field type is @fieldtype. It should be datetime.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("datetime", $field_storage->getType(), t('Field type is @fieldtype. It should be datetime.', array('@fieldtype' => $field_storage->getType()))); // Decimal field with radio buttons. $field_storage = FieldStorageConfig::load('node.field_test_decimal_radio_buttons'); - $this->assertIdentical("list_float", $field_storage->getType(), t('Field type is @fieldtype. It should be list_float.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("list_float", $field_storage->getType(), t('Field type is @fieldtype. It should be list_float.', array('@fieldtype' => $field_storage->getType()))); $this->assertNotNull($field_storage->getSetting('allowed_values')['1.2'], t('First allowed value key is set to 1.2')); $this->assertNotNull($field_storage->getSetting('allowed_values')['2.1'], t('Second allowed value key is set to 2.1')); $this->assertIdentical('1.2', $field_storage->getSetting('allowed_values')['1.2'], t('First allowed value is set to 1.2')); @@ -78,11 +78,11 @@ public function testFields() { // Float field with a single checkbox. $field_storage = FieldStorageConfig::load('node.field_test_float_single_checkbox'); - $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType()))); // Integer field with a select list. $field_storage = FieldStorageConfig::load('node.field_test_integer_selectlist'); - $this->assertIdentical("list_integer", $field_storage->getType(), t('Field type is @fieldtype. It should be list_integer.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("list_integer", $field_storage->getType(), t('Field type is @fieldtype. It should be list_integer.', array('@fieldtype' => $field_storage->getType()))); $this->assertNotNull($field_storage->getSetting('allowed_values')['1234'], t('First allowed value key is set to 1234')); $this->assertNotNull($field_storage->getSetting('allowed_values')['2341'], t('Second allowed value key is set to 2341')); $this->assertNotNull($field_storage->getSetting('allowed_values')['3412'], t('Third allowed value key is set to 3412')); @@ -94,7 +94,7 @@ public function testFields() { // Text field with a single checkbox. $field_storage = FieldStorageConfig::load('node.field_test_text_single_checkbox'); - $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType()))); + $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType()))); // Validate that the source count and processed count match up. /** @var \Drupal\migrate\Entity\MigrationInterface $migration */ diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php index f80dfab..9537170 100644 --- a/core/modules/field/src/Tests/Number/NumberFieldTest.php +++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php @@ -371,8 +371,8 @@ function testNumberFormatter() { $decimal_separators = array('.', ','); $prefix = $this->randomMachineName(); $suffix = $this->randomMachineName(); - $random_float = rand(0,pow(10,6)); - $random_integer = rand(0, pow(10,6)); + $random_float = rand(0, pow(10, 6)); + $random_integer = rand(0, pow(10, 6)); // Create a content type containing float and integer fields. $this->drupalCreateContentType(array('type' => $type)); diff --git a/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php b/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php index 8ef98d6..2323b15 100644 --- a/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php +++ b/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php @@ -145,7 +145,7 @@ protected function testTimestampFormatter() { protected function testTimestampAgoFormatter() { $data = []; - foreach (array(1,2,3,4,5,6) as $granularity) { + foreach (array(1, 2, 3, 4, 5, 6) as $granularity) { $data[] = [ 'future_format' => '@interval hence', 'past_format' => '@interval ago', diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module index c66a0d6..c86a7b9 100644 --- a/core/modules/field/tests/modules/field_test/field_test.module +++ b/core/modules/field/tests/modules/field_test/field_test.module @@ -124,7 +124,7 @@ function field_test_field_widget_form_alter(&$element, FormStateInterface $form_ function field_test_query_efq_table_prefixing_test_alter(&$query) { // Add an additional join onto the entity base table. This will cause an // exception if the EFQ does not properly prefix the base table. - $query->join('entity_test','et2','%alias.id = entity_test.id'); + $query->join('entity_test', 'et2', '%alias.id = entity_test.id'); } diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 56375fc..597be4f 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -38,7 +38,7 @@ function field_ui_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Configuring view and form modes') . '
'; $output .= '
' . t('You can add, edit, and delete view modes for entities on the View modes page, and you can add, edit, and delete form modes for entities on the Form modes page. Once you have defined a view mode or form mode for an entity type, it will be available on the Manage display or Manage form display page for each sub-type of that entity.', array(':view_modes' => \Drupal::url('entity.entity_view_mode.collection'), ':form_modes' => \Drupal::url('entity.entity_form_mode.collection'))) . '
'; $output .= '
' . t('Listing fields') . '
'; - $output .= '
' . t('There are two reports available that list the fields defined on your site. The Entities report lists all your fields, showing the field machine names, types, and the entity types or sub-types they are used on (each sub-type links to the Manage fields page). If the Views and Views UI modules are enabled, the Used in views report lists each field that is used in a view, with a link to edit that view.', array(':entity-list' => \Drupal::url('entity.field_storage_config.collection'), ':views-list' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('views_ui.reports_fields') : '#', ':views' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', array('name' => 'views')) : '#',':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '
'; + $output .= '
' . t('There are two reports available that list the fields defined on your site. The Entities report lists all your fields, showing the field machine names, types, and the entity types or sub-types they are used on (each sub-type links to the Manage fields page). If the Views and Views UI modules are enabled, the Used in views report lists each field that is used in a view, with a link to edit that view.', array(':entity-list' => \Drupal::url('entity.field_storage_config.collection'), ':views-list' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('views_ui.reports_fields') : '#', ':views' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', array('name' => 'views')) : '#', ':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '
'; $output .= ''; return $output; diff --git a/core/modules/field_ui/src/Tests/EntityDisplayTest.php b/core/modules/field_ui/src/Tests/EntityDisplayTest.php index 7c7a48b..1c9332b 100644 --- a/core/modules/field_ui/src/Tests/EntityDisplayTest.php +++ b/core/modules/field_ui/src/Tests/EntityDisplayTest.php @@ -132,7 +132,7 @@ public function testEntityDisplayCRUDSort() { $display->save(); $components = array_keys($display->getComponents()); // The name field is not configurable so will be added automatically. - $expected = array ( 0 => 'component_1', 1 => 'component_2', 2 => 'component_3', 'name'); + $expected = array ( 0 => 'component_1', 1 => 'component_2', 2 => 'component_3', 'name'); $this->assertIdentical($components, $expected); } diff --git a/core/modules/field_ui/src/Tests/FieldUiTestTrait.php b/core/modules/field_ui/src/Tests/FieldUiTestTrait.php index ec0e326..ba70401 100644 --- a/core/modules/field_ui/src/Tests/FieldUiTestTrait.php +++ b/core/modules/field_ui/src/Tests/FieldUiTestTrait.php @@ -46,7 +46,7 @@ public function fieldUIAddNewField($bundle_path, $field_name, $label = NULL, $fi } // First step: 'Add field' page. - $this->drupalPostForm($bundle_path, $initial_edit, t('Save and continue')); + $this->drupalPostForm($bundle_path, $initial_edit, t('Save and continue')); $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', array('%label' => $label)), 'Storage settings page was displayed.'); // Test Breadcrumbs. $this->assertLink($label, 0, 'Field label is correct in the breadcrumb of the storage settings page.'); diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php index c5ac701..8cc6e43 100644 --- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php @@ -492,13 +492,13 @@ function testDisallowedFieldNames() { // Try with an entity key. $edit['field_name'] = 'title'; $bundle_path = 'admin/structure/types/manage/' . $this->contentType; - $this->drupalPostForm("$bundle_path/fields/add-field", $edit, t('Save and continue')); + $this->drupalPostForm("$bundle_path/fields/add-field", $edit, t('Save and continue')); $this->assertText(t('The machine-readable name is already in use. It must be unique.')); // Try with a base field. $edit['field_name'] = 'sticky'; $bundle_path = 'admin/structure/types/manage/' . $this->contentType; - $this->drupalPostForm("$bundle_path/fields/add-field", $edit, t('Save and continue')); + $this->drupalPostForm("$bundle_path/fields/add-field", $edit, t('Save and continue')); $this->assertText(t('The machine-readable name is already in use. It must be unique.')); } diff --git a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php index 3570c35..944e102 100644 --- a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php +++ b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php @@ -47,7 +47,7 @@ public function __construct($plugin_id, $plugin_definition, FieldDefinitionInter * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { - return new static($plugin_id, $plugin_definition,$configuration['field_definition'], $configuration['settings'], $configuration['third_party_settings'], $container->get('element_info')); + return new static($plugin_id, $plugin_definition, $configuration['field_definition'], $configuration['settings'], $configuration['third_party_settings'], $container->get('element_info')); } /** diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php index e2f4aa2..7b0cce5 100644 --- a/core/modules/file/src/Tests/FileFieldWidgetTest.php +++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php @@ -151,7 +151,7 @@ function testMultiValuedWidget() { // - First remove the 2nd file. // - Then remove what is then the 2nd file (was originally the 3rd file). // - Then remove the first file. - foreach (array(1,1,0) as $delta) { + foreach (array(1, 1, 0) as $delta) { // Ensure we have the expected number of Remove buttons, and that they // are numbered sequentially. $buttons = $this->xpath('//input[@type="submit" and @value="Remove"]'); diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index f1f28b5..46046d1 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -22,11 +22,11 @@ function filter_help($route_name, RouteMatchInterface $route_match) { case 'help.page.filter': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be processed and displayed in the site. They are used to transform text, and also help to defend your web site against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the Text Editor module. For more information, see the online documentation for the Filter module.', array(':filter_do' => 'https://www.drupal.org/documentation/modules/filter/',':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? \Drupal::url('help.page', array('name' => 'editor')) : '#')) . '

'; + $output .= '

' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be processed and displayed in the site. They are used to transform text, and also help to defend your web site against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the Text Editor module. For more information, see the online documentation for the Filter module.', array(':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? \Drupal::url('help.page', array('name' => 'editor')) : '#')) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Managing text formats') . '
'; - $output .= '
' . t('You can create and edit text formats on the Text formats page (if the Text Editor module is enabled, this page is named Text formats and editors). One text format is included by default: Plain text (which removes all HTML tags). Additional text formats may be created during installation. You can create a text format by clicking "Add text format".', array(':formats' => \Drupal::url('filter.admin_overview'),':add_format' => \Drupal::url('filter.format_add'))) . '
'; + $output .= '
' . t('You can create and edit text formats on the Text formats page (if the Text Editor module is enabled, this page is named Text formats and editors). One text format is included by default: Plain text (which removes all HTML tags). Additional text formats may be created during installation. You can create a text format by clicking "Add text format".', array(':formats' => \Drupal::url('filter.admin_overview'), ':add_format' => \Drupal::url('filter.format_add'))) . '
'; $output .= '
' . t('Assigning roles to text formats') . '
'; $output .= '
' . t('You can define which users will be able to use each text format by selecting roles. To ensure security, anonymous and untrusted users should only have access to text formats that restrict them to either plain text or a safe set of HTML tags. This is because HTML tags can allow embedding malicious links or scripts in text. More trusted registered users may be granted permission to use less restrictive text formats in order to create rich text. Improper text format configuration is a security risk.') . '
'; $output .= '
' . t('Selecting filters') . '
'; @@ -817,7 +817,7 @@ function filter_filter_secure_image_alter(&$image) { $image->setAttribute('alt', t('Image removed.')); $image->setAttribute('title', t('This image has been removed. For security reasons, only images from the local domain are allowed.')); $image->setAttribute('height', '16'); - $image->setAttribute('width', '16'); + $image->setAttribute('width', '16'); // Add a CSS class to aid in styling. $class = ($image->getAttribute('class') ? trim($image->getAttribute('class')) . ' ' : ''); diff --git a/core/modules/image/src/Controller/ImageStyleDownloadController.php b/core/modules/image/src/Controller/ImageStyleDownloadController.php index b879eee..200a425 100644 --- a/core/modules/image/src/Controller/ImageStyleDownloadController.php +++ b/core/modules/image/src/Controller/ImageStyleDownloadController.php @@ -142,7 +142,7 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st $path_info = pathinfo($image_uri); $converted_image_uri = $path_info['dirname'] . DIRECTORY_SEPARATOR . $path_info['filename']; if (!file_exists($converted_image_uri)) { - $this->logger->notice('Source image at %source_image_path not found while trying to generate derivative image at %derivative_path.', array('%source_image_path' => $image_uri, '%derivative_path' => $derivative_uri)); + $this->logger->notice('Source image at %source_image_path not found while trying to generate derivative image at %derivative_path.', array('%source_image_path' => $image_uri, '%derivative_path' => $derivative_uri)); return new Response($this->t('Error generating image, missing source file.'), 404); } else { diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php index e541c27..c33ca1e 100644 --- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php +++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php @@ -326,7 +326,7 @@ public function testInvalidDefaultImage() { // The non-existent default image should not be saved. $this->assertNull($settings['default_image']['uuid']); - $field = entity_create('field_config', array( + $field = entity_create('field_config', array( 'field_storage' => $field_storage, 'bundle' => 'page', 'label' => $this->randomMachineName(), diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php index 2c6a2e4..53ba09f 100644 --- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php @@ -136,7 +136,7 @@ function _testImageFieldFormatters($scheme) { // Only verify HTTP headers when using private scheme and the headers are // sent by Drupal. $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', 'Content-Type header was sent.'); - $this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'),'private') !== FALSE, 'Cache-Control header was sent.'); + $this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'), 'private') !== FALSE, 'Cache-Control header was sent.'); // Log out and try to access the file. $this->drupalLogout(); diff --git a/core/modules/image/src/Tests/ImageFieldValidateTest.php b/core/modules/image/src/Tests/ImageFieldValidateTest.php index 3fee09c..c5ea831 100644 --- a/core/modules/image/src/Tests/ImageFieldValidateTest.php +++ b/core/modules/image/src/Tests/ImageFieldValidateTest.php @@ -72,7 +72,7 @@ function testRequiredAttributes() { // Look for form-required for the alt text. $elements = $this->xpath('//label[@for="edit-' . $field_name . '-0-alt" and @class="js-form-required form-required"]/following-sibling::input[@id="edit-' . $field_name . '-0-alt"]'); - $this->assertTrue(isset($elements[0]),'Required marker is shown for the required alt text.'); + $this->assertTrue(isset($elements[0]), 'Required marker is shown for the required alt text.'); $elements = $this->xpath('//label[@for="edit-' . $field_name . '-0-title" and @class="js-form-required form-required"]/following-sibling::input[@id="edit-' . $field_name . '-0-title"]'); diff --git a/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php b/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php index 15b470f..f1933da 100644 --- a/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php +++ b/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php @@ -34,7 +34,7 @@ public function testMigration() { // These settings are not recommended... $this->assertTrue($config->get('allow_insecure_derivatives')); $this->assertTrue($config->get('suppress_itok_output')); - $this->assertIdentical("core/modules/image/testsample.png",$config->get('preview_image')); + $this->assertIdentical("core/modules/image/testsample.png", $config->get('preview_image')); } } diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 6d9f699..5904685 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -49,7 +49,7 @@ function language_help($route_name, RouteMatchInterface $route_match) { $output .= ''; $output .= '
'; diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php index 9591618..6e2e70a 100644 --- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php +++ b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php @@ -117,7 +117,7 @@ public function testDefaultLangcode() { $this->assertTrue($configurable_language->isDefault(), 'The en language entity is flagged as the default language.'); $this->config('system.site')->set('default_langcode', 'cc')->save(); - ContentLanguageSettings::loadByEntityTypeBundle('entity_test','custom_bundle') + ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'custom_bundle') ->setLanguageAlterable(TRUE) ->setDefaultLangcode(LanguageInterface::LANGCODE_SITE_DEFAULT) ->save(); diff --git a/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php b/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php index 1c3d748..24bd488 100644 --- a/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php +++ b/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php @@ -33,7 +33,7 @@ protected function setUp() { */ public function testLocalePageLocalTasks($route) { $tasks = array( - 0 => array('locale.translate_page', 'locale.translate_import', 'locale.translate_export','locale.settings'), + 0 => array('locale.translate_page', 'locale.translate_import', 'locale.translate_export', 'locale.settings'), ); $this->assertLocalTasks($route, $tasks); } diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module index 3baf117..7c01f6f 100644 --- a/core/modules/menu_ui/menu_ui.module +++ b/core/modules/menu_ui/menu_ui.module @@ -270,7 +270,7 @@ function menu_ui_form_node_form_alter(&$form, FormStateInterface $form_state) { else { $default = $node_type->getThirdPartySetting('menu_ui', 'parent', 'main:'); } - $parent_element = $menu_parent_selector->parentSelectElement($default, $defaults['id'], $available_menus); + $parent_element = $menu_parent_selector->parentSelectElement($default, $defaults['id'], $available_menus); // If no possible parent menu items were found, there is nothing to display. if (empty($parent_element)) { return; diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php index 6e130b3..d88911a 100644 --- a/core/modules/menu_ui/src/Tests/MenuTest.php +++ b/core/modules/menu_ui/src/Tests/MenuTest.php @@ -116,7 +116,7 @@ function testMenu() { // Verify delete link exists and reset link does not exist. $this->drupalGet('admin/structure/menu/manage/' . $this->menu->id()); - $this->assertLinkByHref(Url::fromRoute('entity.menu_link_content.delete_form', ['menu_link_content' => $this->items[0]->id()])->toString()); + $this->assertLinkByHref(Url::fromRoute('entity.menu_link_content.delete_form', ['menu_link_content' => $this->items[0]->id()])->toString()); $this->assertNoLinkByHref(Url::fromRoute('menu_ui.link_reset', ['menu_link_plugin' => $this->items[0]->getPluginId()])->toString()); // Check delete and reset access. $this->drupalGet('admin/structure/menu/item/' . $this->items[0]->id() . '/delete'); @@ -265,23 +265,23 @@ function doMenuTests() { $menu_name = $this->menu->id(); // Test the 'Add link' local action. - $this->drupalGet(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); + $this->drupalGet(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); $this->clickLink(t('Add link')); $link_title = $this->randomString(); $this->drupalPostForm(NULL, array('link[0][uri]' => '/', 'title[0][value]' => $link_title), t('Save')); - $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); + $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); // Test the 'Edit' operation. $this->clickLink(t('Edit')); $this->assertFieldByName('title[0][value]', $link_title); $link_title = $this->randomString(); $this->drupalPostForm(NULL, array('title[0][value]' => $link_title), t('Save')); - $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); + $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); // Test the 'Delete' operation. $this->clickLink(t('Delete')); $this->assertRaw(t('Are you sure you want to delete the custom menu link %item?', array('%item' => $link_title))); $this->drupalPostForm(NULL, array(), t('Delete')); - $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); + $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name])); // Add nodes to use as links for menu links. $node1 = $this->drupalCreateNode(array('type' => 'article')); diff --git a/core/modules/migrate/tests/src/Unit/MigrationStorageTest.php b/core/modules/migrate/tests/src/Unit/MigrationStorageTest.php index 93cf301..f90682e 100644 --- a/core/modules/migrate/tests/src/Unit/MigrationStorageTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrationStorageTest.php @@ -63,7 +63,7 @@ public function testGetVariantIdsWithVariants() { ->willReturn(['d6_node__page', 'd6_node__article']); $ids = $this->storage->getVariantIds(['d6_node:*', 'd6_user']); - $this->assertSame(['d6_node__page', 'd6_node__article', 'd6_user'], $ids); + $this->assertSame(['d6_node__page', 'd6_node__article', 'd6_user'], $ids); } /** @@ -76,7 +76,7 @@ public function testGetVariantIdsNoVariants() { ->willReturn([]); $ids = $this->storage->getVariantIds(['d6_node:*', 'd6_user']); - $this->assertSame(['d6_user'], $ids); + $this->assertSame(['d6_user'], $ids); } /** @@ -90,7 +90,7 @@ public function testGetVariantIdsNoVariantsOrStaticDependencies() { ->willReturn([]); $ids = $this->storage->getVariantIds(['d6_node:*', 'd6_node_revision:*']); - $this->assertSame([], $ids); + $this->assertSame([], $ids); } } diff --git a/core/modules/node/src/Tests/NodeViewLanguageTest.php b/core/modules/node/src/Tests/NodeViewLanguageTest.php index b53f3e5..65548cd 100644 --- a/core/modules/node/src/Tests/NodeViewLanguageTest.php +++ b/core/modules/node/src/Tests/NodeViewLanguageTest.php @@ -39,7 +39,7 @@ public function testViewLanguage() { $node = $this->drupalCreateNode(array('langcode' => 'es')); $this->drupalGet($node->urlInfo()); - $this->assertText('Spanish','The language field is displayed properly.'); + $this->assertText('Spanish', 'The language field is displayed properly.'); } } diff --git a/core/modules/node/src/Tests/Views/BulkFormTest.php b/core/modules/node/src/Tests/Views/BulkFormTest.php index 01e997a..8230749 100644 --- a/core/modules/node/src/Tests/Views/BulkFormTest.php +++ b/core/modules/node/src/Tests/Views/BulkFormTest.php @@ -175,18 +175,18 @@ public function testBulkForm() { // operations are always applied to individual translations. $edit = array( // Original and all translations. - 'node_bulk_form[0]' => TRUE, // Node 1, English, original. - 'node_bulk_form[1]' => TRUE, // Node 1, British English. - 'node_bulk_form[2]' => TRUE, // Node 1, Italian. + 'node_bulk_form[0]' => TRUE, // Node 1, English, original. + 'node_bulk_form[1]' => TRUE, // Node 1, British English. + 'node_bulk_form[2]' => TRUE, // Node 1, Italian. // Original and only one translation. - 'node_bulk_form[3]' => TRUE, // Node 2, English. - 'node_bulk_form[4]' => TRUE, // Node 2, British English, original. + 'node_bulk_form[3]' => TRUE, // Node 2, English. + 'node_bulk_form[4]' => TRUE, // Node 2, British English, original. 'node_bulk_form[5]' => FALSE, // Node 2, Italian. // Only a single translation. - 'node_bulk_form[6]' => TRUE, // Node 3, English. + 'node_bulk_form[6]' => TRUE, // Node 3, English. 'node_bulk_form[7]' => FALSE, // Node 3, Italian, original. // Only a single untranslated node. - 'node_bulk_form[8]' => TRUE, // Node 4, English, untranslated. + 'node_bulk_form[8]' => TRUE, // Node 4, English, untranslated. 'node_bulk_form[9]' => FALSE, // Node 5, British English, untranslated. 'action' => 'node_unpublish_action', ); @@ -216,18 +216,18 @@ public function testBulkDeletion() { // nodes and individual translations are properly deleted. $edit = array( // Original and all translations. - 'node_bulk_form[0]' => TRUE, // Node 1, English, original. - 'node_bulk_form[1]' => TRUE, // Node 1, British English. - 'node_bulk_form[2]' => TRUE, // Node 1, Italian. + 'node_bulk_form[0]' => TRUE, // Node 1, English, original. + 'node_bulk_form[1]' => TRUE, // Node 1, British English. + 'node_bulk_form[2]' => TRUE, // Node 1, Italian. // Original and only one translation. - 'node_bulk_form[3]' => TRUE, // Node 2, English. - 'node_bulk_form[4]' => TRUE, // Node 2, British English, original. + 'node_bulk_form[3]' => TRUE, // Node 2, English. + 'node_bulk_form[4]' => TRUE, // Node 2, British English, original. 'node_bulk_form[5]' => FALSE, // Node 2, Italian. // Only a single translation. - 'node_bulk_form[6]' => TRUE, // Node 3, English. + 'node_bulk_form[6]' => TRUE, // Node 3, English. 'node_bulk_form[7]' => FALSE, // Node 3, Italian, original. // Only a single untranslated node. - 'node_bulk_form[8]' => TRUE, // Node 4, English, untranslated. + 'node_bulk_form[8]' => TRUE, // Node 4, English, untranslated. 'node_bulk_form[9]' => FALSE, // Node 5, British English, untranslated. 'action' => 'node_delete_action', ); diff --git a/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php b/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php index 5d33ba2..c36b377 100644 --- a/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php +++ b/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php @@ -22,7 +22,7 @@ class RevisionRelationshipsTest extends ViewTestBase { * * @var array */ - public static $modules = array('node' ,'node_test_views'); + public static $modules = array('node' , 'node_test_views'); protected function setUp() { parent::setUp(); diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php index 4816c04..6e6fffb 100644 --- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php +++ b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php @@ -98,7 +98,7 @@ public function testUserWithoutPermission() { $this->drupalGet('node/1'); // Library and in-place editors. - $this->assertNoRaw('core/modules/quickedit/js/quickedit.js', 'Quick Edit library not loaded.'); + $this->assertNoRaw('core/modules/quickedit/js/quickedit.js', 'Quick Edit library not loaded.'); $this->assertNoRaw('core/modules/quickedit/js/editors/formEditor.js', "'form' in-place editor not loaded."); // HTML annotation must always exist (to not break the render cache). diff --git a/core/modules/rest/src/Routing/ResourceRoutes.php b/core/modules/rest/src/Routing/ResourceRoutes.php index b6f94e3..468cc5c 100644 --- a/core/modules/rest/src/Routing/ResourceRoutes.php +++ b/core/modules/rest/src/Routing/ResourceRoutes.php @@ -75,7 +75,7 @@ protected function alterRoutes(RouteCollection $collection) { $methods = $route->getMethods(); // Only expose routes where the method is enabled in the configuration. if ($methods && ($method = $methods[0]) && $method && isset($enabled_methods[$method])) { - $route->setRequirement('_access_rest_csrf', 'TRUE'); + $route->setRequirement('_access_rest_csrf', 'TRUE'); // Check that authentication providers are defined. if (empty($enabled_methods[$method]['supported_auth']) || !is_array($enabled_methods[$method]['supported_auth'])) { diff --git a/core/modules/search/src/Tests/SearchExcerptTest.php b/core/modules/search/src/Tests/SearchExcerptTest.php index 865d79a..7998c1a 100644 --- a/core/modules/search/src/Tests/SearchExcerptTest.php +++ b/core/modules/search/src/Tests/SearchExcerptTest.php @@ -69,7 +69,7 @@ function testSearchExcerpt() { // 123456789 HTMLTest +123456789+‘ +‘ +‘ +‘ +12345678    +‘ +‘ +‘ ‘ $text = "

123456789 HTMLTest +123456789+‘ +‘ +‘ +‘ +12345678    +‘ +‘ +‘ ‘

\n
"; $result = $this->doSearchExcerpt('HTMLTest', $text); - $this->assertFalse(empty($result), 'Rendered Multi-byte HTML encodings are not corrupted in search excerpts'); + $this->assertFalse(empty($result), 'Rendered Multi-byte HTML encodings are not corrupted in search excerpts'); } /** diff --git a/core/modules/system/src/Controller/ThemeController.php b/core/modules/system/src/Controller/ThemeController.php index d54cd91..7d64b5f 100644 --- a/core/modules/system/src/Controller/ThemeController.php +++ b/core/modules/system/src/Controller/ThemeController.php @@ -37,7 +37,7 @@ class ThemeController extends ControllerBase { * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The config factory. */ - public function __construct(ThemeHandlerInterface $theme_handler,ConfigFactoryInterface $config_factory) { + public function __construct(ThemeHandlerInterface $theme_handler, ConfigFactoryInterface $config_factory) { $this->themeHandler = $theme_handler; $this->configFactory = $config_factory; } diff --git a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php index 69e3239..9918322 100644 --- a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php +++ b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php @@ -148,7 +148,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ); // List the dependent entities. - $this->addDependencyListsToForm($form, 'module', $this->modules ,$this->configManager, $this->entityManager); + $this->addDependencyListsToForm($form, 'module', $this->modules , $this->configManager, $this->entityManager); return parent::buildForm($form, $form_state); } diff --git a/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php b/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php index 742bd46..f18c013 100644 --- a/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php +++ b/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php @@ -268,7 +268,7 @@ public function testValueTypeIsKept() { 'test3' => '', 'test4' => 12.64, 'test5' => FALSE, - 'test6' => array(1,2,3), + 'test6' => array(1, 2, 3), ); // Create cache entries. diff --git a/core/modules/system/src/Tests/Database/InsertTest.php b/core/modules/system/src/Tests/Database/InsertTest.php index 4b2e1e4..f021ff5 100644 --- a/core/modules/system/src/Tests/Database/InsertTest.php +++ b/core/modules/system/src/Tests/Database/InsertTest.php @@ -145,7 +145,7 @@ function testInsertSelectFields() { // re-ordered. $query->addExpression('tp.age', 'age'); $query - ->fields('tp', array('name','job')) + ->fields('tp', array('name', 'job')) ->condition('tp.name', 'Meredith'); // The resulting query should be equivalent to: diff --git a/core/modules/system/src/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php index e6aea74..716a6a1 100644 --- a/core/modules/system/src/Tests/Database/SchemaTest.php +++ b/core/modules/system/src/Tests/Database/SchemaTest.php @@ -644,7 +644,7 @@ protected function assertFieldCharacteristics($table_name, $field_name, $field_s */ function testSchemaChangeField() { $field_specs = array( - array('type' => 'int', 'size' => 'normal','not null' => FALSE), + array('type' => 'int', 'size' => 'normal', 'not null' => FALSE), array('type' => 'int', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 17), array('type' => 'float', 'size' => 'normal', 'not null' => FALSE), array('type' => 'float', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 7.3), diff --git a/core/modules/system/src/Tests/Entity/ContentEntityNullStorageTest.php b/core/modules/system/src/Tests/Entity/ContentEntityNullStorageTest.php index 376b02e..3eeee3b 100644 --- a/core/modules/system/src/Tests/Entity/ContentEntityNullStorageTest.php +++ b/core/modules/system/src/Tests/Entity/ContentEntityNullStorageTest.php @@ -27,7 +27,7 @@ class ContentEntityNullStorageTest extends KernelTestBase { * * @var array */ - public static $modules = array('system', 'contact', 'user'); + public static $modules = array('system', 'contact', 'user'); /** * Tests using entity query with ContentEntityNullStorage. diff --git a/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php b/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php index f8ada08..a192b2c 100644 --- a/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php +++ b/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php @@ -60,7 +60,7 @@ public function setUp() { public function testSingleUpdates() { // Create a test entity. $user_ids = [mt_rand(), mt_rand()]; - $entity = EntityTest::create(['name' => $this->randomString(), 'user_id' => $user_ids]); + $entity = EntityTest::create(['name' => $this->randomString(), 'user_id' => $user_ids]); $entity->save(); // Check that only a single value is stored for 'user_id'. @@ -108,7 +108,7 @@ public function testSingleUpdates() { public function testMultipleUpdates() { // Create a test entity. $user_ids = [mt_rand(), mt_rand()]; - $entity = EntityTest::create(['name' => $this->randomString(), 'user_id' => $user_ids]); + $entity = EntityTest::create(['name' => $this->randomString(), 'user_id' => $user_ids]); $entity->save(); // Check that only a single value is stored for 'user_id'. @@ -138,7 +138,7 @@ public function testMultipleUpdates() { */ function testStatusReport() { // Create a test entity. - $entity = EntityTest::create(['name' => $this->randomString(), 'user_id' => mt_rand()]); + $entity = EntityTest::create(['name' => $this->randomString(), 'user_id' => mt_rand()]); $entity->save(); // Check that the status report initially displays no error. diff --git a/core/modules/system/src/Tests/File/HtaccessUnitTest.php b/core/modules/system/src/Tests/File/HtaccessUnitTest.php index 9f5273c..4b7f39d 100644 --- a/core/modules/system/src/Tests/File/HtaccessUnitTest.php +++ b/core/modules/system/src/Tests/File/HtaccessUnitTest.php @@ -63,10 +63,10 @@ function testHtaccessSave() { mkdir($stream, 0777, TRUE); $this->assertTrue(file_save_htaccess($stream)); $content = file_get_contents($stream . '/.htaccess'); - $this->assertTrue(strpos($content,"SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006") !== FALSE); + $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006") !== FALSE); $this->assertTrue(strpos($content, "Require all denied") !== FALSE); - $this->assertTrue(strpos($content,"Deny from all") !== FALSE); - $this->assertTrue(strpos($content,"Options -Indexes -ExecCGI -Includes -MultiViews") !== FALSE); + $this->assertTrue(strpos($content, "Deny from all") !== FALSE); + $this->assertTrue(strpos($content, "Options -Indexes -ExecCGI -Includes -MultiViews") !== FALSE); $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003") !== FALSE); $this->assertFilePermissions($stream . '/.htaccess', 0444); diff --git a/core/modules/system/src/Tests/Render/Element/TableTest.php b/core/modules/system/src/Tests/Render/Element/TableTest.php index 725f339..7d94cd9 100644 --- a/core/modules/system/src/Tests/Render/Element/TableTest.php +++ b/core/modules/system/src/Tests/Render/Element/TableTest.php @@ -38,7 +38,7 @@ protected function setUp() { */ function testThemeTableStickyHeaders() { $header = array('one', 'two', 'three'); - $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); + $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)); $table = array( '#type' => 'table', '#header' => $header, @@ -57,7 +57,7 @@ function testThemeTableStickyHeaders() { */ function testThemeTableNoStickyHeaders() { $header = array('one', 'two', 'three'); - $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); + $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)); $attributes = array(); $caption = NULL; $colgroups = array(); @@ -172,7 +172,7 @@ function testThemeTableHeaderCellOption() { */ public function testThemeTableResponsive() { $header = array('one', 'two', 'three'); - $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); + $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)); $table = array( '#type' => 'table', '#header' => $header, @@ -187,7 +187,7 @@ public function testThemeTableResponsive() { * Tests that the 'responsive-table' class is not applied without headers. */ public function testThemeTableNotResponsiveHeaders() { - $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); + $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)); $table = array( '#type' => 'table', '#rows' => $rows, @@ -202,7 +202,7 @@ public function testThemeTableNotResponsiveHeaders() { */ public function testThemeTableNotResponsiveProperty() { $header = array('one', 'two', 'three'); - $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); + $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)); $table = array( '#type' => 'table', '#header' => $header, @@ -260,7 +260,7 @@ public function testThemeTableHeaderRenderArray() { ), ), ); - $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); + $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)); $table = array( '#type' => 'table', '#header' => $header, diff --git a/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php b/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php index 5acaf7f..23bcef1 100644 --- a/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php +++ b/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php @@ -26,7 +26,7 @@ class TermCacheTagsTest extends EntityWithUriCacheTagsTestBase { */ protected function createEntity() { // Create a "Camelids" vocabulary. - $vocabulary = entity_create('taxonomy_vocabulary', array( + $vocabulary = entity_create('taxonomy_vocabulary', array( 'name' => 'Camelids', 'vid' => 'camelids', )); diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php index d58b2d5..5dec796 100644 --- a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php +++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php @@ -61,7 +61,7 @@ function setUp() { ); // Create a vocabulary. - $this->vocabulary = entity_create('taxonomy_vocabulary', array( + $this->vocabulary = entity_create('taxonomy_vocabulary', array( 'name' => 'Views testing tags', 'vid' => 'views_testing_tags', )); diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php index e33924a..cb16f1a 100644 --- a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php +++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php @@ -82,7 +82,7 @@ protected function mockStandardInstall() { 'type' => 'article', )); // Create the vocabulary for the tag field. - $this->vocabulary = entity_create('taxonomy_vocabulary', array( + $this->vocabulary = entity_create('taxonomy_vocabulary', array( 'name' => 'Views testing tags', 'vid' => 'views_testing_tags', )); diff --git a/core/modules/update/src/Tests/UpdateUploadTest.php b/core/modules/update/src/Tests/UpdateUploadTest.php index f319448..cad7d78 100644 --- a/core/modules/update/src/Tests/UpdateUploadTest.php +++ b/core/modules/update/src/Tests/UpdateUploadTest.php @@ -46,7 +46,7 @@ public function testUploadModule() { ); // This also checks that the correct archive extensions are allowed. $this->drupalPostForm('admin/modules/install', $edit, t('Install')); - $this->assertText(t('Only files with the following extensions are allowed: @archive_extensions.', array('@archive_extensions' => archiver_get_extensions())),'Only valid archives can be uploaded.'); + $this->assertText(t('Only files with the following extensions are allowed: @archive_extensions.', array('@archive_extensions' => archiver_get_extensions())), 'Only valid archives can be uploaded.'); $this->assertUrl('admin/modules/install'); // Check to ensure an existing module can't be reinstalled. Also checks that diff --git a/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php index 12d4fa3..2ae1a0c 100644 --- a/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php +++ b/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php @@ -44,7 +44,7 @@ public function validate($items, Constraint $constraint) { '\x{FEFF}' . // Byte order mark '\x{FF01}-\x{FF60}' . // Full-width latin '\x{FFF9}-\x{FFFD}' . // Replacement characters - '\x{0}-\x{1F}]/u', // NULL byte and control characters + '\x{0}-\x{1F}]/u', // NULL byte and control characters $name) ) { $this->context->addViolation($constraint->illegalMessage); diff --git a/core/modules/user/src/Tests/UserCancelTest.php b/core/modules/user/src/Tests/UserCancelTest.php index 6c2034d..d3be1af 100644 --- a/core/modules/user/src/Tests/UserCancelTest.php +++ b/core/modules/user/src/Tests/UserCancelTest.php @@ -535,7 +535,7 @@ function testMassUserCancelByAdmin() { $this->drupalPostForm(NULL, NULL, t('Cancel accounts')); $status = TRUE; foreach ($users as $account) { - $status = $status && (strpos($this->content, $account->getUsername() . ' has been deleted.') !== FALSE); + $status = $status && (strpos($this->content, $account->getUsername() . ' has been deleted.') !== FALSE); $user_storage->resetCache(array($account->id())); $status = $status && !$user_storage->load($account->id()); } diff --git a/core/modules/user/src/Tests/UserLoginTest.php b/core/modules/user/src/Tests/UserLoginTest.php index 39ffed5..ce1fb94 100644 --- a/core/modules/user/src/Tests/UserLoginTest.php +++ b/core/modules/user/src/Tests/UserLoginTest.php @@ -30,7 +30,7 @@ function testLoginCacheTagsAndDestination() { $this->drupalGet('user/login', array('query' => array('destination' => 'foo'))); $edit = array('name' => $user->getUserName(), 'pass' => $user->pass_raw); $this->drupalPostForm(NULL, $edit, t('Log in')); - $this->assertUrl('foo', [], 'Redirected to the correct URL'); + $this->assertUrl('foo', [], 'Redirected to the correct URL'); } /** diff --git a/core/modules/user/src/UserListBuilder.php b/core/modules/user/src/UserListBuilder.php index a61ce89..b2889fe 100644 --- a/core/modules/user/src/UserListBuilder.php +++ b/core/modules/user/src/UserListBuilder.php @@ -58,7 +58,7 @@ class UserListBuilder extends EntityListBuilder { * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination * The redirect destination service. */ - public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, QueryFactory $query_factory, DateFormatterInterface $date_formatter, RedirectDestinationInterface $redirect_destination) { + public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, QueryFactory $query_factory, DateFormatterInterface $date_formatter, RedirectDestinationInterface $redirect_destination) { parent::__construct($entity_type, $storage); $this->queryFactory = $query_factory; $this->dateFormatter = $date_formatter; diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index 8b71114..460621f 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -1386,7 +1386,7 @@ protected function renderAsLink($alter, $text, $tokens) { // In that case the original path looks like // internal:/admin/content/files/usage/{{ fid }}, which will be escaped by // the toUriString() call above. - $path = preg_replace(['/(\%7B){2}(\%20)*/', '/(\%20)*(\%7D){2}/'], ['{{','}}'], $path); + $path = preg_replace(['/(\%7B){2}(\%20)*/', '/(\%20)*(\%7D){2}/'], ['{{', '}}'], $path); // Use strip tags as there should never be HTML in the path. // However, we need to preserve special characters like " that are escaped diff --git a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php index 4a99388..1c520e0 100644 --- a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php +++ b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php @@ -171,7 +171,7 @@ public function testExposedBlock() { // Test that the correct option is selected after form submission. $this->assertCacheContext('url'); - $this->assertOptionSelected('edit-type','All'); + $this->assertOptionSelected('edit-type', 'All'); foreach (['All', 'article', 'page'] as $argument) { $this->drupalGet('test_exposed_block', ['query' => ['type' => $argument]]); $this->assertCacheContext('url'); diff --git a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php index 4b93c00..e62c1737 100644 --- a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php +++ b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php @@ -77,7 +77,7 @@ protected function setUp() { $this->nodeTypeWithoutTags = $this->drupalCreateContentType(); // Create the vocabulary for the tag field. - $this->tagVocabulary = entity_create('taxonomy_vocabulary', array( + $this->tagVocabulary = entity_create('taxonomy_vocabulary', array( 'name' => 'Views testing tags', 'vid' => 'views_testing_tags', )); diff --git a/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php b/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php index 87c79a3d..785028c 100644 --- a/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php @@ -135,7 +135,7 @@ protected function setupViewPager($items_per_page = 0) { $this->view->pager = $pager; $this->view->style_plugin = new \stdClass(); $this->view->total_rows = 100; - $this->view->result = array(1,2,3,4,5); + $this->view->result = array(1, 2, 3, 4, 5); } } diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index 4d5c950..25abf71 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -42,7 +42,6 @@ - diff --git a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php index 2592333..56a03b3 100644 --- a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php +++ b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php @@ -376,7 +376,7 @@ public function providerTestInvalidDateArrays() { // Test for invalid minute from date array. array(array('year' => 2010, 'month' => 7, 'day' => 8, 'hour' => 8, 'minute' => 88, 'second' => 0), 'America/Chicago'), // Regression test for https://www.drupal.org/node/2084455. - array(array('hour' => 59, 'minute' => 1,'second' => 1), 'America/Chicago'), + array(array('hour' => 59, 'minute' => 1, 'second' => 1), 'America/Chicago'), ); } diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php index 42984c4..040573d 100644 --- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php @@ -81,7 +81,7 @@ public function providerTestCleanCssIdentifier() { // Verify that an identifier starting with two hyphens is replaced. array('__cssidentifier', '--cssidentifier', array()), // Verify that passing double underscores as a filter is processed. - array('_cssidentifier', '__cssidentifier', array('__' => '_')), + array('_cssidentifier', '__cssidentifier', array('__' => '_')), ); } diff --git a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php index b0c4b98..9c04041 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php @@ -217,8 +217,8 @@ public function testCheck() { $this->assertEquals(TRUE, $this->accessManager->check($route_matches['test_route_4'], $this->account)); $this->assertEquals(AccessResult::neutral(), $this->accessManager->check($route_matches['test_route_1'], $this->account, NULL, TRUE)); $this->assertEquals(AccessResult::allowed(), $this->accessManager->check($route_matches['test_route_2'], $this->account, NULL, TRUE)); - $this->assertEquals(AccessResult::forbidden(), $this->accessManager->check($route_matches['test_route_3'], $this->account, NULL, TRUE)); - $this->assertEquals(AccessResult::allowed(), $this->accessManager->check($route_matches['test_route_4'], $this->account, NULL, TRUE)); + $this->assertEquals(AccessResult::forbidden(), $this->accessManager->check($route_matches['test_route_3'], $this->account, NULL, TRUE)); + $this->assertEquals(AccessResult::allowed(), $this->accessManager->check($route_matches['test_route_4'], $this->account, NULL, TRUE)); } /** diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php index e8af816..9976361 100644 --- a/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php @@ -97,9 +97,9 @@ public function providerTestGetLibrariesWithDependencies() { [['test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], [['test/nested_deps_a', 'test/nested_deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']], [['test/nested_deps_b', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']], - [['test/nested_deps_a', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], - [['test/nested_deps_b', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], - [['test/nested_deps_c', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], + [['test/nested_deps_a', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], + [['test/nested_deps_b', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], + [['test/nested_deps_c', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], [['test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], [['test/nested_deps_a', 'test/nested_deps_c', 'test/nested_deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], [['test/nested_deps_b', 'test/nested_deps_a', 'test/nested_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], @@ -107,7 +107,7 @@ public function providerTestGetLibrariesWithDependencies() { [['test/nested_deps_c', 'test/nested_deps_a', 'test/nested_deps_b'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], [['test/nested_deps_c', 'test/nested_deps_b', 'test/nested_deps_a'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c']], // Complex dependencies, combining the above, with many intersections. - [['test/deps_c', 'test/nested_deps_b'], ['test/no_deps_b', 'test/no_deps_a', 'test/deps_c', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']], + [['test/deps_c', 'test/nested_deps_b'], ['test/no_deps_b', 'test/no_deps_a', 'test/deps_c', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']], [['test/no_deps_a', 'test/deps_c', 'test/nested_deps_b'], ['test/no_deps_a', 'test/no_deps_b', 'test/deps_c', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b']], [['test/nested_deps_b', 'test/deps_c', 'test/no_deps_c'], ['test/no_deps_a', 'test/deps_a', 'test/nested_deps_a', 'test/nested_deps_b', 'test/no_deps_b', 'test/deps_c', 'test/no_deps_c']], ]; @@ -149,9 +149,9 @@ public function providerTestGetMinimalRepresentativeSubset() { [['test/nested_deps_c'], ['test/nested_deps_c']], [['test/nested_deps_a', 'test/nested_deps_b'], ['test/nested_deps_b']], [['test/nested_deps_b', 'test/nested_deps_a'], ['test/nested_deps_b']], - [['test/nested_deps_a', 'test/nested_deps_c'], ['test/nested_deps_c']], - [['test/nested_deps_b', 'test/nested_deps_c'], ['test/nested_deps_c']], - [['test/nested_deps_c', 'test/nested_deps_a'], ['test/nested_deps_c']], + [['test/nested_deps_a', 'test/nested_deps_c'], ['test/nested_deps_c']], + [['test/nested_deps_b', 'test/nested_deps_c'], ['test/nested_deps_c']], + [['test/nested_deps_c', 'test/nested_deps_a'], ['test/nested_deps_c']], [['test/nested_deps_a', 'test/nested_deps_b', 'test/nested_deps_c'], ['test/nested_deps_c']], [['test/nested_deps_a', 'test/nested_deps_c', 'test/nested_deps_b'], ['test/nested_deps_c']], [['test/nested_deps_b', 'test/nested_deps_a', 'test/nested_deps_c'], ['test/nested_deps_c']], @@ -159,7 +159,7 @@ public function providerTestGetMinimalRepresentativeSubset() { [['test/nested_deps_c', 'test/nested_deps_a', 'test/nested_deps_b'], ['test/nested_deps_c']], [['test/nested_deps_c', 'test/nested_deps_b', 'test/nested_deps_a'], ['test/nested_deps_c']], // Complex dependencies, combining the above, with many intersections. - [['test/deps_c', 'test/nested_deps_b'], ['test/deps_c', 'test/nested_deps_b']], + [['test/deps_c', 'test/nested_deps_b'], ['test/deps_c', 'test/nested_deps_b']], [['test/no_deps_a', 'test/deps_c', 'test/nested_deps_b'], ['test/deps_c', 'test/nested_deps_b']], [['test/nested_deps_b', 'test/deps_c', 'test/no_deps_c'], ['test/nested_deps_b', 'test/deps_c', 'test/no_deps_c']], ]; diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php index 1c19b15..7e19b38 100644 --- a/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php +++ b/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php @@ -76,13 +76,13 @@ public function providerTestRemoveRoute() { return array( array('enabled', array('_module_dependencies' => 'enabled'), FALSE), array('disabled', array('_module_dependencies' => 'disabled'), TRUE), - array('enabled_or', array('_module_dependencies' => 'disabled,enabled'), FALSE), - array('enabled_or', array('_module_dependencies' => 'enabled,disabled'), FALSE), - array('disabled_or', array('_module_dependencies' => 'disabled,disabled'), TRUE), - array('enabled_and', array('_module_dependencies' => 'enabled+enabled'), FALSE), - array('enabled_and', array('_module_dependencies' => 'enabled+disabled'), TRUE), - array('enabled_and', array('_module_dependencies' => 'disabled+enabled'), TRUE), - array('disabled_and', array('_module_dependencies' => 'disabled+disabled'), TRUE), + array('enabled_or', array('_module_dependencies' => 'disabled,enabled'), FALSE), + array('enabled_or', array('_module_dependencies' => 'enabled,disabled'), FALSE), + array('disabled_or', array('_module_dependencies' => 'disabled,disabled'), TRUE), + array('enabled_and', array('_module_dependencies' => 'enabled+enabled'), FALSE), + array('enabled_and', array('_module_dependencies' => 'enabled+disabled'), TRUE), + array('enabled_and', array('_module_dependencies' => 'disabled+enabled'), TRUE), + array('disabled_and', array('_module_dependencies' => 'disabled+disabled'), TRUE), array('no_dependencies', array(), FALSE), ); }