Commit Graph

15718 Commits

Author SHA1 Message Date
Hugo Hamon
2e07338c5c [FrameworkBundle] use the new request_stack service to get the Request object in the base Controller class 2013-11-21 11:59:04 +01:00
Fabien Potencier
8d85745430 minor #9518 Fixed typos (pborreli)
This PR was merged into the master branch.

Discussion
----------

Fixed typos

Commits
-------

8ebf7c5 Fixed typos
2013-11-19 19:29:47 +01:00
Fabien Potencier
1a992908f1 minor #9531 Add missing dependency to expression-language (armetiz)
This PR was merged into the master branch.

Discussion
----------

Add missing dependency to expression-language

Add missing dependency, without this dependency, PHPUnit can't run successfully.

Commits
-------

4206e98 Add missing dependency to expression-language
2013-11-19 19:25:17 +01:00
Fabien Potencier
c18ba190cf Merge pull request #9532 from fzaninotto/bug_trait_executable
Remove executable bit on ContainerAwareTrait PHP file
2013-11-19 10:12:24 -08:00
Francois Zaninotto
76efcc7f8c Remove executable bit on PHP file 2013-11-19 14:48:58 +01:00
Thomas Tourlourat
4206e98f01 Add missing dependency to expression-language 2013-11-19 14:20:36 +01:00
Fabien Potencier
4f51f0f1c3 bug #9529 [ExpressionLanguage] Fixed conflict between punctation and range (WouterJ)
This PR was squashed before being merged into the master branch (closes #9529).

Discussion
----------

[ExpressionLanguage] Fixed conflict between punctation and range

The range operator (`..`) was actually lexed as 2 punctations (`.`). That causes any expression using the range to fail.

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

Commits
-------

b521dc5 [ExpressionLanguage] Fixed conflict between punctation and range
2013-11-18 22:05:18 +01:00
Wouter J
b521dc5ace [ExpressionLanguage] Fixed conflict between punctation and range 2013-11-18 22:05:18 +01:00
Fabien Potencier
4e9332b6b6 minor #9519 [Debug] Fixed a typo. (jakzal)
This PR was merged into the master branch.

Discussion
----------

[Debug] Fixed a typo.

@pborreli style ;)

Commits
-------

df90c62 [Debug] Fixed a typo.
2013-11-17 09:45:14 +01:00
Jakub Zalas
df90c623f9 [Debug] Fixed a typo. 2013-11-16 18:00:51 +00:00
Pascal Borreli
8ebf7c5515 Fixed typos 2013-11-16 15:13:54 +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
7e744370d7 update CONTRIBUTORS for 2.2.10 2013-11-13 15:29:00 +01:00
Fabien Potencier
09da15b24d updated CHANGELOG for 2.2.10 2013-11-13 15:28:18 +01:00
Fabien Potencier
72d961847f fixed version 2013-11-13 15:28:11 +01:00
Fabien Potencier
2866bd4956 bug #9499 Request::overrideGlobals() may call invalid ini value (denkiryokuhatsuden)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9499).

Discussion
----------

Request::overrideGlobals() may call invalid ini value

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

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 (sets falsy value to )
'request_order' ini value and sets 'variable_order' manually?

Commits
-------

7f43fb8 Request::overrideGlobals() may call invalid ini value
2013-11-13 09:30:53 +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
1667197875 feature #9494 made Router implement RequestMatcherInterface (fabpot)
This PR was merged into the master branch.

Discussion
----------

made Router implement RequestMatcherInterface

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

Commits
-------

42346ea made Router implement RequestMatcherInterface
2013-11-12 22:52:06 +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
Fabien Potencier
bde28cb3b3 bug #9212 [Validator] Force Luhn Validator to only work with strings (Richtermeister)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9212).

Discussion
----------

[Validator] 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.

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

Commits
-------

a9dfd37 Force Luhn Validator to only work with strings
2013-11-09 16:57:10 +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
Fabien Potencier
78e9acbbc5 minor #9477 [Translation] fixed the error in the dumper test as described in #9475 (andremaha)
This PR was merged into the 2.2 branch.

Discussion
----------

[Translation] fixed the error in the dumper test as described in #9475

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

Commits
-------

853404a [Translation] fixed the error in the dumper test as described in #9475
2013-11-09 16:48:40 +01:00
Fabien Potencier
e728f83de9 bug #9476 Fixed bug with lazy services (peterrehm)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9476).

Discussion
----------

Fixed bug with lazy services

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

Commits
-------

8881c75 Fixed bug with lazy services
2013-11-09 16:43:33 +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
Fabien Potencier
4f0f216d91 minor #9454 [PropertyAccess] "__call()" should be displayed only if magicCall is true (aitboudad)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #9454).

Discussion
----------

[PropertyAccess] "__call()" should be displayed only if magicCall is true

Commits
-------

391fbc5 [PropertyAccess] deleted mixing string concatenation inside a sprintf
db2f944 [PropertyAccess] "__call()" should be displayed only if $this->magicCall is true
2013-11-09 12:59:40 +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
527269a7b6 minor #9467 [Console] fix phpdoc and constructor default value (Tobion)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] fix phpdoc and constructor default value

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

Commits
-------

fa4075e [Console] fix phpdoc and constructor default value
2013-11-09 12:36:54 +01:00
Fabien Potencier
d7db2452f1 minor #9347 [WebProfilerBundle] Small bugfix in CSS: don't make links bold. (bobdenotter)
This PR was merged into the 2.3 branch.

Discussion
----------

[WebProfilerBundle] Small bugfix in CSS: don't make links bold.

If the CSS in your application has something like `a { font-weight: bold; }` to make links bold by default, they will also show up **bold** in the profilers toolbar, which doesn't look right. This patch explicitly sets the font-weight to 'normal', as it should be.

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

Commits
-------

984566d Add media-query for printing: Do not print the toolbar.
cf1b7cf Update toolbar.css.twig
b6738b6 Set the font-weight for links to 'normal', to prevent ugly bold links.
2013-11-09 12:27:55 +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
Fabien Potencier
fe9c8bf340 minor #9473 Fixed ExpressionLanguage Readme (peterrehm)
This PR was merged into the master branch.

Discussion
----------

Fixed ExpressionLanguage Readme

Added missing parameter due to which the code in the documentation was not executable.

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

Commits
-------

03a76f5 Added missing parameter to the compile function
2013-11-08 17:04:41 +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
Bob den Otter
984566d9df Add media-query for printing: Do not print the toolbar. 2013-11-05 16:26:57 +01:00
Giorgio Premi
5eca1fb01a Fix ProgressHelper redraw when redrawFreq is greater than 1 2013-11-05 16:14:13 +01:00
Bob den Otter
cf1b7cfdef Update toolbar.css.twig 2013-11-05 16:00:59 +01:00