opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2

Browse source
This commit is contained in:
Pantheon Automation 2016-06-02 15:56:09 -07:00 committed by Greg Anderson
parent 9eae24d844
commit 28556d630e
1322 changed files with 6699 additions and 2064 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
composer.lock generated
View file

@ -1057,12 +1057,12 @@
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "1.0.0"
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
"reference": "1.0.0",
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
"shasum": ""
},
"type": "library",
@ -2714,24 +2714,24 @@
"packages-dev": [
{
"name": "behat/mink",
"version": "v1.7.0",
"version": "v1.7.1",
"source": {
"type": "git",
"url": "https://github.com/minkphp/Mink.git",
"reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf"
"reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf",
"reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf",
"url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9",
"reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9",
"shasum": ""
},
"require": {
"php": ">=5.3.1",
"symfony/css-selector": "~2.1"
"symfony/css-selector": "~2.1|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"suggest": {
"behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
@ -2768,31 +2768,31 @@
"testing",
"web"
],
"time": "2015-09-20 20:24:03"
"time": "2016-03-05 08:26:18"
},
{
"name": "behat/mink-browserkit-driver",
"version": "v1.3.0",
"version": "v1.3.2",
"source": {
"type": "git",
"url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
"reference": "da47df1593dac132f04d24e7277ef40d33d9f201"
"reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/da47df1593dac132f04d24e7277ef40d33d9f201",
"reference": "da47df1593dac132f04d24e7277ef40d33d9f201",
"url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb",
"reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb",
"shasum": ""
},
"require": {
"behat/mink": "~1.7@dev",
"behat/mink": "^1.7.1@dev",
"php": ">=5.3.6",
"symfony/browser-kit": "~2.3",
"symfony/dom-crawler": "~2.3"
"symfony/browser-kit": "~2.3|~3.0",
"symfony/dom-crawler": "~2.3|~3.0"
},
"require-dev": {
"silex/silex": "~1.2",
"symfony/phpunit-bridge": "~2.7"
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"type": "mink-driver",
"extra": {
@ -2824,20 +2824,20 @@
"browser",
"testing"
],
"time": "2015-09-21 20:56:13"
"time": "2016-03-05 08:59:47"
},
{
"name": "behat/mink-goutte-driver",
"version": "v1.2.0",
"version": "v1.2.1",
"source": {
"type": "git",
"url": "https://github.com/minkphp/MinkGoutteDriver.git",
"reference": "c8e254f127d6f2242b994afd4339fb62d471df3f"
"reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f",
"reference": "c8e254f127d6f2242b994afd4339fb62d471df3f",
"url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
"reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
"shasum": ""
},
"require": {
@ -2847,7 +2847,7 @@
"php": ">=5.3.1"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"type": "mink-driver",
"extra": {
@ -2879,7 +2879,7 @@
"headless",
"testing"
],
"time": "2015-09-21 21:31:11"
"time": "2016-03-05 09:04:22"
},
{
"name": "doctrine/instantiator",
@ -2937,24 +2937,24 @@
},
{
"name": "fabpot/goutte",
"version": "v3.1.1",
"version": "v3.1.2",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/Goutte.git",
"reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc"
"reference": "3cbc6ed222422a28400e470050f14928a153207e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/751a3dc5c4d86ec3e97c9f27133ef9694d9243cc",
"reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc",
"url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/3cbc6ed222422a28400e470050f14928a153207e",
"reference": "3cbc6ed222422a28400e470050f14928a153207e",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.0",
"php": ">=5.5.0",
"symfony/browser-kit": "~2.1",
"symfony/css-selector": "~2.1",
"symfony/dom-crawler": "~2.1"
"symfony/browser-kit": "~2.1|~3.0",
"symfony/css-selector": "~2.1|~3.0",
"symfony/dom-crawler": "~2.1|~3.0"
},
"type": "application",
"extra": {
@ -2982,7 +2982,7 @@
"keywords": [
"scraper"
],
"time": "2015-08-29 16:16:56"
"time": "2015-11-05 12:58:44"
},
{
"name": "jcalderonzumba/gastonjs",

20
core/INSTALL.txt
View file

@ -199,7 +199,7 @@ INSTALLATION
5. Change file system storage settings (optional).
The files directory created in step 4 is the default file system path used to
The files directory created in step 3 is the default file system path used to
store all uploaded files, as well as some temporary files created by
Drupal. After installation, you can modify the file system path to store
uploaded files in a different location.
@ -226,11 +226,19 @@ INSTALLATION
mkdir uploads
chmod a+w uploads
b. Navigate to Administration > Configuration > Media > File system, and
enter the desired path. Note that if you want to use private file storage,
you need to first enter the path for private files and save the
configuration, and then change the "Default download method" setting and
save again.
b. Open your settings.php in a plain-text editor, and uncomment (remove the #
at the start of line) this line:
# $settings['file_public_path'] = 'sites/default/files';
Enter the desired path and save the file.
If you want to use private file storage, you need to uncomment (remove
the # at the start of line) the following line in settings.php:
# $settings['file_private_path'] = '';
Enter the path for private files and save the file.
Changing the file system path after files have been uploaded may cause
unexpected problems on an existing site. If you modify the file system path

19
core/MAINTAINERS.txt
View file

@ -53,7 +53,7 @@ Authentication and authorization system
- ?
Base system
- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz
- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
- Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
Batch system
@ -63,7 +63,7 @@ Bootstrap system
- ?
Cache system
- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz
- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
- Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
- Mark Sonnabaum 'msonnabaum' https://www.drupal.org/u/msonnabaum
@ -91,11 +91,11 @@ Database system
- David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
PostgreSQL DB driver
- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz
- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
- Josh Waihi 'fiasco' https://www.drupal.org/u/fiasco
Sqlite DB driver
- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz
- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
Database update system
- ?
@ -110,7 +110,6 @@ Extension system
Field system
- Yves Chedemois 'yched' https://www.drupal.org/u/yched
- Kristof De Jaeger 'swentel' https://www.drupal.org/u/swentel
- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
File system
@ -138,7 +137,7 @@ Language system
- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
Lock system
- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz
- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
Mail system
- ?
@ -199,7 +198,7 @@ Translations
Transliteration system
- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
- Damien Tournoud 'DamZ' https://www.drupal.org/u/damz
- Damien Tournoud 'damien-tournoud' https://www.drupal.org/u/damien-tournoud
- Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
- Jennifer Hodgdon 'jhodgdon' https://www.drupal.org/u/jhodgdon
@ -329,7 +328,6 @@ Editor module
Field UI module
- Yves Chedemois 'yched' https://www.drupal.org/u/yched
- Kristof De Jaeger 'swentel' https://www.drupal.org/u/swentel
- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu
File module
@ -385,7 +383,7 @@ Node module
- David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
Number module
- Kristof De Jaeger 'swentel' https://www.drupal.org/u/swentel
- ?
Options module
- Yves Chedemois 'yched' https://www.drupal.org/u/yched
@ -407,6 +405,7 @@ RDF module
REST module
- Klaus Purer 'klausi' https://www.drupal.org/u/klausi
- Larry Garfield 'Crell' https://www.drupal.org/u/crell
- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
Responsive Image module
- Peter Droogmans 'attiks' https://www.drupal.org/u/attiks
@ -444,7 +443,7 @@ Taxonomy module
- Benjamin Doherty 'bangpound' https://www.drupal.org/u/bangpound
Telephone module
- Dave Reid 'davereid' https://www.drupal.org/u/davereid
- Dave Reid 'dave-reid' https://www.drupal.org/u/dave-reid
Text module
- ?

15
core/assets/vendor/ckeditor/CHANGES.md vendored
View file

@ -1,6 +1,21 @@
CKEditor 4 Changelog
====================
## CKEditor 4.5.9
Fixed Issues:
* [#10685](http://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets).
* [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](http://ckeditor.com/addon/widget) drag handler CSS when there are multiple editor instances.
* [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `<body>` element and the `height` style for the `<html>` element breaks the [Auto Grow](http://ckeditor.com/addon/autogrow) plugin.
* [#14538](http://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `<iframe>` element.
* [#14602](http://dev.ckeditor.com/ticket/14602): Fixed: The [`dom.element.removeAttribute()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeAttribute) method does not remove all attributes if no parameter is given.
* [#8679](http://dev.ckeditor.com/ticket/8679): Fixed: Better focus indication and ability to style the selected color in the [color picker dialog](http://ckeditor.com/addon/colordialog).
* [#11697](http://dev.ckeditor.com/ticket/11697): Fixed: Content is replaced ignoring the letter case setting in the [Find and Replace](http://ckeditor.com/addon/find) dialog window.
* [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with the `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
* [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
* [#14312](http://dev.ckeditor.com/ticket/14312): [IE] Fixed: Artifact is visible after pasting any text.
## CKEditor 4.5.8
New Features:

1378
core/assets/vendor/ckeditor/ckeditor.js vendored
View file

File diff suppressed because it is too large Load diff

2
core/assets/vendor/ckeditor/lang/bn.js vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/dialog.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/dialog_ie.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/editor.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/editor_gecko.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/editor_ie.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/editor_ie7.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/editor_ie8.css vendored
View file

File diff suppressed because one or more lines are too long

2
core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css vendored
View file

File diff suppressed because one or more lines are too long

9
core/authorize.php
View file

@ -21,6 +21,7 @@
*/
use Drupal\Core\DrupalKernel;
use Drupal\Core\Form\EnforcedResponseException;
use Drupal\Core\Url;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
use Symfony\Component\HttpFoundation\Request;
@ -169,7 +170,13 @@ if ($is_allowed) {
}
elseif (!$batch = batch_get()) {
// We have a batch to process, show the filetransfer form.
$content = \Drupal::formBuilder()->getForm('Drupal\Core\FileTransfer\Form\FileTransferAuthorizeForm');
try {
$content = \Drupal::formBuilder()->getForm('Drupal\Core\FileTransfer\Form\FileTransferAuthorizeForm');
}
catch (EnforcedResponseException $e) {
$e->getResponse()->send();
exit;
}
}
}
// We defer the display of messages until all operations are done.

3
core/composer.json
View file

@ -34,7 +34,7 @@
"paragonie/random_compat": "~1.0"
},
"require-dev": {
"behat/mink": "~1.6",
"behat/mink": "~1.7",
"behat/mink-goutte-driver": "~1.2",
"jcalderonzumba/gastonjs": "~1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
@ -70,6 +70,7 @@
"drupal/core-discovery": "self.version",
"drupal/core-event-dispatcher": "self.version",
"drupal/core-file-cache": "self.version",
"drupal/core-filesystem": "self.version",
"drupal/core-gettext": "self.version",
"drupal/core-graph": "self.version",
"drupal/core-php-storage": "self.version",

2
core/core.api.php
View file

@ -2095,7 +2095,7 @@ function hook_mail_backend_info_alter(&$info) {
* @param $countries
* The associative array of countries keyed by two-letter country code.
*
* @see \Drupal\Core\Locale\CountryManager::getList().
* @see \Drupal\Core\Locale\CountryManager::getList()
*/
function hook_countries_alter(&$countries) {
// Elbonia is now independent, so add it to the country list.

4
core/core.libraries.yml
View file

@ -24,10 +24,10 @@ classList:
ckeditor:
remote: https://github.com/ckeditor/ckeditor-dev
version: "4.5.7"
version: "4.5.9"
license:
name: GNU-GPL-2.0-or-later
url: https://github.com/ckeditor/ckeditor-dev/blob/4.5.7/LICENSE.md
url: https://github.com/ckeditor/ckeditor-dev/blob/4.5.9/LICENSE.md
gpl-compatible: true
js:
assets/vendor/ckeditor/ckeditor.js: { preprocess: false, minified: true }

1
core/includes/common.inc
View file

@ -220,7 +220,6 @@ function valid_email_address($mail) {
* UrlHelper::filterBadProtocol() is functionality equivalent to check_url()
* apart from the fact it is protected from double escaping bugs. Note that
* this method no longer marks its output as safe.
*
*/
function check_url($uri) {
return Html::escape(UrlHelper::stripDangerousProtocols($uri));

2
core/includes/errors.inc
View file

@ -181,7 +181,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
if ($fatal) {
// When called from CLI, simply output a plain text message.
// Should not translate the string to avoid errors producing more errors.
$response->setContent(html_entity_decode(strip_tags(SafeMarkup::format('%type: @message in %function (line %line of %file).', $error))). "\n");
$response->setContent(html_entity_decode(strip_tags(SafeMarkup::format('%type: @message in %function (line %line of %file).', $error))) . "\n");
$response->send();
exit;
}

17
core/includes/file.inc
View file

@ -33,23 +33,6 @@ const FILE_CHMOD_FILE = FileSystem::CHMOD_FILE;
* @defgroup file File interface
* @{
* Common file handling functions.
*
* Fields on the file entity:
* - fid: File ID
* - uid: The {users}.uid of the user who is associated with the file.
* - filename: Name of the file with no path components. This may differ from
* the basename of the filepath if the file is renamed to avoid overwriting
* an existing file.
* - uri: URI of the file.
* - filemime: The file's MIME type.
* - filesize: The size of the file in bytes.
* - status: A bitmapped field indicating the status of the file. The first 8
* bits are reserved for Drupal core. The least significant bit indicates
* temporary (0) or permanent (1). Temporary files will be removed during
* cron runs if they are older than the configuration value
* "system.file.temporary_maximum_age", and if clean-up is enabled. Permanent
* files will not be removed.
* - timestamp: UNIX timestamp for the date the file was added to the database.
*/
/**

2
core/includes/form.inc
View file

@ -313,7 +313,6 @@ function template_preprocess_checkboxes(&$variables) {
* An associative array containing:
* - element: An associative array containing the properties and children of
* the details element. Properties used: #children.
*
*/
function template_preprocess_vertical_tabs(&$variables) {
$element = $variables['element'];
@ -372,7 +371,6 @@ function template_preprocess_form(&$variables) {
* - element: An associative array containing the properties of the element.
* Properties used: #title, #value, #description, #rows, #cols,
* #placeholder, #required, #attributes, #resizable
*
*/
function template_preprocess_textarea(&$variables) {
$element = $variables['element'];

4
core/includes/install.core.inc
View file

@ -1372,7 +1372,7 @@ function install_retrieve_file($uri, $destination) {
}
/**
* Checks if the localization server can be contacted.
* Checks if the localization server can be contacted.
*
* @param string $uri
* The URI to contact.
@ -1595,7 +1595,7 @@ function install_download_additional_translations_operations(&$install_state) {
// should download/import translations.
$languages = \Drupal::languageManager()->getLanguages();
$operations = array();
foreach($languages as $langcode => $language) {
foreach ($languages as $langcode => $language) {
// The installer language was already downloaded. Check downloads for the
// other languages if any. Ignore any download errors here, since we
// are in the middle of an install process and there is no way back. We

14
core/includes/install.inc
View file

@ -227,7 +227,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
else {
_drupal_rewrite_settings_global($settings_settings, $data);
}
$variable_names['$'. $setting] = $setting;
$variable_names['$' . $setting] = $setting;
}
$contents = file_get_contents($settings_file);
if ($contents !== FALSE) {
@ -362,13 +362,14 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
* Checks whether this token represents a scalar or NULL.
*
* @param int $type
* The token type
* @see token_name().
* The token type.
* @param string $value
* The value of the token.
*
* @return bool
* TRUE if this token represents a scalar or NULL.
*
* @see token_name()
*/
function _drupal_rewrite_settings_is_simple($type, $value) {
$is_integer = $type == T_LNUMBER;
@ -386,11 +387,12 @@ function _drupal_rewrite_settings_is_simple($type, $value) {
* string.
*
* @param int $type
* The token type
* @see token_name().
* The token type.
*
* @return bool
* TRUE if this token represents a number or a string.
*
* @see token_name()
*/
function _drupal_rewrite_settings_is_array_index($type) {
$is_integer = $type == T_LNUMBER;
@ -515,7 +517,7 @@ function drupal_install_config_directories() {
// they can later be added to git. Since this directory is auto-created, we
// have to write out the README rather than just adding it to the drupal core
// repo.
$text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync.' .' For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config';
$text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync.' . ' For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config';
file_put_contents(config_get_config_directory(CONFIG_SYNC_DIRECTORY) . '/README.txt', $text);
}

40
core/includes/theme.inc
View file

@ -13,8 +13,11 @@ use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Html;
use Drupal\Component\Render\MarkupInterface;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Cache\CacheableDependencyInterface;
use Drupal\Core\Config\Config;
use Drupal\Core\Config\StorageException;
use Drupal\Core\Render\AttachmentsInterface;
use Drupal\Core\Render\BubbleableMetadata;
use Drupal\Core\Render\RenderableInterface;
use Drupal\Core\Template\Attribute;
use Drupal\Core\Theme\ThemeSettings;
@ -399,6 +402,17 @@ function theme_get_setting($setting_name, $theme = NULL) {
* https://www.drupal.org/node/2575065
*/
function theme_render_and_autoescape($arg) {
// If it's a renderable, then it'll be up to the generated render array it
// returns to contain the necessary cacheability & attachment metadata. If
// it doesn't implement CacheableDependencyInterface or AttachmentsInterface
// then there is nothing to do here.
if (!($arg instanceof RenderableInterface) && ($arg instanceof CacheableDependencyInterface || $arg instanceof AttachmentsInterface)) {
$arg_bubbleable = [];
BubbleableMetadata::createFromObject($arg)
->applyTo($arg_bubbleable);
\Drupal::service('renderer')->render($arg_bubbleable);
}
if ($arg instanceof MarkupInterface) {
return (string) $arg;
}
@ -582,7 +596,7 @@ function template_preprocess_datetime_wrapper(&$variables) {
*
* Unfortunately links templates duplicate the "active" class handling of l()
* and LinkGenerator::generate() because it needs to be able to set the "active"
* class not on the links themselves ("a" tags), but on the list items ("li"
* class not on the links themselves (<a> tags), but on the list items (<li>
* tags) that contain the links. This is necessary for CSS to be able to style
* list items differently when the link is active, since CSS does not yet allow
* one to style list items only if it contains a certain element with a certain
@ -642,7 +656,7 @@ function template_preprocess_links(&$variables) {
if (!empty($links)) {
// Prepend the heading to the list, if any.
if (!empty($heading)) {
// Convert a string heading into an array, using a H2 tag by default.
// Convert a string heading into an array, using a <h2> tag by default.
if (is_string($heading)) {
$heading = array('text' => $heading);
}
@ -844,28 +858,28 @@ function template_preprocess_image(&$variables) {
* - colgroups: An array of column groups. Each element of the array can be
* either:
* - An array of columns, each of which is an associative array of HTML
* attributes applied to the COL element.
* - An array of attributes applied to the COLGROUP element, which must
* include a "data" attribute. To add attributes to COL elements, set the
* "data" attribute with an array of columns, each of which is an
* attributes applied to the <col> element.
* - An array of attributes applied to the <colgroup> element, which must
* include a "data" attribute. To add attributes to <col> elements,
* set the "data" attribute with an array of columns, each of which is an
* associative array of HTML attributes.
* Here's an example for $colgroup:
* @code
* $colgroup = array(
* // COLGROUP with one COL element.
* // <colgroup> with one <col> element.
* array(
* array(
* 'class' => array('funky'), // Attribute for the COL element.
* 'class' => array('funky'), // Attribute for the <col> element.
* ),
* ),
* // Colgroup with attributes and inner COL elements.
* // <colgroup> with attributes and inner <col> elements.
* array(
* 'data' => array(
* array(
* 'class' => array('funky'), // Attribute for the COL element.
* 'class' => array('funky'), // Attribute for the <col> element.
* ),
* ),
* 'class' => array('jazzy'), // Attribute for the COLGROUP element.
* 'class' => array('jazzy'), // Attribute for the <colgroup> element.
* ),
* );
* @endcode
@ -1143,7 +1157,7 @@ function template_preprocess_container(&$variables) {
* An associative array containing:
* - items: An associative array of maintenance tasks.
* It's the caller's responsibility to ensure this array's items contain no
* dangerous HTML such as SCRIPT tags.
* dangerous HTML such as <script> tags.
* - active: The key for the currently active maintenance task.
*/
function template_preprocess_maintenance_task_list(&$variables) {
@ -1253,7 +1267,7 @@ function template_preprocess_html(&$variables) {
$variables['html_attributes'] = new Attribute();
// HTML element attributes.
// <html> element attributes.
$language_interface = \Drupal::languageManager()->getCurrentLanguage();
$variables['html_attributes']['lang'] = $language_interface->getId();
$variables['html_attributes']['dir'] = $language_interface->getDirection();

2
core/includes/update.inc
View file

@ -326,7 +326,7 @@ function update_get_update_list() {
$updates = array_combine($updates, $updates);
foreach (array_keys($updates) as $update) {
if ($update == \Drupal::CORE_MINIMUM_SCHEMA_VERSION) {
$ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. It contains an update numbered as ' . \Drupal::CORE_MINIMUM_SCHEMA_VERSION . ' which is reserved for the earliest installation of a module in Drupal ' . \Drupal::CORE_COMPATIBILITY . ', before any updates. In order to update <em>' . $module . '</em> module, you will need to install a version of the module with valid updates.';
$ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. It contains an update numbered as ' . \Drupal::CORE_MINIMUM_SCHEMA_VERSION . ' which is reserved for the earliest installation of a module in Drupal ' . \Drupal::CORE_COMPATIBILITY . ', before any updates. In order to update <em>' . $module . '</em> module, you will need to install a version of the module with valid updates.';
continue 2;
}
if ($update > $schema_version) {

2
core/lib/Drupal.php
View file

@ -81,7 +81,7 @@ class Drupal {
/**
* The current system version.
*/
const VERSION = '8.1.1';
const VERSION = '8.1.2';
/**
* Core API compatibility.

63
core/lib/Drupal/Component/Datetime/DateTimePlus.php
View file

@ -104,6 +104,9 @@ class DateTimePlus {
* A DateTime object.
* @param array $settings
* @see __construct()
*
* @return static
* A new DateTimePlus object.
*/
public static function createFromDateTime(\DateTime $datetime, $settings = array()) {
return new static($datetime->format(static::FORMAT), $datetime->getTimezone(), $settings);
@ -125,8 +128,10 @@ class DateTimePlus {
* __construct().
*
* @return static
* A new \Drupal\Component\DateTimePlus object based on the parameters
* passed in.
* A new DateTimePlus object.
*
* @throws \Exception
* If the array date values or value combination is not correct.
*/
public static function createFromArray(array $date_parts, $timezone = NULL, $settings = array()) {
$date_parts = static::prepareArray($date_parts, TRUE);
@ -155,6 +160,12 @@ class DateTimePlus {
* @see __construct()
* @param array $settings
* @see __construct()
*
* @return static
* A new DateTimePlus object.
*
* @throws \Exception
* If the timestamp is not numeric.
*/
public static function createFromTimestamp($timestamp, $timezone = NULL, $settings = array()) {
if (!is_numeric($timestamp)) {
@ -187,6 +198,13 @@ class DateTimePlus {
* from a format string exactly matches the input. This option
* indicates the format can be used for validation. Defaults to TRUE.
* @see __construct()
*
* @return static
* A new DateTimePlus object.
*
* @throws \Exception
* If the a date cannot be created from the given format, or if the
* created date does not match the input value.
*/
public static function createFromFormat($format, $time, $timezone = NULL, $settings = array()) {
if (!isset($settings['validate_format'])) {
@ -294,6 +312,30 @@ class DateTimePlus {
return call_user_func_array(array($this->dateTimeObject, $method), $args);
}
/**
* Returns the difference between two DateTimePlus objects.
*
* @param \Drupal\Component\Datetime\DateTimePlus|\DateTime $datetime2
* The date to compare to.
* @param bool $absolute
* Should the interval be forced to be positive?
*
* @return \DateInterval
* A DateInterval object representing the difference between the two dates.
*
* @throws \BadMethodCallException
* If the input isn't a DateTime or DateTimePlus object.
*/
public function diff($datetime2, $absolute = FALSE) {
if ($datetime2 instanceof DateTimePlus) {
$datetime2 = $datetime2->dateTimeObject;
}
if (!($datetime2 instanceof \DateTime)) {
throw new \BadMethodCallException(sprintf('Method %s expects parameter 1 to be a \DateTime or \Drupal\Component\Datetime\DateTimePlus object', __METHOD__));
}
return $this->dateTimeObject->diff($datetime2, $absolute);
}
/**
* Implements the magic __callStatic method.
*
@ -324,6 +366,9 @@ class DateTimePlus {
* @param mixed $time
* An input value, which could be a timestamp, a string,
* or an array of date parts.
*
* @return mixed
* The massaged time.
*/
protected function prepareTime($time) {
return $time;
@ -338,6 +383,9 @@ class DateTimePlus {
*
* @param mixed $timezone
* Either a timezone name or a timezone object or NULL.
*
* @return \DateTimeZone
* The massaged time zone.
*/
protected function prepareTimezone($timezone) {
// If the input timezone is a valid timezone object, use it.
@ -370,6 +418,9 @@ class DateTimePlus {
*
* @param string $format
* A PHP format string.
*
* @return string
* The massaged PHP format string.
*/
protected function prepareFormat($format) {
return $format;
@ -403,6 +454,10 @@ class DateTimePlus {
/**
* Detects if there were errors in the processing of this date.
*
* @return boolean
* TRUE if there were errors in the processing of this date, FALSE
* otherwise.
*/
public function hasErrors() {
return (boolean) count($this->errors);
@ -412,6 +467,9 @@ class DateTimePlus {
* Gets error messages.
*
* Public function to return the error messages.
*
* @return array
* An array of errors encountered when creating this date.
*/
public function getErrors() {
return $this->errors;
@ -592,4 +650,5 @@ class DateTimePlus {
return $value;
}
}

10
core/lib/Drupal/Component/DependencyInjection/Container.php
View file

@ -593,7 +593,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
*/
public function enterScope($name) {
if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
@trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
}
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
@ -604,7 +604,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
*/
public function leaveScope($name) {
if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
@trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
}
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
@ -617,7 +617,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
$name = $scope->getName();
if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
@trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
}
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
}
@ -627,7 +627,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
*/
public function hasScope($name) {
if ('request' !== $name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
@trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
}
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
@ -637,7 +637,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
* {@inheritdoc}
*/
public function isScopeActive($name) {
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
@trigger_error('The ' . __METHOD__ . ' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
}

1
core/lib/Drupal/Component/Diff/Diff.php
View file

@ -168,4 +168,5 @@ class Diff {
public function getEdits() {
return $this->edits;
}
}

6
core/lib/Drupal/Component/Diff/DiffFormatter.php
View file

@ -18,7 +18,7 @@ class DiffFormatter {
/**
* Should a block header be shown?
*/
var $show_header = TRUE;
public $show_header = TRUE;
/**
* Number of leading context "lines" to preserve.
@ -26,7 +26,7 @@ class DiffFormatter {
* This should be left at zero for this class, but subclasses
* may want to set this to other values.
*/
var $leading_context_lines = 0;
public $leading_context_lines = 0;
/**
* Number of trailing context "lines" to preserve.
@ -34,7 +34,7 @@ class DiffFormatter {
* This should be left at zero for this class, but subclasses
* may want to set this to other values.
*/
var $trailing_context_lines = 0;
public $trailing_context_lines = 0;
/**
* Format a diff.

1
core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
View file

@ -453,4 +453,5 @@ class DiffEngine {
}
}
}
}

7
core/lib/Drupal/Component/Diff/Engine/DiffOp.php
View file

@ -8,9 +8,9 @@ namespace Drupal\Component\Diff\Engine;
* @subpackage DifferenceEngine
*/
class DiffOp {
var $type;
var $orig;
var $closing;
public $type;
public $orig;
public $closing;
public function reverse() {
trigger_error('pure virtual', E_USER_ERROR);
@ -23,4 +23,5 @@ class DiffOp {
public function nclosing() {
return $this->closing ? sizeof($this->closing) : 0;
}
}

3
core/lib/Drupal/Component/Diff/Engine/DiffOpAdd.php
View file

@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
* @subpackage DifferenceEngine
*/
class DiffOpAdd extends DiffOp {
var $type = 'add';
public $type = 'add';
public function __construct($lines) {
$this->closing = $lines;
@ -18,4 +18,5 @@ class DiffOpAdd extends DiffOp {
public function reverse() {
return new DiffOpDelete($this->closing);
}
}

3
core/lib/Drupal/Component/Diff/Engine/DiffOpChange.php
View file

@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
* @subpackage DifferenceEngine
*/
class DiffOpChange extends DiffOp {
var $type = 'change';
public $type = 'change';
public function __construct($orig, $closing) {
$this->orig = $orig;
@ -18,4 +18,5 @@ class DiffOpChange extends DiffOp {
public function reverse() {
return new DiffOpChange($this->closing, $this->orig);
}
}

3
core/lib/Drupal/Component/Diff/Engine/DiffOpCopy.php
View file

@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
* @subpackage DifferenceEngine
*/
class DiffOpCopy extends DiffOp {
var $type = 'copy';
public $type = 'copy';
public function __construct($orig, $closing = FALSE) {
if (!is_array($closing)) {
@ -21,4 +21,5 @@ class DiffOpCopy extends DiffOp {
public function reverse() {
return new DiffOpCopy($this->closing, $this->orig);
}
}

3
core/lib/Drupal/Component/Diff/Engine/DiffOpDelete.php
View file

@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
* @subpackage DifferenceEngine
*/
class DiffOpDelete extends DiffOp {
var $type = 'delete';
public $type = 'delete';
public function __construct($lines) {
$this->orig = $lines;
@ -18,4 +18,5 @@ class DiffOpDelete extends DiffOp {
public function reverse() {
return new DiffOpAdd($this->orig);
}
}

4
core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
View file

@ -5,8 +5,7 @@ namespace Drupal\Component\Diff\Engine;
use Drupal\Component\Utility\Unicode;
/**
* Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
*
* Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
*/
/**
@ -76,4 +75,5 @@ class HWLDFWordAccumulator {
$this->_flushLine('~done');
return $this->lines;
}
}

4
core/lib/Drupal/Component/Diff/MappedDiff.php
View file

@ -21,15 +21,12 @@ class MappedDiff extends Diff {
*
* @param $from_lines array An array of strings.
* (Typically these are lines from a file.)
*
* @param $to_lines array An array of strings.
*
* @param $mapped_from_lines array This array should
* have the same size number of elements as $from_lines.
* The elements in $mapped_from_lines and
* $mapped_to_lines are what is actually compared
* when computing the diff.
*
* @param $mapped_to_lines array This array should
* have the same number of elements as $to_lines.
*/
@ -55,4 +52,5 @@ class MappedDiff extends Diff {
}
}
}
}

1
core/lib/Drupal/Component/Diff/WordLevelDiff.php
View file

@ -78,4 +78,5 @@ class WordLevelDiff extends MappedDiff {
$lines = $closing->getLines();
return $lines;
}
}

339
core/lib/Drupal/Component/FileSystem/LICENSE.txt Normal file
View file

@ -0,0 +1,339 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

12
core/lib/Drupal/Component/FileSystem/README.txt Normal file
View file

@ -0,0 +1,12 @@
The Drupal FileSystem Component
Thanks for using this Drupal component.
You can participate in its development on Drupal.org, through our issue system:
https://www.drupal.org/project/issues/drupal
You can get the full Drupal repo here:
https://www.drupal.org/project/drupal/git-instructions
You can browse the full Drupal repo here:
http://cgit.drupalcode.org/drupal

18
core/lib/Drupal/Component/FileSystem/TESTING.txt Normal file
View file

@ -0,0 +1,18 @@
HOW-TO: Test this Drupal component
In order to test this component, you'll need to get the entire Drupal repo and
run the tests there.
You'll find the tests under core/tests/Drupal/Tests/Component.
You can get the full Drupal repo here:
https://www.drupal.org/project/drupal/git-instructions
You can find more information about running PHPUnit tests with Drupal here:
https://www.drupal.org/node/2116263
Each component in the Drupal\Component namespace has its own annotated test
group. You can use this group to run only the tests for this component. Like
this:
$ ./vendor/bin/phpunit -c core --group FileSystem

15
core/lib/Drupal/Component/FileSystem/composer.json Normal file
View file

@ -0,0 +1,15 @@
{
"name": "drupal/core-filesystem",
"description": "FileSystem.",
"keywords": ["drupal"],
"homepage": "https://www.drupal.org/project/drupal",
"license": "GPL-2.0+",
"require": {
"php": ">=5.5.9"
},
"autoload": {
"psr-4": {
"Drupal\\Component\\FileSystem\\": ""
}
}
}

1
core/lib/Drupal/Component/Gettext/PoHeader.php
View file

@ -559,4 +559,5 @@ class PoHeader {
}
return (int) $element_stack[0];
}
}

4
core/lib/Drupal/Component/Gettext/PoItem.php
View file

@ -160,7 +160,7 @@ class PoItem {
/**
* Set the comment of this translation.
*
* @param String $comment
* @param string $comment
*/
function setComment($comment) {
$this->_comment = $comment;
@ -181,7 +181,7 @@ class PoItem {
if (isset($values['translation'])) {
$this->setTranslation($values['translation']);
}
if (isset($values['comment'])){
if (isset($values['comment'])) {
$this->setComment($values['comment']);
}
if (isset($this->_source) &&

1
core/lib/Drupal/Component/Graph/Graph.php
View file

@ -154,4 +154,5 @@ class Graph {
// topological order if the graph is acyclic.
$state['last_visit_order'][] = $start;
}
}

1
core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php
View file

@ -31,4 +31,5 @@ abstract class DeriverBase implements DeriverInterface {
public function getDerivativeDefinitions($base_plugin_definition) {
return $this->derivatives;
}
}

1
core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php
View file

@ -240,4 +240,5 @@ class DerivativeDiscoveryDecorator implements DiscoveryInterface {
public function __call($method, $args) {
return call_user_func_array(array($this->decorated, $method), $args);
}
}

1
core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php
View file

@ -33,4 +33,5 @@ class StaticDiscovery implements DiscoveryInterface {
public function deleteDefinition($plugin) {
unset($this->definitions[$plugin]);
}
}

1
core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
View file

@ -63,4 +63,5 @@ class StaticDiscoveryDecorator extends StaticDiscovery {
public function __call($method, $args) {
return call_user_func_array(array($this->decorated, $method), $args);
}
}

1
core/lib/Drupal/Component/Plugin/Exception/InvalidDecoratedMethod.php
View file

@ -7,6 +7,5 @@ use \BadMethodCallException;
/**
* Exception thrown when a decorator's _call() method is triggered, but the
* decorated object does not contain the requested method.
*
*/
class InvalidDecoratedMethod extends BadMethodCallException implements ExceptionInterface { }

4
core/lib/Drupal/Component/Plugin/Exception/InvalidPluginDefinitionException.php
View file

@ -17,10 +17,12 @@ class InvalidPluginDefinitionException extends PluginException {
/**
* Constructs a InvalidPluginDefinitionException.
*
* For the remaining parameters see \Exception.
*
* @param string $plugin_id
* The plugin ID of the mapper.
*
* @see \Exception for the remaining parameters.
* @see \Exception
*/
public function __construct($plugin_id, $message = '', $code = 0, \Exception $previous = NULL) {
$this->pluginId = $plugin_id;

4
core/lib/Drupal/Component/Plugin/Exception/PluginNotFoundException.php
View file

@ -10,10 +10,12 @@ class PluginNotFoundException extends PluginException {
/**
* Construct an PluginNotFoundException exception.
*
* For the remaining parameters see \Exception.
*
* @param string $plugin_id
* The plugin ID that was not found.
*
* @see \Exception for remaining parameters.
* @see \Exception
*/
public function __construct($plugin_id, $message = '', $code = 0, \Exception $previous = NULL) {
if (empty($message)) {

2
core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
View file

@ -71,7 +71,6 @@ class DefaultFactory implements FactoryInterface {
* @throws \Drupal\Component\Plugin\Exception\PluginException
* Thrown when there is no class specified, the class doesn't exist, or
* the class does not implement the specified required interface.
*
*/
public static function getPluginClass($plugin_id, $plugin_definition = NULL, $required_interface = NULL) {
$missing_class_message = sprintf('The plugin (%s) did not specify an instance class.', $plugin_id);
@ -104,4 +103,5 @@ class DefaultFactory implements FactoryInterface {
return $class;
}
}

1
core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
View file

@ -76,4 +76,5 @@ class ReflectionFactory extends DefaultFactory {
}
return $arguments;
}
}

1
core/lib/Drupal/Component/Plugin/PluginBase.php
View file

@ -92,4 +92,5 @@ abstract class PluginBase implements PluginInspectionInterface, DerivativeInspec
public function getPluginDefinition() {
return $this->pluginDefinition;
}
}

1
core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
View file

@ -92,7 +92,6 @@ EOS;
// class.
if ($parent_interfaces = $interface->getInterfaceNames()) {
foreach ($parent_interfaces as $parent_interface) {
if (isset($interfaces[$parent_interface])) {}
unset($interfaces[$parent_interface]);
}
}

3
core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
View file

@ -90,7 +90,7 @@ class PhpTransliteration implements TransliterationInterface {
$replacement = $character;
if (($range1 && !in_array($code, $exclusions_range1)) || ($range2 && !in_array($code, $exclusions_range2))) {
$to_add = $this->lookupReplacement($code, 'xyz');
if(strlen($to_add) === 1) {
if (strlen($to_add) === 1) {
$replacement = $to_add;
}
}
@ -280,4 +280,5 @@ class PhpTransliteration implements TransliterationInterface {
// Save this data.
$this->genericMap[$bank] = $base;
}
}

1
core/lib/Drupal/Component/Transliteration/TransliterationInterface.php
View file

@ -46,4 +46,5 @@ interface TransliterationInterface {
* characters, and unknown characters replaced with $unknown_character.
*/
public function transliterate($string, $langcode = 'en', $unknown_character = '?', $max_length = NULL);
}

6
core/lib/Drupal/Component/Utility/Random.php
View file

@ -149,7 +149,7 @@ class Random {
$num_cons = count($cons);
$word = '';
while(strlen($word) < $length){
while (strlen($word) < $length) {
$word .= $cons[mt_rand(0, $num_cons - 1)] . $vowels[mt_rand(0, $num_vowels - 1)];
}
@ -251,7 +251,7 @@ class Random {
public function paragraphs($paragraph_count = 12) {
$output = '';
for ($i = 1; $i <= $paragraph_count; $i++) {
$output .= $this->sentences(mt_rand(20, 60)) ."\n\n";
$output .= $this->sentences(mt_rand(20, 60)) . "\n\n";
}
return $output;
}
@ -291,7 +291,7 @@ class Random {
$smaller_dimension = ($smaller_dimension % 2) ? $smaller_dimension : $smaller_dimension;
imageellipse($im, $width / 2, $height / 2, $smaller_dimension, $smaller_dimension, $color);
$save_function = 'image'. ($extension == 'jpg' ? 'jpeg' : $extension);
$save_function = 'image' . ($extension == 'jpg' ? 'jpeg' : $extension);
$save_function($im, $destination);
return $destination;
}

3
core/lib/Drupal/Component/Utility/UserAgent.php
View file

@ -122,8 +122,7 @@ class UserAgent {
$qvalue = $ua_langcodes[$prefix];
break;
}
}
while ($prefix = substr($prefix, 0, strrpos($prefix, '-')));
} while ($prefix = substr($prefix, 0, strrpos($prefix, '-')));
// Find the best match.
if ($qvalue > $max_qvalue) {

2
core/lib/Drupal/Component/Utility/Xss.php
View file

@ -116,7 +116,6 @@ class Xss {
* @ingroup sanitization
*
* @see \Drupal\Component\Utility\Xss::getAdminTagList()
*
*/
public static function filterAdmin($string) {
return static::filter($string, static::$adminTags);
@ -344,4 +343,5 @@ class Xss {
public static function getHtmlTagList() {
return static::$htmlTags;
}
}

1
core/lib/Drupal/Component/Uuid/Com.php
View file

@ -15,4 +15,5 @@ class Com implements UuidInterface {
// Remove {} wrapper and make lower case to keep result consistent.
return strtolower(trim(com_create_guid(), '{}'));
}
}

1
core/lib/Drupal/Component/Uuid/Pecl.php
View file

@ -13,4 +13,5 @@ class Pecl implements UuidInterface {
public function generate() {
return uuid_create(UUID_TYPE_DEFAULT);
}
}

1
core/lib/Drupal/Component/Uuid/UuidInterface.php
View file

@ -14,4 +14,5 @@ interface UuidInterface {
* A 16 byte integer represented as a hex string formatted with 4 hyphens.
*/
public function generate();
}

1
core/lib/Drupal/Core/Access/AccessManager.php
View file

@ -169,5 +169,4 @@ class AccessManager implements AccessManagerInterface {
return $service_access;
}
}

1
core/lib/Drupal/Core/Access/CheckProviderInterface.php
View file

@ -61,4 +61,5 @@ interface CheckProviderInterface {
* @return array
*/
public function getChecksNeedRequest();
}

1
core/lib/Drupal/Core/Ajax/CloseDialogCommand.php
View file

@ -46,4 +46,5 @@ class CloseDialogCommand implements CommandInterface {
'persist' => $this->persist,
);
}
}

1
core/lib/Drupal/Core/Ajax/CommandInterface.php
View file

@ -16,4 +16,5 @@ interface CommandInterface {
* Return an array to be run through json_encode and sent to the client.
*/
public function render();
}

2
core/lib/Drupal/Core/Ajax/DataCommand.php
View file

@ -48,7 +48,7 @@ class DataCommand implements CommandInterface {
* A CSS selector for the elements to which the data will be attached.
* @param string $name
* The key of the data to be attached to elements matched by the selector.
* @param type $value
* @param mixed $value
* The value of the data to be attached to elements matched by the selector.
*/
public function __construct($selector, $name, $value) {

1
core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php
View file

@ -33,4 +33,5 @@ class OpenModalDialogCommand extends OpenDialogCommand {
$dialog_options['modal'] = TRUE;
parent::__construct('#drupal-modal', $title, $content, $dialog_options, $settings);
}
}

1
core/lib/Drupal/Core/Ajax/RemoveCommand.php
View file

@ -29,7 +29,6 @@ class RemoveCommand implements CommandInterface {
* Constructs a RemoveCommand object.
*
* @param string $selector
*
*/
public function __construct($selector) {
$this->selector = $selector;

1
core/lib/Drupal/Core/Ajax/SetDialogTitleCommand.php
View file

@ -23,4 +23,5 @@ class SetDialogTitleCommand extends SetDialogOptionCommand {
$this->optionName = 'title';
$this->optionValue = $title;
}
}

1
core/lib/Drupal/Core/Archiver/ArchiverInterface.php
View file

@ -56,4 +56,5 @@ interface ArchiverInterface {
* An array of file names relative to the root of the archive.
*/
public function listContents();
}

1
core/lib/Drupal/Core/Archiver/Tar.php
View file

@ -87,4 +87,5 @@ class Tar implements ArchiverInterface {
public function getArchive() {
return $this->tar;
}
}

1
core/lib/Drupal/Core/Archiver/Zip.php
View file

@ -89,4 +89,5 @@ class Zip implements ArchiverInterface {
public function getArchive() {
return $this->zip;
}
}

2
core/lib/Drupal/Core/Asset/AssetDumper.php
View file

@ -19,7 +19,7 @@ class AssetDumper implements AssetDumperInterface {
public function dump($data, $file_extension) {
// Prefix filename to prevent blocking by firewalls which reject files
// starting with "ad*".
$filename = $file_extension. '_' . Crypt::hashBase64($data) . '.' . $file_extension;
$filename = $file_extension . '_' . Crypt::hashBase64($data) . '.' . $file_extension;
// Create the css/ or js/ path within the files folder.
$path = 'public://' . $file_extension;
$uri = $path . '/' . $filename;

2
core/lib/Drupal/Core/Asset/AssetResolver.php
View file

@ -214,7 +214,7 @@ class AssetResolver implements AssetResolverInterface {
// hook_library_info_alter(). Additionally add the current language to
// support translation of JavaScript files via hook_js_alter().
$libraries_to_load = $this->getLibrariesToLoad($assets);
$cid = 'js:' . $theme_info->getName() . ':' . $this->languageManager->getCurrentLanguage()->getId() . ':' . Crypt::hashBase64(serialize($libraries_to_load) . serialize($assets->getLibraries())) . (int) (count($assets->getSettings()) > 0) . (int) $optimize;
$cid = 'js:' . $theme_info->getName() . ':' . $this->languageManager->getCurrentLanguage()->getId() . ':' . Crypt::hashBase64(serialize($libraries_to_load) . serialize($assets->getLibraries())) . (int) (count($assets->getSettings()) > 0) . (int) $optimize;
if ($cached = $this->cache->get($cid)) {
list($js_assets_header, $js_assets_footer, $settings, $settings_in_header) = $cached->data;

2
core/lib/Drupal/Core/Asset/CssOptimizer.php
View file

@ -163,7 +163,7 @@ class CssOptimizer implements AssetOptimizerInterface {
$directory = dirname($filename);
// If the file is in the current directory, make sure '.' doesn't appear in
// the url() path.
$directory = $directory == '.' ? '' : $directory .'/';
$directory = $directory == '.' ? '' : $directory . '/';
// Alter all internal url() paths. Leave external paths alone. We don't need
// to normalize absolute paths here because that will be done later.

1
core/lib/Drupal/Core/Cache/BackendChain.php
View file

@ -19,7 +19,6 @@ namespace Drupal\Core\Cache;
*
* @ingroup cache
*/
class BackendChain implements CacheBackendInterface, CacheTagsInvalidatorInterface {
/**

4
core/lib/Drupal/Core/Cache/Cache.php
View file

@ -76,10 +76,10 @@ class Cache {
*/
public static function mergeMaxAges($a = Cache::PERMANENT, $b = Cache::PERMANENT) {
// If one of the values is Cache::PERMANENT, return the other value.
if ($a === Cache::PERMANENT){
if ($a === Cache::PERMANENT) {
return $b;
}
if ($b === Cache::PERMANENT){
if ($b === Cache::PERMANENT) {
return $a;
}

1
core/lib/Drupal/Core/Cache/CacheBackendInterface.php
View file

@ -215,4 +215,5 @@ interface CacheBackendInterface {
* Remove a cache bin.
*/
public function removeBin();
}

1
core/lib/Drupal/Core/Cache/CacheTagsChecksumInterface.php
View file

@ -54,4 +54,5 @@ interface CacheTagsChecksumInterface {
* This is only used by tests.
*/
public function reset();
}

1
core/lib/Drupal/Core/Cache/CacheableMetadata.php
View file

@ -6,7 +6,6 @@ namespace Drupal\Core\Cache;
* Defines a generic class for passing cacheability metadata.
*
* @ingroup cache
*
*/
class CacheableMetadata implements RefinableCacheableDependencyInterface {

3
core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
View file

@ -98,7 +98,6 @@ class CacheContextsManager {
* @return \Drupal\Core\Cache\Context\ContextCacheKeys
* The ContextCacheKeys object containing the converted cache keys and
* cacheability metadata.
*
*/
public function convertTokensToKeys(array $context_tokens) {
assert('$this->assertValidTokens($context_tokens)');
@ -195,7 +194,7 @@ class CacheContextsManager {
$ancestor_found = TRUE;
}
} while(!$ancestor_found && strpos($ancestor, '.') !== FALSE);
} while (!$ancestor_found && strpos($ancestor, '.') !== FALSE);
if (!$ancestor_found) {
$optimized_content_tokens[] = $context_token;
}

2
core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
View file

@ -8,7 +8,7 @@ use Drupal\Core\Language\LanguageManagerInterface;
/**
* Defines the LanguagesCacheContext service, for "per language" caching.
*/
class LanguagesCacheContext implements CalculatedCacheContextInterface {
class LanguagesCacheContext implements CalculatedCacheContextInterface {
/**
* The language manager.

11
core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
View file

@ -27,8 +27,17 @@ class QueryArgsCacheContext extends RequestStackCacheContextBase implements Calc
if ($query_arg === NULL) {
return $this->requestStack->getCurrentRequest()->getQueryString();
}
elseif ($this->requestStack->getCurrentRequest()->query->has($query_arg)) {
$value = $this->requestStack->getCurrentRequest()->query->get($query_arg);
if ($value !== '') {
return $value;
}
else {
return '?valueless?';
}
}
else {
return $this->requestStack->getCurrentRequest()->query->get($query_arg);
return NULL;
}
}

1
core/lib/Drupal/Core/Cache/DatabaseBackend.php
View file

@ -477,4 +477,5 @@ class DatabaseBackend implements CacheBackendInterface {
);
return $schema;
}
}

1
core/lib/Drupal/Core/Cache/ListCacheBinsPass.php
View file

@ -28,4 +28,5 @@ class ListCacheBinsPass implements CompilerPassInterface {
$container->setParameter('cache_bins', $cache_bins);
$container->setParameter('cache_default_bin_backends', $cache_default_bin_backends);
}
}

2
core/lib/Drupal/Core/Cache/MemoryCounterBackend.php
View file

@ -9,7 +9,6 @@ namespace Drupal\Core\Cache;
* many times a cache entry was set or requested.
*
* @todo On the longrun this backend should be replaced by phpunit mock objects.
*
*/
class MemoryCounterBackend extends MemoryBackend {
@ -49,7 +48,6 @@ class MemoryCounterBackend extends MemoryBackend {
*
* @param string $function
* The called function.
*
* @param string $cid
* The cache ID of the cache entry to increase the counter.
*/

1
core/lib/Drupal/Core/Cache/NullBackend.php
View file

@ -88,4 +88,5 @@ class NullBackend implements CacheBackendInterface {
* {@inheritdoc}
*/
public function removeBin() {}
}

2
core/lib/Drupal/Core/Cache/PhpBackend.php
View file

@ -211,7 +211,7 @@ class PhpBackend implements CacheBackendInterface {
* {@inheritdoc}
*/
public function invalidateAll() {
foreach($this->storage()->listAll() as $cidhash) {
foreach ($this->storage()->listAll() as $cidhash) {
$this->invalidatebyHash($cidhash);
}
}

1
core/lib/Drupal/Core/Config/BootstrapConfigStorageFactory.php
View file

@ -56,4 +56,5 @@ class BootstrapConfigStorageFactory {
public static function getFileStorage() {
return new FileStorage(config_get_config_directory(CONFIG_ACTIVE_DIRECTORY));
}
}

2
core/lib/Drupal/Core/Config/ConfigCollectionInfo.php
View file

@ -30,7 +30,7 @@ class ConfigCollectionInfo extends Event {
*
* @throws \InvalidArgumentException
* Exception thrown if $collection is equal to
* \Drupal\Core\Config\StorageInterface::DEFAULT_COLLECTION
* \Drupal\Core\Config\StorageInterface::DEFAULT_COLLECTION.
*/
public function addCollection($collection, ConfigFactoryOverrideInterface $override_service = NULL) {
if ($collection == StorageInterface::DEFAULT_COLLECTION) {

2
core/lib/Drupal/Core/Config/ConfigFactory.php
View file

@ -271,7 +271,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
// Because get() adds overrides both from $GLOBALS and from
// $this->configFactoryOverrides, add cache keys for each.
$keys[] = 'global_overrides';
foreach($this->configFactoryOverrides as $override) {
foreach ($this->configFactoryOverrides as $override) {
$keys[] = $override->getCacheSuffix();
}
return $keys;

1
core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
View file

@ -99,4 +99,5 @@ class ConfigModuleOverridesEvent extends Event {
}
return $this;
}
}

Some files were not shown because too many files have changed in this diff Show more