Nicolas Grekas
d1b67a561c
fix test
2018-03-01 11:49:02 +01:00
Fabien Potencier
97cee3a157
Merge branch '4.0'
...
* 4.0:
[Form][WCAG] Add hidden labels on date and time fields
Pass on previous exception in FatalThrowableError
[Routing] remove dead code
[Routing] fix typo
[Form][WCAG] Fixed HTML errors
fix merge
[FrameworkBundle] [Console] add a warning when command is not found
[WebProfilerBundle] limit ajax request to 100 and remove the last one
2018-02-28 13:50:15 -08:00
Nicolas Grekas
d419fd4cc8
fix merge
2018-02-26 19:35:35 +01:00
Maxime Steinhausser
5a2f2954ae
[FrameworkBundle][Routing] Use a PSR-11 container & parameter bag in FrameworkBundle Router
2017-12-09 16:16:33 +01:00
Nicolas Grekas
1e1b37753c
Merge branch '3.3' into 3.4
...
* 3.3:
[DI] minor docblock fixes
2017-10-24 16:12:06 +02:00
Nicolas Grekas
7fb9f614ee
Merge branch '2.8' into 3.3
...
* 2.8:
[DI] minor docblock fixes
2017-10-24 16:05:06 +02:00
Nicolas Grekas
2b95ba3299
Merge branch '2.7' into 2.8
...
* 2.7:
[DI] minor docblock fixes
2017-10-24 15:48:52 +02:00
Nicolas Grekas
0c9edaf336
[DI] minor docblock fixes
2017-10-24 13:40:19 +02:00
Nicolas Grekas
d1cfec11c3
Merge branch '3.2' into 3.3
...
* 3.2:
[FrameworkBundle] Fix tests
2017-07-12 17:03:57 +02:00
Nicolas Grekas
2e0c6bc855
[FrameworkBundle] Fix tests
2017-07-12 16:53:35 +02:00
Tobias Schultze
4c1fdd4edf
[Routing] also add matched params for redirect due to trailing slash
2017-07-11 08:35:47 +02:00
Maxime Steinhausser
fad4d9e2ef
[DI][Router][DX] Invalidate routing cache when container parameters changed
2017-03-05 20:24:24 +01:00
Nicolas Grekas
95f30de91d
Merge branch '2.8' into 3.2
...
* 2.8:
Updated PHPUnit namespaces
2017-02-20 13:38:41 +01:00
Peter Rehm
205ced409b
Updated PHPUnit namespaces
2017-02-20 13:35:43 +01:00
Nicolas Grekas
66cad2e4c5
Merge branch '2.8' into 3.2
...
* 2.8:
Update to PHPUnit namespaces
Minor typo fix messsagesData -> messagesData
remove translation data collector when not usable
2017-02-18 18:28:00 +01:00
Nicolas Grekas
33bae93a44
Merge branch '2.7' into 2.8
...
* 2.7:
Update to PHPUnit namespaces
remove translation data collector when not usable
2017-02-18 18:06:33 +01:00
Peter Rehm
ddd2dff9b2
Update to PHPUnit namespaces
2017-02-18 08:02:39 -08:00
Fabien Potencier
3f96468942
Merge branch '3.1' into 3.2
...
* 3.1:
fixed obsolete getMock() usage
fixed obsolete getMock() usage
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
do not remove the Twig ExceptionController service
removed obsolete condition
do not try to register incomplete definitions
2016-12-19 17:07:36 +01:00
Fabien Potencier
7ae26ed5f1
Merge branch '2.8' into 3.1
...
* 2.8:
fixed obsolete getMock() usage
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
do not remove the Twig ExceptionController service
removed obsolete condition
do not try to register incomplete definitions
2016-12-19 16:53:49 +01:00
Fabien Potencier
84e75a78b3
Merge branch '2.7' into 2.8
...
* 2.7:
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
2016-12-19 16:38:44 +01:00
Fabien Potencier
71d059cad1
fixed obsolete getMock() usage
2016-12-19 16:22:46 +01:00
Nicolas Grekas
a931002ca2
[FrameworkBundle] Forbid env parameters in routing configuration
2016-11-29 18:09:44 +01:00
Jakub Zalas
0a883a94f1
Change few occurences of a public setUp() method to protected
2016-01-27 11:49:43 +00:00
Nicolas Grekas
6005fe53f7
Merge branch '2.8'
...
Conflicts:
composer.json
src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Translation/PluralizationRules.php
src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
2015-10-07 09:44:07 +02:00
ogizanagi
af0eba7d26
[FrameworkBundle] [Routing] DelegatingLoader: deprecate logger argument
2015-10-06 17:24:04 +02:00
Fabien Potencier
e756135f64
feature #12960 [FrameworkBundle] Container parameters in Route#condition (nikita2206)
...
This PR was squashed before being merged into the 2.7 branch (closes #12960 ).
Discussion
----------
[FrameworkBundle] Container parameters in Route#condition
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | yes
| Deprecations? | no
| Tests pass? | no
| Fixed tickets | -
| License | MIT
| Doc PR | -
Adds ability to use parameters in route conditions like you can use them in container definitions:
```php
contact:
path: /contact
defaults: { _controller: AcmeDemoBundle:Main:contact }
condition: "request.headers.get('User-Agent') matches '%allowed_user_agents%'"
```
As you could see replacement of the placeholder happens before ExpressionLanguage will tokenize and compile the expression so it looks kinda ad-hoc and primitive. This means a BC break for us, because some of conditions out there that had percentage symbol might be invalid now, f.e.: `10%var_name%2`- without the patch this will be currently compiled to `10 % $var_name % 2`, with the patch it will try to replace `%var_name%` with a parameter. The same goes for percentage symbols inside string literals.
This PR is a different implementation of #12869 which is I think is too overcomplicated for this feature.
Commits
-------
505e474
[FrameworkBundle] Container parameters in Route#condition
2015-01-16 23:05:28 +01:00
nikita2206
505e474dee
[FrameworkBundle] Container parameters in Route#condition
2015-01-16 23:03:48 +01:00
Tobias Schultze
bd91867225
[FrameworkBundle] remove superfluous test that is already covered in routing
2015-01-13 13:22:41 +01:00
Disquedur
e638ccbe39
Remove aligned '=>' and '='
2014-10-30 21:17:55 +01:00
Fabien Potencier
b5b12a54f7
Merge branch '2.3' into 2.5
...
* 2.3:
Remove aligned '=>' and '='
Break infinite loop while resolving aliases
[Security][listener] change priority of switchuser
Improved the phpdoc for security token classes
bumped Symfony version to 2.3.22
updated VERSION for 2.3.21
update CONTRIBUTORS for 2.3.21
updated CHANGELOG for 2.3.21
Conflicts:
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/Console/Helper/ProgressHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/Finder/Shell/Command.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
src/Symfony/Component/Form/Extension/Core/Type/FormType.php
src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
src/Symfony/Component/Templating/PhpEngine.php
src/Symfony/Component/Validator/Constraints/ImageValidator.php
src/Symfony/Component/Validator/Constraints/TypeValidator.php
2014-10-26 08:41:27 +01:00
Disquedur
51312d31cc
Remove aligned '=>' and '='
2014-10-26 08:30:58 +01:00
Fabien Potencier
b91866f6c1
Merge branch '2.4' into 2.5
...
* 2.4:
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
[Tests] PHPUnit Optimizations
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
src/Symfony/Component/Validator/Constraints/CollectionValidator.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php
src/Symfony/Component/Yaml/Parser.php
2014-09-22 11:14:18 +02:00
Fabien Potencier
369aebf431
fixed CS
2014-09-22 10:32:35 +02:00
Daniel Tschinder
8cd8ec001a
Remove usage of deprecated _scheme in Routing Component
...
Instead correctly use the array of schemes from the Route.
Also adjusted the dumpers to dump the correct data.
I extended the tests to not only test the deprecated behavior, but also
the new schemes-requirement.
2014-01-06 08:32:07 +01:00
Fabien Potencier
146e6663ef
Revert "bug #9601 [Routing] Remove usage of deprecated _scheme requirement (Danez)"
...
This reverts commit 0af3d19c38
, reversing
changes made to d56cc4b2cb
.
2014-01-06 08:27:41 +01:00
Fabien Potencier
a38e2c042b
fixes PSR-0 issues in tests
2013-12-30 22:13:42 +01:00
Daniel Tschinder
557dfaa2c1
Remove usage of deprecated _scheme in Routing Component
...
Instead correctly use the array of schemes from the Route.
Also adjusted the dumpers to dump the correct data.
I extended the tests to not only test the deprecated behavior, but also
the new schemes-requirement.
2013-12-13 00:37:21 +01:00
Tobias Schultze
719e0377bb
[FrameworkBundle] fix routing container parameter exception message
...
also improve regex performance and fix implementation-specific written tests and typo
2013-10-31 16:19:00 +01:00
Tobias Schultze
8513ac9a10
[Routing] added working test case for issue #5135
2013-10-24 15:23:46 +02:00
Fabien Potencier
94f6116f42
renamed hostname to host in the routing system ( closes #6775 )
...
As explained in #6775 , this has been done for the following reasons:
1. It's also Request::getHost()
2. The term hostname has been obsoleted in
http://tools.ietf.org/html/rfc3986#appendix-D.2 and uses the host only
3. hostname in the RFC was defined as the registered domain name, but we
probably also want to match IP-Adresses with the pattern which is the
host = IP-literal / IPv4address / reg-name for.
2013-01-21 17:57:32 +01:00
Fabien Potencier
463b464c10
replaced usage of Route::getPattern() by Route::getPath()
2013-01-16 23:04:10 +01:00
Fabien Potencier
b357cafd00
[Routing] renamed hostname pattern to just hostname
2013-01-14 17:14:02 +01:00
Mario A. Alvarez Garcia
c8e65a28e9
[FrameworkBundle][Routing] Resolve placeholders in hostnamePattern rules
2012-11-27 17:22:45 -05:00
Fabien Potencier
224d6b7925
Merge branch '2.1'
...
* 2.1:
[FrameworkBundle] Router skip defaults resolution for arrays
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
2012-11-07 07:48:28 +01:00
Antoine Hérault
208e134945
[FrameworkBundle] Router skip defaults resolution for arrays
2012-11-06 16:30:03 +01:00
Klein Florian
4b867654c6
[FrameworkBundle] recursively resolve container parameter placeholders
...
for arrays in router _defaults
2012-07-23 16:44:28 +02:00
Fabien Potencier
9e32d9029f
[FrameworkBundle] tweaked previous merge
2012-07-10 08:56:32 +02:00
Tim Nagel
a1d1a02b47
Null default value route regression
2012-07-10 13:59:45 +10:00
Victor Berchet
0555913fbb
[FrameworkBundle] Allow using kernel parameters in routes
...
Kernel parameters can now be used at any position in patterns, defaults and requirements.
2012-07-04 14:47:36 +02:00
Eriksen Costa
013f998bb8
updated license blocks
2012-03-31 18:00:32 -03:00