diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
index 1c0c312dc2..9d8645e00f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
@@ -4,22 +4,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Doctrine\Common\Annotations\AnnotationReader
- Doctrine\Common\Annotations\CachedReader
- Doctrine\Common\Annotations\FileCacheReader
-
-
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index 3e049c0f2c..48dc2e8977 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -4,24 +4,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector
- Symfony\Component\HttpKernel\DataCollector\RequestDataCollector
- Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector
- Symfony\Component\HttpKernel\DataCollector\EventDataCollector
- Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector
- Symfony\Component\HttpKernel\DataCollector\TimeDataCollector
- Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector
- Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector
-
-
-
+
-
+
@@ -30,32 +19,32 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
index 819f9623b0..d5d7855a23 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml
@@ -5,21 +5,19 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher
%kernel.cache_dir%/%kernel.container_class%.xml
- Symfony\Component\HttpKernel\Controller\TraceableControllerResolver
-1
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
index 39266eab03..2be5bae2ee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml
@@ -5,13 +5,11 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Component\HttpKernel\EventListener\DebugHandlersListener
- Symfony\Component\Stopwatch\Stopwatch
0
-
+
@@ -22,6 +20,6 @@
null
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
index 277054442f..86600a8698 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
@@ -4,15 +4,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\HttpKernel\HttpCache\Esi
- Symfony\Component\HttpKernel\EventListener\SurrogateListener
-
-
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index 5090309101..b7ddcc4fc8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -4,21 +4,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Form\ResolvedFormTypeFactory
- Symfony\Component\Form\FormRegistry
- Symfony\Component\Form\FormFactory
- Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension
- Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser
- Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler
-
-
-
+
-
+
-
+
-
+
@@ -49,7 +40,7 @@
-
+
@@ -154,7 +145,7 @@
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
index 1e8e3c8983..757724148c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form_debug.xml
@@ -4,31 +4,24 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy
- Symfony\Component\Form\Extension\DataCollector\Type\DataCollectorTypeExtension
- Symfony\Component\Form\Extension\DataCollector\FormDataCollector
- Symfony\Component\Form\Extension\DataCollector\FormDataExtractor
-
-
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
index 930ca17b0a..332e767c4d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_listener.xml
@@ -4,12 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\HttpKernel\EventListener\FragmentListener
-
-
-
+
%fragment.path%
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
index d3687da13a..bbf857a50b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/fragment_renderer.xml
@@ -5,36 +5,32 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler
- Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer
- Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer
- Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer
/_fragment
-
+
%kernel.debug%
-
+
%fragment.path%
-
+
%fragment.renderer.hinclude.global_template%
%fragment.path%
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
index 182560ccba..b83aa072f2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
@@ -4,20 +4,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\FrameworkBundle\Templating\Asset\PathPackage
- Symfony\Component\Templating\Asset\UrlPackage
- Symfony\Bundle\FrameworkBundle\Templating\Asset\PackageFactory
-
-
-
+
service('request_stack').getMasterRequest()
-
+
@@ -30,7 +24,7 @@
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
index cee86b3b72..35e266125c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
@@ -4,13 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\HttpKernel\Profiler\Profiler
- Symfony\Component\HttpKernel\EventListener\ProfilerListener
-
-
-
+
@@ -23,7 +18,7 @@
%profiler.storage.lifetime%
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
index 0e0fc65dea..1ebee06451 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_access.xml
@@ -4,12 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\PropertyAccess\PropertyAccessor
-
-
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
index cc836c35e3..323744edaa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/request.xml
@@ -4,12 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\HttpKernel\EventListener\AddRequestFormatsListener
-
-
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index 6b2f7c9688..f13a038c27 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -5,54 +5,45 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Bundle\FrameworkBundle\Routing\Router
- Symfony\Component\Routing\RequestContext
- Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader
- Symfony\Component\Config\Loader\LoaderResolver
- Symfony\Component\Routing\Loader\XmlFileLoader
- Symfony\Component\Routing\Loader\YamlFileLoader
- Symfony\Component\Routing\Loader\PhpFileLoader
Symfony\Component\Routing\Generator\UrlGenerator
Symfony\Component\Routing\Generator\UrlGenerator
Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper
Symfony\Bundle\FrameworkBundle\Routing\RedirectableUrlMatcher
Symfony\Bundle\FrameworkBundle\Routing\RedirectableUrlMatcher
Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper
- Symfony\Bundle\FrameworkBundle\CacheWarmer\RouterCacheWarmer
%router.cache_class_prefix%UrlMatcher
%router.cache_class_prefix%UrlGenerator
- Symfony\Component\HttpKernel\EventListener\RouterListener
localhost
http
-
+
-
+
-
+
-
+
-
+
-
+
%router.resource%
@@ -74,7 +65,7 @@
-
+
%router.request_context.base_url%
GET
%router.request_context.host%
@@ -83,12 +74,12 @@
%request_listener.https_port%
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml
index 2b6307a9ef..8963736925 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml
@@ -4,13 +4,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Security\Core\Util\SecureRandom
-
-
-
+
%kernel.cache_dir%/secure_random.seed
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
index 143c8a68ef..fa8a46d9aa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
@@ -4,22 +4,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Security\Csrf\TokenGenerator\UriSafeTokenGenerator
- Symfony\Component\Security\Csrf\TokenStorage\SessionTokenStorage
- Symfony\Component\Security\Csrf\CsrfTokenManager
-
-
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index ecc8f4920c..66e21d50fd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -5,14 +5,11 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Component\Serializer\Serializer
- Symfony\Component\Serializer\Encoder\XmlEncoder
- Symfony\Component\Serializer\Encoder\JsonEncoder
-
+
@@ -44,11 +41,11 @@
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index 2c3c6ea312..63cbe6b00d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -4,36 +4,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher
- Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel
- Symfony\Component\Filesystem\Filesystem
- Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate
- Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer
- Symfony\Component\HttpKernel\Config\FileLocator
- Symfony\Component\HttpKernel\UriSigner
- Symfony\Component\HttpFoundation\RequestStack
-
-
-
+
-
+
-
+
-
+
-
+
@@ -41,14 +30,14 @@
-
+
-
+
%kernel.root_dir%/Resources
-
+
%kernel.secret%
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 591f92e456..2a4816a2b3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -5,59 +5,49 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Component\HttpFoundation\Session\Session
- Symfony\Component\HttpFoundation\Session\Flash\FlashBag
- Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag
- Symfony\Component\HttpFoundation\Session\Storage\MetadataBag
_sf2_meta
- Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage
- Symfony\Component\HttpFoundation\Session\Storage\PhpBridgeSessionStorage
- Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage
- Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler
- Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler
- Symfony\Bundle\FrameworkBundle\EventListener\SessionListener
-
+
-
+
%session.metadata.storage_key%
%session.metadata.update_threshold%
-
+
%session.storage.options%
-
+
-
+
-
+
-
+
%kernel.cache_dir%/sessions
MOCKSESSID
-
+
%session.save_path%
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
index 7b723227da..d1889b7735 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -4,58 +4,45 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine
- Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser
- Symfony\Bundle\FrameworkBundle\Templating\TemplateFilenameParser
- Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplatePathsCacheWarmer
- Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator
- Symfony\Bundle\FrameworkBundle\Templating\Loader\FilesystemLoader
- Symfony\Component\Templating\Loader\CacheLoader
- Symfony\Component\Templating\Loader\ChainLoader
- Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder
- Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper
-
-
-
+
-
+
-
+
-
+
%kernel.cache_dir%
-
+
%kernel.root_dir%/Resources
-
+
-
+
-
+
%templating.loader.cache.path%
-
+
@@ -63,7 +50,7 @@
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
index 49e79416e1..f2bdc45c22 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml
@@ -4,12 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\FrameworkBundle\Templating\TimedPhpEngine
-
-
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
index 5b4f8073fe..0b2861346d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
@@ -4,24 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\FrameworkBundle\Templating\PhpEngine
- Symfony\Component\Templating\Helper\SlotsHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\ActionsHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\RouterHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\RequestHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\CodeHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper
- Symfony\Bundle\FrameworkBundle\Templating\Helper\StopwatchHelper
- Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine
- Symfony\Component\Form\FormRenderer
- Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables
-
-
-
+
@@ -29,63 +13,63 @@
%kernel.charset%
-
+
-
+
-
+
-
+
-
+
-
+
%templating.helper.code.file_link_format%
%kernel.root_dir%
%kernel.charset%
-
+
-
+
-
+
-
+
%templating.helper.form.resources%
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
index 4e609a06e5..2cdf624e81 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
@@ -5,26 +5,22 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Bundle\FrameworkBundle\Client
- Symfony\Component\BrowserKit\History
- Symfony\Component\BrowserKit\CookieJar
- Symfony\Bundle\FrameworkBundle\EventListener\TestSessionListener
-
+
%test.client.parameters%
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
index 1c6eb323b0..b30b1b8c15 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -4,39 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\FrameworkBundle\Translation\Translator
- Symfony\Component\Translation\IdentityTranslator
- Symfony\Component\Translation\MessageSelector
- Symfony\Component\Translation\Loader\PhpFileLoader
- Symfony\Component\Translation\Loader\YamlFileLoader
- Symfony\Component\Translation\Loader\XliffFileLoader
- Symfony\Component\Translation\Loader\PoFileLoader
- Symfony\Component\Translation\Loader\MoFileLoader
- Symfony\Component\Translation\Loader\QtFileLoader
- Symfony\Component\Translation\Loader\CsvFileLoader
- Symfony\Component\Translation\Loader\IcuResFileLoader
- Symfony\Component\Translation\Loader\IcuDatFileLoader
- Symfony\Component\Translation\Loader\IniFileLoader
- Symfony\Component\Translation\Loader\JsonFileLoader
- Symfony\Component\Translation\Dumper\PhpFileDumper
- Symfony\Component\Translation\Dumper\XliffFileDumper
- Symfony\Component\Translation\Dumper\PoFileDumper
- Symfony\Component\Translation\Dumper\MoFileDumper
- Symfony\Component\Translation\Dumper\YamlFileDumper
- Symfony\Component\Translation\Dumper\QtFileDumper
- Symfony\Component\Translation\Dumper\CsvFileDumper
- Symfony\Component\Translation\Dumper\IniFileDumper
- Symfony\Component\Translation\Dumper\JsonFileDumper
- Symfony\Component\Translation\Dumper\IcuResFileDumper
- Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor
- Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader
- Symfony\Component\Translation\Extractor\ChainExtractor
- Symfony\Component\Translation\Writer\TranslationWriter
-
-
-
+
@@ -53,104 +22,104 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
index ccfd44e5ca..ac153f91b2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
@@ -5,23 +5,16 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Component\Validator\Validator\ValidatorInterface
- Symfony\Component\Validator\ValidatorBuilderInterface
- Symfony\Component\Validator\Validation
- Symfony\Component\Validator\Mapping\Cache\ApcCache
- Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory
- Symfony\Component\Validator\Constraints\ExpressionValidator
- Symfony\Component\Validator\Constraints\EmailValidator
-
+
-
-
+
+
@@ -35,21 +28,21 @@
-
+
%validator.mapping.cache.prefix%
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
index 9b2f3cb3a4..af7d37449a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -4,37 +4,29 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver
- Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser
- Symfony\Component\HttpKernel\EventListener\ResponseListener
- Symfony\Component\HttpKernel\EventListener\StreamedResponseListener
- Symfony\Component\HttpKernel\EventListener\LocaleListener
-
-
-
+
-
+
-
+
%kernel.charset%
-
+
-
+
%kernel.default_locale%
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
index e71237a7fc..c36115ae42 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -46,7 +46,7 @@ class LoggingTranslatorPassTest extends \PHPUnit_Framework_TestCase
$definition->expects($this->once())
->method('getClass')
- ->will($this->returnValue("%translator.class%"));
+ ->will($this->returnValue("Symfony\Bundle\FrameworkBundle\Translation\Translator"));
$parameterBag->expects($this->once())
->method('resolveValue')
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 106083643b..3a7a37194e 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -458,7 +458,7 @@ class SecurityExtension extends Extension
$arguments = array($config['ignore_case']);
return array(
- 'class' => new Parameter('security.encoder.plain.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder',
'arguments' => $arguments,
);
}
@@ -466,7 +466,7 @@ class SecurityExtension extends Extension
// pbkdf2 encoder
if ('pbkdf2' === $config['algorithm']) {
return array(
- 'class' => new Parameter('security.encoder.pbkdf2.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder',
'arguments' => array(
$config['hash_algorithm'],
$config['encode_as_base64'],
@@ -479,14 +479,14 @@ class SecurityExtension extends Extension
// bcrypt encoder
if ('bcrypt' === $config['algorithm']) {
return array(
- 'class' => new Parameter('security.encoder.bcrypt.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder',
'arguments' => array($config['cost']),
);
}
// message digest encoder
return array(
- 'class' => new Parameter('security.encoder.digest.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder',
'arguments' => array(
$config['algorithm'],
$config['encode_as_base64'],
@@ -619,7 +619,7 @@ class SecurityExtension extends Extension
}
$container
- ->register($id, '%security.matcher.class%')
+ ->register($id, 'Symfony\Component\HttpFoundation\RequestMatcher')
->setPublic(false)
->setArguments($arguments)
;
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
index 8f6a608c6d..bcb6b68815 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
@@ -4,12 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\SecurityBundle\DataCollector\SecurityDataCollector
-
-
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index eda3ed6419..723b48df40 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -5,52 +5,12 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
- Symfony\Component\Security\Core\SecurityContext
-
- Symfony\Component\Security\Core\User\UserChecker
-
- Symfony\Component\Security\Core\Encoder\EncoderFactory
- Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder
- Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder
- Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder
- Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder
-
- Symfony\Component\Security\Core\User\InMemoryUserProvider
- Symfony\Component\Security\Core\User\User
- Symfony\Component\Security\Core\User\ChainUserProvider
-
- Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver
Symfony\Component\Security\Core\Authentication\Token\AnonymousToken
Symfony\Component\Security\Core\Authentication\Token\RememberMeToken
-
- Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager
-
- Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy
-
- Symfony\Component\Security\Core\Authorization\AccessDecisionManager
-
- Symfony\Component\Security\Core\Authorization\Voter\RoleVoter
- Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter
- Symfony\Component\Security\Core\Authorization\Voter\RoleHierarchyVoter
- Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter
-
- Symfony\Component\Security\Http\Firewall
- Symfony\Bundle\SecurityBundle\Security\FirewallMap
- Symfony\Bundle\SecurityBundle\Security\FirewallContext
- Symfony\Component\HttpFoundation\RequestMatcher
- Symfony\Component\HttpFoundation\ExpressionRequestMatcher
-
- Symfony\Component\Security\Core\Role\RoleHierarchy
-
- Symfony\Component\Security\Http\HttpUtils
-
- Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator
-
- Symfony\Component\Security\Core\Authorization\ExpressionLanguage
-
+
@@ -65,7 +25,7 @@
-
+
%security.authentication.manager.erase_credentials%
@@ -73,16 +33,16 @@
-
+
%security.authentication.trust_resolver.anonymous_class%
%security.authentication.trust_resolver.rememberme_class%
-
+
%security.authentication.session_strategy.strategy%
-
+
@@ -94,40 +54,40 @@
-
+
-
+
-
+
-
+
%security.role_hierarchy.roles%
-
+
-
+
-
+
-
+
@@ -136,18 +96,18 @@
-
+
-
+
-
+
@@ -159,18 +119,18 @@
-
-
+
+
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
index 624b6b1d1d..767e30d52e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
@@ -4,37 +4,23 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy
-
- Symfony\Component\Security\Acl\Voter\AclVoter
- Symfony\Component\Security\Acl\Permission\BasicPermissionMap
-
- Symfony\Component\Security\Acl\Domain\ObjectIdentityRetrievalStrategy
- Symfony\Component\Security\Acl\Domain\SecurityIdentityRetrievalStrategy
-
- Symfony\Component\Security\Acl\Domain\DoctrineAclCache
-
- Symfony\Component\Security\Acl\Domain\AclCollectionCache
-
-
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
index a61d648b0b..2675a37cd3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl_dbal.xml
@@ -4,16 +4,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Security\Acl\Dbal\MutableAclProvider
- Symfony\Component\Security\Acl\Dbal\Schema
- Symfony\Bundle\SecurityBundle\EventListener\AclSchemaListener
-
-
-
+
@@ -26,7 +20,7 @@
-
+
%security.acl.dbal.class_table_name%
%security.acl.dbal.entry_table_name%
@@ -36,19 +30,19 @@
-
+
-
+
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
index d715355707..3434587de4 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -4,53 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint
-
- Symfony\Component\Security\Http\Firewall\ChannelListener
-
- Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint
- Symfony\Component\Security\Http\Firewall\UsernamePasswordFormAuthenticationListener
-
- Symfony\Component\Security\Http\Firewall\SimpleFormAuthenticationListener
-
- Symfony\Component\Security\Http\Firewall\SimplePreAuthenticationListener
-
- Symfony\Component\Security\Http\Firewall\BasicAuthenticationListener
- Symfony\Component\Security\Http\EntryPoint\BasicAuthenticationEntryPoint
-
- Symfony\Component\Security\Http\Firewall\DigestAuthenticationListener
- Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint
-
- Symfony\Component\Security\Http\Firewall\X509AuthenticationListener
-
- Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener
-
- Symfony\Component\Security\Http\Firewall\SwitchUserListener
-
- Symfony\Component\Security\Http\Firewall\LogoutListener
- Symfony\Component\Security\Http\Logout\SessionLogoutHandler
- Symfony\Component\Security\Http\Logout\CookieClearingLogoutHandler
- Symfony\Component\Security\Http\Logout\DefaultLogoutSuccessHandler
-
- Symfony\Component\Security\Http\Firewall\AccessListener
- Symfony\Component\Security\Http\AccessMap
- Symfony\Component\Security\Http\Firewall\ExceptionListener
- Symfony\Component\Security\Http\Firewall\ContextListener
-
- Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider
- Symfony\Component\Security\Core\Authentication\Provider\SimpleAuthenticationProvider
- Symfony\Component\Security\Core\Authentication\Provider\PreAuthenticatedAuthenticationProvider
-
- Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider
-
- Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler
- Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler
- Symfony\Component\Security\Http\Authentication\SimpleAuthenticationHandler
-
-
-
+
@@ -58,29 +13,29 @@
-
+
-
+
%request_listener.http_port%
%request_listener.https_port%
-
+
-
+
-
+
-
+
-
+
@@ -89,21 +44,21 @@
-
+
-
-
+
+
-
+
/
-
+
@@ -127,7 +82,7 @@
-
+
@@ -137,7 +92,7 @@
-
+
@@ -146,18 +101,18 @@
-
+
@@ -165,7 +120,7 @@
-
+
@@ -175,7 +130,7 @@
-
+
@@ -196,7 +151,7 @@
-
+
@@ -205,7 +160,7 @@
-
+
@@ -214,7 +169,7 @@
-
+
@@ -222,18 +177,18 @@
%security.authentication.hide_user_not_found%
-
+
-
+
-
+
@@ -245,7 +200,7 @@
-
+
@@ -258,7 +213,7 @@
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
index 930e1656d8..98862197ae 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -4,20 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider
-
- Symfony\Component\Security\Http\Firewall\RememberMeListener
- Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider
-
- Symfony\Component\Security\Http\RememberMe\PersistentTokenBasedRememberMeServices
- Symfony\Component\Security\Http\RememberMe\TokenBasedRememberMeServices
-
- Symfony\Component\Security\Http\RememberMe\ResponseListener
-
-
-
+
@@ -27,11 +15,11 @@
-
+
-
+
@@ -43,19 +31,19 @@
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
index b10d060d8a..e800500d43 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml
@@ -4,18 +4,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bundle\SecurityBundle\Templating\Helper\LogoutUrlHelper
- Symfony\Bundle\SecurityBundle\Templating\Helper\SecurityHelper
-
-
-
+
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml
index 9fe6c4adde..85be5476d4 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/templating_twig.xml
@@ -4,18 +4,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Symfony\Bridge\Twig\Extension\LogoutUrlExtension
- Symfony\Bridge\Twig\Extension\SecurityExtension
-
-
-
+
-
+
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index 5f139ca6e1..a34df33b7d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -180,24 +180,24 @@ abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(array(array(
'JMS\FooBundle\Entity\User1' => array(
- 'class' => new Parameter('security.encoder.plain.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder',
'arguments' => array(false),
),
'JMS\FooBundle\Entity\User2' => array(
- 'class' => new Parameter('security.encoder.digest.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder',
'arguments' => array('sha1', false, 5),
),
'JMS\FooBundle\Entity\User3' => array(
- 'class' => new Parameter('security.encoder.digest.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder',
'arguments' => array('md5', true, 5000),
),
'JMS\FooBundle\Entity\User4' => new Reference('security.encoder.foo'),
'JMS\FooBundle\Entity\User5' => array(
- 'class' => new Parameter('security.encoder.pbkdf2.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder',
'arguments' => array('sha1', false, 5, 30),
),
'JMS\FooBundle\Entity\User6' => array(
- 'class' => new Parameter('security.encoder.bcrypt.class'),
+ 'class' => 'Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder',
'arguments' => array(15),
),
)), $container->getDefinition('security.encoder_factory.generic')->getArguments());
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 52a12bc439..abddb8b2d4 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -4,30 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
- Twig_Environment
- Symfony\Bundle\TwigBundle\Loader\FilesystemLoader
- Twig_Loader_Chain
- Symfony\Bundle\TwigBundle\TwigEngine
- Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheCacheWarmer
- Symfony\Bridge\Twig\Extension\TranslationExtension
- Symfony\Bridge\Twig\Extension\CodeExtension
- Symfony\Bridge\Twig\Extension\RoutingExtension
- Symfony\Bridge\Twig\Extension\YamlExtension
- Symfony\Bridge\Twig\Extension\FormExtension
- Symfony\Bridge\Twig\Extension\HttpKernelExtension
- Symfony\Bridge\Twig\Extension\StopwatchExtension
- Symfony\Bridge\Twig\Extension\ExpressionExtension
- Symfony\Bridge\Twig\Form\TwigRendererEngine
- Symfony\Bridge\Twig\Form\TwigRenderer
- Symfony\Bridge\Twig\Translation\TwigExtractor
- Symfony\Component\HttpKernel\EventListener\ExceptionListener
- Symfony\Bundle\TwigBundle\Controller\ExceptionController
- Symfony\Bundle\TwigBundle\Controller\PreviewErrorController
-
-
-
+
@@ -43,7 +21,7 @@
-
+
@@ -52,17 +30,17 @@
-
+
-
+
-
+
@@ -80,7 +58,7 @@
-
+
@@ -88,32 +66,32 @@
-
+
%kernel.root_dir%
%kernel.charset%
-
+
-
+
-
+
%kernel.debug%
-
+
-
+
@@ -121,39 +99,39 @@
-
+
-
+
%twig.form.resources%
-
+
-