Commit 73b5652a authored by alexpott's avatar alexpott

Issue #2470693 by dawehner, Berdir, jibran, hussainweb, pwolanin, znerol: Upgrade to Symfony 2.7.0

parent 7786d91c

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -6,18 +6,19 @@
"require": {
"php": ">=5.4.5",
"sdboyer/gliph": "0.1.*",
"symfony/class-loader": "2.6.*",
"symfony/console": "2.6.*",
"symfony/css-selector": "2.6.*",
"symfony/dependency-injection": "2.6.*",
"symfony/event-dispatcher": "2.6.*",
"symfony/http-foundation": "2.6.*",
"symfony/http-kernel": "2.6.*",
"symfony/routing": "2.6.*",
"symfony/serializer": "2.6.*",
"symfony/validator": "2.6.*@dev",
"symfony/process": "2.6.*",
"symfony/yaml": "2.6.*",
"symfony/class-loader": "2.7.*",
"symfony/console": "2.7.*",
"symfony/css-selector": "2.7.*",
"symfony/dependency-injection": "2.7.*",
"symfony/event-dispatcher": "2.7.*",
"symfony/http-foundation": "2.7.*",
"symfony/http-kernel": "2.7.*",
"symfony/routing": "2.7.*",
"symfony/serializer": "2.7.*",
"symfony/translation": "2.7.*",
"symfony/validator": "2.7.*",
"symfony/process": "2.7.*",
"symfony/yaml": "2.7.*",
"twig/twig": "1.18.*",
"doctrine/common": "~2.4.2",
"doctrine/annotations": "1.2.*",
......@@ -34,6 +35,8 @@
"fabpot/goutte": "^2.0.3",
"masterminds/html5": "~2.1"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
"psr-4": {
"Drupal\\Core\\": "lib/Drupal/Core",
......
This diff is collapsed.
......@@ -144,57 +144,49 @@ services:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [bootstrap]
cache.config:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [config]
cache.default:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [default]
cache.entity:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [entity]
cache.menu:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [menu]
cache.render:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [render]
cache.data:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [data]
cache.discovery:
class: Drupal\Core\Cache\CacheBackendInterface
tags:
- { name: cache.bin, default_backend: cache.backend.chainedfast }
factory_method: get
factory_service: cache_factory
factory: cache_factory:get
arguments: [discovery]
cache_router_rebuild_subscriber:
class: Drupal\Core\EventSubscriber\CacheRouterRebuildSubscriber
......@@ -253,13 +245,11 @@ services:
- { name: backend_overridable }
config.storage.file:
class: Drupal\Core\Config\FileStorage
factory_class: Drupal\Core\Config\FileStorageFactory
factory_method: getActive
factory: Drupal\Core\Config\FileStorageFactory::getActive
public: false
config.storage.staging:
class: Drupal\Core\Config\FileStorage
factory_class: Drupal\Core\Config\FileStorageFactory
factory_method: getStaging
factory: Drupal\Core\Config\FileStorageFactory::getStaging
config.storage.snapshot:
class: Drupal\Core\Config\DatabaseStorage
arguments: ['@database', config_snapshot]
......@@ -285,8 +275,7 @@ services:
arguments: ['@config.factory']
database:
class: Drupal\Core\Database\Connection
factory_class: Drupal\Core\Database\Database
factory_method: getConnection
factory: Drupal\Core\Database\Database::getConnection
arguments: [default]
file_system:
class: Drupal\Core\File\FileSystem
......@@ -324,8 +313,7 @@ services:
logger.channel_base:
abstract: true
class: Drupal\Core\Logger\LoggerChannel
factory_method: get
factory_service: logger.factory
factory: logger.factory:get
logger.channel.default:
parent: logger.channel_base
arguments: ['system']
......@@ -340,8 +328,7 @@ services:
arguments: ['cron']
logger.channel.file:
class: Drupal\Core\Logger\LoggerChannel
factory_method: get
factory_service: logger.factory
factory: logger.factory:get
arguments: ['file']
logger.channel.form:
parent: logger.channel_base
......@@ -358,8 +345,7 @@ services:
settings:
class: Drupal\Core\Site\Settings
factory_class: Drupal\Core\Site\Settings
factory_method: getInstance
factory: Drupal\Core\Site\Settings::getInstance
state:
class: Drupal\Core\State\State
arguments: ['@keyvalue']
......@@ -546,8 +532,7 @@ services:
arguments: ['@service_container']
app.root:
class: SplString
factory_service: 'app.root.factory'
factory_method: 'get'
factory: app.root.factory:get
tags:
- { name: parameter_service }
app.root.factory:
......@@ -617,8 +602,7 @@ services:
- { name: service_collector, tag: string_translator, call: addTranslator }
database.replica:
class: Drupal\Core\Database\Connection
factory_class: Drupal\Core\Database\Database
factory_method: getConnection
factory: Drupal\Core\Database\Database::getConnection
arguments: [replica]
typed_data_manager:
class: Drupal\Core\TypedData\TypedDataManager
......
......@@ -24,14 +24,14 @@ public static function preAutoloadDump(Event $event) {
$package = $composer->getPackage();
$autoload = $package->getAutoload();
$autoload['classmap'] = array_merge($autoload['classmap'], array(
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ParameterBag.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/FileBag.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/ServerBag.php',
'vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/HeaderBag.php',
'vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernel.php',
'vendor/symfony/http-kernel/Symfony/Component/HttpKernel/HttpKernelInterface.php',
'vendor/symfony/http-kernel/Symfony/Component/HttpKernel/TerminableInterface.php'
'vendor/symfony/http-foundation/Request.php',
'vendor/symfony/http-foundation/ParameterBag.php',
'vendor/symfony/http-foundation/FileBag.php',
'vendor/symfony/http-foundation/ServerBag.php',
'vendor/symfony/http-foundation/HeaderBag.php',
'vendor/symfony/http-kernel/HttpKernel.php',
'vendor/symfony/http-kernel/HttpKernelInterface.php',
'vendor/symfony/http-kernel/TerminableInterface.php',
));
$package->setAutoload($autoload);
}
......
......@@ -43,10 +43,6 @@ public function __construct(ParameterBagInterface $parameterBag = NULL) {
public function set($id, $service, $scope = self::SCOPE_CONTAINER) {
SymfonyContainer::set($id, $service, $scope);
if ($this->hasDefinition($id) && ($definition = $this->getDefinition($id)) && $definition->isSynchronized()) {
$this->synchronize($id);
}
// Ensure that the _serviceId property is set on synthetic services as well.
if (isset($this->services[$id]) && is_object($this->services[$id]) && !isset($this->services[$id]->_serviceId)) {
$this->services[$id]->_serviceId = $id;
......
......@@ -83,6 +83,10 @@ public function load($file)
// parameters
if (isset($content['parameters'])) {
if (!is_array($content['parameters'])) {
throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in %s. Check your YAML syntax.', $file));