This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php
Fabien Potencier 42e3ecbe78 Merge branch '2.6' into 2.7
* 2.6: (25 commits)
  [2.6] link to https://symfony.com where possible
  Do not override PHP constants, only use when available
  link to https://symfony.com where possible
  [FrameworkBundle] Added missing log in server:run command
  [Finder] Only use GLOB_BRACE when available
  [HttpFoundation] Allow curly braces in trusted host patterns
  Fix merge
  Fix typo in variable name
  [profiler][security] check authenticated user by tokenClass instead of username.
  [WebProfiler] fix html syntax for input types
  [TwigBundle] Fix deprecated use of FlattenException
  [DependencyInjection] Removed extra strtolower calls
  Use https://symfony.com/search for searching
  [Debug] PHP7 compatibility with BaseException
  [Validator] Fixed Choice when an empty array is used in the "choices" option
  Fixed tests
  [StringUtil] Fixed singularification of 'selfies'
  Fix Portuguese (Portugal) translation for Security
  improved exception when missing required component
  [DependencyInjection] resolve circular reference
  ...

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
	src/Symfony/Component/Form/README.md
	src/Symfony/Component/Intl/README.md
	src/Symfony/Component/Security/README.md
	src/Symfony/Component/Translation/README.md
	src/Symfony/Component/Validator/README.md
2015-05-02 17:21:08 +02:00
..
services1-1.php Merge branch '2.3' into 2.6 2015-03-27 11:19:51 +01:00
services1.php CS: general fixes 2015-03-25 00:47:08 +01:00
services8.php CS: general fixes 2015-03-25 00:47:08 +01:00
services9_compiled.php Merge branch '2.6' into 2.7 2015-05-02 17:21:08 +02:00
services9.php Merge branch '2.6' into 2.7 2015-03-27 11:22:45 +01:00
services10.php Merge branch '2.3' into 2.6 2015-04-27 14:43:05 +02:00
services12.php Merge branch '2.3' into 2.6 2015-04-27 14:43:05 +02:00
services19.php Fix merge 2015-03-27 19:02:17 +01:00
services20.php Fix merge 2015-03-27 19:18:01 +01:00
simple.php moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00