Commit 87dc82a4 authored by webchick's avatar webchick

Issue #1424924 by Rob Loach: Added Use Composer for updating Symfony...

Issue #1424924 by Rob Loach: Added Use Composer for updating Symfony components (without removing Symfony code from repo).
parent 3b2f5ad9

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
{
"require": {
"symfony/class-loader": "2.1.*",
"symfony/dependency-injection": "2.1.*",
"symfony/event-dispatcher": "2.1.*",
"symfony/http-foundation": "2.1.*",
"symfony/http-kernel": "2.1.*",
"symfony/routing": "2.1.*",
"symfony/yaml": "2.1.*",
"twig/twig": "1.8.*"
},
"minimum-stability": "beta"
}
{
"hash": "ec77094fc475b57afb7a27f63983ead1",
"packages": [
{
"package": "symfony/class-loader",
"version": "v2.1.0-BETA1"
},
{
"package": "symfony/dependency-injection",
"version": "v2.1.0-BETA1"
},
{
"package": "symfony/event-dispatcher",
"version": "v2.1.0-BETA1"
},
{
"package": "symfony/http-foundation",
"version": "v2.1.0-BETA1"
},
{
"package": "symfony/http-kernel",
"version": "v2.1.0-BETA1"
},
{
"package": "symfony/routing",
"version": "v2.1.0-BETA1"
},
{
"package": "symfony/yaml",
"version": "v2.1.0-BETA1"
},
{
"package": "twig/twig",
"version": "v1.8.3"
}
],
"packages-dev": null,
"aliases": [
],
"minimum-stability": "beta",
"stability-flags": [
]
}
...@@ -2994,13 +2994,13 @@ function drupal_classloader() { ...@@ -2994,13 +2994,13 @@ function drupal_classloader() {
if (!isset($loader)) { if (!isset($loader)) {
// Include the Symfony ClassLoader for loading PSR-0-compatible classes. // Include the Symfony ClassLoader for loading PSR-0-compatible classes.
require_once DRUPAL_ROOT . '/core/vendor/Symfony/Component/ClassLoader/UniversalClassLoader.php'; require_once DRUPAL_ROOT . '/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php';
// @todo Use a cleaner way than variable_get() to switch autoloaders. // @todo Use a cleaner way than variable_get() to switch autoloaders.
switch (variable_get('autoloader_mode', 'default')) { switch (variable_get('autoloader_mode', 'default')) {
case 'apc': case 'apc':
if (function_exists('apc_store')) { if (function_exists('apc_store')) {
require_once DRUPAL_ROOT . '/core/vendor/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php'; require_once DRUPAL_ROOT . '/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
$loader = new ApcUniversalClassLoader('drupal.' . $GLOBALS['drupal_hash_salt']); $loader = new ApcUniversalClassLoader('drupal.' . $GLOBALS['drupal_hash_salt']);
break; break;
} }
...@@ -3015,13 +3015,19 @@ function drupal_classloader() { ...@@ -3015,13 +3015,19 @@ function drupal_classloader() {
// Register explicit PSR-0 vendor namespaces. // Register explicit PSR-0 vendor namespaces.
$loader->registerNamespaces(array( $loader->registerNamespaces(array(
// All Symfony-borrowed code lives in /core/vendor/Symfony. // All Symfony-borrowed code lives in /core/vendor/symfony.
'Symfony' => DRUPAL_ROOT . '/core/vendor', 'Symfony\Component\ClassLoader' => DRUPAL_ROOT . '/core/vendor/symfony/class-loader',
'Symfony\Component\DependencyInjection' => DRUPAL_ROOT . '/core/vendor/symfony/dependency-injection',
'Symfony\Component\EventDispatcher' => DRUPAL_ROOT . '/core/vendor/symfony/event-dispatcher',
'Symfony\Component\HttpFoundation' => DRUPAL_ROOT . '/core/vendor/symfony/http-foundation',
'Symfony\Component\HttpKernel' => DRUPAL_ROOT . '/core/vendor/symfony/http-kernel',
'Symfony\Component\Routing' => DRUPAL_ROOT . '/core/vendor/symfony/routing',
'Symfony\Component\Yaml' => DRUPAL_ROOT . '/core/vendor/symfony/yaml',
)); ));
// Register PEAR-style vendor namespaces. // Register PEAR-style vendor namespaces.
$loader->registerPrefixes(array( $loader->registerPrefixes(array(
// All Twig-borrowed code lives in /core/vendor/Twig. // All Twig-borrowed code lives in /core/vendor/twig.
'Twig' => DRUPAL_ROOT . '/core/vendor', 'Twig' => DRUPAL_ROOT . '/core/vendor/twig/twig/lib',
)); ));
// Register the Drupal namespace for classes in core as a fallback. // Register the Drupal namespace for classes in core as a fallback.
// This allows to register additional namespaces within the Drupal namespace // This allows to register additional namespaces within the Drupal namespace
......
# SimpleTest breaks with the following files, so avoid adding them.
symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/