Fabien Potencier
05c2ecc124
Merge branch '2.3' into 2.7
...
* 2.3:
added the new Composer exclude-from-classmap option
fix expected argument type docblock
Set back libxml settings after testings.
fixed Twig deprecation notices
2015-10-30 13:10:21 -07:00
Anne-Sophie Bachelard
65bef75bef
added the new Composer exclude-from-classmap option
2015-10-30 12:48:51 -07:00
Nicolas Grekas
309ad43b71
Merge branch '2.3' into 2.7
...
* 2.3:
[tests] Use @requires annotation when possible
[ci] Enable collecting and replaying skipped tests
[Process] Workaround buggy PHP warning
[Console] Add additional ways to detect OS400 platform
[Yaml] Allow tabs before comments at the end of a line
Conflicts:
composer.json
src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/composer.json
2015-10-10 11:26:25 +02:00
Nicolas Grekas
4032c88a21
[ci] Enable collecting and replaying skipped tests
2015-10-10 10:46:02 +02:00
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
Fabien Potencier
b8cd3ca3f8
Merge branch '2.3' into 2.6
...
* 2.3:
link to https://symfony.com where possible
[FrameworkBundle] Added missing log in server:run command
[HttpFoundation] Allow curly braces in trusted host patterns
[profiler][security] check authenticated user by tokenClass instead of username.
Use https://symfony.com/search for searching
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
src/Symfony/Component/Form/README.md
src/Symfony/Component/Intl/README.md
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/README.md
src/Symfony/Component/Translation/README.md
src/Symfony/Component/Validator/README.md
2015-05-02 17:18:45 +02:00
Christian Flothmann
bf8a1ce2a2
link to https://symfony.com where possible
2015-05-01 16:06:45 +02:00
Tobias Schultze
4e85901380
Use PSR-4 everywhere instead of PSR-0
2015-04-11 23:38:32 +02:00
Fabien Potencier
5503804cf9
removed 3.0 constraints from 2.7 composer files
2015-04-10 09:23:38 +02:00
Nicolas Grekas
2f3692aca7
Merge branch '2.3' into 2.6
...
* 2.3:
Minor hot fix
[PROCESS] make sure /dev/tty is readable
[2.3] require-dev PHPUnit bridge
[FrameworkBundle] Fixed Shell logo
[2.3] Update CONTRIBUTING.md
[2.3][Process] Fixed PhpProcess::getCommandLine() result
[Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
Enforce UTF-8 charset for core controllers
Conflicts:
CONTRIBUTING.md
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Templating/composer.json
2015-02-24 12:52:21 +01:00
Nicolas Grekas
8b02796e9e
[2.3] require-dev PHPUnit bridge
2015-02-24 11:24:26 +01:00
Nicolas Grekas
acac734d08
[PhpUnitBridge] new bridge for testing with PHPUnit
2015-02-18 11:38:04 +01:00
Fabien Potencier
6dc897931b
bumped min PHP version to 5.3.9
2015-01-09 07:51:41 +01:00
Nicolas Grekas
b369bb6eed
[2.7] Allow 3.0 requirements
2014-12-27 12:44:51 +01:00
Fabien Potencier
d94d837e9e
updated version to 2.7
2014-11-10 19:00:54 +01:00
Fabien Potencier
a11645c637
updated version to 2.6
2014-05-23 16:36:49 +02:00
Fabien Potencier
4aab341d59
updated version to 2.5
2013-11-24 21:17:07 +01:00
Fabien Potencier
485802de94
updated version to 2.4
2013-05-16 09:54:39 +02:00
Fabien Potencier
3aa37b59e6
[Config] added missing dep in composer.json
2013-04-21 16:30:01 +02:00
Fabien Potencier
d0aaf62557
updated the branch alias in composer files
2013-01-31 22:39:01 +01:00
Filippo Tessarotto
45bf52358e
Optimize autoload prefix in composer.json
...
By having more specific autoload prefixes it is possible to reduce the
number of stat calls made. Also it prevents conflicts with similar
namespaces.
2012-09-28 09:34:16 +02:00
Fabien Potencier
4dc197c3e1
udpated composer.json to 2.2
2012-09-06 20:45:30 +02:00
William DURAND
933e821496
Add minimum-stability (dev) in each component
2012-08-22 15:48:41 +02:00
Fabien Potencier
cd24e6ea8f
Revert "raised the minimum version of PHP to 5.3.4 ( closes #3856 )"
...
This reverts commit 2dcc44897e
.
2012-07-15 12:13:51 +02:00
Fabien Potencier
2dcc44897e
raised the minimum version of PHP to 5.3.4 ( closes #3856 )
...
We've raised the minimum version of PHP because of a PHP
bug before 5.3.4:
https://bugs.php.net/bug.php?id=52083
https://bugs.php.net/bug.php?id=50027
2012-07-13 21:22:46 +02:00
Fabien Potencier
3719c70870
updated minimum PHP version to 5.3.3
...
5.3.3 has some interesting fixes and this is the version used by
Redhat 6 and Debian 6
2012-05-07 10:29:11 +02:00
Fabien Potencier
9fbf8555f0
Revert "merged branch Seldaek/master (PR #4133 )"
...
This reverts commit 00e7a94a8c
, reversing
changes made to a01dec00f4
.
2012-04-27 19:55:40 +02:00
Jordi Boggiano
00c4267726
Update branch aliases
2012-04-27 12:47:50 +02:00
Jordi Boggiano
bafcaafbe6
Removed version field
2012-02-27 09:59:20 +01:00
Jordi Boggiano
f9d9dc7ce9
Add branch-alias for composer
2012-02-25 03:26:20 +01:00
Fabien Potencier
8ce034fae0
Revert "merged 2.0"
...
This reverts commit 7000e944fd
, reversing
changes made to 9d9013d662
.
2012-01-08 20:43:02 +01:00
Fabien Potencier
208c2e468c
removed the version attribute in all composer.json files
2012-01-05 14:51:20 +01:00
Fabien Potencier
d1ae6c7cb6
bumped Symfony version in composer.json files to 2.0.7
2011-11-17 06:58:47 +01:00
Fabien Potencier
f8f622b39c
bumped Symfony version to 2.0.6-DEV
2011-11-02 14:18:45 +01:00
Fabien Potencier
7f21a5e979
bumped Symfony version in composer.json files to 2.0.5
2011-11-02 12:42:41 +01:00
Fabien Potencier
d7a5351aaa
updated composer.json files to contain information about autoloading and target dirs
2011-11-01 12:30:24 +01:00
Igor Wiedler
9ade639bb4
[composer] add composer.json
2011-09-27 00:55:43 +02:00