Tobias Schultze
63c77aae53
Merge branch '2.8'
...
Conflicts:
composer.json
src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
src/Symfony/Component/ClassLoader/DebugClassLoader.php
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
src/Symfony/Component/Console/Input/StringInput.php
src/Symfony/Component/Debug/DebugClassLoader.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/DependencyInjection/ContainerInterface.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
src/Symfony/Component/DependencyInjection/Scope.php
src/Symfony/Component/DependencyInjection/ScopeInterface.php
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/Event.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/KernelInterface.php
src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
src/Symfony/Component/HttpKernel/Log/NullLogger.php
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Resources/translations/security.tr.xlf
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Translation/Translator.php
2015-09-29 16:08:28 +02:00
Tobias Schultze
8573385a83
Merge branch '2.3' into 2.7
...
Conflicts:
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
src/Symfony/Component/ClassLoader/DebugClassLoader.php
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
src/Symfony/Component/EventDispatcher/Event.php
src/Symfony/Component/Filesystem/Exception/IOException.php
src/Symfony/Component/HttpFoundation/File/File.php
src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
src/Symfony/Component/HttpFoundation/StreamedResponse.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
src/Symfony/Component/HttpKernel/HttpKernel.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/KernelInterface.php
src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
src/Symfony/Component/HttpKernel/Log/NullLogger.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Routing/RequestContext.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Templating/EngineInterface.php
src/Symfony/Component/Templating/PhpEngine.php
src/Symfony/Component/Templating/TemplateNameParser.php
src/Symfony/Component/Templating/TemplateReference.php
src/Symfony/Component/Templating/TemplateReferenceInterface.php
src/Symfony/Component/Translation/IdentityTranslator.php
src/Symfony/Component/Translation/Translator.php
src/Symfony/Component/Validator/ConstraintViolationInterface.php
src/Symfony/Component/Validator/Constraints/False.php
src/Symfony/Component/Validator/Constraints/FalseValidator.php
src/Symfony/Component/Validator/Constraints/GroupSequence.php
src/Symfony/Component/Validator/Constraints/Image.php
src/Symfony/Component/Validator/Constraints/Null.php
src/Symfony/Component/Validator/Constraints/NullValidator.php
src/Symfony/Component/Validator/Constraints/True.php
src/Symfony/Component/Validator/Constraints/TrueValidator.php
src/Symfony/Component/Validator/ExecutionContextInterface.php
src/Symfony/Component/Validator/ValidatorInterface.php
2015-09-29 14:06:14 +02:00
Tobias Schultze
f1c7c657a7
remove api tags from code
2015-09-28 19:11:22 +02:00
Pierre du Plessis
e0e19f6d8e
Add better error message when controller action isn't callable
2015-09-23 10:09:32 +02:00
Fabien Potencier
c0e4495b66
fixes CS
2015-08-24 09:13:45 +02:00
Iltar van der Berg
ea80c9b4c2
[DX] Attempt to improve logging messages with parameters
2015-01-16 16:11:12 +01:00
Graham Campbell
443307edc1
Docblock fixes
2014-11-30 13:33:44 +00:00
Fabien Potencier
1104112c04
feature #12022 [HttpKernel] Extract method to instantiate controller in ControllerResolver (danharper)
...
This PR was merged into the 2.6-dev branch.
Discussion
----------
[HttpKernel] Extract method to instantiate controller in ControllerResolver
Replaces #10814 to merge into `master` instead of `2.3`.
---
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
Currently it's required to duplicate the entirety of the `getController()` and `createController()` methods just to replace the call to `new` (e.g. with container resolution, instead).
Now it's possible to just override the `instantiateController()` method.
Commits
-------
88274df
[HttpKernel] Extract method to make callable controller in ControllerResolver
2014-09-25 08:41:43 +02:00
Dan Harper
88274df463
[HttpKernel] Extract method to make callable controller in ControllerResolver
...
correct naming
2014-04-29 17:23:49 +01:00
Fabien Potencier
e96b018805
fixed types in phpdocs
2014-04-16 12:30:19 +02:00
Fabien Potencier
82cbf698b7
Merge branch '2.3' into 2.4
...
* 2.3:
added missing unit test
fixed too greedy replacements
fixed protocol-relative URLs
added override power to server parameters provided on request method
made parsing controllers more robust
Fixed YamlFileLoader imports path
Conflicts:
src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
2014-03-27 15:53:17 +01:00
Fabien Potencier
6dba2296f1
made parsing controllers more robust
2014-03-27 08:52:42 +01:00
Fabien Potencier
e2ac5dfc78
Merge branch '2.3' into 2.4
...
* 2.3:
fixed various inconsistencies
reduced recursion when building DumperPrefixCollection
renamed variables - making next change more readable
removing dead code.
[DomCrawler] Fixed filterXPath() chaining
[DomCrawler] Fixed incorrect handling of image inputs
Conflicts:
src/Symfony/Component/DomCrawler/Crawler.php
src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
2014-02-11 14:52:09 +01:00
Fabien Potencier
eb3f6c6efb
fixed various inconsistencies
2014-02-11 11:29:24 +01:00
Tobias Schultze
6d5ddce9a4
unify and fix callable phpdoc throughout symfony
2013-11-20 10:25:10 +01:00
Fabien Potencier
8c447680b9
[HttpKernel] allowed any callable to be returned by ControllerResolver::createController
2013-04-20 22:13:18 +02:00
Jordi Boggiano
67d7423456
Remove use of deprecated HttpKernel LoggerInterface
2013-01-09 10:52:29 +01:00
Jordi Boggiano
1e5a890864
[Monolog] Mark old non-PSR3 methods as deprecated
2013-01-09 10:19:50 +01:00
Florin Patan
c2acc6c2cb
Fixed most of the docblocks/unused namespaces
2012-12-19 08:09:49 +01:00
Fabien Potencier
77839690d9
changed getName() to name on all Reflection* object calls ( fixes #4555 , refs https://bugs.php.net/bug.php?id=61384 )
2012-06-12 14:23:19 +02:00
Fabien Potencier
745b9a6d6c
[HttpKernel] fixed function support in ControllerResolver ( closes #3331 )
2012-02-12 00:34:53 +01:00
Andrej Hudec
cd24fb86a8
change explode's limit parameter based on known variable content
2011-12-11 21:58:35 +01:00
Andrej Hudec
b3cc270450
minor optimalisations for explode
2011-12-11 21:58:30 +01:00
Fabien Potencier
7b1dda84b9
[HttpKernel] added unit tests for previous merge
2011-11-24 08:39:49 +01:00
Juan M Martínez
61e0bdebf8
[HttpKernel] ControllerResolver arguments reflection for Closure object.
...
When controller is a Closure ControllerResolver::getArguments tries to
make a ReflectionMethod of the __invoke method. But because it's an
internal function, the parameters method isDefaultValueAvailable will
return always false, even if isOptional return true.
2011-11-24 08:39:37 +01:00
Fabien Potencier
54999ef02d
[HttpKernel] made a small internal refactoring to ease extensibility
2011-08-08 23:20:53 +02:00
Fabien Potencier
be031f54a1
[HttpKernel] fixed ControllerResolver when the controller is a class name with an __invoke() method
2011-08-08 23:20:03 +02:00
Fabien Potencier
7720cb9be4
[HttpKernel] tagged public @api
2011-07-20 10:14:31 +02:00
Fabien Potencier
e145bdf6ff
[HttpKernel] fixed a crash on some machines (check that the controller is actually a class name before calling method_exists, closes #769 )
2011-06-15 17:23:14 +02:00
Fabien Potencier
fb24b95bd5
made some tweaks to error levels
2011-06-15 13:04:19 +02:00
Kai
dca09fd53f
Changed log level of "Using Controller ..." message from info to debug
2011-05-24 15:25:54 +02:00
Fabien Potencier
c6818d8bf7
[HttpKernel] added support for controllers as arrays and object with an __invoke method
...
Controllers can now be any valid PHP callable
2011-04-16 16:26:15 +02:00
Fabien Potencier
1b8dc80215
[HttpKernel] moved from protected to private
2011-03-23 19:47:16 +01:00
Fabien Potencier
8c423edfef
replaced symfony-project.org by symfony.com
2011-03-06 12:40:06 +01:00
Fabien Potencier
55f38e10af
[HttpKernel] simplified code
2011-01-29 15:36:57 +01:00
Fabien Potencier
e5c8d7aa4f
[HttpKernel] fixed typo in phpdoc
2011-01-23 12:10:45 +01:00
Dominique Bongiraud
64fb94c725
normalized license messages in PHP files
2011-01-18 08:07:46 +01:00
Fabien Potencier
1185a26eb9
[HttpKernel] simplified code a bit
2010-10-31 14:44:35 +01:00
Fabien Potencier
1990fc543b
[HttpKernel] added Closure support to ControllerResolver
2010-09-16 10:53:59 +02:00
Fabien Potencier
bf82cf42dd
renamed Symfony\Components to Symfony\Component
2010-08-20 23:09:55 +02:00