Skip to content

Commit

Permalink
core 9.14
Browse files Browse the repository at this point in the history
  • Loading branch information
Misha Vinokur authored and Misha Vinokur committed Feb 5, 2021
1 parent 665794a commit e86ed29
Show file tree
Hide file tree
Showing 928 changed files with 7,565 additions and 6,010 deletions.
46 changes: 23 additions & 23 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 23 additions & 23 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -1913,17 +1913,17 @@
},
{
"name": "drupal/core",
"version": "9.1.3",
"version_normalized": "9.1.3.0",
"version": "9.1.4",
"version_normalized": "9.1.4.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
"reference": "62f5d7d0f9f7c279b996b0f33d0ccd501adcd980"
"reference": "d16a7cb33b7a01e3b2e66d36e2011f27ba9786f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/62f5d7d0f9f7c279b996b0f33d0ccd501adcd980",
"reference": "62f5d7d0f9f7c279b996b0f33d0ccd501adcd980",
"url": "https://api.github.com/repos/drupal/core/zipball/d16a7cb33b7a01e3b2e66d36e2011f27ba9786f4",
"reference": "d16a7cb33b7a01e3b2e66d36e2011f27ba9786f4",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -2087,6 +2087,7 @@
"drupal/workflows": "self.version",
"drupal/workspaces": "self.version"
},
"time": "2021-02-03T19:21:05+00:00",
"type": "drupal-core",
"extra": {
"drupal-scaffold": {
Expand Down Expand Up @@ -2155,23 +2156,16 @@
"includes/bootstrap.inc"
]
},
"scripts": {
"pre-autoload-dump": [
"Drupal\\Core\\Composer\\Composer::preAutoloadDump"
],
"post-autoload-dump": [
"Drupal\\Core\\Composer\\Composer::ensureHtaccess"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"description": "Drupal is an open source content management platform powering millions of websites and applications."
},
{
"name": "drupal/core-composer-scaffold",
"version": "9.1.3",
"version_normalized": "9.1.3.0",
"version": "9.1.4",
"version_normalized": "9.1.4.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-composer-scaffold.git",
Expand All @@ -2193,6 +2187,7 @@
"require-dev": {
"composer/composer": "^1.8@stable"
},
"time": "2020-08-07T22:30:13+00:00",
"type": "composer-plugin",
"extra": {
"class": "Drupal\\Composer\\Plugin\\Scaffold\\Plugin",
Expand All @@ -2206,6 +2201,7 @@
"Drupal\\Composer\\Plugin\\Scaffold\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
Expand All @@ -2217,8 +2213,8 @@
},
{
"name": "drupal/core-project-message",
"version": "9.1.3",
"version_normalized": "9.1.3.0",
"version": "9.1.4",
"version_normalized": "9.1.4.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-project-message.git",
Expand All @@ -2234,6 +2230,7 @@
"composer-plugin-api": "^1.1 || ^2",
"php": ">=7.3.0"
},
"time": "2020-09-14T13:40:36+00:00",
"type": "composer-plugin",
"extra": {
"class": "Drupal\\Composer\\Plugin\\ProjectMessage\\MessagePlugin"
Expand All @@ -2244,6 +2241,7 @@
"Drupal\\Composer\\Plugin\\ProjectMessage\\": "."
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
Expand All @@ -2255,17 +2253,17 @@
},
{
"name": "drupal/core-recommended",
"version": "9.1.3",
"version_normalized": "9.1.3.0",
"version": "9.1.4",
"version_normalized": "9.1.4.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
"reference": "cc9bbc18cdd2a2aa9174d6ffc1f6428c330ba1ca"
"reference": "e48e05b546b0ebef74af26a6d3104dd3bd499202"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal/core-recommended/zipball/cc9bbc18cdd2a2aa9174d6ffc1f6428c330ba1ca",
"reference": "cc9bbc18cdd2a2aa9174d6ffc1f6428c330ba1ca",
"url": "https://api.github.com/repos/drupal/core-recommended/zipball/e48e05b546b0ebef74af26a6d3104dd3bd499202",
"reference": "e48e05b546b0ebef74af26a6d3104dd3bd499202",
"shasum": ""
},
"require": {
Expand All @@ -2274,7 +2272,7 @@
"doctrine/annotations": "1.11.1",
"doctrine/lexer": "1.2.1",
"doctrine/reflection": "1.2.2",
"drupal/core": "9.1.3",
"drupal/core": "9.1.4",
"egulias/email-validator": "2.1.22",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.4.0",
Expand Down Expand Up @@ -2328,7 +2326,9 @@
"conflict": {
"webflo/drupal-core-strict": "*"
},
"time": "2021-02-03T19:21:05+00:00",
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
Expand Down
13 changes: 10 additions & 3 deletions web/core/MAINTAINERS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ CKEditor
- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
- Marek 'mlewand' Lewandowski https://www.drupal.org/u/mlewand

Claro
- Cristina Chumillas 'ckrina' https://www.drupal.org/u/ckrina
- Sascha Eggenberger 'saschaeggi' https://www.drupal.org/u/saschaeggi
- Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii
- Ben Mullins 'bnjmnm' https://www.drupal.org/u/bnjmnm

Classy
- David Hernandez 'davidhernandez' https://www.drupal.org/u/davidhernandez

Expand Down Expand Up @@ -507,9 +513,9 @@ re-architect or otherwise improve large areas of Drupal core. See
https://www.drupal.org/community-initiatives/drupal-core for more information on
their responsibilities. The initiative coordinators for Drupal 8 are:

Admin UI & JavaScript Modernisation Initiative
- Cristina Chumillas 'ckrina' https://www.drupal.org/u/ckrina
- Sally Young 'justafish' https://www.drupal.org/u/justafish
Decoupled Menus Initiative
- Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
- Gabe Sullice 'gabesullice' https://www.drupal.org/u/gabesullice

Layout Initiative
- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
Expand Down Expand Up @@ -543,6 +549,7 @@ participate in mentoring.
- Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
- Matthew Radcliffe 'mradcliffe' https://www.drupal.org/u/mradcliffe
- (provisional) Chris Darke 'chrisdarke' https://www.drupal.org/u/chrisdarke
- (provisional) Brian Gilbert 'realityloop' https://www.drupal.org/u/realityloop
- (provisional) AmyJune Hineline 'volkswagenchick' https://www.drupal.org/u/volkswagenchick

Provisional membership: None at this time.
2 changes: 1 addition & 1 deletion web/core/lib/Drupal.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class Drupal {
/**
* The current system version.
*/
const VERSION = '9.1.3';
const VERSION = '9.1.4';

/**
* Core API compatibility.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,7 @@ public function process(ContainerBuilder $container) {
// Add a method call for each handler to the consumer service
// definition.
foreach ($handlers as $id => $priority) {
$arguments = [];
$arguments[0] = new Reference($id);
if (isset($priority_pos)) {
$arguments[$priority_pos] = $priority;
}
if (isset($id_pos)) {
$arguments[$id_pos] = $id;
}
// Sort the arguments by position.
ksort($arguments);
$arguments = [new Reference($id), $priority];
if (is_subclass_of($interfaces[$id], $interface)) {
$consumer->addMethodCall('addMimeTypeGuesser', $arguments);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ private function parseDefinitions($content, $file)
list($provider, ) = explode('.', $basename, 2);
}
foreach ($content['services'] as $id => $service) {
$service['tags'][] = ['name' => '_provider', 'provider' => $provider];
if (is_array($service)) {
$service['tags'][] = ['name' => '_provider', 'provider' => $provider];
}
$this->parseDefinition($id, $service, $file);
}
}
Expand Down
10 changes: 9 additions & 1 deletion web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,15 @@ public function loadUnchanged($id) {
}

/**
* {@inheritdoc}
* Resets the entity cache.
*
* Content entities have both an in-memory static cache and a persistent
* cache. Use this method to clear all caches. To clear just the in-memory
* cache, use the 'entity.memory_cache' service.
*
* @param array $ids
* (optional) If specified, the cache is reset for the entities with the
* given ids only.
*/
public function resetCache(array $ids = NULL) {
if ($ids) {
Expand Down
2 changes: 1 addition & 1 deletion web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ interface EntityStorageInterface {
const FIELD_LOAD_REVISION = 'FIELD_LOAD_REVISION';

/**
* Resets the internal, static entity cache.
* Resets the internal entity cache.
*
* @param $ids
* (optional) If specified, the cache is reset for the entities with the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public function compile($conditionContainer) {
$condition_class::translateCondition($condition, $sql_query, $tables->isFieldCaseSensitive($condition['field']));
$function = $condition['function'];
$placeholder = ':db_placeholder_' . $conditionContainer->nextPlaceholder();
$conditionContainer->having("$function($field) {$condition['operator']} $placeholder", [$placeholder => $condition['value']]);
$sql_field_escaped = '[' . str_replace('.', '].[', $field) . ']';
$conditionContainer->having("$function($sql_field_escaped) {$condition['operator']} $placeholder", [$placeholder => $condition['value']]);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ protected function addAggregate() {
if ($this->aggregate) {
foreach ($this->aggregate as $aggregate) {
$sql_field = $this->getSqlField($aggregate['field'], $aggregate['langcode']);
$this->sqlExpressions[$aggregate['alias']] = $aggregate['function'] . "($sql_field)";
$sql_field_escaped = '[' . str_replace('.', '].[', $sql_field) . ']';
$this->sqlExpressions[$aggregate['alias']] = $aggregate['function'] . "($sql_field_escaped)";
}
}
return $this;
Expand Down
3 changes: 3 additions & 0 deletions web/core/lib/Drupal/Core/Form/FormHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ protected static function processStatesArray(array &$conditions, $search, $repla
*
* @param array $elements
* A render array element having a #states property as described above.
*
* @see \Drupal\form_test\Form\JavascriptStatesForm
* @see \Drupal\FunctionalJavascriptTests\Core\Form\JavascriptStatesTest
*/
public static function processStates(array &$elements) {
$elements['#attached']['library'][] = 'core/drupal.states';
Expand Down

0 comments on commit e86ed29

Please sign in to comment.