Commit Graph

26276 Commits

Author SHA1 Message Date
Nicolas Grekas c96d76dd5e Merge branch '2.7' into 2.8
* 2.7:
  Drop hirak/prestissimo
  bumped Symfony version to 2.7.14
  updated VERSION for 2.7.13
  updated CHANGELOG for 2.7.13
  bumped Symfony version to 2.3.42
  [Debug] Fix fatal error handlers on PHP 7
  updated VERSION for 2.3.41
  update CONTRIBUTORS for 2.3.41
  updated CHANGELOG for 2.3.41

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2016-05-12 10:20:14 -05:00
Nicolas Grekas 215c891310 Merge branch '2.3' into 2.7
* 2.3:
  Drop hirak/prestissimo
  bumped Symfony version to 2.3.42
  updated VERSION for 2.3.41
  update CONTRIBUTORS for 2.3.41
  updated CHANGELOG for 2.3.41

Conflicts:
	appveyor.yml
	src/Symfony/Component/HttpKernel/Kernel.php
2016-05-12 10:18:46 -05:00
Nicolas Grekas b3da5df715 minor #18757 Drop hirak/prestissimo (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Drop hirak/prestissimo

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

unstable (see #18743 on appveyor)

Commits
-------

8f136ab Drop hirak/prestissimo
2016-05-12 10:16:26 -05:00
Nicolas Grekas 8f136ab665 Drop hirak/prestissimo 2016-05-12 07:44:15 -05:00
Fabien Potencier 97ebca1528 bug #18677 [DoctrineBridge] Fixed bc layer after #18069 (HeahDude)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[DoctrineBridge] Fixed bc layer after #18069

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

Commits
-------

8a6cf9d [DoctrineBridge] fixed bc layer from #18069
2016-05-11 12:50:28 -05:00
Francis Besset 9a0bc995bb Fixed DateTimeInterface comparaison
Fixed DateTimeInterface comparaison
2016-05-11 15:57:40 +02:00
Fabien Potencier eadfc933ab bug #18745 [MonologBridge] Uninstallable together with symfony/http-kernel in 3.0.6 (ymc-dabe)
This PR was merged into the 3.0 branch.

Discussion
----------

[MonologBridge] Uninstallable together with symfony/http-kernel in 3.0.6

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

Caused by #18705, it is impossible to install v3.0.6 of symfony/monolog-bridge
together with v3.0.6 of symfony/http-kernel.

The intention of #18705 "added a conflict between Monolog bridge 2.8 and
HTTP Kernel 3.0+" was to prevent installing symfony/monolog-bridge from the
3.0 series with http-kernel from the 2.8 series of symfony. While this now
works correctly in v2.8.6, it breaks installing symfony/monolog-bridge v3.0.6
with symfony/http-kernel v3.0.6.

This PR resolves this issue.

# How to reproduce
- Create a test directory and change into it - e.g. with `mkdir /tmp/reproduce-symfony-18745 && cd /tmp/reproduce-symfony-18745`
- Add the following composer.json to this test directory
```
{
   "require": {
     "symfony/monolog-bridge": "3.0.6",
     "symfony/http-kernel": "3.0.6"
  }
}
```
- Run `composer install` from the test directory

## Expected behavior
Composer installs symfony/monolog-bridge and symfony/http-kernel (together with their dependencies).

## Actual behavior
Composer fails with the following error messages:
```
#:/tmp/reproduce-symfony-18745$ composer install
Loading composer repositories with package information
Updating dependencies (including require-dev)
Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - Installation request for symfony/monolog-bridge 3.0.6 -> satisfiable by symfony/monolog-bridge[v3.0.6].
    - symfony/http-kernel v3.0.6 conflicts with symfony/monolog-bridge[v3.0.6].
    - Installation request for symfony/http-kernel 3.0.6 -> satisfiable by symfony/http-kernel[v3.0.6].
```

Commits
-------

72c44c2 [MonologBridge] Uninstallable together with symfony/http-kernel in 3.0.6
2016-05-11 07:54:55 -05:00
Daniel Beyer 72c44c274e [MonologBridge] Uninstallable together with symfony/http-kernel in 3.0.6
Caused by #18705, it is impossible to install v3.0.6 of symfony/monolog-bridge
together with v3.0.6 of symfony/http-kernel.

The intention of #18705 "added a conflict between Monolog bridge 2.8 and
HTTP Kernel 3.0+" was to prevent installing symfony/monolog-bridge from the
3.0 series with http-kernel from the 2.8 series of symfony. While this now
works correctly in v2.8.6, it breaks installing symfony/monolog-bridge v3.0.6
with symfony/http-kernel v3.0.6.

This commit resolves this issue.
2016-05-11 10:46:10 +02:00
Fabien Potencier 7e59c71d9a bug #18737 [Debug] Fix fatal error handlers on PHP 7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Fix fatal error handlers on PHP 7

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

Currently, fatal error handlers are broken on PHP 7.

Commits
-------

c7d3b45 [Debug] Fix fatal error handlers on PHP 7
2016-05-10 11:50:18 -05:00
Fabien Potencier 74a3d0b9c2 bumped Symfony version to 3.0.7 2016-05-09 17:35:04 -05:00
Fabien Potencier a821ed51b8 Merge pull request #18741 from fabpot/release-3.0.6
released v3.0.6
2016-05-10 00:13:31 +02:00
Fabien Potencier 4829ea2b1d updated VERSION for 3.0.6 2016-05-09 17:13:13 -05:00
Fabien Potencier 4f8c89d1be updated CHANGELOG for 3.0.6 2016-05-09 17:12:58 -05:00
Fabien Potencier e9ea57f6c7 bumped Symfony version to 2.8.7 2016-05-09 17:09:16 -05:00
Fabien Potencier 8408816780 Merge pull request #18740 from fabpot/release-2.8.6
released v2.8.6
2016-05-09 23:45:54 +02:00
Fabien Potencier 6d3b1e22c4 updated VERSION for 2.8.6 2016-05-09 16:45:36 -05:00
Fabien Potencier ce1ca0255d updated CHANGELOG for 2.8.6 2016-05-09 16:45:27 -05:00
Fabien Potencier ebdff4686d bumped Symfony version to 2.7.14 2016-05-09 16:42:27 -05:00
Fabien Potencier 7c23f76ba7 Merge pull request #18739 from fabpot/release-2.7.13
released v2.7.13
2016-05-09 22:35:47 +02:00
Fabien Potencier d0c233ee4d updated VERSION for 2.7.13 2016-05-09 15:35:33 -05:00
Fabien Potencier f31a08d69c updated CHANGELOG for 2.7.13 2016-05-09 15:35:20 -05:00
Fabien Potencier 4533220997 bumped Symfony version to 2.3.42 2016-05-09 15:32:07 -05:00
Nicolas Grekas c7d3b45841 [Debug] Fix fatal error handlers on PHP 7 2016-05-09 15:05:29 -05:00
Fabien Potencier f3f87ce00d Merge pull request #18738 from fabpot/release-2.3.41
released v2.3.41
2016-05-09 21:45:40 +02:00
Fabien Potencier efd48596a9 updated VERSION for 2.3.41 2016-05-09 14:45:27 -05:00
Fabien Potencier f80f588218 update CONTRIBUTORS for 2.3.41 2016-05-09 14:45:18 -05:00
Fabien Potencier a5c27e37cd updated CHANGELOG for 2.3.41 2016-05-09 14:45:08 -05:00
Fabien Potencier b4a889fc29 Merge branch '2.8' into 3.0
* 2.8:
  fixed bad merge
2016-05-09 14:39:20 -05:00
Fabien Potencier d86918e1c0 Merge branch '2.7' into 2.8
* 2.7:
  fixed bad merge
2016-05-09 14:39:10 -05:00
Fabien Potencier 9a0e29991d fixed bad merge 2016-05-09 14:39:01 -05:00
Fabien Potencier 5c47d9adc5 Merge branch '2.8' into 3.0
* 2.8:
  Fixed issue with blank password with Ldap
2016-05-09 14:35:23 -05:00
Fabien Potencier 6f48b4be52 security #18736 Fixed issue with blank password with Ldap (csarrazi)
This PR was merged into the 2.8 branch.

Discussion
----------

Fixed issue with blank password with Ldap

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

c7d9c62 Fixed issue with blank password with Ldap
2016-05-09 14:34:47 -05:00
Charles Sarrazin c7d9c62c79 Fixed issue with blank password with Ldap
The bind operation of LDAP, as described in RFC 4513, provides a method
which allows for authentication of users. For the Simple Authentication
Method a user may use the anonymous authentication mechanism, the
unauthenticated authentication mechanism, or the name/password
authentication mechanism. The unauthenticated authentication mechanism
is used when a client who desires to establish an anonymous
authorization state passes a non-zero length distinguished name and a
zero length password. Most LDAP servers either can be configured to
allow this mechanism or allow it by default.

_Web-based applications which perform the simple bind operation with the
client's credentials are at risk when an anonymous authorization state is
established. This can occur when the web-based application passes a
distinguished name and a zero length password to the LDAP server._

Thus, misconfiguring a server with simple bind can trick Symfony into
thinking the username/password tuple as valid, potentially leading to
unauthorized access.
2016-05-09 14:32:30 -05:00
Fabien Potencier 19b8d9e801 Merge branch '2.8' into 3.0
* 2.8:
  limited the maximum length of a submitted username
2016-05-09 14:31:02 -05:00
Fabien Potencier 6d20ceee90 Merge branch '2.7' into 2.8
* 2.7:
  limited the maximum length of a submitted username
2016-05-09 14:24:00 -05:00
Fabien Potencier 60bf201eba Merge branch '2.3' into 2.7
* 2.3:
  limited the maximum length of a submitted username
2016-05-09 14:23:35 -05:00
Fabien Potencier ff93b17930 security #18733 limited the maximum length of a submitted username (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

limited the maximum length of a submitted username

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

f8dc28a limited the maximum length of a submitted username
2016-05-09 14:13:10 -05:00
Fabien Potencier f8dc28ae53 limited the maximum length of a submitted username 2016-05-09 13:29:33 -05:00
Fabien Potencier 273688c5d6 Merge branch '2.8' into 3.0
* 2.8:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  prevent calling get() for service_container service
  call get() after the container was compiled
  Fixed readme of OptionsResolver
  top-level anonymous services must be public
  [DependencyInjection] Suggest ExpressionLanguage in composer.json
  added a conflict between Monolog bridge 2.8 and HTTP Kernel 3.0+
2016-05-09 13:14:44 -05:00
Fabien Potencier 766393de8a Merge branch '2.7' into 2.8
* 2.7:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  prevent calling get() for service_container service
  call get() after the container was compiled
  Fixed readme of OptionsResolver
  [DependencyInjection] Suggest ExpressionLanguage in composer.json
2016-05-09 13:12:35 -05:00
Fabien Potencier b9b68f7af8 Merge branch '2.3' into 2.7
* 2.3:
  [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
  call get() after the container was compiled
  Fixed readme of OptionsResolver
2016-05-09 13:11:52 -05:00
Fabien Potencier 928c1d65b4 bug #18730 [FrameworkBundle] prevent calling get() for service_container service (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] prevent calling get() for service_container service

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

This change will simply fix the tests once #18728 gets merged. An alternative approach would be to compile the container so that the code would still work even for services that have been set directly using `set()`. However, compiling the container in a descriptor imo is an unexpected side effect which I tried to avoid here.

Commits
-------

2d46bd4 prevent calling get() for service_container service
2016-05-09 13:08:03 -05:00
Fabien Potencier daa2afa90c minor #18729 call get() after the container was compiled (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

call get() after the container was compiled

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

This will prevent future issues when calling `ContainerBuilder::get()` before compiling the container will be deprecated (see #18728).

Commits
-------

954126b call get() after the container was compiled
2016-05-09 13:03:25 -05:00
Fabien Potencier 17e29116c6 minor #18695 [DependencyInjection] Suggest ExpressionLanguage in composer.json (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] Suggest ExpressionLanguage in composer.json

| 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

As the DependencyInjection component has lots of classes containing uses of the ExpressionLanguage component, I propose to add it to the composer.json suggests.

Commits
-------

d6c9073 [DependencyInjection] Suggest ExpressionLanguage in composer.json
2016-05-09 13:00:26 -05:00
Fabien Potencier bdc99de4bc minor #18727 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param (eriwin)
This PR was squashed before being merged into the 2.3 branch (closes #18727).

Discussion
----------

[2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param

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

Updated phpdoc of AnonymousToken $user param from string to string|object since an object is allowed to in the parent AbstractToken: https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php#L91

Commits
-------

b1c60b4 [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param
2016-05-09 12:47:57 -05:00
Erik van Wingerden b1c60b4f0d [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param 2016-05-09 12:47:55 -05:00
Christian Flothmann 2d46bd4812 prevent calling get() for service_container service 2016-05-09 17:08:24 +02:00
Christian Flothmann 954126b04f call get() after the container was compiled 2016-05-09 17:05:30 +02:00
Nicolas Grekas 53b1ee52a2 [Cache] Lock-less FilesystemAdapter 2016-05-08 05:02:40 +02:00
Tobias Schultze e8970a6de2 minor #18721 [OptionsResolver] Fixed readme (francisbesset)
This PR was merged into the 2.3 branch.

Discussion
----------

[OptionsResolver] Fixed readme

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

This PR fix bad markdown syntax in readme file of OptionsResolver component.

Commits
-------

beecc6c Fixed readme of OptionsResolver
2016-05-06 22:49:13 +02:00