Commit Graph

14559 Commits

Author SHA1 Message Date
Jérôme Tamarelle
9ac3556825 [DependencyInjection] Add exception for service name not dumpable in PHP 2013-07-19 09:14:04 +02:00
Fabien Potencier
40f7e6875f bumped Symfony version to 2.3.3-DEV 2013-07-17 10:47:37 +02:00
Fabien Potencier
b82eb2f371 updated VERSION for 2.3.2 2013-07-17 08:22:21 +02:00
Fabien Potencier
1672396654 updated CHANGELOG for 2.3.2 2013-07-17 08:22:04 +02:00
Fabien Potencier
a3fbf0082d Merge branch '2.2' into 2.3
* 2.2:
  fixed typo
  bumped Symfony version to 2.2.5
  updated VERSION for 2.2.4
  update CONTRIBUTORS for 2.2.4
  updated CHANGELOG for 2.2.4
  Fixed NativeSessionStorage:regenerate when does not exists
  removed extraneous whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-07-17 07:57:53 +02:00
Fabien Potencier
ddebe064db fixed typo 2013-07-16 10:48:55 +02:00
Fabien Potencier
002d9e80e9 bumped Symfony version to 2.2.5 2013-07-15 22:44:57 +02:00
Fabien Potencier
76f918a125 updated VERSION for 2.2.4 2013-07-15 14:28:01 +02:00
Fabien Potencier
732f1f8f0d update CONTRIBUTORS for 2.2.4 2013-07-15 14:27:44 +02:00
Fabien Potencier
97e0c4f9e9 updated CHANGELOG for 2.2.4 2013-07-15 14:27:43 +02:00
Fabien Potencier
579dbe2b94 merged branch lyrixx/fix-8460 (PR #8479)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8479).

Discussion
----------

 	[HttpFoundation] Fixed NativeSessionStorage:regenerate when does not exists

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

**warning** I did not try to reproduce this bug, so I am not sure it fixes the issue. I just open a PR with the suggested patch. Tests for http foundation are OK. I am not sur it's the best way to fix this issue as I do not understand why symfony reach this code if $_SESSION is not set.

Commits
-------

f5d59fb [HttpFoundation] Fixed NativeSessionStorage:regenerate when  does not exists
2013-07-15 14:12:07 +02:00
Grégoire Pineau
52e530da1f Fixed NativeSessionStorage:regenerate when does not exists 2013-07-15 14:12:07 +02:00
Fabien Potencier
adde057877 removed extraneous whitespaces 2013-07-13 21:08:31 +02:00
Fabien Potencier
c2c156835f Merge branch '2.2' into 2.3
* 2.2:
  Reverts JSON_NUMERIC_CHECK
  Just a Typo
  [Yaml] removed wrong comment removal inside a string block
  Fixing configuration validation error messages.
  [HtppKernel] fixed inline fragment renderer
  fixed inline fragment renderer
  ProgressHelper shows percentage complete.
  Comment fixed: RedrawFrequency is measured in steps.
  fix handling of a default 'template' as a string

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
2013-07-11 21:36:36 +02:00
Fabien Potencier
d3f16d0ea0 merged branch genexp/master (PR #8477)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8477).

Discussion
----------

Reverts recent change that added type coercion for JSON responses

We shouldn't be coercing primitive in the array provided to setData.

Commits
-------

02e6aef Reverts JSON_NUMERIC_CHECK
2013-07-11 21:34:16 +02:00
Brian Corrigan
bb59f40178 Reverts JSON_NUMERIC_CHECK
We shouldn't be coercing types.
2013-07-11 21:34:16 +02:00
Fabien Potencier
c5f8a8a1ee merged branch mborgmann/patch-2 (PR #8476)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8476).

Discussion
----------

Just a typo

Just a typo in the doc

Commits
-------

fdaf59f Just a Typo
2013-07-11 17:52:52 +02:00
Moritz Borgmann
306b704bb0 Just a Typo 2013-07-11 17:52:51 +02:00
Fabien Potencier
81a49c638a merged branch jfsimon/issue-8145 (PR #8472)
This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] removed wrong comment removal inside a string block

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

Commits
-------

9c5f8c6 [Yaml] removed wrong comment removal inside a string block
2013-07-11 17:50:16 +02:00
Fabien Potencier
577bc82b02 merged branch jfsimon/issue-8450 (PR #8468)
This PR was merged into the 2.2 branch.

Discussion
----------

[HtppKernel] fixed inline fragment renderer

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

Commits
-------

2dc1ee0 [HtppKernel] fixed inline fragment renderer
2013-07-11 17:49:50 +02:00
Jean-François Simon
9c5f8c6b96 [Yaml] removed wrong comment removal inside a string block 2013-07-11 11:28:01 +02:00
Fabien Potencier
69772b90e4 merged branch seiffert/master (PR #8465)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8465).

Discussion
----------

[Config] Fixed error messages of min/max validation methods

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

This PR fixes the error messages of the configuration validation methods `min` and `max`. The error message was "Should be greater/less than: <value>" but should be "Should be greater/less than or equal to <value>".

Commits
-------

3395837 Fixing configuration validation error messages.
2013-07-10 16:03:01 +02:00
Paul Seiffert
aaa40e5902 Fixing configuration validation error messages.
The min and max validation functions lead to incorrect error messages.
2013-07-10 16:03:01 +02:00
Jean-François Simon
2dc1ee04b4 [HtppKernel] fixed inline fragment renderer 2013-07-10 16:02:46 +02:00
Fabien Potencier
183ff09bf1 merged branch jfsimon/issue-8450 (PR #8462)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8462).

Discussion
----------

[HttpKernel] fixed inline fragment renderer

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

Commits
-------

1554f1f [HttpKernel] fixed inline fragment renderer
2013-07-10 09:34:46 +02:00
Jean-François Simon
06b69b859a fixed inline fragment renderer 2013-07-10 09:34:46 +02:00
Fabien Potencier
ce2fae1953 merged branch reenl/fix-round-issues (PR #8447)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Show completed percentage, not a rounded value.

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

This pull request has 2 minor changes:
- 199/200 => 99% instead of 100% (there was no test case and I added one, everything else passes) In the past the value was rounded, the progress bar ended up being 100% for 0.5% of the total execution time. That means 18 seconds on a 1 hour process.
- Fixed the comments to match the inner workings of RedrawFrequency.

First Symfony PR and second overall so hope I just did this the right way.

PR #8419 Rebased for 2.2

Commits
-------

91bb757 ProgressHelper shows percentage complete.
40591b9 Comment fixed: RedrawFrequency is measured in steps.
2013-07-08 16:59:54 +02:00
Fabien Potencier
2d61ebf26b merged branch lsmith77/fix_include_default_text (PR #8445)
This PR was merged into the 2.2 branch.

Discussion
----------

Fix include default text

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=fix_include_default_text)](https://travis-ci.org/lsmith77/symfony)
Fixes the following tickets: -
License of the code: MIT

Commits
-------

9d1004b fix handling of a default 'template' as a string
2013-07-08 16:43:11 +02:00
Reen Lokum
91bb7578c2 ProgressHelper shows percentage complete.
In the past the value was rounded, the progressbar ended up being 100% for 0.5%
of the total execution time. That means 18 seconds on a 1 hour process.
2013-07-08 16:34:53 +02:00
Reen Lokum
40591b92c8 Comment fixed: RedrawFrequency is measured in steps. 2013-07-08 16:24:02 +02:00
Fabien Potencier
686bbb61c4 Merge branch '2.2' into 2.3
* 2.2:
  Update JsonResponse.php
  [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
  [WebProfiler] fix content-type parameter
  Replace romaji period characters with Japanese style zenkaku period characters
  Passed the config when building the Configuration in ConfigurableExtension

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
2013-07-08 15:36:15 +02:00
Lukas Kahwe Smith
9d1004b59e fix handling of a default 'template' as a string 2013-07-08 15:32:00 +02:00
Fabien Potencier
af31180205 merged branch esgy/patch-1 (PR #8420)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8420).

Discussion
----------

Update JsonResponse.php

Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS.

Commits
-------

2b1c973 Update JsonResponse.php
2013-07-08 15:12:22 +02:00
Sorin Gitlan
218bb907ef Update JsonResponse.php
Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS.
2013-07-08 15:12:21 +02:00
Fabien Potencier
ea468a2337 merged branch fabpot/render-objects-fix (PR #8438)
This PR was merged into the 2.2 branch.

Discussion
----------

Render objects fix

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

Commits
-------

82dbaee [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
2013-07-08 15:01:30 +02:00
Fabien Potencier
4efac29ba2 merged branch fabpot/removed-unused-code (PR #8440)
This PR was merged into the 2.3 branch.

Discussion
----------

removed unused code

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

Commits
-------

c60bdf5 removed unused code
2013-07-08 15:00:35 +02:00
Fabien Potencier
82dbaee06d [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124) 2013-07-08 11:12:10 +02:00
Fabien Potencier
92c30b913b merged branch entering/browser-kit-beautify-code (PR #8432)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8432).

Discussion
----------

[BrowserKit] CookieJar remove unneeded var, Client remove unneeded else

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

Commits
-------

10c6799 [BrowserKit] CookieJar remove unneeded var, Client remove unneeded else
2013-07-07 17:48:29 +02:00
entering
4d2051c1d4 CookieJar remove unneeded var, Client remove unneeded else 2013-07-07 17:48:29 +02:00
Fabien Potencier
eaf9ede606 merged branch WouterJ/di_alias_dumper_bug (PR #8435)
This PR was squashed before being merged into the 2.3 branch (closes #8435).

Discussion
----------

[DI] Fixed bug requesting non existing service from dumped frozen container

When dumping a frozen container without aliases, the method `Container::has()` will throw a *"Warning: array_key_exists() expects parameter 2 to be array, null given"* warning. It's because `PhpDumper::addAliases` returns `''` if no aliases are given. This will work for a normal constructor, because it calls the `Container::__construct` method, but the frozen constructor doesn't do that. So it requires a `$this->aliases = array();` in the constructor.

This PR fixes this bug (and adds the test). Bug is introduced in #8252 and 63367a3d5615ff65251ccee4f73223107275f65f

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

Commits
-------

8bb4e4d [DI] Fixed bug requesting non existing service from dumped frozen container
2013-07-07 17:47:47 +02:00
WouterJ
8bb4e4d332 [DI] Fixed bug requesting non existing service from dumped frozen container 2013-07-07 17:47:47 +02:00
Fabien Potencier
f03a4894d5 merged branch birko/patch-1 (PR #8411)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8411).

Discussion
----------

Update validators.sk.xlf

updatet pluralization translations for lenght validators

Commits
-------

00c2e5c Update validators.sk.xlf
2013-07-03 12:44:49 +02:00
František Bereň
ab9e3eede1 Update validators.sk.xlf 2013-07-03 12:44:49 +02:00
Tobias Schultze
6dbd1e102b [WebProfiler] fix content-type parameter 2013-07-02 14:51:26 +02:00
Fabien Potencier
41f5c184b7 merged branch stof/config_argument (PR #8359)
This PR was merged into the 2.2 branch.

Discussion
----------

Passed the config when building the Configuration in ConfigurableExtension

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

This passes the config to ``getConfiguration`` instead of passing an empty array in ConfigurableExtension. This makes the class usable for bundle overwriting the ``getConfiguration`` method to use the config instead of using the default logic (which does not need the config).

Commits
-------

a830001 Passed the config when building the Configuration in ConfigurableExtension
2013-07-02 14:49:11 +02:00
Fabien Potencier
107852b330 merged branch wwotoole/patch-1 (PR #8400)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8400).

Discussion
----------

Replace romaji period characters with Japanese style zenkaku period char...

...acters

Found 4 of the Japanese translations inconsistently used romaji style periods. Replaced with zenkaku periods.

Commits
-------

1b3b1a7 Replace romaji period characters with Japanese style zenkaku period characters
2013-07-02 09:41:46 +02:00
Warwick
b602544bf7 Replace romaji period characters with Japanese style zenkaku period characters
Found 4 of the Japanese translations inconsistently used romaji style periods. Replaced with zenkaku periods.
2013-07-02 09:41:45 +02:00
Fabien Potencier
4c0bfd3313 fixed CS 2013-07-01 14:24:43 +02:00
Fabien Potencier
af101a5a63 Merge branch '2.2' into 2.3
* 2.2:
  fixed CS
  typo first->second
  Fixed variable name used in translation cache

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/CssSelector/Node/FunctionNode.php
	src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
2013-07-01 14:17:23 +02:00
Fabien Potencier
fdf2d6228c fixed CS 2013-07-01 14:15:46 +02:00