Commit Graph

29720 Commits

Author SHA1 Message Date
Fabien Potencier
f832a4c7eb minor #22666 CS fixes (fabpot)
This PR was merged into the 3.2 branch.

Discussion
----------

CS fixes

| Q             | A
| ------------- | ---
| Branch?       | 3.2
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

33d6f5c327 fixed CS
2017-05-07 20:42:20 -07:00
Fabien Potencier
33d6f5c327 fixed CS 2017-05-07 19:28:57 -07:00
Fabien Potencier
b81a6629ee Merge branch '2.8' into 3.2
* 2.8:
  fixed CS
  [DI] Fix PhpDumper blank lines around namespace
  fixed CS
  Filesystem: annotate the one network test with a "network" group.
  [DependencyInjection] Don't store default deprecation template in every service definition instance
2017-05-07 18:51:21 -07:00
Fabien Potencier
5e8412b65f minor #22660 fixed CS (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

fixed CS

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

a23330bf1e fixed CS
2017-05-07 18:49:14 -07:00
Fabien Potencier
a23330bf1e fixed CS 2017-05-07 18:19:21 -07:00
Fabien Potencier
ae3d88c215 Merge branch '2.7' into 2.8
* 2.7:
  [DI] Fix PhpDumper blank lines around namespace
2017-05-07 18:18:23 -07:00
Fabien Potencier
62cb443770 minor #22663 [DI] Fix PhpDumper blank lines around namespace (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[DI] Fix PhpDumper blank lines around namespace

| 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

219bce9916 tries to fix CS in an expected PhpDumper output, which actually shows the PhpDumper does not create proper blank lines around the namespace.
That's why tests are failing on https://github.com/symfony/symfony/pull/22660.

Commits
-------

c9f6c1680f [DI] Fix PhpDumper blank lines around namespace
2017-05-07 18:18:06 -07:00
Maxime Steinhausser
c9f6c1680f [DI] Fix PhpDumper blank lines around namespace 2017-05-07 19:29:35 +02:00
Fabien Potencier
57129de78c Merge branch '2.7' into 2.8
* 2.7:
  fixed CS
  Filesystem: annotate the one network test with a "network" group.
2017-05-07 09:04:05 -07:00
Fabien Potencier
219bce9916 fixed CS 2017-05-07 09:03:57 -07:00
Fabien Potencier
fd9459cdfd minor #22630 Filesystem: annotate the one network test with a "network" group. (orlitzky)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #22630).

Discussion
----------

Filesystem: annotate the one network test with a "network" group.

This is one tiny commit that lets us avoid hitting the network while running the test suite. We've packaged symfony-filesystem in Gentoo, and our users can run the test suite when they install it. However, network access is forbidden during the test phase (it causes spurious failures, privacy issues, etc.). By marking the one network test with `@group network`, we are able to skip it with `--exclude-group network`.

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

Commits
-------

fd0dd57e74 Filesystem: annotate the one network test with a "network" group.
2017-05-04 11:16:16 -07:00
Michael Orlitzky
fd0dd57e74 Filesystem: annotate the one network test with a "network" group.
Tests that require network access can be problematic, because they
depend on some external state not under your control. That can lead to
"random" failures when the code in question actually works fine. The
Filesystem component has one such test, and this commit adds it to the
"network" group (for PHPUnit).

Doing so lets the user skip that particular test, by running phpunit
with the --exclude-group flag. We take advantage of this in Gentoo,
where every user has the ability to run the test suite but network
access is forbidden.
2017-05-04 11:16:15 -07:00
Fabien Potencier
0602fb53ab minor #22628 [DependencyInjection] Don't store default deprecation template in every service definition instance (fortis)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Don't store default deprecation template in every service definition instance

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

While debugging I noticed that each service definition contains a default deprecation template, even if it was not marked as deprecated

Commits
-------

388ee467c5 [DependencyInjection] Don't store default deprecation template in every service definition instance
2017-05-04 11:12:20 -07:00
Alan Bondarchuk
388ee467c5 [DependencyInjection] Don't store default deprecation template in every service definition instance 2017-05-04 20:21:54 +03:00
Nicolas Grekas
b8714d34a1 Merge branch '2.8' into 3.2
* 2.8:
  [appveyor] Run the test suite on PHP 7.1
  bumped Symfony version to 2.8.21
  updated VERSION for 2.8.20
  updated CHANGELOG for 2.8.20
  bumped Symfony version to 2.7.28
  updated VERSION for 2.7.27
  update CONTRIBUTORS for 2.7.27
  updated CHANGELOG for 2.7.27
2017-05-04 14:22:25 +02:00
Nicolas Grekas
dfae2ab6be Merge branch '2.7' into 2.8
* 2.7:
  [appveyor] Run the test suite on PHP 7.1
  bumped Symfony version to 2.7.28
  updated VERSION for 2.7.27
  update CONTRIBUTORS for 2.7.27
  updated CHANGELOG for 2.7.27
2017-05-04 14:19:31 +02:00
Nicolas Grekas
0c704cf76a minor #22602 [EventDispatcher] fix merge of #22541 from 2.8 (dmaicher)
This PR was merged into the 3.2 branch.

Discussion
----------

[EventDispatcher] fix merge of #22541 from 2.8

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

This cleans up a test case that was merged from 2.8 into 3.2 here: 824dc8ba5f

@fabpot due to different implementations I created 2 PR's:

2.8: https://github.com/symfony/symfony/pull/22541
3.2: https://github.com/symfony/symfony/pull/22568

So the 2.8 merge into 3.2 of my change-set introduced some unused variable `$isWrapped` here: 824dc8ba5f (diff-af3c4fbca8bb77957c00087543ae5a4dR113)

This PR just cleans it up and also removes the data provider 😉

Commits
-------

f67eba8 [EventDispatcher] fix merge of #22541 from 2.8
2017-05-02 11:20:19 +02:00
Nicolas Grekas
0c4e549fa1 minor #22560 [appveyor] Run the test suite on PHP 7.1 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[appveyor] Run the test suite on PHP 7.1

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

Commits
-------

a537d6c [appveyor] Run the test suite on PHP 7.1
2017-05-02 11:17:38 +02:00
Nicolas Grekas
8342cd7c1c minor #22562 [appveyor][3.x] Run the test suite on PHP 7.1 (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[appveyor][3.x] Run the test suite on PHP 7.1

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | let's see
| Fixed tickets | #22556
| License       | MIT
| Doc PR        | -

Commits
-------

51b82f5 [appveyor][3.x] Run the test suite on PHP 7.1
2017-05-02 11:16:43 +02:00
Nicolas Grekas
a537d6c11e [appveyor] Run the test suite on PHP 7.1 2017-05-02 10:48:05 +02:00
Nicolas Grekas
51b82f5469 [appveyor][3.x] Run the test suite on PHP 7.1 2017-05-02 10:05:20 +02:00
David Maicher
f67eba863c [EventDispatcher] fix merge of #22541 from 2.8 2017-05-01 20:34:19 +02:00
Fabien Potencier
da26b3f32f bumped Symfony version to 3.2.9 2017-05-01 11:00:12 -07:00
Fabien Potencier
85959c2abb Merge pull request #22601 from fabpot/release-3.2.8
released v3.2.8
2017-05-01 10:47:03 -07:00
Fabien Potencier
e3133489bc updated VERSION for 3.2.8 2017-05-01 10:46:48 -07:00
Fabien Potencier
4bb25dc938 updated CHANGELOG for 3.2.8 2017-05-01 10:46:41 -07:00
Fabien Potencier
1f1b5d4f9e bumped Symfony version to 2.8.21 2017-05-01 10:40:16 -07:00
Fabien Potencier
bbe1eae0c2 Merge pull request #22599 from fabpot/release-2.8.20
released v2.8.20
2017-05-01 09:14:31 -07:00
Fabien Potencier
db017ebba2 updated VERSION for 2.8.20 2017-05-01 09:14:16 -07:00
Fabien Potencier
f98aeb2fd0 updated CHANGELOG for 2.8.20 2017-05-01 09:14:12 -07:00
Fabien Potencier
0e9a243bba bumped Symfony version to 2.7.28 2017-05-01 09:13:24 -07:00
Fabien Potencier
5c7a1e0f33 Merge pull request #22598 from fabpot/release-2.7.27
released v2.7.27
2017-05-01 09:01:39 -07:00
Fabien Potencier
161bed58be updated VERSION for 2.7.27 2017-05-01 09:01:24 -07:00
Fabien Potencier
44d2149378 update CONTRIBUTORS for 2.7.27 2017-05-01 09:01:11 -07:00
Fabien Potencier
ddc9e78b08 updated CHANGELOG for 2.7.27 2017-05-01 09:01:06 -07:00
Fabien Potencier
c7a7170e0e fixed tests 2017-05-01 07:58:48 -07:00
Fabien Potencier
9c610ee1a2 fixed merge 2017-05-01 07:56:26 -07:00
Fabien Potencier
824dc8ba5f Merge branch '2.8' into 3.2
* 2.8:
  Fix minor phpdoc mismatches with the code(detected by phan)
  [Asset] Starting slash should indicate no basePath wanted
  [Security] Fix phpdoc logout listener
  Add iconv extension to suggested dependencies
  Fix minor typo in the main README.md
  Allow Upper Case property names in ObjectNormalizer
  [EventDispatcher] fix: unwrap listeners for correct info
2017-05-01 07:55:58 -07:00
Fabien Potencier
6000fafa27 Merge branch '2.7' into 2.8
* 2.7:
  Fix minor phpdoc mismatches with the code(detected by phan)
  [Asset] Starting slash should indicate no basePath wanted
  [Security] Fix phpdoc logout listener
  Fix minor typo in the main README.md
2017-05-01 07:31:55 -07:00
Fabien Potencier
c84ee65b99 minor #22453 Fix minor phpdoc mismatches with the code(detected by phan) (TysonAndre)
This PR was squashed before being merged into the 2.7 branch (closes #22453).

Discussion
----------

Fix minor phpdoc mismatches with the code(detected by phan)

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

Fix minor mismatches between phpdoc and the type of the code itself, detected by etsy/phan (Prevent confusion in the future)
The actual return types of a few functions have changed from int to bool where preg_match or `&` was used.
Fix optional param before required param in src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php

The config used and the rest of the output is at https://gist.github.com/TysonAndre/91bed0e16583301f1e6e5cc2a4807081 (Uses some patches to etsy/phan that weren't merged to master yet)

Commits
-------

12f1239565 Fix minor phpdoc mismatches with the code(detected by phan)
2017-04-29 08:58:47 -07:00
Tyson Andre
12f1239565 Fix minor phpdoc mismatches with the code(detected by phan) 2017-04-29 08:58:46 -07:00
Fabien Potencier
07fc0602e1 bug #22550 Allow Upper Case property names in ObjectNormalizer (insekticid)
This PR was merged into the 2.8 branch.

Discussion
----------

Allow Upper Case property names in ObjectNormalizer

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

Same problem that has been fixed here https://github.com/symfony/symfony/pull/22265
and here https://github.com/api-platform/core/pull/1037

ObjectNormalizer returns $id instead of $Id. It is bad naming convention, but is possible

```php
class Entity {
    protected $Id;

    public function getId()
    {
        return $this->Id;
    }
}
```

Commits
-------

b2b4faa3c0 Allow Upper Case property names in ObjectNormalizer
2017-04-29 08:44:59 -07:00
Fabien Potencier
04e48bd120 minor #22557 [VarDumper] Add iconv dependency (julienfalque)
This PR was merged into the 2.8 branch.

Discussion
----------

[VarDumper] Add iconv dependency

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

Alternative to #20927.

I still think adding `@requires extension iconv` to the related tests would be nice though: on some PHP setups the iconv extension is not available by default, those tests will fail and result in red errors when running the test suite, even when working on something unrelated. The test would still run on CI so it's fine IMO.

Should I add `ext-iconv` and/or `symfony/polyfill` to `require-dev`?

/cc @nicolas-grekas

Commits
-------

13f17079ef Add iconv extension to suggested dependencies
2017-04-29 08:42:18 -07:00
Fabien Potencier
c669b88403 bug #22528 [Asset] Starting slash should indicate no basePath wanted (weaverryan)
This PR was squashed before being merged into the 2.7 branch (closes #22528).

Discussion
----------

[Asset] Starting slash should indicate no basePath wanted

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

**Important** View the second commit for an accurate diff. The first commit just renames some strings in a test for clarity.

When we moved `PathPackage` from `Templating` to `Asset`, we actually changed its behavior. Assume that we're deployed under a `/subdir` subdirectory:

**Before** `{{ asset('/main.css') }}` would *not* have the base path prefixed -> `/main.css`

**After** `{{ asset('/main.css') }}` *does* have the base path prefixed -> `/subdir/main.css`

3adff11d72/src/Symfony/Component/Templating/Asset/PathPackage.php (L61-L63)

This PR simply reverses that, to the *previous* behavior. This *is* a BC break... and also arguably a bug fix :). Interestingly, when we changed the behavior the first time (i.e. broke BC), I don't think that anyone noticed. It should only affect users deployed under a subdirectory.

Why do I care? I'm using the new `JsonManifestVersionStrategy` with a library that is outputting paths that *already* include my subdirectory:

```json
{
    "build/main.css": "/subdir/build/main.abc123.css"
}
```

So, I do not want Symfony to detect the `/subdir` and apply it a second time.

Commits
-------

3cc096b540 [Asset] Starting slash should indicate no basePath wanted
2017-04-28 16:08:26 -07:00
Ryan Weaver
3cc096b540 [Asset] Starting slash should indicate no basePath wanted 2017-04-28 16:08:24 -07:00
Fabien Potencier
af15ead255 minor #22574 [Security] Fix phpdoc logout listener (ro0NL)
This PR was squashed before being merged into the 2.7 branch (closes #22574).

Discussion
----------

[Security] Fix phpdoc logout listener

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

Separated from #22572

Commits
-------

e843924c03 [Security] Fix phpdoc logout listener
2017-04-28 10:36:26 -07:00
Roland Franssen
e843924c03 [Security] Fix phpdoc logout listener 2017-04-28 10:36:25 -07:00
Nicolas Grekas
c590e85c1b bug #22568 [EventDispatcher] fix getting priorities of listeners during dispatch (dmaicher)
This PR was merged into the 3.2 branch.

Discussion
----------

[EventDispatcher] fix getting priorities of listeners during dispatch

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

The WebProfiler collects listener info during dispatching the `kernel.terminate` event which caused issues while retrieving priorities as the wrappers are registered instead of the real listeners.

Commits
-------

79b71c0 [EventDispatcher] fix getting priorities of listeners during dispatch
2017-04-28 14:55:39 +02:00
David Maicher
79b71c069d [EventDispatcher] fix getting priorities of listeners during dispatch 2017-04-28 13:59:53 +02:00
Julien Falque
13f17079ef
Add iconv extension to suggested dependencies 2017-04-28 08:26:40 +02:00