Commit Graph

24295 Commits

Author SHA1 Message Date
Tobias Schultze
7f964a96bb Merge branch '3.0' 2016-01-04 15:51:32 +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
Fabien Potencier
d35d70ee4d Merge branch '3.0'
* 3.0:
  updated copyright year
  updated copyright year
  Update copyright year
  [2.3] Static Code Analysis for Components
2016-01-03 16:35:40 +01: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
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
eed17e9b62 Merge branch '3.0'
* 3.0:
  [Process] Clean tested process on tear down
2015-12-31 11:59:57 +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
Nicolas Grekas
9c2dbb6084 Merge branch '3.0'
* 3.0:
  [travis] Use xargs instead of parallel to test --enable-sigchild
  bug #14246 [Filesystem] dumpFile() non atomic
  [Bridge/Doctrine] Fix test case
2015-12-31 10:20:59 +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
Nicolas Grekas
60edaecaa8 minor #17196 [travis] Use xargs instead of parallel to test --enable-sigchild (nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[travis] Use xargs instead of parallel to test --enable-sigchild

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

The --timeout option doesn't work, jobs still fail with a 10 minutes timeout...
Let's see the output with xargs, if it happens again...

Commits
-------

f3def51 [travis] Use xargs instead of parallel to test --enable-sigchild
2015-12-31 09:58:21 +01:00
Nicolas Grekas
f3def51e83 [travis] Use xargs instead of parallel to test --enable-sigchild 2015-12-31 09:50:01 +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
eb7330f7af Merge branch '3.0'
* 3.0:
  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
2015-12-30 19:48:02 +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
Nicolas Grekas
5ff87136d6 minor #17189 [Process] Fix running tests on HHVM>=3.8 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix running tests on HHVM>=3.8

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

open_basedir works correctly since hhvm 3.8

Commits
-------

a47208b [Process] Fix running tests on HHVM>=3.8
2015-12-30 19:21:38 +01:00
Nicolas Grekas
a47208bea9 [Process] Fix running tests on HHVM>=3.8 2015-12-30 19:16:06 +01:00
Tobias Schultze
140ed985be feature #16747 [Form] Improved performance of ChoiceType and its subtypes (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Improved performance of ChoiceType and its subtypes

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

I found out today that, although CachingFactoryDecorator is part of Symfony 2.7, it is not configured to be used in the DI configuration. This simple in-memory cache improved the page load by 50% for one considerably large form with many (~600) choice/entity fields that I was working on today.

Also, caching of query builders with parameters was broken, since the parameters are represented by objects. PHP's object hashes were used to calculate the cache keys, hence the cache always missed. I converted parameters to arrays for calculating the cache keys to fix this problem.

Commits
-------

a0ef101 [Form] Improved performance of ChoiceType and its subtypes
2015-12-30 16:04:43 +01:00
Christophe Coevoet
a22a0707d4 bug #17179 [WebProfiler] Removed an object as route generator argument (iltar)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfiler] Removed an object as route generator argument

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

Commits
-------

43fd7bb Removed an object as route generator argument
2015-12-30 12:38:15 +01:00
Nicolas Grekas
5c16f40492 Merge branch '3.0'
* 3.0:
  [Form] fix Catchable Fatal Error if choices is not an array
  [Process] Fix a transient test
  [Process] Fix potential race condition leading to transient tests
  [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException
  [Routing] removed unused variable in PhpMatcherDumperTest class.
  [travis] use github token to fetch deps from ZIP files
  [DependencyInjection] fixes typo in triggered deprecation notice.
  [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class.
  [Form] Fixed regression on Collection type
  add missing symfony/polyfill-php55 dependency
2015-12-30 11:41:51 +01:00
Nicolas Grekas
52c4304084 Merge branch '2.8' into 3.0
* 2.8:
  [Form] fix Catchable Fatal Error if choices is not an array
  [Process] Fix a transient test
  [Process] Fix potential race condition leading to transient tests
  [DoctrineBridge] [PropertyInfo] Catch Doctrine\ORM\Mapping\MappingException
  [Routing] removed unused variable in PhpMatcherDumperTest class.
  [travis] use github token to fetch deps from ZIP files
  [DependencyInjection] fixes typo in triggered deprecation notice.
  [Form] improve deprecation messages for the "empty_value" and "choice_list" options in the ChoiceType class.
  [Form] Fixed regression on Collection type
  add missing symfony/polyfill-php55 dependency

Conflicts:
	src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
	src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
	src/Symfony/Component/HttpFoundation/composer.json
2015-12-30 11:41:35 +01:00