Commit Graph

24483 Commits

Author SHA1 Message Date
Fabien Potencier
e9b8aae787 minor #17264 Fix typo in Locale class annotations (enumag)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17264).

Discussion
----------

Fix typo in Locale class annotations

Commits
-------

eab7e11 typo
2016-01-05 16:32:23 +01:00
Jáchym Toušek
eab7e11be7 typo 2016-01-05 16:32:23 +01:00
Kévin Dunglas
4e2eef08ed [FrameworkBundle] Allow to autowire service_container 2016-01-04 22:21:22 +01:00
Fabien Potencier
19a63356ef bug #17183 [FrameworkBundle] Set the kernel.name properly after a cache warmup (jakzal)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17183).

Discussion
----------

[FrameworkBundle] Set the kernel.name properly after a cache warmup

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

Commits
-------

1438b9a [FrameworkBundle] Set the kernel.name properly after a cache warmup
2016-01-04 18:15:55 +01:00
Jakub Zalas
1438b9a067 [FrameworkBundle] Set the kernel.name properly after a cache warmup 2016-01-04 18:15:54 +01:00
Fabien Potencier
5a9c1b5a0f minor #17243 Removed spaces before semicolon (dereckson)
This PR was merged into the 2.3 branch.

Discussion
----------

Removed spaces before semicolon

'lorem ; ipsum' → 'lorem; ipsum'

| Q             | A
| ------------- | ---
| Fixed tickets | #17242
| License       | MIT

Commits
-------

169d551 Removed spaces before semicolon
2016-01-04 17:52:03 +01:00
Fabien Potencier
5991565286 bug #17197 [Yaml] cast arrays to objects after parsing has finished (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[Yaml] cast arrays to objects after parsing has finished

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

Casting arrays to objects must happen after the complete YAML string has
been parsed to avoid errors when parsing subsequent lines.

Commits
-------

8251d67 cast arrays to objects after parsing has finished
2016-01-04 17:50:38 +01:00
Fabien Potencier
674c07070d bug #17247 Fix toolbar display when nvd3 is loaded on page (Seldaek)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix toolbar display when nvd3 is loaded on page

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

Minor CSS fix for the toolbar, as nvd3 sets `svg { display: block }` so you end up with something like:

![image](https://cloud.githubusercontent.com/assets/183678/12079564/974aa694-b235-11e5-897e-ecb31ba20f26.png)

Commits
-------

d7010c0 Fix toolbar display when nvd3 is loaded on page
2016-01-04 17:49:06 +01:00
Tobias Schultze
431ea6b4ef Merge branch '2.8' into 3.0 2016-01-04 15:51:01 +01:00
Tobias Schultze
3686ed64b8 Merge branch '2.7' into 2.8 2016-01-04 15:50:03 +01:00
Tobias Schultze
fff265d451 Merge branch '2.3' into 2.7 2016-01-04 15:49:16 +01:00
Tobias Schultze
67ccb2d843 minor #17250 [WebProfilerBundle] Remove duplicated HTML attributes (hason)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfilerBundle] Remove duplicated HTML attributes

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

Commits
-------

7335dee [WebProfilerBundle] Removed duplicated HTML attributes
2016-01-04 15:30:25 +01:00
Tobias Schultze
eeaa4dcd0c minor #17248 [Form] fixed DateTimeType tests using "date_widget"="choice". (Adrien LUCAS)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17248).

Discussion
----------

[Form] fixed DateTimeType tests using "date_widget"="choice".

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

As said in the [documentation](http://symfony.com/doc/current/reference/forms/types/datetime.html#years), the default years available in the ``DateType`` go from five year before to five year after the current year. So now that it's 2016 all around, the tests which use the ``"date_widget"="choice"`` without defining a ``"years"`` option and tries to submit a date in 2010 are failing because 2010 is not in the default choice list.

This PR fixes the issue by setting the ``"years"`` option to ``"2010"`` for each test that need it. It also remove unnecessary (and confusing) dummy data from some tests which were suffering the same issue but silently.

Edit : The PHP 5.6 build on travis seems to fetch and run some old version of the tests. So it still fail on this build but not on the others anymore.

Commits
-------

be20e89 Fix Form's DateTimeType tests.
2016-01-04 15:27:02 +01:00
Adrien LUCAS
be20e892c2 Fix Form's DateTimeType tests. 2016-01-04 15:27:01 +01:00
Fabien Potencier
e738227d63 bug #17159 [Yaml] recognize when a block scalar is left (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] recognize when a block scalar is left

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

The parser did not recognize when the block scalar was completely parsed
and thus treated following comments as they need to be kept leading to
parse errors on the following lines.

Commits
-------

3a22165 [Yaml] recognize when a block scalar is left
2016-01-04 12:01:16 +01:00
Martin Hasoň
7335dee927 [WebProfilerBundle] Removed duplicated HTML attributes 2016-01-03 23:41:47 +01:00
Christian Flothmann
3a2216559b [Yaml] recognize when a block scalar is left
The parser did not recognize when the block scalar was completely parsed
and thus treated following comments as they need to be kept leading to
parse errors on the following lines.
2016-01-03 20:52:40 +01:00
Jérôme Vasseur
8566dc18fc Remove normalizer cache in Serializer class 2016-01-03 18:07:57 +01:00
Jordi Boggiano
d7010c0e41 Fix toolbar display when nvd3 is loaded on page 2016-01-03 16:17:23 +00:00
Fabien Potencier
5931ef7288 Merge branch '2.8' into 3.0
* 2.8:
  updated copyright year
  updated copyright year
  Update copyright year
  [2.3] Static Code Analysis for Components
2016-01-03 16:35:16 +01:00
Fabien Potencier
c0b894d4c2 updated copyright year 2016-01-03 16:34:36 +01:00
Fabien Potencier
0606d9c8b4 Merge branch '2.7' into 2.8
* 2.7:
  updated copyright year
  Update copyright year
  [2.3] Static Code Analysis for Components
2016-01-03 16:33:41 +01:00
Fabien Potencier
6dbef8ccb8 updated copyright year 2016-01-03 16:33:06 +01:00
Fabien Potencier
d6f503660f Merge branch '2.3' into 2.7
* 2.3:
  Update copyright year
  [2.3] Static Code Analysis for Components
2016-01-03 16:32:00 +01:00
Fabien Potencier
7b097ae418 minor #17244 Update copyright year (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

Update copyright year

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

Happy new year! 🎉

Commits
-------

ce067e6 Update copyright year
2016-01-03 16:28:35 +01:00
Diego Saint Esteben
ce067e6460 Update copyright year 2016-01-01 23:53:47 -03:00
Sébastien Santoro
169d5513a6 Removed spaces before semicolon
'lorem ; ipsum' → 'lorem; ipsum'
2016-01-01 15:10:52 +00:00
Fabien Potencier
1b15ac3bdc minor #17085 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #17085).

Discussion
----------

[2.3] Static Code Analysis for Components

| 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

Static Code Analysis with Php Inspections (EA Extended):
    - remaining mkdir race conditions
    - continue miss-usage in switch

Commits
-------

6d303c7 [2.3] Static Code Analysis for Components
2015-12-31 19:24:03 +01:00
Vladimir Reznichenko
6d303c7755 [2.3] Static Code Analysis for Components 2015-12-31 19:24:01 +01:00
Nicolas Grekas
e469ef4d18 Merge branch '2.8' into 3.0
* 2.8:
  [Process] Clean tested process on tear down
2015-12-31 11:59:47 +01:00
Nicolas Grekas
eb7f2f7443 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Clean tested process on tear down
2015-12-31 11:59:32 +01:00
Nicolas Grekas
bd97e51e0b Merge branch '2.3' into 2.7
* 2.3:
  [Process] Clean tested process on tear down
2015-12-31 11:59:19 +01:00
Nicolas Grekas
e9dcc04ace minor #17198 [Process] Clean tested process on tear down (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Clean tested process on tear down

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

As show on this failing test (https://travis-ci.org/symfony/symfony/jobs/99569782#L2690) and confirmed locally, some tested process objects remain in memory until the global destructor shutdown stage.
This PR forces processes to be cleaned right after their test case.

Commits
-------

80e1107 [Process] Clean tested process on tear down
2015-12-31 11:58:59 +01:00
Nicolas Grekas
80e11071cc [Process] Clean tested process on tear down 2015-12-31 11:29:46 +01:00
Kévin Dunglas
c1740fcc82 [Serializer] ObjectNormalizer: context can contain not serializable data 2015-12-31 11:23:14 +01:00
Christian Flothmann
8251d6711d cast arrays to objects after parsing has finished
Casting arrays to objects must happen after the complete YAML string has
been parsed to avoid errors when parsing subsequent lines.
2015-12-31 10:59:55 +01:00
Nicolas Grekas
47a41a1b41 Merge branch '2.8' into 3.0
* 2.8:
  [travis] Use xargs instead of parallel to test --enable-sigchild
  bug #14246 [Filesystem] dumpFile() non atomic
  [Bridge/Doctrine] Fix test case

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
	src/Symfony/Component/Filesystem/Filesystem.php
2015-12-31 10:20:38 +01:00
Nicolas Grekas
5da874d42f Merge branch '2.7' into 2.8
* 2.7:
  [travis] Use xargs instead of parallel to test --enable-sigchild
2015-12-31 10:18:34 +01:00
Nicolas Grekas
4b1ac1574c Merge branch '2.3' into 2.7
* 2.3:
  [travis] Use xargs instead of parallel to test --enable-sigchild
2015-12-31 10:18:12 +01:00
Nicolas Grekas
4512e3456d [travis] Use xargs instead of parallel to test --enable-sigchild 2015-12-31 10:15:06 +01:00
Nicolas Grekas
217be2399a minor #17194 [Bridge/Doctrine] Fix test case (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Bridge/Doctrine] Fix test case

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

The choice_list vs choice_loader change is already applied on 3.0,
the `@group legacy` tags a test case that has been already removed in 3.0.
@webmozart or anyone else could you please have a quick look here and confirm it's ok?

Commits
-------

4ef2c33 [Bridge/Doctrine] Fix test case
2015-12-31 10:10:07 +01:00
Nicolas Grekas
98f013fe0c Merge branch '2.7' into 2.8
* 2.7:
  bug #14246 [Filesystem] dumpFile() non atomic
2015-12-31 10:09:35 +01:00
Nicolas Grekas
ddab6278a2 Merge branch '2.3' into 2.7
* 2.3:
  bug #14246 [Filesystem] dumpFile() non atomic

Conflicts:
	src/Symfony/Component/Filesystem/Filesystem.php
2015-12-31 10:09:12 +01:00
Nicolas Grekas
3aa30005f0 bug #17195 bug #14246 [Filesystem] dumpFile() non atomic (Hidde Boomsma)
This PR was merged into the 2.3 branch.

Discussion
----------

bug #14246 [Filesystem] dumpFile() non atomic

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

Remove race condition where `dumpFile` has written the resulting file but has not given access yet.

Commits
-------

e4015d5 bug #14246 [Filesystem] dumpFile() non atomic
2015-12-31 10:05:40 +01:00
Hidde Boomsma
e4015d5cc3 bug #14246 [Filesystem] dumpFile() non atomic 2015-12-31 09:33:44 +01:00
Nicolas Grekas
4ef2c33aef [Bridge/Doctrine] Fix test case 2015-12-31 09:26:04 +01:00
Nicolas Grekas
78a08f3a68 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
  Removed an object as route generator argument

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
2015-12-30 19:45:14 +01:00
Nicolas Grekas
3676c3b61c Fix merge 2015-12-30 19:31:26 +01:00
Nicolas Grekas
d38278fd12 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
2015-12-30 19:23:12 +01:00
Nicolas Grekas
c457f7beb7 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix running tests on HHVM>=3.8
2015-12-30 19:22:28 +01:00