Commit Graph

22870 Commits

Author SHA1 Message Date
Nicolas Grekas
114e5d68d2 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix transient tests for incremental outputs

Conflicts:
	src/Symfony/Component/Process/Tests/ProcessTest.php
2016-02-02 14:32:58 +01:00
Nicolas Grekas
60cbf0dce8 minor #17650 [Process] Fix transient tests for incremental outputs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix transient tests for incremental outputs

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

Commits
-------

90455df [Process] Fix transient tests for incremental outputs
2016-02-02 14:27:33 +01:00
Nicolas Grekas
90455dfe56 [Process] Fix transient tests for incremental outputs 2016-02-02 14:16:45 +01:00
Nicolas Grekas
e874754dee [Console] Add missing @require annotation in test 2016-02-02 10:46:12 +01:00
Nicolas Grekas
49031493ef Fix merge 2016-02-01 21:47:29 +01:00
Nicolas Grekas
fc5e80c0cb Merge branch '2.3' into 2.7
* 2.3:
  [appveyor] Fix failure reporting
2016-02-01 21:45:15 +01:00
Nicolas Grekas
de6e3c81d8 minor #17639 [appveyor] Fix failure reporting (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[appveyor] Fix failure reporting

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

Status: needs work

Commits
-------

b58f483 [appveyor] Fix failure reporting
2016-02-01 21:44:24 +01:00
Nicolas Grekas
b58f4833df [appveyor] Fix failure reporting 2016-02-01 21:38:54 +01:00
Christian Flothmann
1a96c40f35 [#17634] move DebugBundle license file 2016-02-01 20:40:12 +01:00
Christian Flothmann
10c17f8589 Merge branch '2.3' into 2.7
* 2.3:
  Move licenses according to new best practices
2016-02-01 20:38:55 +01:00
Christian Flothmann
445eb03511 minor #17634 Move licenses according to new best practices (dunglas)
This PR was merged into the 2.3 branch.

Discussion
----------

Move licenses according to new best practices

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

Commits
-------

aab5dec Move licenses according to new best practices
2016-02-01 20:32:16 +01:00
Fabien Potencier
bb205039f5 Merge branch '2.3' into 2.7
* 2.3:
  backport GlobTest from 2.7 branch
  [2.3] Fixed an undefined variable in Glob::toRegex
2016-02-01 13:39:46 +01:00
Fabien Potencier
f560dc0ded minor #17633 [FrameworkBundle] Remove unused code in test (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove unused code in test

| 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

Commits
-------

8780e26 [FrameworkBundle] Remove unused code in test
2016-02-01 13:36:16 +01:00
Fabien Potencier
2ef7489fea minor #17638 [Finder] backport GlobTest from 2.7 branch (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] backport GlobTest from 2.7 branch

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

Commits
-------

ceaeb43 backport GlobTest from 2.7 branch
2016-02-01 13:35:14 +01:00
Fabien Potencier
5a79ac623d minor #17629 [2.3] Fixed an undefined variable in Glob::toRegex (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fixed an undefined variable in Glob::toRegex

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

Note: to be merged **only in Symfony 2.3**.  `$delimiter` variable exists in the rest of Symfony versions.

Commits
-------

f0b7c14 [2.3] Fixed an undefined variable in Glob::toRegex
2016-02-01 13:33:51 +01:00
Christian Flothmann
ceaeb43692 backport GlobTest from 2.7 branch 2016-02-01 12:48:21 +01:00
Kévin Dunglas
aab5decc5b Move licenses according to new best practices 2016-01-31 22:16:42 +01:00
Kévin Dunglas
8780e26c9d [FrameworkBundle] Remove unused code in test 2016-01-31 22:09:31 +01:00
Javier Eguiluz
f0b7c14fd2 [2.3] Fixed an undefined variable in Glob::toRegex 2016-01-31 20:27:08 +01:00
Fabien Potencier
ccc6d311b1 simplified a test 2016-01-31 08:57:13 +01:00
Fabien Potencier
9d8232bf25 Merge branch '2.3' into 2.7
* 2.3:
  fix container cache key generation
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()
2016-01-31 08:56:20 +01:00
Fabien Potencier
27de563236 bug #17596 [Translation] Add resources from fallback locale to parent catalogue (c960657)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation] Add resources from fallback locale to parent catalogue

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

The resources representing a locale includes those of the fallback locale. However, `getCatalogue()->getResources()` only returns the resources belonging specifically to the selected locale.

Example: The locale `en_GB` falls back to `en`. I use the locale `en_GB`. During development, when I modify the `en_GB` translation file, the changes appear instantly when reloading the page. If I modify the `en` translation file, I need to manually clear the cache in order for the new translation to appear.

I believe this is a regression that was introduced in #15527.

This patch is for the 2.3 branch. For 2.6 and later, the test can be updated to use the getCatalogue() method instead of using ReflectionProperty.

Commits
-------

f7f82fa [Translation] Add resources from fallback locale
2016-01-31 08:53:09 +01:00
Fabien Potencier
9cdb2074ce minor #17620 [FrameworkBundle] fix container cache key generation (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] fix container cache key generation

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

If the actual class name were not taken into, we would not be able to
detect inconsistencies between the different configuration formats (PHP,
YAML, and XML) as the container built based on the first evaluated
configuration format would be cached and reused by tests for the other
formats too.

Commits
-------

29750e5 fix container cache key generation
2016-01-31 08:38:33 +01:00
Fabien Potencier
aadd4b6ed4 minor #17616 [Form] fix option name in changelog (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] fix option name in changelog

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

Commits
-------

0c4b636 [Form] fix option name in changelog
2016-01-31 08:33:25 +01:00
Christian Flothmann
29750e51ad fix container cache key generation
If the actual class name were not taken into, we would not be able to
detect inconsistencies between the different configuration formats (PHP,
YAML, and XML) as the container built based on the first evaluated
configuration format would be cached and reused by tests for the other
formats too.
2016-01-30 22:24:39 +01:00
Christian Flothmann
0c4b636c24 [Form] fix option name in changelog 2016-01-30 21:05:11 +01:00
Fabien Potencier
8c0b48f6ca bug #17605 [FrameworkBundle] remove default null value for asset version (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] remove default null value for asset version

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

Setting `null` as the version of a package means that it uses the empty
version strategy. However, omitting the `version` option entirely was
meant to fall back to the default version strategy. This is not possible
when the default version value is `null` as there is no way to remove
it.

Commits
-------

25f735f remove default null value for asset version
2016-01-30 16:54:06 +01:00
Fabien Potencier
bd7f4d6b22 minor #17582 [2.7] Fix tests (paradajozsef)
This PR was squashed before being merged into the 2.7 branch (closes #17582).

Discussion
----------

[2.7] Fix tests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Let's see Travis results
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

c8e1384 [2.7] Fix tests
2016-01-30 16:53:21 +01:00
Paráda József
c8e1384b84 [2.7] Fix tests 2016-01-30 16:53:18 +01:00
Fabien Potencier
12bee17ffc bug #17606 [DependencyInjection] pass triggerDeprecationError arg to parent class (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] pass triggerDeprecationError arg to parent class

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/17565#discussion_r51100525
| License       | MIT
| Doc PR        |

Commits
-------

350625d pass triggerDeprecationError arg to parent class
2016-01-30 09:55:49 +01:00
Christian Flothmann
350625dd21 pass triggerDeprecationError arg to parent class 2016-01-30 09:46:07 +01:00
Christian Flothmann
25f735f78a remove default null value for asset version
Setting `null` as the version of a package means that it uses the empty
version strategy. However, omitting the `version` option entirely was
meant to fall back to the default version strategy. This is not possible
when the default version value is `null` as there is no way to remove
it.
2016-01-30 09:02:28 +01:00
Fabien Potencier
b6a8ed6bb6 minor #17604 [2.7] [2.8] [3.0] [minor fix] remove duplicated value (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [2.8] [3.0] [minor fix] remove duplicated value

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

Commits
-------

d15c34a remove duplicated value
2016-01-29 18:33:07 +01:00
Jules Pietri
d15c34a51f remove duplicated value 2016-01-29 17:58:49 +01:00
Christian Schmidt
f7f82fa4f2 [Translation] Add resources from fallback locale 2016-01-28 23:38:57 +01:00
Fabien Potencier
2c43532376 bug #16956 [DependencyInjection] XmlFileLoader: enforce tags to have a name (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] XmlFileLoader: enforce tags to have a name

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

Commits
-------

d86a3a7 [DependencyInjection] enforce tags to have a name
2016-01-28 08:04:25 +01:00
Christian Flothmann
d86a3a7ba3 [DependencyInjection] enforce tags to have a name 2016-01-27 23:29:55 +01:00
Fabien Potencier
0005c560ec minor #17576 [YAML] Refine the return value of Yaml::parse() (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[YAML] Refine the return value of Yaml::parse()

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

Commits
-------

6a806e3 [YAML] Refine the return value of Yaml::parse()
2016-01-27 17:58:40 +01:00
Jakub Zalas
6a806e32b7 [YAML] Refine the return value of Yaml::parse() 2016-01-27 16:53:33 +00:00
Fabien Potencier
528572b764 minor #17565 [DependencyInjection] simplify the BC layer (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] simplify the BC layer

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

The change to the `setFactoryService()` method is consistent with what
we did with the `getFactoryService()` before (and how we handle the
deprecation of strict references in Symfony 2.8).

Commits
-------

6cd5ee3 [DependencyInjection] simplify the BC layer
2016-01-27 16:32:31 +01:00
Fabien Potencier
2ef46b311b minor #17566 Change couple of occurences of a public setUp() method to protected (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

Change couple of occurences of a public setUp() method to protected

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

`setUp()` is a protected method. There's no occurrences on the 2.3 branch.

Commits
-------

5fe7359 Change couple of occurences of a public setUp() method to protected
2016-01-27 16:22:58 +01:00
Christian Flothmann
6cd5ee3b26 [DependencyInjection] simplify the BC layer
The change to the `setFactoryService()` method is consistent with what
we did with the `getFactoryService()` before (and how we handle the
deprecation of strict references in Symfony 2.8).
2016-01-27 12:47:27 +01:00
Jakub Zalas
5fe7359659 Change couple of occurences of a public setUp() method to protected 2016-01-27 11:47:13 +00:00
Christian Flothmann
3a027badb7 Merge branch '2.3' into 2.7
* 2.3:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows
2016-01-27 12:27:15 +01:00
Fabien Potencier
828fba4e1d fixed CS 2016-01-27 11:46:45 +01:00
Fabien Potencier
7365bc0e84 bug #16265 [BrowserKit] Corrected HTTP_HOST logic (Naktibalda)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #16265).

Discussion
----------

[BrowserKit] Corrected HTTP_HOST logic

HTTP_HOST is just a header - it does not override URI,
uri does not override HTTP_HOST header.
If HTTP_HOST is not set then and only then hostname is extracted from uri.

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

Commits
-------

b5f524d [BrowserKit] Corrected HTTP_HOST logic #15398
2016-01-27 11:45:57 +01:00
Gintautas Miselis
b5f524d40b [BrowserKit] Corrected HTTP_HOST logic #15398 2016-01-27 11:45:57 +01:00
Fabien Potencier
72fa3bdda9 minor #17552 Remove invalid CSS white-space value (Triiistan)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove invalid CSS white-space value

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

Commits
-------

03d3182 Remove invalid CSS white-space value
2016-01-27 11:20:13 +01:00
Fabien Potencier
da16d15f13 bug #17554 [DependencyInjection] resolve aliases in factories (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] resolve aliases in factories

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

Commits
-------

fde10e7 resolve aliases in factories
2016-01-27 11:13:36 +01:00
Fabien Potencier
7743eefe18 bug #17555 [DependencyInjection] resolve aliases in factory services (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] resolve aliases in factory services

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

Commits
-------

7702189 resolve aliases in factory services
2016-01-27 11:10:53 +01:00