Update to Drupal 8.1.5. For more information, see https://www.drupal.org/project/drupal/releases/8.1.5
This commit is contained in:
parent
13b6ca7cc2
commit
38ba7c357d
342 changed files with 7814 additions and 1534 deletions
|
@ -49,7 +49,7 @@ class Plugin implements AnnotationInterface {
|
|||
* The annotation array.
|
||||
*
|
||||
* @return array
|
||||
* The parsed annotation as a definition.
|
||||
* The parsed annotation as a definition.
|
||||
*/
|
||||
protected function parse(array $values) {
|
||||
$definitions = array();
|
||||
|
|
|
@ -455,7 +455,7 @@ class DateTimePlus {
|
|||
/**
|
||||
* Detects if there were errors in the processing of this date.
|
||||
*
|
||||
* @return boolean
|
||||
* @return bool
|
||||
* TRUE if there were errors in the processing of this date, FALSE
|
||||
* otherwise.
|
||||
*/
|
||||
|
|
|
@ -373,7 +373,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
|
|||
* {@inheritdoc}
|
||||
*/
|
||||
public function has($id) {
|
||||
return isset($this->services[$id]) || isset($this->serviceDefinitions[$id]);
|
||||
return isset($this->aliases[$id]) || isset($this->services[$id]) || isset($this->serviceDefinitions[$id]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -60,6 +60,7 @@ class OptimizedPhpArrayDumper extends Dumper {
|
|||
*/
|
||||
public function getArray() {
|
||||
$definition = array();
|
||||
$this->aliases = $this->getAliases();
|
||||
$definition['aliases'] = $this->getAliases();
|
||||
$definition['parameters'] = $this->getParameters();
|
||||
$definition['services'] = $this->getServiceDefinitions();
|
||||
|
@ -454,6 +455,9 @@ class OptimizedPhpArrayDumper extends Dumper {
|
|||
}
|
||||
|
||||
// Private shared service.
|
||||
if (isset($this->aliases[$id])) {
|
||||
$id = $this->aliases[$id];
|
||||
}
|
||||
$definition = $this->container->getDefinition($id);
|
||||
if (!$definition->isPublic()) {
|
||||
// The ContainerBuilder does not share a private service, but this means a
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
},
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"symfony/dependency-injection": "2.7.*",
|
||||
"symfony/expression-language": "2.7.*"
|
||||
"symfony/dependency-injection": "~2.8",
|
||||
"symfony/expression-language": "~2.7"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
"license": "GPL-2.0+",
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"symfony/dependency-injection": "2.7.*",
|
||||
"symfony/event-dispatcher": "2.7.*"
|
||||
"symfony/dependency-injection": "~2.8",
|
||||
"symfony/event-dispatcher": "~2.7"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"license": "GPL-2.0+",
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"symfony/http-foundation": "2.7.*"
|
||||
"symfony/http-foundation": "~2.7"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
|
@ -30,8 +30,8 @@ trait DiscoveryTrait {
|
|||
* @param string $plugin_id
|
||||
* A plugin id.
|
||||
* @param bool $exception_on_invalid
|
||||
* (optional) If TRUE, an invalid plugin ID will throw an exception.
|
||||
* Defaults to FALSE.
|
||||
* If TRUE, an invalid plugin ID will cause an exception to be thrown; if
|
||||
* FALSE, NULL will be returned.
|
||||
*
|
||||
* @return array|null
|
||||
* A plugin definition, or NULL if the plugin ID is invalid and
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"license": "GPL-2.0+",
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"symfony/validator": "2.7.*"
|
||||
"symfony/validator": "~2.7"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
|
@ -7,7 +7,7 @@ namespace Drupal\Component\Render;
|
|||
*
|
||||
* Output strategies assist in transforming HTML strings into strings that are
|
||||
* appropriate for a given context (e.g. plain-text), through performing the
|
||||
* relevant formatting. No santization is applied.
|
||||
* relevant formatting. No sanitization is applied.
|
||||
*/
|
||||
interface OutputStrategyInterface {
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"license": "GPL-2.0+",
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"symfony/yaml": "2.7.*"
|
||||
"symfony/yaml": "~2.7"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
Reference in a new issue