Commit Graph

15796 Commits

Author SHA1 Message Date
Fabien Potencier
aabd8fca3c bug #9537 [FrameworkBundle] Fix mistake in translation's service definition. (phpmike)
This PR was submitted for the 2.3 branch but it was merged into the 2.2 branch instead (closes #9537).

Discussion
----------

[FrameworkBundle] Fix mistake in translation's service definition.

Wrong class parameter fixed.

Commits
-------

b542e84 [FrameworkBundle] Fix mistake in translation's service definition.
2013-11-19 19:26:27 +01:00
Michaël VEROUX
5719d84ae4 Fix mistake in translation's service definition. 2013-11-19 19:26:27 +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
Rafael Dohms
9e7788ea80 Cache Warmup Breaks Namespaced Kernel
My kernel has been moved and namespaced to `Cfs\Bundle\MultiSiteBundle\Kernel\CfsKernel`. This worked fine until a change was made to how the kernel temp stuff is handled in the warmup phase.

When the app generates its own cache (i.e you run cache without warmup and access the site) everything is generated ok and the .meta files generate the proper reference to the FQN of the Kernel.

However if the warmup is used, it uses `Cfs\Bundle\MultiSiteBundle\Kernel\CfsKerne_` as the temporary Kernel, and when it does "fix references to the Kernel in .meta files" it generates 2 errors.

1. It does not use a string safe tempKernel name, so it never finds the reference to the kernel
2. If you fix that, then it replaces the FQN of the tempKernel with `CfsKernel`, the non-namespaced name of the proper Kernel (it also leaves the character count wrong in the serialization `C:43:<class>` where 43 is the char count for the FQN above)

The two changes above fix this, by escaping the string and replacing it with a FQN Kernel Class name.

What are your thoughts on this?
2013-11-18 11:39:25 +01:00
Peter Kokot
1b6b1e9bfb if handler_id is identical to null fix 2013-11-17 15:05:15 +01:00
Peter Kokot
f3487312b7 CS fix 2013-11-17 14:39:12 +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
805ea3e6cb minor #9517 [2.2] Fixed ModelChoiceList tests in Propel1 bridge (jakzal)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2] Fixed ModelChoiceList tests in Propel1 bridge

Tests on 2.2 are broken since #9469 was merged.

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

Commits
-------

1e2d14e Fixed ModelChoiceList tests in Propel1 bridge.
2013-11-16 14:25:39 +01:00
Jakub Zalas
1e2d14ebb5 Fixed ModelChoiceList tests in Propel1 bridge. 2013-11-16 13:14:05 +00:00
David Stone
edae59c242 [AclProvider] Fix incorrect behaviour when partial results returned from cache 2013-11-15 12:54:31 -07:00
Fabien Potencier
2375046a64 bug #9367 [Process] Check if the pipe array is empty before calling stream_select() (jfposton)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9367).

Discussion
----------

[Process] Check if the pipe array is empty before calling stream_select()

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

ProcessPipes generates a warning frequently which can cause issues for custom shutdown functions. Adding a check to see if the pipe array is empty should be functionally equivalent without having to generate the error.

Fixes: #9280

Commits
-------

12f95e2 [Process] Check if the pipe array is empty before calling stream_select()
2013-11-15 17:36:12 +01:00
Jonathan Poston
52a18ea163 Check if the pipe array is empty before calling stream_select() 2013-11-15 17:36:11 +01:00
Fabien Potencier
6316de572a bug #9211 [Form] Fixed memory leak in FormValidator (bschussek)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed memory leak in FormValidator

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

Commits
-------

1bb7e4d [Form] Added method Form::getClickedButton() to remove memory leak in FormValidator
5329ab5 [Form] Fixed memory leak in FormValidator
2013-11-14 21:58:12 +01:00
Tobias Schultze
077a089b4e unify missing parentheses 2013-11-14 15:30:56 +01:00
Tobias Schultze
2888594dbd unify short ternary operator 2013-11-14 15:22:38 +01:00
Fabien Potencier
2ef5e61888 minor #9506 [Intl] fixed datetime test as described in #9455 (andremaha)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] fixed datetime test as described in #9455

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

Commits
-------

056d836 [Intl] fixed datetime test as described in #9455
2013-11-14 14:43:31 +01:00
Fabien Potencier
43371bb754 bug #9469 [2.2][Propel1] re-factor Propel1 ModelChoiceList (havvg)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Propel1] re-factor Propel1 ModelChoiceList

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | fixes propelorm/Propel#789
| License       | MIT

replaces #9458

Commits
-------

613b5f6 re-factor Propel1 ModelChoiceList
2013-11-14 14:42:38 +01:00
Andrey Esaulov
056d83646f [Intl] fixed datetime test as described in #9455 2013-11-14 12:38:26 +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
5a7bacaa78 updated CHANGELOG for 2.3.7 2013-11-14 08:58:40 +01:00
Fabien Potencier
74201e01ce minor #9479 [Locale] fixed the failing test described in #9455 (andremaha)
This PR was merged into the 2.2 branch.

Discussion
----------

[Locale] fixed the failing test described in #9455

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

Commits
-------

3f91039 [Locale] fixed the failing test described in #9455
2013-11-14 06:54:51 +01: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
Tobias Schultze
2a9daff8d9 [HttpKernel] better written kernel tests 2013-11-11 19:41:19 +01:00
Tobias Schultze
111ac18232 unify constructor initialization style throughout symfony 2013-11-11 19:40:07 +01:00
Toni Uebernickel
613b5f647b re-factor Propel1 ModelChoiceList
* add BaseModelChoiceListTest ensuring compatibility
* fix keys and order are preserved
* fix lazy-load to use filters of initial query
2013-11-11 10:47:50 +01:00
Andrey Esaulov
7d35ce3584 [HttpFoundation] fixed the issue described in #9480 2013-11-09 17:25:44 +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