diff --git a/composer.json b/composer.json index 97c131f..70c45cb 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,9 @@ "license": "GPL-2.0+", "require": { "composer/installers": "^1.0.24", - "wikimedia/composer-merge-plugin": "^1.4" + "wikimedia/composer-merge-plugin": "^1.4", + "drupal/coder": "^8.2", + "squizlabs/php_codesniffer": "*" }, "replace": { "drupal/core": "^8.5" diff --git a/composer.lock b/composer.lock index 310254b..e6fc918 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "97de1708c79f6205a295cfc9808c0c72", + "hash": "1f526a27bf68dbc307fe1e1aff034bc2", + "content-hash": "1fcd080a315d310a23645b6839b24be4", "packages": [ { "name": "asm89/stack-cors", @@ -56,7 +57,7 @@ "cors", "stack" ], - "time": "2017-04-11T20:03:41+00:00" + "time": "2017-04-11 20:03:41" }, { "name": "composer/installers", @@ -163,7 +164,7 @@ "zend", "zikula" ], - "time": "2016-08-13T20:53:52+00:00" + "time": "2016-08-13 20:53:52" }, { "name": "composer/semver", @@ -225,7 +226,7 @@ "validation", "versioning" ], - "time": "2016-08-30T16:08:34+00:00" + "time": "2016-08-30 16:08:34" }, { "name": "doctrine/annotations", @@ -293,7 +294,7 @@ "docblock", "parser" ], - "time": "2015-08-31T12:32:49+00:00" + "time": "2015-08-31 12:32:49" }, { "name": "doctrine/cache", @@ -363,7 +364,7 @@ "cache", "caching" ], - "time": "2016-10-29T11:16:17+00:00" + "time": "2016-10-29 11:16:17" }, { "name": "doctrine/collections", @@ -429,7 +430,7 @@ "collections", "iterator" ], - "time": "2015-04-14T22:21:58+00:00" + "time": "2015-04-14 22:21:58" }, { "name": "doctrine/common", @@ -502,7 +503,7 @@ "persistence", "spl" ], - "time": "2016-11-30T16:50:46+00:00" + "time": "2016-11-30 16:50:46" }, { "name": "doctrine/inflector", @@ -569,7 +570,7 @@ "singularize", "string" ], - "time": "2015-11-06T14:35:42+00:00" + "time": "2015-11-06 14:35:42" }, { "name": "doctrine/lexer", @@ -623,7 +624,44 @@ "lexer", "parser" ], - "time": "2014-09-09T13:34:57+00:00" + "time": "2014-09-09 13:34:57" + }, + { + "name": "drupal/coder", + "version": "8.2.12", + "source": { + "type": "git", + "url": "https://github.com/klausi/coder.git", + "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/klausi/coder/zipball/984c54a7b1e8f27ff1c32348df69712afd86b17f", + "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.4.0", + "squizlabs/php_codesniffer": ">=2.8.1 <3.0", + "symfony/yaml": ">=2.0.0" + }, + "require-dev": { + "phpunit/phpunit": ">=3.7 <6" + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "Coder is a library to review Drupal code.", + "homepage": "https://www.drupal.org/project/coder", + "keywords": [ + "code review", + "phpcs", + "standards" + ], + "time": "2017-03-18 10:28:49" }, { "name": "easyrdf/easyrdf", @@ -685,7 +723,7 @@ "rdfa", "sparql" ], - "time": "2015-02-27T09:45:49+00:00" + "time": "2015-02-27 09:45:49" }, { "name": "egulias/email-validator", @@ -737,7 +775,7 @@ "validation", "validator" ], - "time": "2017-02-03T22:48:59+00:00" + "time": "2017-02-03 22:48:59" }, { "name": "guzzlehttp/guzzle", @@ -799,7 +837,7 @@ "rest", "web service" ], - "time": "2017-02-28T22:50:30+00:00" + "time": "2017-02-28 22:50:30" }, { "name": "guzzlehttp/promises", @@ -850,7 +888,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20T10:07:11+00:00" + "time": "2016-12-20 10:07:11" }, { "name": "guzzlehttp/psr7", @@ -915,7 +953,7 @@ "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2017-03-20 17:10:46" }, { "name": "masterminds/html5", @@ -980,7 +1018,7 @@ "serializer", "xml" ], - "time": "2016-09-22T11:01:11+00:00" + "time": "2016-09-22 11:01:11" }, { "name": "paragonie/random_compat", @@ -1028,7 +1066,7 @@ "pseudorandom", "random" ], - "time": "2017-03-13T16:27:32+00:00" + "time": "2017-03-13 16:27:32" }, { "name": "psr/http-message", @@ -1078,7 +1116,7 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "time": "2016-08-06 14:39:51" }, { "name": "psr/log", @@ -1125,7 +1163,85 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2016-10-10 12:19:37" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "2.9.1", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2017-05-22 02:43:20" }, { "name": "stack/builder", @@ -1174,7 +1290,7 @@ "keywords": [ "stack" ], - "time": "2016-06-02T06:58:42+00:00" + "time": "2016-06-02 06:58:42" }, { "name": "symfony-cmf/routing", @@ -1233,7 +1349,7 @@ "database", "routing" ], - "time": "2016-03-31T09:11:39+00:00" + "time": "2016-03-31 09:11:39" }, { "name": "symfony/class-loader", @@ -1289,7 +1405,7 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" }, { "name": "symfony/console", @@ -1352,7 +1468,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-04-26T01:39:17+00:00" + "time": "2017-04-26 01:39:17" }, { "name": "symfony/debug", @@ -1409,7 +1525,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-04-19T20:17:50+00:00" + "time": "2017-04-19 20:17:50" }, { "name": "symfony/dependency-injection", @@ -1472,7 +1588,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-04-26T01:39:17+00:00" + "time": "2017-04-26 01:39:17" }, { "name": "symfony/event-dispatcher", @@ -1532,7 +1648,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:58:48+00:00" + "time": "2017-05-01 14:58:48" }, { "name": "symfony/http-foundation", @@ -1585,7 +1701,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-01 14:55:58" }, { "name": "symfony/http-kernel", @@ -1667,7 +1783,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-05-01T17:46:48+00:00" + "time": "2017-05-01 17:46:48" }, { "name": "symfony/polyfill-iconv", @@ -1726,7 +1842,7 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/polyfill-mbstring", @@ -1785,7 +1901,7 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2016-11-14 01:06:16" }, { "name": "symfony/process", @@ -1834,7 +1950,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" }, { "name": "symfony/psr-http-message-bridge", @@ -1894,7 +2010,7 @@ "http-message", "psr-7" ], - "time": "2016-09-14T18:37:20+00:00" + "time": "2016-09-14 18:37:20" }, { "name": "symfony/routing", @@ -1969,7 +2085,7 @@ "uri", "url" ], - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" }, { "name": "symfony/serializer", @@ -2044,7 +2160,7 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-01 14:55:58" }, { "name": "symfony/translation", @@ -2108,7 +2224,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" }, { "name": "symfony/validator", @@ -2185,7 +2301,7 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" }, { "name": "symfony/yaml", @@ -2240,7 +2356,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-01 14:55:58" }, { "name": "twig/twig", @@ -2302,7 +2418,7 @@ "keywords": [ "templating" ], - "time": "2017-02-27T00:07:03+00:00" + "time": "2017-02-27 00:07:03" }, { "name": "wikimedia/composer-merge-plugin", @@ -2351,7 +2467,7 @@ } ], "description": "Composer plugin to merge multiple composer.json files", - "time": "2017-03-13T16:52:55+00:00" + "time": "2017-03-13 16:52:55" }, { "name": "zendframework/zend-diactoros", @@ -2403,7 +2519,7 @@ "psr", "psr-7" ], - "time": "2017-04-06T16:18:34+00:00" + "time": "2017-04-06 16:18:34" }, { "name": "zendframework/zend-escaper", @@ -2447,7 +2563,7 @@ "escaper", "zf2" ], - "time": "2016-06-30T19:48:38+00:00" + "time": "2016-06-30 19:48:38" }, { "name": "zendframework/zend-feed", @@ -2508,7 +2624,7 @@ "feed", "zf2" ], - "time": "2016-02-11T18:54:29+00:00" + "time": "2016-02-11 18:54:29" }, { "name": "zendframework/zend-stdlib", @@ -2553,7 +2669,7 @@ "stdlib", "zf2" ], - "time": "2016-04-12T21:19:36+00:00" + "time": "2016-04-12 21:19:36" } ], "packages-dev": [ @@ -2613,7 +2729,7 @@ "testing", "web" ], - "time": "2017-02-06T09:59:54+00:00" + "time": "2017-02-06 09:59:54" }, { "name": "behat/mink-browserkit-driver", @@ -2669,7 +2785,7 @@ "browser", "testing" ], - "time": "2016-03-05T08:59:47+00:00" + "time": "2016-03-05 08:59:47" }, { "name": "behat/mink-goutte-driver", @@ -2724,7 +2840,7 @@ "headless", "testing" ], - "time": "2016-03-05T09:04:22+00:00" + "time": "2016-03-05 09:04:22" }, { "name": "doctrine/instantiator", @@ -2778,44 +2894,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" - }, - { - "name": "drupal/coder", - "version": "8.2.12", - "source": { - "type": "git", - "url": "https://github.com/klausi/coder.git", - "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/klausi/coder/zipball/984c54a7b1e8f27ff1c32348df69712afd86b17f", - "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.4.0", - "squizlabs/php_codesniffer": ">=2.8.1 <3.0", - "symfony/yaml": ">=2.0.0" - }, - "require-dev": { - "phpunit/phpunit": ">=3.7 <6" - }, - "type": "phpcodesniffer-standard", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0+" - ], - "description": "Coder is a library to review Drupal code.", - "homepage": "https://www.drupal.org/project/coder", - "keywords": [ - "code review", - "phpcs", - "standards" - ], - "time": "2017-03-18T10:28:49+00:00" + "time": "2015-06-14 21:17:01" }, { "name": "fabpot/goutte", @@ -2864,7 +2943,7 @@ "keywords": [ "scraper" ], - "time": "2017-01-03T13:21:43+00:00" + "time": "2017-01-03 13:21:43" }, { "name": "ircmaxell/password-compat", @@ -2906,7 +2985,7 @@ "hashing", "password" ], - "time": "2014-11-20T16:49:30+00:00" + "time": "2014-11-20 16:49:30" }, { "name": "jcalderonzumba/gastonjs", @@ -2963,7 +3042,7 @@ "headless", "phantomjs" ], - "time": "2016-01-18T09:21:03+00:00" + "time": "2016-01-18 09:21:03" }, { "name": "jcalderonzumba/mink-phantomjs-driver", @@ -3024,7 +3103,7 @@ "phantomjs", "testing" ], - "time": "2015-12-04T13:55:02+00:00" + "time": "2015-12-04 13:55:02" }, { "name": "mikey179/vfsStream", @@ -3070,7 +3149,7 @@ ], "description": "Virtual file system to mock the real file system in unit tests.", "homepage": "http://vfs.bovigo.org/", - "time": "2016-07-18T14:02:57+00:00" + "time": "2016-07-18 14:02:57" }, { "name": "phpdocumentor/reflection-docblock", @@ -3119,7 +3198,7 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2015-02-03T12:10:50+00:00" + "time": "2015-02-03 12:10:50" }, { "name": "phpspec/prophecy", @@ -3182,7 +3261,7 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2017-03-02 20:05:34" }, { "name": "phpunit/php-code-coverage", @@ -3244,7 +3323,7 @@ "testing", "xunit" ], - "time": "2015-10-06T15:47:00+00:00" + "time": "2015-10-06 15:47:00" }, { "name": "phpunit/php-file-iterator", @@ -3291,7 +3370,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2016-10-03 07:40:28" }, { "name": "phpunit/php-text-template", @@ -3332,7 +3411,7 @@ "keywords": [ "template" ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", @@ -3381,7 +3460,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2017-02-26 11:10:40" }, { "name": "phpunit/php-token-stream", @@ -3430,7 +3509,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27T10:12:30+00:00" + "time": "2017-02-27 10:12:30" }, { "name": "phpunit/phpunit", @@ -3502,7 +3581,7 @@ "testing", "xunit" ], - "time": "2017-02-06T05:18:07+00:00" + "time": "2017-02-06 05:18:07" }, { "name": "phpunit/phpunit-mock-objects", @@ -3558,7 +3637,7 @@ "mock", "xunit" ], - "time": "2015-10-02T06:51:40+00:00" + "time": "2015-10-02 06:51:40" }, { "name": "sebastian/comparator", @@ -3622,7 +3701,7 @@ "compare", "equality" ], - "time": "2017-01-29T09:50:25+00:00" + "time": "2017-01-29 09:50:25" }, { "name": "sebastian/diff", @@ -3674,7 +3753,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08T07:14:41+00:00" + "time": "2015-12-08 07:14:41" }, { "name": "sebastian/environment", @@ -3724,7 +3803,7 @@ "environment", "hhvm" ], - "time": "2016-08-18T05:49:44+00:00" + "time": "2016-08-18 05:49:44" }, { "name": "sebastian/exporter", @@ -3791,7 +3870,7 @@ "export", "exporter" ], - "time": "2016-06-17T09:04:28+00:00" + "time": "2016-06-17 09:04:28" }, { "name": "sebastian/global-state", @@ -3842,7 +3921,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12T03:26:01+00:00" + "time": "2015-10-12 03:26:01" }, { "name": "sebastian/recursion-context", @@ -3895,7 +3974,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-10-03T07:41:43+00:00" + "time": "2016-10-03 07:41:43" }, { "name": "sebastian/version", @@ -3930,85 +4009,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21T13:59:46+00:00" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "2.8.1", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.1.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "bin": [ - "scripts/phpcs", - "scripts/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Fixer.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2017-03-01T22:17:45+00:00" + "time": "2015-06-21 13:59:46" }, { "name": "symfony/browser-kit", @@ -4065,7 +4066,7 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" }, { "name": "symfony/css-selector", @@ -4118,7 +4119,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-01 14:55:58" }, { "name": "symfony/dom-crawler", @@ -4174,7 +4175,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" }, { "name": "symfony/phpunit-bridge", @@ -4236,7 +4237,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-04-12 14:13:17" } ], "aliases": [], diff --git a/core/lib/Drupal/Component/Diff/Diff.php b/core/lib/Drupal/Component/Diff/Diff.php index 8135b15..c8d82d4 100644 --- a/core/lib/Drupal/Component/Diff/Diff.php +++ b/core/lib/Drupal/Component/Diff/Diff.php @@ -36,7 +36,7 @@ class Diff { public function __construct($from_lines, $to_lines) { $eng = new DiffEngine(); $this->edits = $eng->diff($from_lines, $to_lines); - //$this->_check($from_lines, $to_lines); + // $this->_check($from_lines, $to_lines); } /** diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php index dadde4e..568a323 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php @@ -299,8 +299,8 @@ protected function _compareseq($xoff, $xlim, $yoff, $ylim) { } else { // This is ad hoc but seems to work well. - //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); - //$nchunks = max(2, min(8, (int)$nchunks)); + // $nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); + // $nchunks = max(2, min(8, (int)$nchunks)); $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1; list($lcs, $seps) = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks); } diff --git a/core/lib/Drupal/Component/Utility/UserAgent.php b/core/lib/Drupal/Component/Utility/UserAgent.php index c80c44e..7106921 100644 --- a/core/lib/Drupal/Component/Utility/UserAgent.php +++ b/core/lib/Drupal/Component/Utility/UserAgent.php @@ -40,8 +40,8 @@ public static function getBestMatchingLangcode($http_accept_language, $langcodes // The Accept-Language header contains information about the language // preferences configured in the user's user agent / operating system. // RFC 2616 (section 14.4) defines the Accept-Language header as follows: - // Accept-Language = "Accept-Language" ":" - // 1#( language-range [ ";" "q" "=" qvalue ] ) + // Accept-Language = "Accept-Language" ":" + // 1#( language-range [ ";" "q" "=" qvalue ] ) // language-range = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" ) // Samples: "hu, en-us;q=0.66, en;q=0.33", "hu,en-us;q=0.5" $ua_langcodes = []; diff --git a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php index c3c83e1..9c174e0 100644 --- a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php +++ b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php @@ -113,10 +113,10 @@ public function render(array $css_assets) { // - There are more than 31 CSS assets on the page, yet we must stay // below IE<10's limit of 31 total CSS inclusion tags, we handle this // in two ways: - // - file CSS assets that are not eligible for aggregation (their + // - file CSS assets that are not eligible for aggregation (their // 'preprocess' flag has been set to FALSE): in this case, output a // LINK tag. - // - file CSS assets that can be aggregated (and possibly have been): + // - file CSS assets that can be aggregated (and possibly have been): // in this case, figure out which subsequent file CSS assets share // the same key properties ('group', 'media' and 'browsers') and // output this group into as few STYLE tags as possible (a STYLE diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index 06fed4b..9712e6f 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -383,16 +383,16 @@ protected function createExtensionChangelist() { // sorted in reverse alphabetical order, to ensure the order is exactly // opposite from installation. For example, this module list: // array( - // 'actions' => 0, - // 'ban' => 0, - // 'options' => -2, - // 'text' => -1, + // 'actions' => 0, + // 'ban' => 0, + // 'options' => -2, + // 'text' => -1, // ); // will result in the following sort order: // -2 options // -1 text - // 0 0 ban - // 0 1 actions + // 0 0 ban + // 0 1 actions // @todo Move this sorting functionality to the extension system. array_multisort(array_values($module_list), SORT_ASC, array_keys($module_list), SORT_DESC, $module_list); $this->extensionChangelist['module']['uninstall'] = array_intersect(array_keys($module_list), $uninstall); diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php index 3769e54..658d059 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php @@ -111,7 +111,7 @@ public static function open(array &$connection_options = []) { // so backslashes in the password need to be doubled up. // The bug was reported against pdo_pgsql 1.0.2, backslashes in passwords // will break on this doubling up when the bug is fixed, so check the version - //elseif (phpversion('pdo_pgsql') < 'version_this_was_fixed_in') { + // elseif (phpversion('pdo_pgsql') < 'version_this_was_fixed_in') { else { $connection_options['password'] = str_replace('\\', '\\\\', $connection_options['password']); } diff --git a/core/lib/Drupal/Core/Database/StatementInterface.php b/core/lib/Drupal/Core/Database/StatementInterface.php index a34bf61..a97043a 100644 --- a/core/lib/Drupal/Core/Database/StatementInterface.php +++ b/core/lib/Drupal/Core/Database/StatementInterface.php @@ -37,7 +37,7 @@ * "the access type must be omitted" if it is protected; i.e., conflicting * statements). The access type has to be protected. */ - //protected function __construct(Connection $dbh); + // protected function __construct(Connection $dbh); /** * Executes a prepared statement diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 260e477..ac4b544 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -451,7 +451,7 @@ public function boot() { // Provide a default configuration, if not set. if (!isset($configuration['default'])) { // @todo Use extension_loaded('apcu') for non-testbot - // https://www.drupal.org/node/2447753. + // https://www.drupal.org/node/2447753. if (function_exists('apcu_fetch')) { $configuration['default']['cache_backend_class'] = '\Drupal\Component\FileCache\ApcuFileCacheBackend'; } diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index c5421ed..a9d3e03 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -1337,7 +1337,7 @@ public function hasTranslationChanges() { foreach ($this->getFieldDefinitions() as $field_name => $definition) { // @todo Avoid special-casing the following fields. See - // https://www.drupal.org/node/2329253. + // https://www.drupal.org/node/2329253. if (in_array($field_name, $skip_fields, TRUE)) { continue; } diff --git a/core/lib/Drupal/Core/Entity/EntityFieldManager.php b/core/lib/Drupal/Core/Entity/EntityFieldManager.php index a0fff7e..ecfba5f 100644 --- a/core/lib/Drupal/Core/Entity/EntityFieldManager.php +++ b/core/lib/Drupal/Core/Entity/EntityFieldManager.php @@ -238,7 +238,7 @@ protected function buildBaseFieldDefinitions($entity_type_id) { $provider = $entity_type->getProvider(); foreach ($base_field_definitions as $definition) { // @todo Remove this check once FieldDefinitionInterface exposes a proper - // provider setter. See https://www.drupal.org/node/2225961. + // provider setter. See https://www.drupal.org/node/2225961. if ($definition instanceof BaseFieldDefinition) { $definition->setProvider($provider); } @@ -252,7 +252,7 @@ protected function buildBaseFieldDefinitions($entity_type_id) { // defining the field. foreach ($module_definitions as $field_name => $definition) { // @todo Remove this check once FieldDefinitionInterface exposes a - // proper provider setter. See https://www.drupal.org/node/2225961. + // proper provider setter. See https://www.drupal.org/node/2225961. if ($definition instanceof BaseFieldDefinition && $definition->getProvider() == NULL) { $definition->setProvider($module); } @@ -359,7 +359,7 @@ protected function buildBundleFieldDefinitions($entity_type_id, $bundle, array $ $provider = $entity_type->getProvider(); foreach ($bundle_field_definitions as $definition) { // @todo Remove this check once FieldDefinitionInterface exposes a proper - // provider setter. See https://www.drupal.org/node/2225961. + // provider setter. See https://www.drupal.org/node/2225961. if ($definition instanceof BaseFieldDefinition) { $definition->setProvider($provider); } @@ -373,7 +373,7 @@ protected function buildBundleFieldDefinitions($entity_type_id, $bundle, array $ // defining the field. foreach ($module_definitions as $field_name => $definition) { // @todo Remove this check once FieldDefinitionInterface exposes a - // proper provider setter. See https://www.drupal.org/node/2225961. + // proper provider setter. See https://www.drupal.org/node/2225961. if ($definition instanceof BaseFieldDefinition) { $definition->setProvider($module); } @@ -527,7 +527,7 @@ protected function buildFieldStorageDefinitions($entity_type_id) { // defining the field. foreach ($module_definitions as $field_name => $definition) { // @todo Remove this check once FieldDefinitionInterface exposes a - // proper provider setter. See https://www.drupal.org/node/2225961. + // proper provider setter. See https://www.drupal.org/node/2225961. if ($definition instanceof BaseFieldDefinition) { $definition->setProvider($module); } diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php index 25b837b..715fa1a 100644 --- a/core/lib/Drupal/Core/Entity/EntityForm.php +++ b/core/lib/Drupal/Core/Entity/EntityForm.php @@ -325,8 +325,8 @@ protected function copyFormValuesToEntity(EntityInterface $entity, array $form, } // @todo: This relies on a method that only exists for config and content - // entities, in a different way. Consider moving this logic to a config - // entity specific implementation. + // entities, in a different way. Consider moving this logic to a config + // entity specific implementation. foreach ($values as $key => $value) { $entity->set($key, $value); } diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php index 2c3340e..b511701 100644 --- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php @@ -273,8 +273,8 @@ public function buildMultiple(array $build_list) { // Assign the weights configured in the display. // @todo: Once https://www.drupal.org/node/1875974 provides the missing - // API, only do it for 'extra fields', since other components have - // been taken care of in EntityViewDisplay::buildMultiple(). + // API, only do it for 'extra fields', since other components have + // been taken care of in EntityViewDisplay::buildMultiple(). foreach ($display->getComponents() as $name => $options) { if (isset($build_list[$key][$name])) { $build_list[$key][$name]['#weight'] = $options['weight']; diff --git a/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php b/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php index fb40fd5..6e802f2 100644 --- a/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php +++ b/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php @@ -151,8 +151,8 @@ protected function getAddFormRoute(EntityTypeInterface $entity_type) { // and access requirements. $expected_parameter = $entity_type->getBundleEntityType() ?: $entity_type->getKey('bundle'); // @todo: We have to check if a route contains a bundle in its path as - // test entities have inconsistent usage of "add-form" link templates. - // Fix it in https://www.drupal.org/node/2699959. + // test entities have inconsistent usage of "add-form" link templates. + // Fix it in https://www.drupal.org/node/2699959. if (($bundle_key = $entity_type->getKey('bundle')) && strpos($route->getPath(), '{' . $expected_parameter . '}') !== FALSE) { $route->setDefault('_title_callback', EntityController::class . '::addBundleTitle'); // If the bundles are entities themselves, we can add parameter diff --git a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php index ea8bff1..4fd7d80 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php +++ b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php @@ -170,7 +170,7 @@ public static function setLinkActiveClass($html_markup, $current_path, $is_front } // Get the HTML: this will be the opening part of a single tag, e.g.: - // + // $tag = substr($html_markup, $pos_tag_start, $pos_tag_end - $pos_tag_start + 1); // Parse it into a DOMDocument so we can reliably read and modify diff --git a/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php index cc54d6c..e5d3849 100644 --- a/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php +++ b/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php @@ -902,9 +902,9 @@ public function guess($path) { // Iterate over the file parts, trying to find a match. // For my.awesome.image.jpeg, we try: - // - jpeg - // - image.jpeg, and - // - awesome.image.jpeg + // - jpeg + // - image.jpeg, and + // - awesome.image.jpeg while ($additional_part = array_pop($file_parts)) { $extension = strtolower($additional_part . ($extension ? '.' . $extension : '')); if (isset($this->mapping['extensions'][$extension])) { diff --git a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php index 9f18963..99c1c06 100644 --- a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php +++ b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php @@ -108,7 +108,7 @@ public function chmodJailed($path, $mode, $recursive) { if ($this->isDirectory($path) && $recursive) { $filelist = @ftp_nlist($this->connection, $path); if (!$filelist) { - //empty directory - returns false + // empty directory - returns false return; } foreach ($filelist as $file) { diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php index b78efb3..52f4b9c 100644 --- a/core/lib/Drupal/Core/Form/FormState.php +++ b/core/lib/Drupal/Core/Form/FormState.php @@ -1206,12 +1206,12 @@ public function cleanValues() { // the value corresponding to this button. // We iterate over the #parents of this button and move a reference to // each parent in self::getValues(). For example, if #parents is: - // array('foo', 'bar', 'baz') + // array('foo', 'bar', 'baz') // then the corresponding self::getValues() part will look like this: // array( - // 'foo' => array( - // 'bar' => array( - // 'baz' => 'button_value', + // 'foo' => array( + // 'bar' => array( + // 'baz' => 'button_value', // ), // ), // ) diff --git a/core/lib/Drupal/Core/Form/FormSubmitter.php b/core/lib/Drupal/Core/Form/FormSubmitter.php index 4a4275e..d929845 100644 --- a/core/lib/Drupal/Core/Form/FormSubmitter.php +++ b/core/lib/Drupal/Core/Form/FormSubmitter.php @@ -99,7 +99,7 @@ public function executeSubmitHandlers(&$form, FormStateInterface &$form_state) { // Check if a previous _submit handler has set a batch, but make sure we // do not react to a batch that is already being processed (for instance // if a batch operation performs a - // \Drupal\Core\Form\FormBuilderInterface::submitForm()). + // \Drupal\Core\Form\FormBuilderInterface::submitForm()). if (($batch = &$this->batchGet()) && !isset($batch['id'])) { // Some previous submit handler has set a batch. To ensure correct // execution order, store the call in a special 'control' batch set. diff --git a/core/lib/Drupal/Core/Render/RenderCache.php b/core/lib/Drupal/Core/Render/RenderCache.php index 9ac3381..dfe6452 100644 --- a/core/lib/Drupal/Core/Render/RenderCache.php +++ b/core/lib/Drupal/Core/Render/RenderCache.php @@ -62,7 +62,7 @@ public function get(array $elements) { // Form submissions rely on the form being built during the POST request, // and render caching of forms prevents this from happening. // @todo remove the isMethodCacheable() check when - // https://www.drupal.org/node/2367555 lands. + // https://www.drupal.org/node/2367555 lands. if (!$this->requestStack->getCurrentRequest()->isMethodCacheable() || !$cid = $this->createCacheID($elements)) { return FALSE; } @@ -89,7 +89,7 @@ public function set(array &$elements, array $pre_bubbling_elements) { // Form submissions rely on the form being built during the POST request, // and render caching of forms prevents this from happening. // @todo remove the isMethodCacheable() check when - // https://www.drupal.org/node/2367555 lands. + // https://www.drupal.org/node/2367555 lands. if (!$this->requestStack->getCurrentRequest()->isMethodCacheable() || !$cid = $this->createCacheID($elements)) { return FALSE; } @@ -121,10 +121,10 @@ public function set(array &$elements, array $pre_bubbling_elements) { // persist that information between the cache write and the next cache // read. So, what we can do is store the following into 'foo': // [ - // '#cache_redirect' => TRUE, + // '#cache_redirect' => TRUE, // '#cache' => [ - // ... - // 'contexts' => ['b'], + // ... + // 'contexts' => ['b'], // ], // ] // @@ -153,10 +153,10 @@ public function set(array &$elements, array $pre_bubbling_elements) { // - When a request is processed where context 'b' = 'b1', what would be // cached for a $pre_bubbling_cid of 'foo' is: // [ - // '#cache_redirect' => TRUE, + // '#cache_redirect' => TRUE, // '#cache' => [ - // ... - // 'contexts' => ['b', 'c'], + // ... + // 'contexts' => ['b', 'c'], // ], // ] // - When a request is processed where context 'b' = 'b2', we would @@ -166,10 +166,10 @@ public function set(array &$elements, array $pre_bubbling_elements) { // with rendering the structure, perform the required context bubbling // and then overwrite the above item with: // [ - // '#cache_redirect' => TRUE, + // '#cache_redirect' => TRUE, // '#cache' => [ - // ... - // 'contexts' => ['b', 'd'], + // ... + // 'contexts' => ['b', 'd'], // ], // ] // - Now, if a request comes in where context 'b' = 'b1' again, the above @@ -178,10 +178,10 @@ public function set(array &$elements, array $pre_bubbling_elements) { // we would process this request as a cache miss, at the end of which, // we would overwrite the above item back to: // [ - // '#cache_redirect' => TRUE, + // '#cache_redirect' => TRUE, // '#cache' => [ - // ... - // 'contexts' => ['b', 'c'], + // ... + // 'contexts' => ['b', 'c'], // ], // ] // - The above would always result in accurate renderings, but would @@ -194,10 +194,10 @@ public function set(array &$elements, array $pre_bubbling_elements) { // state where the redirection element includes all of the contexts used // throughout all requests: // [ - // '#cache_redirect' => TRUE, + // '#cache_redirect' => TRUE, // '#cache' => [ - // ... - // 'contexts' => ['b', 'c', 'd'], + // ... + // 'contexts' => ['b', 'c', 'd'], // ], // ] // diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php index 287ffbb..a99fd8f 100644 --- a/core/lib/Drupal/Core/Render/Renderer.php +++ b/core/lib/Drupal/Core/Render/Renderer.php @@ -339,7 +339,7 @@ protected function doRender(&$elements, $is_root_call = FALSE) { // present (without such a callback, it would be impossible to replace the // placeholder), replace the current element with a placeholder. // @todo remove the isMethodCacheable() check when - // https://www.drupal.org/node/2367555 lands. + // https://www.drupal.org/node/2367555 lands. if (isset($elements['#create_placeholder']) && $elements['#create_placeholder'] === TRUE && $this->requestStack->getCurrentRequest()->isMethodCacheable()) { if (!isset($elements['#lazy_builder'])) { throw new \LogicException('When #create_placeholder is set, a #lazy_builder callback must be present as well.'); diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php index 95495cf..2182508 100644 --- a/core/lib/Drupal/Core/Session/SessionManager.php +++ b/core/lib/Drupal/Core/Session/SessionManager.php @@ -124,9 +124,9 @@ public function start() { // know the future session ID of a lazily started session in advance. // // @todo: With current versions of PHP there is little reason to generate - // the session id from within application code. Consider using the - // default php session id instead of generating a custom one: - // https://www.drupal.org/node/2238561 + // the session id from within application code. Consider using the + // default php session id instead of generating a custom one: + // https://www.drupal.org/node/2238561 $this->setId(Crypt::randomBytesBase64()); // Initialize the session global and attach the Symfony session bags. diff --git a/core/lib/Drupal/Core/Validation/DrupalTranslator.php b/core/lib/Drupal/Core/Validation/DrupalTranslator.php index 505deca..a59ba15 100644 --- a/core/lib/Drupal/Core/Validation/DrupalTranslator.php +++ b/core/lib/Drupal/Core/Validation/DrupalTranslator.php @@ -40,7 +40,7 @@ public function transChoice($id, $number, array $parameters = [], $domain = NULL } // Normally, calls to formatPlural() need to use literal strings, like - // formatPlural($count, '1 item', '@count items') + // formatPlural($count, '1 item', '@count items') // so that the Drupal project POTX string extractor will correctly // extract the strings for translation and save them in a format that // formatPlural() can work with. However, this is a special case, because diff --git a/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php b/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php index 525ef34..c109a23 100644 --- a/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php +++ b/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php @@ -175,8 +175,8 @@ public function process(FeedInterface $feed) { } foreach ($feed->items as $item) { // @todo: The default entity view builder always returns an empty - // array, which is ignored in aggregator_save_item() currently. Should - // probably be fixed. + // array, which is ignored in aggregator_save_item() currently. Should + // probably be fixed. if (empty($item['title'])) { continue; } diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php index 9a04ce7..f2d015b 100644 --- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php @@ -474,8 +474,8 @@ protected function generateACFSettings(Editor $editor) { // attributes is allowed. However, that may not be the case: the "*" // tag may still apply restrictions. // Since CKEditor's ACF follows the following principle: - // Once validated, an element or its property cannot be - // invalidated by another rule. + // Once validated, an element or its property cannot be + // invalidated by another rule. // That means that the most permissive setting wins. Which means that // it will still be allowed by CKEditor, for instance, to define any // style, no matter what the "*" tag's restrictions may be. If there diff --git a/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php index eb02d37..9550650 100644 --- a/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php +++ b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php @@ -81,9 +81,9 @@ public function testEnabledPlugins() { // Case 3: enable each of the newly available plugins, if possible: // a. Llama: cannot be enabled, since it does not implement - // CKEditorPluginContextualInterface nor CKEditorPluginButtonsInterface. + // CKEditorPluginContextualInterface nor CKEditorPluginButtonsInterface. // b. LlamaContextual: enabled by adding the 'Strike' button, which is - // part of another plugin! + // part of another plugin! // c. LlamaButton: automatically enabled by adding its 'Llama' button. // d. LlamaContextualAndButton: enabled by either b or c. // e. LlamaCSS: automatically enabled by add its 'LlamaCSS' button. diff --git a/core/modules/comment/src/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php index c834fa6..a01106d 100644 --- a/core/modules/comment/src/Controller/CommentController.php +++ b/core/modules/comment/src/Controller/CommentController.php @@ -288,7 +288,7 @@ public function replyFormAccess(EntityInterface $entity, $field_name, $pid = NUL // Check if the user has the proper permissions. $access = $access->andIf(AccessResult::allowedIfHasPermission($account, 'access comments')); - /// Load the parent comment. + // Load the parent comment. $comment = $this->entityManager()->getStorage('comment')->load($pid); // Check if the parent comment is published and belongs to the entity. $access = $access->andIf(AccessResult::allowedIf($comment && $comment->isPublished() && $comment->getCommentedEntityId() == $entity->id())); diff --git a/core/modules/comment/src/Plugin/views/sort/Thread.php b/core/modules/comment/src/Plugin/views/sort/Thread.php index 1984934..44fba29 100644 --- a/core/modules/comment/src/Plugin/views/sort/Thread.php +++ b/core/modules/comment/src/Plugin/views/sort/Thread.php @@ -16,14 +16,14 @@ class Thread extends SortPluginBase { public function query() { $this->ensureMyTable(); - //Read comment_render() in comment.module for an explanation of the - //thinking behind this sort. + // Read comment_render() in comment.module for an explanation of the + // thinking behind this sort. if ($this->options['order'] == 'DESC') { $this->query->addOrderBy($this->tableAlias, $this->realField, $this->options['order']); } else { $alias = $this->tableAlias . '_' . $this->realField . 'asc'; - //@todo is this secure? + // @todo is this secure? $this->query->addOrderBy(NULL, "SUBSTRING({$this->tableAlias}.{$this->realField}, 1, (LENGTH({$this->tableAlias}.{$this->realField}) - 1))", $this->options['order'], $alias); } } diff --git a/core/modules/comment/src/Tests/CommentThreadingTest.php b/core/modules/comment/src/Tests/CommentThreadingTest.php index 8f412b2..a4474e1 100644 --- a/core/modules/comment/src/Tests/CommentThreadingTest.php +++ b/core/modules/comment/src/Tests/CommentThreadingTest.php @@ -131,10 +131,10 @@ protected function assertParentLink($cid, $pid) { // This pattern matches a markup structure like: // //
- //

- // - //

- //
+ //

+ // + //

+ // $pattern = "//a[@id='comment-$cid']/following-sibling::article//p[contains(@class, 'parent')]//a[contains(@href, 'comment-$pid')]"; $this->assertFieldByXpath($pattern, NULL, format_string( @@ -157,7 +157,7 @@ protected function assertNoParentLink($cid) { // //
//

- //
+ // $pattern = "//a[@id='comment-$cid']/following-sibling::article//p[contains(@class, 'parent')]"; $this->assertNoFieldByXpath($pattern, NULL, format_string( diff --git a/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/core/modules/contact/tests/src/Unit/MailHandlerTest.php index 898ea22..ba3bfad 100644 --- a/core/modules/contact/tests/src/Unit/MailHandlerTest.php +++ b/core/modules/contact/tests/src/Unit/MailHandlerTest.php @@ -234,7 +234,7 @@ public function getSendMailMessages() { $results[] = $result + $default_result; $data[] = [$message, $sender, $results]; - //For authenticated user. + // For authenticated user. $results = []; $message = $this->getAuthenticatedMockMessage(); $sender = $this->getMockSender(FALSE, 'user@drupal.org'); diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/src/Tests/EditorSecurityTest.php index d00fe0e..5dbee7c 100644 --- a/core/modules/editor/src/Tests/EditorSecurityTest.php +++ b/core/modules/editor/src/Tests/EditorSecurityTest.php @@ -75,11 +75,11 @@ protected function setUp() { parent::setUp(); // Create 5 text formats, to cover all potential use cases: - // 1. restricted_without_editor (untrusted: anonymous) - // 2. restricted_with_editor (normal: authenticated) - // 3. restricted_plus_dangerous_tag_with_editor (privileged: trusted) - // 4. unrestricted_without_editor (privileged: admin) - // 5. unrestricted_with_editor (privileged: admin) + // 1. restricted_without_editor (untrusted: anonymous) + // 2. restricted_with_editor (normal: authenticated) + // 3. restricted_plus_dangerous_tag_with_editor (privileged: trusted) + // 4. unrestricted_without_editor (privileged: admin) + // 5. unrestricted_with_editor (privileged: admin) // With text formats 2, 3 and 5, we also associate a text editor that does // not guarantee XSS safety. "restricted" means the text format has XSS // filters on output, "unrestricted" means the opposite. @@ -166,10 +166,10 @@ protected function setUp() { ]); // Create 4 users, each with access to different text formats/editors: - // - "untrusted": restricted_without_editor - // - "normal": restricted_with_editor, - // - "trusted": restricted_plus_dangerous_tag_with_editor - // - "privileged": restricted_without_editor, restricted_with_editor, + // - "untrusted": restricted_without_editor + // - "normal": restricted_with_editor, + // - "trusted": restricted_plus_dangerous_tag_with_editor + // - "privileged": restricted_without_editor, restricted_with_editor, // restricted_plus_dangerous_tag_with_editor, // unrestricted_without_editor and unrestricted_with_editor $this->untrustedUser = $this->drupalCreateUser([ @@ -382,8 +382,8 @@ public function testSwitchingSecurity() { ]; // Log in as the privileged user, and for every sample, do the following: - // - switch to every other text format/editor - // - assert the XSS-filtered values that we get from the server + // - switch to every other text format/editor + // - assert the XSS-filtered values that we get from the server $this->drupalLogin($this->privilegedUser); foreach ($expected as $case) { $this->drupalGet('node/' . $case['node_id'] . '/edit'); diff --git a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php index ce63092..9385c7a 100644 --- a/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php +++ b/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php @@ -141,7 +141,7 @@ public function providerTestFilterXss() { // Spaces and meta chars before the JavaScript in images for XSS. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Spaces_and_meta_chars_before_the_JavaScript_in_images_for_XSS // @fixme This dataset currently fails under 5.4 because of - // https://www.drupal.org/node/1210798. Restore after it's fixed. + // https://www.drupal.org/node/1210798. Restore after it's fixed. if (version_compare(PHP_VERSION, '5.4.0', '<')) { $data[] = ['', '']; } @@ -171,7 +171,7 @@ public function providerTestFilterXss() { // Double open angle brackets. // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Double_open_angle_brackets // @see http://ha.ckers.org/blog/20060611/hotbot-xss-vulnerability/ to - // understand why this is a vulnerability. + // understand why this is a vulnerability. $data[] = ['