Commit Graph

23096 Commits

Author SHA1 Message Date
Nicolas Grekas ecdd681898 Merge branch '2.7' into 2.8
* 2.7:
  Fix undefined array $server
  Fix bug in windows detection
  [ProxyManager] Tmp fix composer reqs issue in ZF
  Add missing exclusions from phpunit.xml.dist
  [Serializer] ObjectNormalizer: don't serialize static methods and props
  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/Component/Security/phpunit.xml.dist
2015-11-18 14:45:00 +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 e122d88eb6 minor #16565 [Validator] BIC (SWIFT-BIC) validation constraint sl translation (peterkokot)
This PR was merged into the 2.8 branch.

Discussion
----------

[Validator] BIC (SWIFT-BIC) validation constraint sl translation

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

39f0989 [Validator] [sl] BIC (SWIFT-BIC) validation constraint
2015-11-18 11:19:47 +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 362974b85b bug #16581 Fix call to undefined function json_last_error_message (dawehner)
This PR was squashed before being merged into the 2.8 branch (closes #16581).

Discussion
----------

Fix call to undefined function json_last_error_message

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

Commits
-------

15f9cf2 Fix call to undefined function json_last_error_message
2015-11-18 11:05:39 +01:00
Daniel Wehner 15f9cf2740 Fix call to undefined function json_last_error_message 2015-11-18 11:05:38 +01:00
Fabien Potencier 78de5e30ea bug #16573 [FrameworkBundle] Fix PropertyInfo extractor namespace in framework bundle (jvasseur)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Fix PropertyInfo extractor namespace in framework bundle

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

The only failing test I had was because of the missing zendframework/zend-stdlib, adding it made tests pass.

Commits
-------

d04984a Fix PropertyInfo extractor namespace in framework bundle
2015-11-18 10:59:41 +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
Jérôme Vasseur d04984ad05 Fix PropertyInfo extractor namespace in framework bundle 2015-11-18 09:40:44 +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
Tobias Schultze 17608389f1 minor #16568 [Form] Enhance some FormRegistry deprecation messages (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Enhance some FormRegistry deprecation messages

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

Commits
-------

02d2148 [Form] Enhance some FormRegistry deprecation messages
2015-11-17 12:52:32 +01:00
Tobias Schultze cfc1e3aa6d minor #16564 [WebProfilerBundle] correct typo in show stack trace link (shieldo)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfilerBundle] correct typo in show stack trace link

| Q             | A
| ------------- | ---
| Fixed tickets | n/a
| License       | MIT

Simple typo fix for link for showing stack trace in the Logs page of the 2.8/3.0 profiler.

Commits
-------

9b08505 [WebProfilerBundle] correct typo in show stack trace link
2015-11-17 12:51:10 +01:00
Nicolas Grekas 02d2148f37 [Form] Enhance some FormRegistry deprecation messages 2015-11-17 11:33:11 +01:00
Peter Kokot 39f09893b9 [Validator] [sl] BIC (SWIFT-BIC) validation constraint 2015-11-17 02:04:18 +01:00
Douglas Greenshields 9b0850511f [WebProfilerBundle] correct typo in show stack trace link 2015-11-17 00:47:20 +00:00
Fabien Potencier 86b4c0536c bumped Symfony version to 2.8.0 2015-11-16 13:50:22 +01:00
Fabien Potencier 3b99b3a6e7 Merge pull request #16550 from fabpot/release-2.8.0-BETA1
released v2.8.0-BETA1
2015-11-16 10:09:38 +01:00
Fabien Potencier 021c087486 updated VERSION for 2.8.0-BETA1 2015-11-16 10:09:15 +01:00
Fabien Potencier dca92f59d8 updated CHANGELOG for 2.8.0-BETA1 2015-11-16 10:09:05 +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 fef28b2fa1 Merge branch '2.7' into 2.8 2015-11-12 02:14: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
Fabien Potencier cbaa9c4eac minor #16523 Reorder upgrade doc (umpirsky)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #16523).

Discussion
----------

Reorder upgrade doc

Just group "The option "`a`" was renamed to "`b`"." together.

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

Commits
-------

2c65507 Reorder upgrade steps
2015-11-11 16:43:22 +01:00
umpirsky 2c655074f8 Reorder upgrade steps 2015-11-11 16:43:21 +01:00
Fabien Potencier 775129fcd2 bug #16515 Fixed tabs when there are several groups of tabs in the same page (javiereguiluz)
This PR was merged into the 2.8 branch.

Discussion
----------

Fixed tabs when there are several groups of tabs in the same page

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

Multiple tabs in the same page work again as expected:

![multiple_tabs](https://cloud.githubusercontent.com/assets/73419/11059933/310169c6-879d-11e5-91b2-b90af67b2a74.gif)

Commits
-------

c5daff0 Fixed tabs when there are several groups of tabs in the same page
2015-11-10 13:35:38 +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
Javier Eguiluz c5daff0143 Fixed tabs when there are several groups of tabs in the same page 2015-11-10 11:20:15 +01:00
Fabien Potencier 0fc513e611 feature #16156 [Filesystem] Changed dumpFile to allow dumping to streams (markchalloner, pierredup)
This PR was merged into the 2.8 branch.

Discussion
----------

[Filesystem] Changed dumpFile to allow dumping to streams

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

This is a follow-up of #14970 with comments addressed

Commits
-------

5ca7dee Fix mode
a17aa5e Fixed failing test for HHVM
61a3afd Removed unused logic in MockStream
247266c Update coding standard for MockStream
c6a7747 [Filesystem] added tempnam() stream wrapper aware version of PHP's native tempnam() and fixed dumpFile to allow dumping to streams
2015-11-09 22:34:48 +01:00
Fabien Potencier 456e55846d bug #16493 [Security] Renamed key to secret Part 2 (WouterJ)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Renamed key to secret Part 2

Anonymous and RememberMe were already changed in https://github.com/symfony/symfony/pull/15141 This PR renames 2 more occurences of key in the Security: AnonymousAuthenticationListener and the Digest entry point.

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

Commits
-------

55f59d5 Renamed key to secret
2015-11-09 22:34:05 +01:00
Nicolas Grekas 7c0b9b6a0d Merge branch '2.7' into 2.8
* 2.7:
  [ci] Tmp force phpunit/phpunit-mock-objects <= 3.0.0
2015-11-09 17:22:52 +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
Pierre du Plessis 5ca7dee2fd Fix mode 2015-11-09 17:11:40 +02:00
Pierre du Plessis a17aa5e091 Fixed failing test for HHVM 2015-11-09 17:11:40 +02:00
Pierre du Plessis 61a3afd829 Removed unused logic in MockStream 2015-11-09 17:11:40 +02:00