Commit Graph

14012 Commits

Author SHA1 Message Date
Nicolas Grekas
5a560f1d12 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Don't use parallel on HHVM
  [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows
  Skip some tests on HHVM due to a PHPunit bug
  Use the Trusty Travis infrastructure for HHVM builds
  Add 3.1 to  PR template branch row, remove 2.3
  Improve memory efficiency
2016-06-03 13:06:57 +02:00
Nicolas Grekas
a004fc7526 minor #18932 Improve memory efficiency (Dword123)
This PR was merged into the 2.7 branch.

Discussion
----------

Improve memory efficiency

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

This avoids concatenating `$message` and `PHP_EOL` (if necessary) as a new value, greatly improving memory efficiency for large `$message`s.

Commits
-------

c1df9f2 Improve memory efficiency
2016-06-03 13:01:18 +02:00
Nicolas Grekas
c4149a40fb minor #18947 Run an uptodate version of HHVM on Travis (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Run an uptodate version of HHVM on Travis

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

Using the Trusty infrastructure allows running an uptodate version of HHVM rather than running the latest version supporting Precise, which is very old.
It relies on an undocumented feature of the Travis config file, namely the fact that ``matrix.include`` actually allows to overwrite everything from the config file (it is merged with the main config), even though the Travis linter complains about it. I think it is fine to use this and to replace it with an official approach once there is one.

Refs #18922

Commits
-------

e6956c9 Skip some tests on HHVM due to a PHPunit bug
e041da0 Use the Trusty Travis infrastructure for HHVM builds
2016-06-03 10:03:59 +02:00
Nicolas Grekas
574f4e4147 [appveyor] Ignore STATUS_HEAP_CORRUPTION errors on Windows 2016-06-03 09:48:37 +02:00
Christophe Coevoet
e6956c9bfc Skip some tests on HHVM due to a PHPunit bug 2016-06-02 11:40:24 +02:00
Dword123
c1df9f210e Improve memory efficiency
This avoids concatenating `$message` and `PHP_EOL` (if necessary) as a new value, greatly improving memory efficiency for large `$message`s.
2016-06-01 13:20:21 +02:00
Fabien Potencier
e617502ba2 Merge branch '2.7' into 2.8
* 2.7:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:57:11 +02:00
Fabien Potencier
00763f6e41 Merge branch '2.3' into 2.7
* 2.3:
  [Routing] Finish annotation loader taking a class constant as a beginning of a class name
  [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-30 08:56:59 +02:00
Robin Chalas
1c94fea42f [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments
CS Fixes

Add tests

Add docblock

Fix side effect on FrameworkBundle tests

Remove useless '\n' from TextDescriptor since comments are block
2016-05-29 20:12:27 +02:00
Fabien Potencier
ab621ee574 bug #18907 [Routing] Fix the annotation loader taking a class constant as a beginning of a class name (jakzal, nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Fix the annotation loader taking a class constant as a beginning of a class name

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

Code copy/pasted from ClassMapGenerator.php

Commits
-------

8d4f35d [Routing] Finish annotation loader taking a class constant as a beginning of a class name
43c7f9b [Routing] Fix the annotation loader taking a class constant as a beginning of a class name
2016-05-29 18:07:21 +02:00
Nicolas Grekas
8d4f35d12c [Routing] Finish annotation loader taking a class constant as a beginning of a class name 2016-05-29 12:13:06 +02:00
Nicolas Grekas
56b5f4196b Merge branch '2.7' into 2.8
* 2.7:
  [PropertyAccess] Fix for PHP 7.0.7
2016-05-29 11:49:47 +02:00
Nicolas Grekas
a350459d70 Merge branch '2.3' into 2.7
* 2.3:
  [PropertyAccess] Fix for PHP 7.0.7

Conflicts:
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2016-05-29 11:49:32 +02:00
Nicolas Grekas
a125af74f8 [PropertyAccess] Fix for PHP 7.0.7 2016-05-29 11:41:46 +02:00
Fabien Potencier
fc32e6a794 Merge branch '2.7' into 2.8
* 2.7:
  fixed PHP 5.3 compat in tests
2016-05-26 10:21:20 +02:00
Fabien Potencier
a842b97087 fixed PHP 5.3 compat in tests 2016-05-26 10:21:12 +02:00
Fabien Potencier
1567ce6d9e Merge branch '2.7' int pusto 2.8
* 2.7:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:20 +02:00
Fabien Potencier
557bc51c5b Merge branch '2.3' into 2.7
* 2.3:
  fixed PHP 5.3 compat in tests
2016-05-26 10:07:14 +02:00
Fabien Potencier
c59a3da606 fixed PHP 5.3 compat in tests 2016-05-26 10:04:58 +02:00
Fabien Potencier
e89e1656b9 Merge branch '2.7' into 2.8
* 2.7:
  [Console] SymfonyStyle: Align multi-line/very-long-line blocks
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
  Fix js comment in profiler
2016-05-26 09:56:38 +02:00
Fabien Potencier
13394f81f7 Merge branch '2.3' into 2.7
* 2.3:
  [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut
2016-05-26 09:56:29 +02:00
Robin Chalas
963fe1d635 [Console] SymfonyStyle: Align multi-line/very-long-line blocks
Remove SymfonyStyle::comment() changes (out of scope)

CS Fixes

Add tests
2016-05-26 09:53:24 +02:00
Peter Rehm
7cb76558ce [Console][DX] Fixed ambiguous error message when using a duplicate option shortcut 2016-05-26 09:43:25 +02:00
Fabien Potencier
5cb0ad3f81 Merge branch '2.7' into 2.8
* 2.7:
  [Yaml] fix exception contexts
  People - person singularization
  [Yaml] properly handle unindented collections
  [Serializer] Add test for ignored attributes during denormalization
  chomp newlines only at the end of YAML documents
  Fixed server status command when port has been omitted
  Update UPGRADE FROM 2.x to 3.0
  Catch \Throwable
  Use levenshtein level for better Bundle matching
  [WebProfilerBundle] Fix CORS ajax security issues
2016-05-24 12:00:02 +02:00
Fabien Potencier
eac5868d20 Merge branch '2.3' into 2.7
* 2.3:
  [Yaml] fix exception contexts
  People - person singularization
  [Yaml] properly handle unindented collections
  chomp newlines only at the end of YAML documents
2016-05-24 11:57:18 +02:00
Christian Flothmann
9bdaba4801 [Yaml] fix exception contexts 2016-05-23 12:02:40 +02:00
Fabien Potencier
7830fa7dbd bug #18840 [Yaml] properly handle unindented collections (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] properly handle unindented collections

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

Commits
-------

717e1a9 [Yaml] properly handle unindented collections
2016-05-23 11:02:43 +02:00
Fabien Potencier
eff863b434 bug #18765 Catch \Throwable (fprochazka)
This PR was merged into the 2.8 branch.

Discussion
----------

Catch \Throwable

| Q             | A
| ------------- | ---
| Branch?       | 2.8, 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Mostly!
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

The first commit is based on symfony/symfony#15949
Depends on symfony/symfony#18813, symfony/symfony#18812

----

I'm new to symfony, so I'm not sure where are all the places where it makes sense to actually catch the throwable and where not. I added most places that seemed logical and when I wasn't sure, I added it anyway. I'm hoping you guys (and girls?) can point out the places where the catch should not be added, I'll fix it and then I can create several PR's for the older branches. A lot of this IMHO should go also to 3.0.

Commits
-------

de671f4 Catch \Throwable
2016-05-23 11:00:59 +02:00
Fabien Potencier
f55680b3ab bug #18813 Catch \Throwable (fprochazka)
This PR was merged into the 2.7 branch.

Discussion
----------

Catch \Throwable

| Q             | A
| ------------- | ---
| Branch?       | 2.7, 2.8, 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Related symfony/symfony#18765, symfony/symfony#15949
Depends on symfony/symfony#18812

Commits
-------

103526b Catch \Throwable
2016-05-23 10:58:41 +02:00
Martin Morávek (moravek.martin)
02070f9fd3 People - person singularization 2016-05-23 10:52:53 +02:00
Christian Flothmann
717e1a9e47 [Yaml] properly handle unindented collections 2016-05-22 18:07:51 +02:00
Kévin Dunglas
c2f7fedfd6 [Serializer] Add test for ignored attributes during denormalization 2016-05-22 13:47:44 +02:00
Christian Flothmann
a4b1fa6694 chomp newlines only at the end of YAML documents 2016-05-21 09:04:04 +02:00
Filip Procházka
de671f4cb2 Catch \Throwable 2016-05-19 16:01:30 +02:00
Filip Procházka
103526b40f Catch \Throwable 2016-05-19 15:58:47 +02:00
Mathieu Lemoine
834f550263 [DX][DI] Make Autowiring exceptions more future friendly 2016-05-13 15:42:47 -04:00
Fabien Potencier
bcdf568a19 Merge branch '2.7' into 2.8
* 2.7:
  Fix computation of PR diffs for component matrix lines
  [BUG] Delete class 'control-group' in bootstrap 3
  [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
2016-05-13 13:03:14 -05:00
Fabien Potencier
208e6b0f9e bug #18774 [console][table] adjust width of colspanned cell. (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[console][table] adjust width of colspanned cell.

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

Commits
-------

081ad73 [console][table] adjust width of colspanned cell.
2016-05-13 12:56:25 -05:00
Abdellatif Ait boudad
081ad731b6 [console][table] adjust width of colspanned cell. 2016-05-13 16:56:27 +01:00
Issei.M
ae38660fde [2.8] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper 2016-05-13 10:41:04 -05:00
Fabien Potencier
1253b1d344 Merge branch '2.7' into 2.8
* 2.7:
  added missing constant in Response
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  added StaticVerionStrategyTest
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
  [console][table] adjust width of colspanned cell.
2016-05-13 10:38:45 -05:00
Fabien Potencier
4a065b44dd added missing constant in Response 2016-05-13 10:31:27 -05:00
Fabien Potencier
58f8f5174f Merge branch '2.3' into 2.7
* 2.3:
  Update HTTP statuses list
  [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
  Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns
  [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
  Updated the link to the list of currency codes
2016-05-13 10:28:37 -05:00
dasmfm
fa99fbd7cf Update HTTP statuses list 2016-05-13 10:22:39 -05:00
Robin Chalas
31285c22fa [Console][#18619] Prevent fatal error when calling Command#getHelper() without helperSet
Use Command::setHelperSet rather than Command#setHelperSet in exception msg

Simplify exception message

Add DidYouForget to exception msg
2016-05-13 10:18:46 -05:00
Fabien Potencier
8648fe2ed3 bug #18686 [console][table] adjust width of colspanned cell. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[console][table] adjust width of colspanned cell.

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

Commits
-------

9b35449 [console][table] adjust width of colspanned cell.
2016-05-13 10:09:02 -05:00
danionut90
80300f52d4 added StaticVerionStrategyTest 2016-05-13 10:01:47 -05:00
Daniel Espendiller
94b9e44993 Add SplFileInfo array doc on Finder iterator methods so that IDE will know what it returns 2016-05-13 09:58:35 -05:00
Fabien Potencier
f8f624b0d5 bug #18761 [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper (issei-m)
This PR was squashed before being merged into the 2.3 branch (closes #18761).

Discussion
----------

[2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper

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

For https://github.com/symfony/symfony/pull/18747

Commits
-------

7101cab [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper
2016-05-13 09:43:54 -05:00
Issei.M
7101cab29f [2.3] [Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper 2016-05-13 09:43:53 -05:00