Commit c6776109 authored by catch's avatar catch

Issue #3002206 by jibran, longwave, truls1502, alexpott, NickWilde: Update the...

Issue #3002206 by jibran, longwave, truls1502, alexpott, NickWilde: Update the stable version of drupal/coder to ˆ8.3.1
parent 039eae17
......@@ -3379,22 +3379,28 @@
},
{
"name": "drupal/coder",
"version": "8.2.12",
"version": "8.3.1",
"source": {
"type": "git",
"url": "https://git.drupal.org/project/coder.git",
"reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f"
"reference": "29a25627e7148b3119c84f18e087fc3b8c85b959"
},
"require": {
"ext-mbstring": "*",
"php": ">=5.4.0",
"squizlabs/php_codesniffer": ">=2.8.1 <3.0",
"squizlabs/php_codesniffer": "^3.0.1",
"symfony/yaml": ">=2.0.0"
},
"require-dev": {
"phpunit/phpunit": ">=3.7 <6"
},
"type": "phpcodesniffer-standard",
"autoload": {
"psr-0": {
"Drupal\\": "coder_sniffer/Drupal/",
"DrupalPractice\\": "coder_sniffer/Drupal/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
......@@ -3406,7 +3412,7 @@
"phpcs",
"standards"
],
"time": "2017-03-18T10:28:49+00:00"
"time": "2018-09-21T14:22:49+00:00"
},
{
"name": "fabpot/goutte",
......@@ -4654,64 +4660,37 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "2.8.1",
"version": "3.4.1",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d"
"reference": "5b4333b4010625d29580eb4a41f1e53251be6baa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
"reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5b4333b4010625d29580eb4a41f1e53251be6baa",
"reference": "5b4333b4010625d29580eb4a41f1e53251be6baa",
"shasum": ""
},
"require": {
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
"php": ">=5.1.2"
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"bin": [
"scripts/phpcs",
"scripts/phpcbf"
"bin/phpcs",
"bin/phpcbf"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
"dev-master": "3.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"
......@@ -4723,12 +4702,12 @@
}
],
"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",
"homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"keywords": [
"phpcs",
"standards"
],
"time": "2017-03-01T22:17:45+00:00"
"time": "2019-03-19T03:22:27+00:00"
},
{
"name": "symfony/browser-kit",
......
......@@ -56,7 +56,7 @@
"behat/mink": "1.7.x-dev",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "1.3.x-dev",
"drupal/coder": "^8.2.12",
"drupal/coder": "^8.3.1",
"jcalderonzumba/gastonjs": "^1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
"mikey179/vfsstream": "^1.2",
......
......@@ -9,7 +9,7 @@
*/
class Timer {
static protected $timers = [];
protected static $timers = [];
/**
* Starts the timer with the specified name.
......
......@@ -40,28 +40,28 @@ abstract class Database {
*
* @var array
*/
static protected $connections = [];
protected static $connections = [];
/**
* A processed copy of the database connection information from settings.php.
*
* @var array
*/
static protected $databaseInfo = [];
protected static $databaseInfo = [];
/**
* A list of key/target credentials to simply ignore.
*
* @var array
*/
static protected $ignoreTargets = [];
protected static $ignoreTargets = [];
/**
* The key of the currently active database connection.
*
* @var string
*/
static protected $activeKey = 'default';
protected static $activeKey = 'default';
/**
* An array of active query log objects.
......@@ -75,7 +75,7 @@ abstract class Database {
*
* @var array
*/
static protected $logs = [];
protected static $logs = [];
/**
* Starts logging a given logging key on the specified connection.
......
......@@ -192,8 +192,7 @@ protected function getTableMapping(EntityTypeInterface $entity_type, array $stor
* {@inheritdoc}
*/
public function requiresEntityStorageSchemaChanges(EntityTypeInterface $entity_type, EntityTypeInterface $original) {
return
$this->hasSharedTableStructureChange($entity_type, $original) ||
return $this->hasSharedTableStructureChange($entity_type, $original) ||
// Detect changes in key or index definitions.
$this->getEntitySchemaData($entity_type, $this->getEntitySchema($entity_type, TRUE)) != $this->loadEntitySchemaData($original);
}
......@@ -211,8 +210,7 @@ public function requiresEntityStorageSchemaChanges(EntityTypeInterface $entity_t
* a table has been renamed.
*/
protected function hasSharedTableStructureChange(EntityTypeInterface $entity_type, EntityTypeInterface $original) {
return
$entity_type->isRevisionable() != $original->isRevisionable() ||
return $entity_type->isRevisionable() != $original->isRevisionable() ||
$entity_type->isTranslatable() != $original->isTranslatable() ||
$this->hasSharedTableNameChanges($entity_type, $original);
}
......@@ -237,8 +235,7 @@ protected function hasSharedTableNameChanges(EntityTypeInterface $entity_type, E
// We first check if the new table already exists because the storage might
// have created it even though it wasn't specified in the entity type
// definition.
return
(!$base_table && $entity_type->getBaseTable() != $original->getBaseTable()) ||
return (!$base_table && $entity_type->getBaseTable() != $original->getBaseTable()) ||
(!$data_table && $entity_type->getDataTable() != $original->getDataTable()) ||
(!$revision_table && $entity_type->getRevisionTable() != $original->getRevisionTable()) ||
(!$revision_data_table && $entity_type->getRevisionDataTable() != $original->getRevisionDataTable());
......
......@@ -36,7 +36,7 @@ public function __construct($root) {
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static ($container->get('app.root'));
return new static($container->get('app.root'));
}
/**
......
......@@ -38,7 +38,7 @@ class HtmlTag extends RenderElement {
* @see http://www.w3.org/TR/html5/syntax.html#syntax-start-tag
* @see http://www.w3.org/TR/html5/syntax.html#void-elements
*/
static protected $voidElements = [
protected static $voidElements = [
'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input',
'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr',
'rect', 'circle', 'polygon', 'ellipse', 'stop', 'use', 'path',
......
......@@ -33,10 +33,8 @@ public function __construct(array $renderer_config) {
* {@inheritdoc}
*/
public function canCreatePlaceholder(array $element) {
return
// If generated by a #lazy_builder callback, placeholdering is possible.
isset($element['#lazy_builder'])
&&
// If generated by a #lazy_builder callback, placeholdering is possible.
return isset($element['#lazy_builder']) &&
// If #create_placeholder === FALSE, placeholdering is disallowed.
(!isset($element['#create_placeholder']) || $element['#create_placeholder'] !== FALSE);
}
......
......@@ -30,7 +30,7 @@ public function build() {
return [
'#prefix' => '<div id="' . $this->getPluginId() . '--username">',
'#suffix' => '</div>',
'#markup' => $user ? $user->getAccountName() : 'No context mapping selected.' ,
'#markup' => $user ? $user->getAccountName() : 'No context mapping selected.',
];
}
......
......@@ -100,7 +100,7 @@ public function __construct($plugin_id, $plugin_definition, ConfigFactoryInterfa
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
// Note that we ignore the plugin $configuration because mappers have
// nothing to configure in themselves.
return new static (
return new static(
$plugin_id,
$plugin_definition,
$container->get('config.factory'),
......
......@@ -153,7 +153,7 @@ public function __construct($plugin_id, $plugin_definition, ConfigFactoryInterfa
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
// Note that we ignore the plugin $configuration because mappers have
// nothing to configure in themselves.
return new static (
return new static(
$plugin_id,
$plugin_definition,
$container->get('config.factory'),
......
......@@ -182,8 +182,7 @@ function _content_translation_is_field_translatability_configurable(EntityTypeIn
// Allow to configure only fields supporting multilingual storage. We skip our
// own fields as they are always translatable. Additionally we skip a set of
// well-known fields implementing entity system business logic.
return
$definition->isTranslatable() &&
return $definition->isTranslatable() &&
$definition->getProvider() != 'content_translation' &&
!in_array($definition->getName(), [$entity_type->getKey('langcode'), $entity_type->getKey('default_langcode'), 'revision_translation_affected']);
}
......
......@@ -491,7 +491,7 @@ protected function doTestTemporaryFileRemovalExploit(UserInterface $victim_user,
// Have attacker create a new node with a different uploaded file and
// ensure it got uploaded successfully.
$edit = [
'title[0][value]' => $type . '-title' ,
'title[0][value]' => $type . '-title',
];
// Attach a file to a node.
......
......@@ -416,8 +416,7 @@ protected function assertConfigOverride($config_name, $key, $value, $langcode) {
*/
protected function assertActiveConfig($config_name, $key, $value, $langcode) {
$config = $this->configFactory->getEditable($config_name);
return
$this->assertEqual($config->get('langcode'), $langcode) &&
return $this->assertEqual($config->get('langcode'), $langcode) &&
$this->assertIdentical($config->get($key), $value);
}
......
......@@ -33,8 +33,7 @@ protected function setUp() {
$stable_core_modules = array_filter($all_modules, function ($module) {
// Filter out contrib, hidden, testing, and experimental modules. We also
// don't need to enable modules that are already enabled.
return
$module->origin === 'core' &&
return $module->origin === 'core' &&
empty($module->info['hidden']) &&
$module->status == FALSE &&
$module->info['package'] !== 'Testing' &&
......
......@@ -27,7 +27,7 @@ class XmlEncoder implements SerializerAwareInterface, EncoderInterface, DecoderI
*
* @var array
*/
static protected $format = ['xml'];
protected static $format = ['xml'];
/**
* An instance of the Symfony XmlEncoder to perform the actual encoding.
......
......@@ -11,7 +11,7 @@ class SerializationTestEncoder implements EncoderInterface {
*
* @var string
*/
static protected $format = 'serialization_test';
protected static $format = 'serialization_test';
/**
* {@inheritdoc}
......
......@@ -11,7 +11,7 @@ class SerializationTestNormalizer implements NormalizerInterface {
*
* @var string
*/
static protected $format = 'serialization_test';
protected static $format = 'serialization_test';
/**
* Normalizes an object into a set of arrays/scalars.
......
......@@ -293,8 +293,7 @@ public static function scanDirectory($namespace_prefix, $path) {
// We don't want to discover abstract TestBase classes, traits or
// interfaces. They can be deprecated and will call @trigger_error()
// during discovery.
return
substr($file_name, -4) === '.php' &&
return substr($file_name, -4) === '.php' &&
substr($file_name, -12) !== 'TestBase.php' &&
substr($file_name, -9) !== 'Trait.php' &&
substr($file_name, -13) !== 'Interface.php';
......
......@@ -53,7 +53,7 @@ public function __construct(ConfigFactoryInterface $config_factory, DateFormatte
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static (
return new static(
$container->get('config.factory'),
$container->get('date.formatter'),
$container->get('stream_wrapper_manager')
......
......@@ -16,7 +16,7 @@ class ThemeTokenTest extends BrowserTestBase {
*
* @var array
*/
static public $modules = ['block'];
public static $modules = ['block'];
/**
* {@inheritdoc}
......
......@@ -15,7 +15,7 @@ class PathHooksTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
static public $modules = ['system'];
public static $modules = ['system'];
/**
* Test system_path_*() correctly clears caches.
......
......@@ -54,8 +54,7 @@ public function testSystemTimeZones() {
$ungrouped_count = count(system_time_zones());
$grouped_result = system_time_zones(NULL, TRUE);
$grouped_count = 0;
array_walk_recursive($grouped_result, function () use
(&$grouped_count) {
array_walk_recursive($grouped_result, function () use (&$grouped_count) {
$grouped_count++;
});
$this->assertEquals($ungrouped_count, $grouped_count);
......
......@@ -978,8 +978,6 @@ function user_mail_tokens(&$replacements, $data, $options) {
}
}
/*** Administrative features ***********************************************/
/**
* Retrieves the names of roles matching specified conditions.
*
......
......@@ -24,11 +24,11 @@
<!-- Only include specific sniffs that pass. This ensures that, if new sniffs are added, HEAD does not fail.-->
<!-- Drupal sniffs -->
<rule ref="Drupal.Array.Array">
<rule ref="Drupal.Arrays.Array">
<!-- Sniff for these errors: CommaLastItem -->
<exclude name="Drupal.Array.Array.ArrayClosingIndentation"/>
<exclude name="Drupal.Array.Array.ArrayIndentation"/>
<exclude name="Drupal.Array.Array.LongLineDeclaration"/>
<exclude name="Drupal.Arrays.Array.ArrayClosingIndentation"/>
<exclude name="Drupal.Arrays.Array.ArrayIndentation"/>
<exclude name="Drupal.Arrays.Array.LongLineDeclaration"/>
</rule>
<rule ref="Drupal.Classes.ClassCreateInstance"/>
<rule ref="Drupal.Classes.ClassDeclaration"/>
......@@ -207,6 +207,9 @@
<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
<severity>0</severity>
</rule>
<rule ref="PEAR.Functions.FunctionCallSignature.OpeningIndent">
<severity>0</severity>
</rule>
<rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
<severity>0</severity>
</rule>
......
......@@ -16,7 +16,7 @@
*/
class CryptRandomFallbackTest extends TestCase {
static protected $functionCalled = 0;
protected static $functionCalled = 0;
/**
* Allows the test to confirm that the namespaced random_bytes() was called.
......
......@@ -241,7 +241,6 @@ public function findFile() {
}
}
namespace {
if (!function_exists('drupal_valid_test_ua')) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment