Commit Graph

320 Commits

Author SHA1 Message Date
Fabien Potencier
2aea588ceb updated VERSION for 2.5.0-BETA1 2014-04-11 22:04:22 +02:00
Fabien Potencier
77bfac719c Merge branch '2.4'
* 2.4:
  [Form][2.3] Fixes empty file-inputs getting treated as extra field.
  changed some PHPUnit assertions to more specific ones
  fixed Kernel::stripComments() normalizing new-lines
  added a BC comment
  Update FileLoader to fix issue #10339
  bumped Symfony version to 2.3.12
  updated VERSION for 2.3.11
  update CONTRIBUTORS for 2.3.11
  updated CHANGELOG for 2.3.11
  Throw exception when unable to normalize embedded object
  Fixed evaluation of short circuit operators
  Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline.
  [2.4][HttpKernel] Fix issue #10209 When the profiler has `only_exception` option activated and a subrequest throw an exception, the parent profile cannot be found.
2014-03-03 13:53:01 +01:00
Fabien Potencier
52f8dc7c1b Merge branch '2.3' into 2.4
* 2.3:
  changed some PHPUnit assertions to more specific ones
  fixed Kernel::stripComments() normalizing new-lines
  added a BC comment
  Update FileLoader to fix issue #10339
2014-03-01 18:35:04 +01:00
Sebastiaan Stok
63032c7c89 fixed Kernel::stripComments() normalizing new-lines
This makes normalizing new-lines less error-prone
when a string contains multiple new line-lines
2014-02-28 13:42:15 +01:00
Fabien Potencier
1c0fcd0252 bumped Symfony version to 2.3.12 2014-02-27 17:33:40 +01:00
Fabien Potencier
aa5b228e87 updated VERSION for 2.3.11 2014-02-27 15:55:30 +01:00
Fabien Potencier
82d9a76996 bumped Symfony version to 2.4.3 2014-02-12 22:00:41 +01:00
Fabien Potencier
b70633f92f updated VERSION for 2.4.2 2014-02-12 20:27:03 +01:00
Fabien Potencier
8fef4f0398 bumped Symfony version to 2.3.11 2014-02-12 20:09:40 +01:00
Fabien Potencier
e4b9ff28b7 updated VERSION for 2.3.10 2014-02-12 09:18:23 +01:00
Fabien Potencier
439664dabd bumped Symfony version to 2.4.2 2014-01-05 11:33:23 +01:00
Fabien Potencier
377a5fb23b updated VERSION for 2.4.1 2014-01-05 03:12:11 +01:00
Fabien Potencier
e7df0cfecd bumped Symfony version to 2.3.10 2014-01-05 03:02:33 +01:00
Fabien Potencier
ee1e0f2ef8 updated VERSION for 2.3.9 2014-01-05 02:24:54 +01:00
Fabien Potencier
18d69a8ff2 Merge branch '2.4'
* 2.4:
  removed unneeded use statements
  [DoctrineBridge] Fixed an issue with DoctrineParserCache
  removed unneeded use statements
  Prepend Child Bundle paths before the parent
  [Routing] add unit tests for Symfony\Component\Routing\RequestContext class
2014-01-01 10:16:05 +01:00
Fabien Potencier
e0402bae65 Merge branch '2.3' into 2.4
* 2.3:
  removed unneeded use statements
  Prepend Child Bundle paths before the parent
  [Routing] add unit tests for Symfony\Component\Routing\RequestContext class

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
	src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
	src/Symfony/Component/Validator/ConstraintValidatorFactory.php
2014-01-01 09:14:50 +01:00
Fabien Potencier
7f9a366529 removed unneeded use statements 2014-01-01 08:52:14 +01:00
Fabien Potencier
7d80045b22 Merge branch '2.4'
* 2.4:
  fixed typos
  Fixed deprecated method calls
  Add testing against HHVM at Travis-CI
  Fixed typo
  Fixed typo
  Fixed typo
  fixed acronyms
  [Validator] Fixed IBAN validator with 0750447346 value

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2013-12-28 22:40:48 +01:00
Fabien Potencier
3a1d2200b0 Merge branch '2.3' into 2.4
* 2.3:
  fixed typos
  Fixed deprecated method calls
  Add testing against HHVM at Travis-CI
  Fixed typo
  Fixed typo
  fixed acronyms
  [Validator] Fixed IBAN validator with 0750447346 value

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2013-12-28 22:39:51 +01:00
Fabien Potencier
15baa81fdc fixed acronyms 2013-12-28 09:33:14 +01:00
Fabien Potencier
eccd938479 bumped Symfony version to 2.3.9 2013-12-16 16:25:46 +01:00
Fabien Potencier
b0b421908d updated VERSION for 2.3.8 2013-12-16 15:36:05 +01:00
Fabien Potencier
de5790314d Merge branch '2.4'
* 2.4:
  [Debug] fixed tests
  ErrorHandlerTest: restore_error_handler() on assertion failure
  Fixed typo
  [validator] throw an exception if isn't an instance of ConstraintValidatorInterface.
  Reset the box model to content-box in the web debug toolbar
  [FrameworkBundle] Allowed "0" as a checkbox value in the php template.
  raising delta on stopwatch as travis really breaks with less than 35
  Switched to correct gender of "Token"
  bumped Symfony version to 2.4.1
  updated VERSION for 2.4.0
  updated CHANGELOG for 2.4.0
  fixed typos in several translations
  [HttpKernel] use static late binding when dumping out container

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-12-12 17:07:18 +01:00
Fabien Potencier
4147141e1f Merge branch '2.3' into 2.4
* 2.3:
  Fixed typo
  [validator] throw an exception if isn't an instance of ConstraintValidatorInterface.
  Reset the box model to content-box in the web debug toolbar
  [FrameworkBundle] Allowed "0" as a checkbox value in the php template.
  raising delta on stopwatch as travis really breaks with less than 35
  Switched to correct gender of "Token"
  fixed typos in several translations
  [HttpKernel] use static late binding when dumping out container
2013-12-12 17:06:47 +01:00
Fabien Potencier
0c71cfa14b minor #9678 [HttpKernel] use static late binding when dumping out container (tgabi333)
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #9678).

Discussion
----------

[HttpKernel] use static late binding when dumping out container

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no?
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |  #9649
| License       | MIT
| Doc PR        |

This PR gives the ability to override the stripComments method in descendants (and to disable the memory-eater container whitespace stripping)

Commits
-------

2e241cc [HttpKernel] use static late binding when dumping out container
2013-12-05 08:46:04 +01:00
Fabien Potencier
a20b9a4103 bumped Symfony version to 2.4.1 2013-12-03 18:55:46 +01:00
Fabien Potencier
2e47d2edd4 updated VERSION for 2.4.0 2013-12-03 16:23:03 +01:00
Fabien Potencier
e5362c1e8a Merge branch '2.4'
* 2.4:
  updated Composer suggested packages
  updated VERSION for 2.2.11
  update CONTRIBUTORS for 2.2.11
  updated CHANGELOG for 2.2.11
  Fixed typo in phpdoc
  Default form.csrf_protection.enabled to csrf_protection.enabled
  Handled the scenario when no entity manager is passed with closure query builder.
  Enabled csrf_protection by default if form.csrf_protection is enabled
  [HttpKernel] made a small optimization to Bundle initialization
  minor optimalization at bundle initialization
  [EventDispatcher] tweaked README
  removed observer pattern, in favour of mediator
  [DoctrineBridge] normalized class names in the ORM type guesser
  Fix `extract` method to avoid recalculating count() for each iteration.
  [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler
  use the correct class name to retrieve mapped class' metadata and repository
  [WebProfilerBundle] Fixed js escaping in time.html.twig
2013-12-03 15:52:29 +01:00
Fabien Potencier
d618762956 Merge branch '2.3' into 2.4
* 2.3:
  updated VERSION for 2.2.11
  update CONTRIBUTORS for 2.2.11
  updated CHANGELOG for 2.2.11
  Fixed typo in phpdoc
  Handled the scenario when no entity manager is passed with closure query builder.
  [HttpKernel] made a small optimization to Bundle initialization
  minor optimalization at bundle initialization
  [EventDispatcher] tweaked README
  removed observer pattern, in favour of mediator
  [DoctrineBridge] normalized class names in the ORM type guesser
  Fix `extract` method to avoid recalculating count() for each iteration.
  [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler
  use the correct class name to retrieve mapped class' metadata and repository
  [WebProfilerBundle] Fixed js escaping in time.html.twig

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
2013-12-03 15:52:22 +01:00
Fabien Potencier
40c097276d Merge branch '2.2' into 2.3
* 2.2:
  updated VERSION for 2.2.11
  update CONTRIBUTORS for 2.2.11
  updated CHANGELOG for 2.2.11
  [HttpKernel] made a small optimization to Bundle initialization
  minor optimalization at bundle initialization
  [EventDispatcher] tweaked README
  removed observer pattern, in favour of mediator
  [DoctrineBridge] normalized class names in the ORM type guesser
  Fix `extract` method to avoid recalculating count() for each iteration.
  use the correct class name to retrieve mapped class' metadata and repository
  [WebProfilerBundle] Fixed js escaping in time.html.twig

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
	src/Symfony/Component/HttpKernel/Kernel.php
2013-12-03 15:51:26 +01:00
Tóth Gábor
2e241cc606 [HttpKernel] use static late binding when dumping out container 2013-12-02 15:32:33 +01:00
Fabien Potencier
6a9c223b06 updated VERSION for 2.2.11 2013-12-02 08:14:10 +01:00
Fabien Potencier
3330c40621 [HttpKernel] made a small optimization to Bundle initialization 2013-11-30 13:45:29 +01:00
Gábor Tóth
4ba6c0b90e minor optimalization at bundle initialization
fast check to avoid six array method calls
2013-11-30 13:44:15 +01:00
Fabien Potencier
a5408b0a2a bumped Symfony version to 2.4.0 2013-11-25 22:22:41 +01:00
Fabien Potencier
32ceb0b89c updated VERSION for 2.4.0-RC1 2013-11-25 20:35:53 +01:00
Fabien Potencier
4aab341d59 updated version to 2.5 2013-11-24 21:17:07 +01:00
Fabien Potencier
a954df4b6e bumped Symfony version to 2.3.8 2013-11-14 10:43:43 +01:00
Fabien Potencier
2829b47187 updated VERSION for 2.3.7 2013-11-14 08:58:51 +01:00
Fabien Potencier
59a4313a52 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.11
  updated VERSION for 2.2.10
  update CONTRIBUTORS for 2.2.10
  updated CHANGELOG for 2.2.10
  fixed version
  Request::overrideGlobals() may call invalid ini value
  Force Luhn Validator to only work with strings
  [Translation] fixed the error in the dumper test as described in #9475
  [Console] fix phpdoc and constructor default value

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-11-13 22:27:40 +01:00
Fabien Potencier
16b01ec1bc bumped Symfony version to 2.2.11 2013-11-13 22:22:57 +01:00
Fabien Potencier
14979a3bf9 updated VERSION for 2.2.10 2013-11-13 15:29:12 +01:00
Fabien Potencier
72d961847f fixed version 2013-11-13 15:28:11 +01:00
Tobias Schultze
111ac18232 unify constructor initialization style throughout symfony 2013-11-11 19:40:07 +01:00
Fabien Potencier
72f1b62ffb bumped Symfony version to 2.4.0 2013-10-30 16:13:28 +01:00
Fabien Potencier
b6310973d7 updated VERSION for 2.4.0-BETA2 2013-10-30 14:25:52 +01:00
Fabien Potencier
f3bd125aed bumped Symfony version to 2.3.7 2013-10-10 16:16:40 +02:00
Fabien Potencier
d0597156c4 updated VERSION for 2.3.6 2013-10-10 15:24:22 +02:00
Fabien Potencier
2996c6b4c6 bumped Symfony version to 2.2.10 2013-10-10 15:10:05 +02:00
Fabien Potencier
6a5c6c0d76 updated VERSION for 2.2.9 2013-10-10 14:15:43 +02:00