Commit Graph

8478 Commits

Author SHA1 Message Date
Wouter J
b521dc5ace [ExpressionLanguage] Fixed conflict between punctation and range 2013-11-18 22:05:18 +01:00
Jakub Zalas
df90c623f9 [Debug] Fixed a typo. 2013-11-16 18:00:51 +00:00
Fabien Potencier
587f355137 Merge branch '2.3'
* 2.3: (25 commits)
  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
  Fixed bug with lazy services
  [Translation] fixed the error in the dumper test as described in #9475
  deleted mixing string concatenation inside a sprintf
  "__call()" should be displayed only if $this->magicCall is true
  [Console] fix phpdoc and constructor default value
  Add media-query for printing: Do not print the toolbar.
  Fix ProgressHelper redraw when redrawFreq is greater than 1
  Update toolbar.css.twig
  slovenian translations fixed
  slovenian translations fixed
  [DependencyInjection] fixed YamlDumper did not make services private.
  [FrameworkBundle] fix routing container parameter exception message
  [Form] fix and unify phpdoc
  ...

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-11-13 22:30:16 +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
Daisuke Ohata
9bc76ca13d Request::overrideGlobals() may call invalid ini value
According to http://php.net/manual/ja/ini.core.php ,
there's not variable_order, but variables_order (with trailing "s").

Perhaps it breaks BC for some developer who unsets
'request_order' ini value and sets 'variable_order' manually?
2013-11-13 09:30:53 +01:00
Fabien Potencier
42346ea3a2 made Router implement RequestMatcherInterface 2013-11-12 08:05:02 +01:00
Fabien Potencier
b76ac2f865 [Console] simplified code (refs #9420) 2013-11-09 17:01:15 +01:00
Fabien Potencier
d5436e38e9 bug #9420 [Console][ProgressHelper] Fix ProgressHelper redraw when redrawFreq is greater than 1 (giosh94mhz)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console][ProgressHelper] Fix ProgressHelper redraw when redrawFreq is greater than 1

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

When using a ProgressHelper object with redrawFreq > 1, there are situation where redraw may never occur.
E.g.

    redrawFreq = 2
    setContent = 1
    advance(2) ... the redraw event is detected by 0 == current % redrawFreq.

I've tested the patch against phpunit and my local environment.

Maybe, a new test can be implemented to avoid the previous example, but I'm not familiar with mock object... :)

Commits
-------

5eca1fb Fix ProgressHelper redraw when redrawFreq is greater than 1
2013-11-09 16:59:42 +01:00
Daniel Richter
1e410c7bcb Force Luhn Validator to only work with strings
The Luhn Validator fails to work with float or large integers (internally turned into float by php, depending on precision setting).
This is problematic because developers might use number or integer form fields to capture credit card data, which will lead to a validation error even though the form input itself was valid. This commit makes validator throw UnexpectedTypeException on non-string input to avoid this confusion.
2013-11-09 16:57:10 +01:00
Peter Rehm
9010e4657a Fixed bug with lazy services 2013-11-09 16:43:20 +01:00
Andrey Esaulov
853404a11e [Translation] fixed the error in the dumper test as described in #9475 2013-11-09 13:40:25 +01:00
Fabien Potencier
b9b7c8ac8e minor #9427 adjust doctrine dependencies (Tobion)
This PR was merged into the master branch.

Discussion
----------

adjust doctrine dependencies

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

I went through all components/bundles/bridges in symfony and searched for doctrine dependencies. Then looked if it only requires a subset (annotations instead of common for example).

Commits
-------

7366901 adjust doctrine dependencies
2013-11-09 13:05:18 +01:00
Fabien Potencier
b8ec2bfdf0 minor #9407 [Process] Renamed flushOutput() and flushErrorOutput() to clearOutput() and clearErrorOutput() (bschussek)
This PR was merged into the master branch.

Discussion
----------

[Process] Renamed flushOutput() and flushErrorOutput() to clearOutput() and clearErrorOutput()

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

I renamed `flushOutput()` and `flushErrorOutput()` to `clearOutput()` and `clearErrorOutput()` since I find the current naming unintuitive. When reading [the blog post about this feature](http://symfony.com/blog/new-in-symfony-2-4-flushing-stdout-and-stderr-on-a-process) I initially thought that the output would be flushed to the console (as in `ob_flush()`).

Using "clear" on the other hand conforms well with [our conventions](http://symfony.com/doc/current/contributing/code/conventions.html).

Commits
-------

1811367 [Process] Renamed flushOutput() and flushErrorOutput() to clearOutput() and clearErrorOutput()
2013-11-09 13:03:12 +01:00
Abdellatif AitBoudad
1727bece84 deleted mixing string concatenation inside a sprintf 2013-11-09 12:59:39 +01:00
Abdellatif AitBoudad
5b0f8787cf "__call()" should be displayed only if $this->magicCall is true 2013-11-09 12:59:39 +01:00
Fabien Potencier
705384bc5f minor #9450 Fixed typos (pborreli)
This PR was squashed before being merged into the master branch (closes #9450).

Discussion
----------

Fixed typos

Commits
-------

e8af42e Fixed typos
2013-11-09 12:55:32 +01:00
Pascal Borreli
e8af42e780 Fixed typos 2013-11-09 12:55:32 +01:00
Fabien Potencier
d30ffe6d2e bug #9461 set mergeFallback to true, (ychadwick)
This PR was merged into the master branch.

Discussion
----------

set mergeFallback to true,

If your default locale is de_CH for example, then you get an incomplete list of locales. This issue has been resolved in the LanguageBundle and RegionBundle but not in for the LocaleBundle. Would be also a good idea for the CurrencyBundle

Commits
-------

4587d4e set mergeFallback to true, otherwise an uncomplete list is shown with default locale is for example de_CH
2013-11-09 12:39:25 +01:00
Fabien Potencier
99b2570803 bug #9451 Fix bug with variable named context to securityContext (mieszko4)
This PR was merged into the master branch.

Discussion
----------

Fix bug with variable named context to securityContext

Commits
-------

38433d7 Fix bug with variable named context to securityContext in SimplePreAuthenticationListener->handle function
2013-11-09 12:25:24 +01:00
Peter Rehm
03a76f5da1 Added missing parameter to the compile function 2013-11-08 16:59:08 +01:00
Tobias Schultze
fa4075e6d1 [Console] fix phpdoc and constructor default value 2013-11-08 01:49:34 +01:00
Yorkie Chadwick
4587d4e28a set mergeFallback to true, otherwise an uncomplete list is shown with default locale is for example de_CH 2013-11-07 16:35:54 +01:00
Tobias Schultze
7366901691 adjust doctrine dependencies 2013-11-07 14:20:52 +01:00
mieszko4
38433d765c Fix bug with variable named context to securityContext in SimplePreAuthenticationListener->handle function 2013-11-05 22:11:59 +01:00
Giorgio Premi
5eca1fb01a Fix ProgressHelper redraw when redrawFreq is greater than 1 2013-11-05 16:14:13 +01:00
Fabien Potencier
0ab9c8d046 moved logic for the session listeners into the HttpKernel component 2013-11-04 07:11:47 +01:00
Fabien Potencier
25160e39d2 minor #9437 Slovenian translations fixed for Symfony 2.3 (peterkokot)
This PR was merged into the 2.3 branch.

Discussion
----------

Slovenian translations fixed for Symfony 2.3

Commits
-------

1ec42ec slovenian translations fixed
2013-11-04 07:10:28 +01:00
Fabien Potencier
8f0faee45e Merge branch '2.2' into 2.3
* 2.2:
  slovenian translations fixed
  [DependencyInjection] fixed YamlDumper did not make services private.
  [FrameworkBundle] fix routing container parameter exception message
  update CONTRIBUTORS
  added content length header to BinaryFileResponse
  [Routing] added working test case for issue #5135
2013-11-04 07:09:51 +01:00
Peter Kokot
08191303cd slovenian translations fixed 2013-11-04 02:00:27 +01:00
Peter Kokot
1ec42ec590 slovenian translations fixed 2013-11-04 01:55:20 +01:00
Rouven Weßling
e8c2082c04 [DependencyInjection] fixed YamlDumper did not make services private. 2013-11-03 00:57:38 +01:00
Fabien Potencier
dec28d19d6 bug #9332 [Config] Quoting reserved characters (WouterJ)
This PR was merged into the master branch.

Discussion
----------

[Config] Quoting reserved characters

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

Commits
-------

a5c0123 Use Inline class to quote reserved characters
2013-11-01 07:15:42 +01:00
Wouter J
a5c0123e35 Use Inline class to quote reserved characters 2013-10-31 20:29:46 +01:00
Fabien Potencier
3502ca22a6 minor #9244 [Console] make parent constructor test more reliable (Tobion)
This PR was merged into the master branch.

Discussion
----------

[Console] make parent constructor test more reliable

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixes   | #9186 , f2b60e9
| Tests pass?   | yes
| license?      | MIT

It also fixes the test since f2b60e9 and improves phpdoc

The second commit improves regex performance to validate name (using possesive quantifier).

I did some basic performance tests http://3v4l.org/PuvuL
The new regex only takes 1/3 of the time compared to the old one!

Commits
-------

5798029 [Console] improve regex performance to validate name
22b09ce [Console] make parent constructor test more reliable
2013-10-31 17:40:24 +01:00
Fabien Potencier
cac4aaa4ee bug #9416 fixed issue with clone now the children of the original form are preserved and the clone form is given new children (yjv)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed issue with clone now the children of the original form are preserved and the clone form is given new children

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

Commits
-------

b952bcb fixed issue with clone now the children of the original form are preserved and the clone form is given new children
2013-10-31 16:59:00 +01:00
Fabien Potencier
7455650904 bug #9423 [Form] fix CsrfProviderAdapter (Tobion)
This PR was merged into the master branch.

Discussion
----------

[Form] fix CsrfProviderAdapter

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixes   | #9418
| Tests pass?   | yes
| license?      | MIT

Commits
-------

887f71c [Form] fix CsrfProviderAdapter
2013-10-31 16:58:10 +01:00
Fabien Potencier
81ceee5f9a minor #9425 [Form] fix and unify phpdoc (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] fix and unify phpdoc

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| license?      | MIT

- Fixes FormTypeGuesserInterface that must return ValueGuess for guessRequired etc. instead of abstract Guess because its excepted for example by FormFactory.
- Unify array typehints that was not done consistently.

Commits
-------

7a754c3 [Form] fix and unify phpdoc
2013-10-31 16:57:44 +01:00
Tobias Schultze
7a754c36a4 [Form] fix and unify phpdoc 2013-10-31 15:15:49 +01:00
Tobias Schultze
887f71c18c [Form] fix CsrfProviderAdapter 2013-10-31 14:22:03 +01:00
Fabien Potencier
f7692beec7 [HttpKernel] added missing use statement 2013-10-31 12:15:14 +01:00
Joseph Deray
b952bcbf9a fixed issue with clone now the children of the original form are preserved and the clone form is given new children 2013-10-30 18:44:30 -04:00
Kevin Bond
2b8029e469 added content length header to BinaryFileResponse 2013-10-30 17:57:35 +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
Bernhard Schussek
4807c5effc [Form] Fixed failing FormDataExtractorTest 2013-10-30 13:42:39 +01:00
Bernhard Schussek
18113672c1 [Process] Renamed flushOutput() and flushErrorOutput() to clearOutput() and clearErrorOutput() 2013-10-30 13:27:00 +01:00
Fabien Potencier
23f12faa53 fixed CS 2013-10-30 09:33:58 +01:00