diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,411 Commits 24 Branches 563 Tags 228 MiB
a43ccb10a0
Commit Graph

27411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier
a43ccb10a0 Merge branch '2.8' into 3.1 
* 2.8:
  DX: replace @link with @see annotation
  bumped min version of Twig to 1.28
 2016-11-16 17:17:09 -05:00
Fabien Potencier
7487ccb501 Merge branch '2.7' into 2.8 
* 2.7:
  bumped min version of Twig to 1.28
 2016-11-16 17:16:08 -05:00
Fabien Potencier
ef40651dd3 bug #20484 bumped min version of Twig to 1.28 (fabpot) 
This PR was merged into the 2.7 branch.

Discussion
----------

bumped min version of Twig to 1.28

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

Commits
-------

b8f7614 bumped min version of Twig to 1.28
 2016-11-16 17:10:58 -05:00
Fabien Potencier
f2a7704ab3 Merge branch '2.7' into 2.8 
* 2.7:
  DX: replace @link with @see annotation
 2016-11-15 18:02:12 -05:00
Fabien Potencier
a1afa21a8c minor #20506 DX: replace @link with @see annotation (keradus) 
This PR was merged into the 2.7 branch.

Discussion
----------

DX: replace @link with @see annotation

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

Just to standardise.

```console
λ grep -r "* @see " src | wc -l
    360

λ grep -r "* @link " src | wc -l
     12
```

Commits
-------

f7326c1 DX: replace @link with @see annotation
 2016-11-15 18:00:43 -05:00
Fabien Potencier
a813cb7f76 minor #20523 [Serializer] Improve test coverage of the MaxDepth annotation (dunglas) 
This PR was merged into the 3.1 branch.

Discussion
----------

[Serializer] Improve test coverage of the MaxDepth annotation

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| 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
-------

5311696 [Serializer] Improve test coverage of the MaxDepth annotation
 2016-11-15 15:46:31 -05:00
Nicolas Grekas
30e83dcc4b Merge branch '2.8' into 3.1 
* 2.8:
  [Debug] Remove GLOBALS from exception context to avoid endless recursion
 2016-11-15 07:55:20 -05:00
Nicolas Grekas
9b9f1be117 Merge branch '2.7' into 2.8 
* 2.7:
  [Debug] Remove GLOBALS from exception context to avoid endless recursion
 2016-11-15 07:53:17 -05:00
Nicolas Grekas
0221ffcb8f bug #20519 [Debug] Remove GLOBALS from exception context to avoid endless recursion (Seldaek) 
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Remove GLOBALS from exception context to avoid endless recursion

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

This fixes a endless recursion as seen in https://github.com/felixfbecker/php-language-server/pull/137 - it only happens if you trigger an error in the global context so it's kinda hard to write a test for, but hopefully the fix can be accepted.

Commits
-------

1bb95ac [Debug] Remove GLOBALS from exception context to avoid endless recursion
 2016-11-15 07:52:31 -05:00
Jordi Boggiano
1bb95acb84 [Debug] Remove GLOBALS from exception context to avoid endless recursion 2016-11-15 13:37:17 +01:00
Nicolas Grekas
6b7dd44e9f Merge branch '2.8' into 3.1 
* 2.8:
  [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler
  [Form] Fix tests to use FQCN
 2016-11-15 07:07:16 -05:00
Nicolas Grekas
f0a6ed8c5b Merge branch '2.7' into 2.8 
* 2.7:
  [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler
 2016-11-15 07:06:39 -05:00
Nicolas Grekas
29bf662779 minor #20518 [Form] Fix tests to use FQCN (ogizanagi) 
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fix tests to use FQCN

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

Fixes an issue while merging 2.7 in upper branches (2cf474e2eb (diff-fbbd0dcfdc8319ceb89c18435e590fd2R234))

Commits
-------

0d6a60b [Form] Fix tests to use FQCN
 2016-11-15 07:00:39 -05:00
Nicolas Grekas
e24cedb19b bug #20455 [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler (giosh94mhz) 
This PR was squashed before being merged into the 2.7 branch (closes #20455).

Discussion
----------

[ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler

| 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        | |

I have some PHP classes which ends with an `__halt_compiler` call which fail on production.

This is due to the ClassCollectionLoader inlining the class code (which is followed by random binary data) which breaks PHP parsing of the following classes.

I found this issue while using ZendGuardLoader module, but this apply to whatever php class using this function call.

I've made my fix, based on #19859, and tested it with symfony 2.7 and 2.8

Commits
-------

a60cd15 [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler
 2016-11-15 04:22:04 -05:00
Giorgio Premi
a60cd15850 [ClassLoader] Fix ClassCollectionLoader inlining with __halt_compiler 2016-11-15 04:22:02 -05:00
Kévin Dunglas
531169656e
[Serializer] Improve test coverage of the MaxDepth annotation 2016-11-15 08:36:22 +01:00
Maxime Steinhausser
0d6a60bd1b [Form] Fix tests to use FQCN 2016-11-14 18:40:05 +01:00
Fabien Potencier
61fea5a3f1 Merge branch '2.8' into 3.1 
* 2.8:
  [TwigBridge] fix tests
  Tag the FormFieldRegistry as being internal
  [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds
  [Validator] Added missing swedish translation
  [TranslationDebug] workaround for getFallbackLocales.
  [Translation] fixed nested fallback catalogue  using multiple locales.
  fixed phpdoc
  [Command] Fixed method comments as phpDoc syntax
  Added single quotes for upgrade guides.
 2016-11-14 08:20:02 -08:00
Fabien Potencier
2cf474e2eb Merge branch '2.7' into 2.8 
* 2.7:
  [TwigBridge] fix tests
  Tag the FormFieldRegistry as being internal
  [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds
  [Validator] Added missing swedish translation
  [TranslationDebug] workaround for getFallbackLocales.
  [Translation] fixed nested fallback catalogue  using multiple locales.
  fixed phpdoc
  [Command] Fixed method comments as phpDoc syntax
 2016-11-14 08:15:57 -08:00
Fabien Potencier
9a66470116 minor #20511 [TwigBridge] fix tests (xabbuh) 
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] fix tests

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

Adapt tests for null coalescing support from twigphp/Twig#2238.

Commits
-------

1f15395 [TwigBridge] fix tests
 2016-11-14 08:14:22 -08:00
Christian Flothmann
1f1539579c [TwigBridge] fix tests 
Adapt tests for null coalescing support from twigphp/Twig#2238.
 2016-11-14 09:34:35 +01:00
Dariusz Ruminski
f7326c15d8 DX: replace @link with @see annotation 2016-11-13 18:41:36 +01:00
Fabien Potencier
b8f7614388 bumped min version of Twig to 1.28 2016-11-12 09:04:32 -08:00
Fabien Potencier
6648615081 minor #20500 Tag the FormFieldRegistry as being internal (stof) 
This PR was merged into the 2.7 branch.

Discussion
----------

Tag the FormFieldRegistry as being internal

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

The phpdoc already describes it as being internal (since it was introduced). This adds the proper tag to mark it as internal in our standard way.

Commits
-------

0801f97 Tag the FormFieldRegistry as being internal
 2016-11-12 07:52:13 -08:00
Christophe Coevoet
0801f9723b Tag the FormFieldRegistry as being internal 2016-11-12 16:48:22 +01:00
Fabien Potencier
edf5d715e3 bug #20307 [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds (LuisDeimos) 
This PR was squashed before being merged into the 2.7 branch (closes #20307).

Discussion
----------

[Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds

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

Fix: When using a form with an Time type with option 'widget' => 'single_text', and 0 is selected in the seconds, we obtain an TransformationFailedException "Unable to reverse value for property path "[time]": Data missing". Check ticket #20304

Commits
-------

bcb03e0 [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds
 2016-11-12 07:33:13 -08:00
Luis Ramírez +Deimos+
bcb03e0a39 [Form] Fix Date\TimeType marked as invalid on request with single_text and zero seconds 2016-11-12 07:33:12 -08:00
Fabien Potencier
c4989c5605 bug #20480 [FrameworkBundle] Register the ArrayDenormalizer (dunglas) 
This PR was squashed before being merged into the 3.1 branch (closes #20480).

Discussion
----------

[FrameworkBundle] Register the ArrayDenormalizer

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

Registers the `ArrayDenormalizer` class in FrameworkBundle.

**Why it's a bug fix?**

Because since 3.1, most normalizers are able to deserialize complex types (e.g.: an object embedded in an object). They use the `Class\Name[]` notation to handle collections.

However, this only works when the `ArrayDenormalizer` has been registered (it is responsible of handling the `[]` notation).
We do it manually in unit tests, but `ArrayDenormalizer` has never been integrated in FrameworkBundle.

See the test case for further details.

Commits
-------

2eedafc [FrameworkBundle] Register the ArrayDenormalizer
 2016-11-11 07:48:10 -08:00
Kévin Dunglas
2eedafc231 [FrameworkBundle] Register the ArrayDenormalizer 2016-11-11 07:48:09 -08:00
Fabien Potencier
75e0046234 bug #20286 [Serializer] Fix DataUriNormalizer's regex (dunglas) 
This PR was squashed before being merged into the 3.1 branch (closes #20286).

Discussion
----------

[Serializer] Fix DataUriNormalizer's regex

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

Commits
-------

5dc5dc8 [Serializer] Fix DataUriNormalizer's regex
 2016-11-11 07:47:19 -08:00
Kévin Dunglas
5dc5dc8475 [Serializer] Fix DataUriNormalizer's regex 2016-11-11 07:47:17 -08:00
Fabien Potencier
4967ad4b90 minor #20481 [Validator] Added missing swedish translation (Nyholm) 
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #20481).

Discussion
----------

[Validator] Added missing swedish translation

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

I've checked our major banks websites and we have no better word for "Business Identifier Code" than "BIC". Some banks used "BIC-code" so that is what I wrote here.

Commits
-------

f3fede2 [Validator] Added missing swedish translation
 2016-11-10 13:05:13 -08:00
Tobias Nyholm
f3fede2e83 [Validator] Added missing swedish translation 2016-11-10 13:05:13 -08:00
Fabien Potencier
3594877f75 bug #20466 [Translation] fixed nested fallback catalogue using multiple locales. (aitboudad) 
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation] fixed nested fallback catalogue  using multiple locales.

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

Commits
-------

bac217d [Translation] fixed nested fallback catalogue  using multiple locales.
 2016-11-09 14:55:02 -08:00
Fabien Potencier
6953f4f779 minor #20444 [YAML] PHPDoc fixes for inline parser/dumper (ro0NL) 
This PR was merged into the 2.7 branch.

Discussion
----------

[YAML] PHPDoc fixes for inline parser/dumper

| Q             | A
| ------------- | ---
| Branch?       | "master"
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Commits
-------

dd47295 fixed phpdoc
 2016-11-09 14:52:56 -08:00
Fabien Potencier
d6e928734c bug #20465 [#18637][TranslationDebug] workaround for getFallbackLocales. (aitboudad) 
This PR was merged into the 2.7 branch.

Discussion
----------

[#18637][TranslationDebug] workaround for getFallbackLocales.

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

Commits
-------

31deea1 [TranslationDebug] workaround for getFallbackLocales.
 2016-11-09 14:18:25 -08:00
Abdellatif Ait boudad
31deea1d3d [TranslationDebug] workaround for getFallbackLocales. 2016-11-09 20:23:10 +00:00
Abdellatif Ait boudad
bac217dd83 [Translation] fixed nested fallback catalogue using multiple locales. 2016-11-09 19:27:17 +00:00
Fabien Potencier
a524ba5e77 bug #20453 [Cache] Make directory hashing case insensitive (nicolas-grekas) 
This PR was merged into the 3.1 branch.

Discussion
----------

[Cache] Make directory hashing case insensitive

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

Fixes this situation: a Windows OS, running a Debian via VirtualBox and Vagrant. So the cache folder is on a Windows partition while the PHP command is running inside Debian...

Not testable without this specific setup...

Commits
-------

6d4a658 [Cache] Make directory hashing case insensitive
 2016-11-09 09:59:43 -08:00
Roland Franssen
dd47295c15 fixed phpdoc 2016-11-09 17:27:48 +00:00
Fabien Potencier
7e53eab232 minor #20446 [Command] remove exception annotation from run method (Karim Miladi) 
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #20446).

Discussion
----------

[Command] remove exception annotation from run method

| Q             | A
| ------------- | ---
| Branch?       | master
| 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
-------

5a1bf6a [Command] Fixed method comments as phpDoc syntax
 2016-11-09 08:10:25 -08:00
Karim Miladi
5a1bf6aa6e [Command] Fixed method comments as phpDoc syntax 2016-11-09 08:10:25 -08:00
Nicolas Grekas
6d4a658ab7 [Cache] Make directory hashing case insensitive 2016-11-09 15:09:05 +01:00
Fabien Potencier
4bd6206d2e minor #20448 Added single quotes for upgrade guides. (Aliance) 
This PR was merged into the 2.8 branch.

Discussion
----------

Added single quotes for upgrade guides.

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

Commits
-------

2016031 Added single quotes for upgrade guides.
 2016-11-08 06:54:55 -08:00
Lesnykh Ilia
201603137c
Added single quotes for upgrade guides. 2016-11-08 16:51:01 +03:00
Fabien Potencier
790e7dd74d Merge branch '2.8' into 3.1 
* 2.8:
  prefer getSourceContext() over getSource()
  [HttpFoundation] Avoid implicit null to array conversion in request matcher
  Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)"
  Update UPGRADE-2.7.md
 2016-11-07 11:34:53 -08:00
Fabien Potencier
570bebdcb3 Merge branch '2.7' into 2.8 
* 2.7:
  prefer getSourceContext() over getSource()
  [HttpFoundation] Avoid implicit null to array conversion in request matcher
  Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)"
  Update UPGRADE-2.7.md
 2016-11-07 11:34:39 -08:00
Fabien Potencier
40dc73aa28 bug #20440 [TwigBridge][TwigBundle][HttpKernel] prefer getSourceContext() over getSource() (xabbuh) 
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge][TwigBundle][HttpKernel] prefer getSourceContext() over getSource()

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

Commits
-------

adbc529 prefer getSourceContext() over getSource()
 2016-11-07 11:32:26 -08:00
Christian Flothmann
adbc529b7b prefer getSourceContext() over getSource() 2016-11-07 19:42:43 +01:00
Fabien Potencier
589d019f2e minor #20433 Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)" (chalasr) 
This PR was merged into the 2.7 branch.

Discussion
----------

Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)"

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/20184#discussion_r85265689
| License       | MIT
| Doc PR        | n/a

This reverts commit 3f650f8 because the fix is not valid.
It is actually not possible to have an option with value optional given empty to be `empty` if this one has a default value. The default value will always be the one returned, see https://github.com/symfony/symfony/pull/20184#discussion_r85265689 for details.

Commits
-------

b2fa7c4 Revert "bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)"
 2016-11-07 07:14:01 -08:00