* kriswallsmith/framework/protocol-relative-base-urls:
[Templating] updated assets helper to leave protocol-relative URLs untouched
[FrameworkBundle] cleaned up test class
* l3l0/routing-tests:
[Routing] added tearDown with cleanup the file system tmp directory
[Routing] moved clean up the directory from tearDown to setUp. Removed setUpBeforeClass method
[Routing] modified place when we store temporary file
[Routing] modified unit test for PhpGeneratorDumper class
[Routing] add unit test for PhpGeneratorDumper class
[Routing] added more tests for UrlGenerator class
* subsven/master:
re-add filename based directory filter to the AnnotationDirectoryLoader, now restricting to *.php files and therefore disregarding e.g. SVN metadata files
revert adding filename based filter to the directory resource
Eleminate the need to manually clear the cache if a new controller file containing routing annotations is added - part II * add unit tests * introduce filename filter to DirectoryResource (to restrict change monitoring to a subset of files) * modify AnnotationDirectoryLoader.php to use filename filter set on Controller\.php$
* add unit tests
* introduce filename filter to DirectoryResource (to restrict change monitoring to a subset of files)
* modify AnnotationDirectoryLoader.php to use filename filter set on Controller\.php$
* vicb/cfg_rebase:
[Config] Ability to add and override node types without having to subclass NodeBuilder
[DoctrineBundle] Fix some typos
[SwiftMailerBundle] Fix a merge issue in the configuration
Tweak PHPDocs in the extension configuration files
[Config] Component refactoring
* The array returned by getListeners() now removes the listener hash as the key (as this is an implementation detail)
* The sort method now guarantees that a listener registered before another will stay in the same order even for the same priority (for BC)
* Made various optimizations
The onCore* events are fired at some pre-defined points during the
handling of a request. At this is more important than the fact
that you can change things from the event.