Commit Graph

22286 Commits

Author SHA1 Message Date
Fabien Potencier 16fb7016c8 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix trailing space in PHP binary finder
  Remove tmp addition of zend-stdlib
2015-11-19 17:11:24 +01:00
Nicolas Grekas 1728dcca82 minor #16599 [Process] Fix trailing space in PHP binary finder (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix trailing space in PHP binary finder

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

Commits
-------

f15e6e0 [Process] Fix trailing space in PHP binary finder
2015-11-19 13:57:32 +01:00
Nicolas Grekas f15e6e0ba9 [Process] Fix trailing space in PHP binary finder 2015-11-19 13:49:26 +01:00
Nicolas Grekas 49aa6d4351 minor #16595 Remove tmp addition of zend-stdlib (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove tmp addition of zend-stdlib

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

Reverts #16553

Commits
-------

6e015e7 Remove tmp addition of zend-stdlib
2015-11-19 13:48:26 +01:00
Nicolas Grekas 6e015e7e0e Remove tmp addition of zend-stdlib 2015-11-19 13:33:53 +01:00
Nicolas Grekas aa82cd338a Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix PhpProcess with phpdbg runtime

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
2015-11-18 17:27:55 +01:00
Nicolas Grekas a05e73fa47 bug #16574 [Process] Fix PhpProcess with phpdbg runtime (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix PhpProcess with phpdbg runtime

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

With this PR, I'm able to successfully run the test suite of the Process component using
`phpdbg -qrr ./phpunit src/Symfony/Component/Process/`

Commits
-------

9669238 [Process] Fix PhpProcess with phpdbg runtime
2015-11-18 17:26:24 +01:00
Nicolas Grekas 9669238af6 [Process] Fix PhpProcess with phpdbg runtime 2015-11-18 16:41:59 +01:00
Nicolas Grekas a8d21b5ca9 Merge branch '2.3' into 2.7
* 2.3:
  Fix undefined array $server
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Add missing exclusions from phpunit.xml.dist
  Fix the server variables in the router_*.php files
  [Validator] Allow an empty path with a non empty fragment or a query
  The following change adds support for Armenian pluralization.
  [2.3][Process] fix Proccess run with pts enabled

Conflicts:
	composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
	src/Symfony/Component/Security/phpunit.xml.dist
2015-11-18 14:41:01 +01:00
Fabien Potencier 6f72d6346e minor #16580 Add missing exclusions from phpunit.xml.dist (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Add missing exclusions from phpunit.xml.dist

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

Commits
-------

d4880c4 Add missing exclusions from phpunit.xml.dist
2015-11-18 11:16:24 +01:00
Fabien Potencier a4ea881109 minor #16566 [HttpFoundation] Fix undefined array $server (belka-ew)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16566).

Discussion
----------

[HttpFoundation] Fix undefined array $server

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

$server variable isn't defined in the test /src/Symfony/Component/HttpFoundation/Tests/RequestTest.php:RequestTest

Commits
-------

75aa6f6 Fix undefined array $server
2015-11-18 11:13:04 +01:00
Eugene Wissner 75aa6f68f8 Fix undefined array $server 2015-11-18 11:13:04 +01:00
Fabien Potencier 2cbf8221e6 bug #16578 [Console] Fix bug in windows detection (kbond)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #16578).

Discussion
----------

[Console] Fix bug in windows detection

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

Commits
-------

c4068d9 Fix bug in windows detection
2015-11-18 10:54:27 +01:00
Kevin Bond c4068d923d Fix bug in windows detection 2015-11-18 10:54:26 +01:00
Nicolas Grekas 040b4095fa minor #16553 [ProxyManager] Tmp fix composer reqs issue in ZF (nicolas-grekas)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16553).

Discussion
----------

[ProxyManager] Tmp fix composer reqs issue in ZF

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

See https://github.com/Ocramius/ProxyManager/issues/260#issuecomment-156962918

Commits
-------

0125145 [ProxyManager] Tmp fix composer reqs issue in ZF
2015-11-18 10:04:25 +01:00
Nicolas Grekas 01251455c0 [ProxyManager] Tmp fix composer reqs issue in ZF 2015-11-18 10:04:13 +01:00
Nicolas Grekas d4880c4785 Add missing exclusions from phpunit.xml.dist 2015-11-18 09:19:46 +01:00
Fabien Potencier 59f357d3c1 bug #16546 [Serializer] ObjectNormalizer: don't serialize static methods and props (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #16546).

Discussion
----------

[Serializer] ObjectNormalizer: don't serialize static methods and props

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

Commits
-------

1fab27b [Serializer] ObjectNormalizer: don't serialize static methods and props
2015-11-17 20:34:28 +01:00
Kévin Dunglas 1fab27b58c [Serializer] ObjectNormalizer: don't serialize static methods and props 2015-11-17 20:34:27 +01:00
Fabien Potencier c0f7463c3e bug #16352 Fix the server variables in the router_*.php files (leofeyer)
This PR was squashed before being merged into the 2.3 branch (closes #16352).

Discussion
----------

Fix the server variables in the router_*.php files

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

The built-in web server automatically rewrites everything to the `app_dev.php` script, but it does not adjust the server variables accordingly.

Here is the output of `print_r($_SERVER)` on Apache with mod_rewrite enabled (relevant lines only):

```
Array
(
    [REQUEST_URI] => /text-elements.html
    [SCRIPT_NAME] => /app_dev.php
    [PHP_SELF] => /app_dev.php
)
```

And here is the output of the exact same script on the built-in server:

```
Array
(
    [REQUEST_URI] => /text-elements.html
    [SCRIPT_NAME] => /text-elements.html
    [PHP_SELF] => /text-elements.html
)
```

And here is the return value of Symfony's `Request::getScriptName()` method:

```php
// Apache: http://localhost/text-elements.html
echo $this->container->get('request_stack')->getCurrentRequest()->getScriptName(); // /app_dev.php

// Built-in web server: http://127.0.0.1:8000/text-elements.html
echo $this->container->get('request_stack')->getCurrentRequest()->getScriptName(); // /text-elements.html
```

This PR fixes the two server variables in the `router_dev.php` script.

Commits
-------

4923411 Fix the server variables in the router_*.php files
2015-11-13 09:09:50 +01:00
Leo Feyer 4923411062 Fix the server variables in the router_*.php files 2015-11-13 09:09:48 +01:00
Fabien Potencier f2e87224e0 bug #16537 [Validator] Allow an empty path with a non empty fragment or a query (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Allow an empty path with a non empty fragment or a query

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

#16259 didn't fully fix the issue.

Commits
-------

2d0af8e [Validator] Allow an empty path with a non empty fragment or a query
2015-11-13 09:06:49 +01:00
Jakub Zalas 2d0af8e719 [Validator] Allow an empty path with a non empty fragment or a query 2015-11-13 07:29:58 +00:00
Fabien Potencier ec39f9da5d bug #16528 [Translation] Add support for Armenian pluralization. (marcosdsanchez)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16528).

Discussion
----------

[Translation] Add support for Armenian pluralization.

According to http://www.unicode.org/cldr/charts/27/supplemental/language_plural_rules.html#hy
Armenian has 2 forms of pluralization for cardinal numbers.

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

Commits
-------

5f1980b The following change adds support for Armenian pluralization.
2015-11-12 10:09:49 +01:00
Marcos Sánchez 5f1980ba5c The following change adds support for Armenian pluralization.
According to http://www.unicode.org/cldr/charts/27/supplemental/language_plural_rules.html#hy
Armenian has 2 forms of pluralization.
2015-11-12 10:09:48 +01:00
Tobias Schultze 0bd8b58d9b minor #16446 OptionsResolver test coverage (eventhorizonpl)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #16446).

Discussion
----------

OptionsResolver test coverage

Hi,

This PR adds 100% test code coverage to OptionsResolver component.

Best regards,
Michal

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

Commits
-------

185950c OptionsResolver test coverage
2015-11-12 02:13:16 +01:00
Michal Piotrowski 185950c5d4 OptionsResolver test coverage 2015-11-12 02:13:15 +01:00
Nicolas Grekas ab3c8f891a bug #16510 [2.3][Process] fix Proccess run with pts enabled (ewgRa)
This PR was squashed before being merged into the 2.3 branch (closes #16510).

Discussion
----------

[2.3][Process] fix Proccess run with pts enabled

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

Commits
-------

9cf90fb [2.3][Process] fix Proccess run with pts enabled
2015-11-10 11:50:50 +01:00
Evgeniy Sokolov 9cf90fbcbf [2.3][Process] fix Proccess run with pts enabled 2015-11-10 11:49:25 +01:00
Nicolas Grekas 6f1d506824 Merge branch '2.3' into 2.7
* 2.3:
  [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0
2015-11-09 17:22:45 +01:00
Nicolas Grekas f107a0a98e minor #16507 [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0

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

To make tests green again until https://github.com/sebastianbergmann/phpunit-mock-objects/pull/272 or https://github.com/sebastianbergmann/phpunit-mock-objects/pull/268 is merged+tagged.

Commits
-------

1b428df [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0
2015-11-09 17:22:04 +01:00
Nicolas Grekas 1b428df90f [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0 2015-11-09 17:10:51 +01:00
Nicolas Grekas 1bc1931ede Merge branch '2.3' into 2.7
* 2.3:
  [ci] Phpunit tests wont run if composer is installed in a wrapper
  [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
  fix race condition at mkdir (#16258)
  [PropertyAccess] Test access to dynamic properties
  [PropertyAccess] Fix dynamic property accessing.

Conflicts:
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2015-11-09 13:45:14 +01:00
Nicolas Grekas 3d41d9368a minor #16503 [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand (nicolas-grekas, emil-nasso)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Add version tag in phpunit wrapper to trigger cache-reset on demand

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

Commits
-------

f93e0c2 [ci] Phpunit tests wont run if composer is installed in a wrapper
481bf66 [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand
2015-11-09 13:32:25 +01:00
Emil Andersson f93e0c23d1 [ci] Phpunit tests wont run if composer is installed in a wrapper 2015-11-09 13:13:34 +01:00
Nicolas Grekas 481bf6603d [ci] Add version tag in phpunit wrapper to trigger cache-reset on demand 2015-11-09 13:13:33 +01:00
Fabien Potencier 6d46a186a6 bug #16292 fix race condition at mkdir (#16258) (ewgRa)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16292).

Discussion
----------

fix race condition at mkdir (#16258)

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

Commits
-------

2c2836c fix race condition at mkdir (#16258)
2015-11-07 09:38:45 +01:00
Evgeniy Sokolov 2c2836c599 fix race condition at mkdir (#16258) 2015-11-07 09:38:45 +01:00
Fabien Potencier da95b53604 bug #15945 [Form] trigger deprecation warning when using empty_value (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] trigger deprecation warning when using empty_value

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

The `empty_value` option is deprecated in the `choice`, `date`, and
`time` form types. Therefore, a deprecation warning must be triggered
when the users configures a value for this option.

The `datetime` form type does not need to be updated as it passes
configured values to the `date` and `time` form types which trigger
deprecation warnings anyway.

Commits
-------

405d4a8 trigger deprecation warning when using empty_value
2015-11-07 09:26:45 +01:00
Fabien Potencier aacbcef537 bug #16384 [FrameworkBundle] JsonDescriptor - encode container params only once (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] JsonDescriptor - encode container params only once

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

Commits
-------

dd9d076 JsonDescriptor - encode container params only once
2015-11-07 09:20:26 +01:00
Fabien Potencier 9093f1f564 minor #16482 [Bridge] [PhpUnit] fixes documentation markup. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Bridge] [PhpUnit] fixes documentation markup.

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

Commits
-------

9e41d27 [Bridge] [PhpUnit] fixes documentation markup.
2015-11-07 09:12:54 +01:00
Tobias Schultze f75f44b7c5 bug #16480 [VarDumper] Fix PHP7 type-hints compat (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix PHP7 type-hints compat

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

Commits
-------

edd5633 [VarDumper] Fix PHP7 type-hints compat
2015-11-06 18:48:55 +01:00
Nicolas Grekas edd5633374 [VarDumper] Fix PHP7 type-hints compat 2015-11-06 15:49:25 +01:00
Hugo Hamon 9e41d27851 [Bridge] [PhpUnit] fixes documentation markup. 2015-11-06 11:15:01 +01:00
Fabien Potencier 814c2727de bug #16463 [PropertyAccess] Port of the performance optimization from 2.3 (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #16463).

Discussion
----------

[PropertyAccess] Port of the performance optimization from 2.3

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

Portage of #16294 in the 2.7 branch.

Commits
-------

aa4cc90 [PropertyAccess] Port of the performance optimization from 2.3
2015-11-05 14:42:58 +01:00
Kévin Dunglas aa4cc90a87 [PropertyAccess] Port of the performance optimization from 2.3 2015-11-05 14:42:52 +01:00
Fabien Potencier 4f7fd74257 bug #16462 [PropertyAccess] Fix dynamic property accessing. (dunglas)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Fix dynamic property accessing.

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

Fix a bug regarding dynamic properties access introduced by #16294.

Commits
-------

916f9e0 [PropertyAccess] Test access to dynamic properties
352dfb9 [PropertyAccess] Fix dynamic property accessing.
2015-11-05 14:31:32 +01:00
Fabien Potencier 1bed1772f6 bug #16454 [Serializer] GetSetNormalizer shouldn't set/get static methods (boekkooi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] GetSetNormalizer shouldn't set/get static methods

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

This PR fixes setting static getters and setters when serializing.
This is strictly speaking a BC break but in my opinion a needed one because the current behavior is unexpected.

Commits
-------

d8d4405 [Serializer] GetSetNormalizer shouldn't set/get static methods
2015-11-05 14:03:56 +01:00
Fabien Potencier e21bf56c71 bug #16453 [Serializer] PropertyNormalizer shouldn't set static properties (boekkooi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] PropertyNormalizer shouldn't set static properties

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

This PR fixes a bug where static properties where set by the PropertyNormalizer.

Commits
-------

b15bdca [Serializer] PropertyNormalizer shouldn't set static properties
2015-11-05 14:02:15 +01:00
Nicolas Grekas a3f2f5c441 bug #16471 [VarDumper] Fix casting for ReflectionParameter (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fix casting for ReflectionParameter

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

Commits
-------

8ff449d [VarDumper] Fix casting for ReflectionParameter
2015-11-05 10:58:21 +01:00