Commit Graph

18294 Commits

Author SHA1 Message Date
Fabien Potencier
402e18321e Merge branch '2.3' into 2.5
* 2.3:
  [Debug] fix error message on double exception
  Fix initialized() with aliased services
  Rename Symfony2 to Symfony
  backport #12489

Conflicts:
	CONTRIBUTING.md
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
2014-11-28 11:00:29 +01:00
Fabien Potencier
0dfa7d549e minor #12554 compare version using PHP_VERSION_ID (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

compare version using PHP_VERSION_ID

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

This continues the work started in #12497 on the `2.3` branch.

Commits
-------

d2f846b compare version using PHP_VERSION_ID
2014-11-28 10:43:41 +01:00
Fabien Potencier
efbf588ed0 bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
This PR was submitted for the 2.6 branch but it was merged into the 2.3 branch instead (closes #12553).

Discussion
----------

[Debug] fix error message on double exception

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

Commits
-------

1ed7606 [Debug] fix error message on double exception
2014-11-28 10:40:13 +01:00
Nicolas Grekas
1ed7606c32 [Debug] fix error message on double exception 2014-11-28 10:40:13 +01:00
Fabien Potencier
155fa96bff minor #12551 remove an unneeded check (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

remove an unneeded check

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

It is already checked in the `isEnabled()` method if the current PHP
build is HHVM and the `server:run` command is never enabled then.
Thus, it's not needed to check for HHVM on every command execution.

Commits
-------

2035fea remove an unneeded check
2014-11-28 10:36:33 +01:00
Fabien Potencier
819280fbbc bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] backport #12489

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

Commits
-------

556eff1 backport #12489
2014-11-28 10:32:58 +01:00
Fabien Potencier
4f05279edd minor #12565 Rename Symfony2 to Symfony (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

Rename Symfony2 to Symfony

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

Replaces #12563

Commits
-------

0a76b7e Rename Symfony2 to Symfony
2014-11-28 10:25:39 +01:00
Fabien Potencier
1ce8f03040 bug #12570 Fix initialized() with aliased services (Daniel Wehner)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12570).

Discussion
----------

Fix initialized() with aliased services

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

Commits
-------

a18b6d1 Fix initialized() with aliased services
2014-11-25 12:27:34 +01:00
Daniel Wehner
a18b6d17e3 Fix initialized() with aliased services 2014-11-25 12:27:34 +01:00
Romain Neutron
0a76b7e9fc Rename Symfony2 to Symfony 2014-11-24 15:09:11 +01:00
Christian Flothmann
d2f846b453 compare version using PHP_VERSION_ID
This continues the work started in #12497 on the `2.3` branch.
2014-11-23 21:10:39 +01:00
Christian Flothmann
556eff1b54 backport #12489 2014-11-23 20:08:57 +01:00
Christian Flothmann
2035fea2a8 remove an unneeded check
It is already checked in the `isEnabled()` method if the current PHP
build is HHVM and the `server:run` command is never enabled then.
Thus, it's not needed to check for HHVM on every command execution.
2014-11-23 20:04:20 +01:00
Fabien Potencier
5284b59fb9 Merge branch '2.3' into 2.5
* 2.3:
  reformat code as suggested by @fabpot
  Fix typo
  Make `\Request::get` more performant.
  [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data
  bumped Symfony version to 2.3.23
  fixed typo
  updated VERSION for 2.3.22
  update CONTRIBUTORS for 2.3.22
  updated CHANGELOG for 2.3.22

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-11-21 17:07:27 +01:00
Fabien Potencier
da1c1c578b minor #12537 [HttpFoundation] Make Request::get() more performant (KorvinSzanto, xabbuh)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #12537).

Discussion
----------

[HttpFoundation] Make Request::get() more performant

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

This finishes the work started by @KorvinSzanto in #12369.

Commits
-------

3039935 reformat code as suggested by @fabpot
ad64223 Fix typo
4162713 Make `\Request::get` more performant.
2014-11-21 17:05:55 +01:00
Christian Flothmann
3039935997 reformat code as suggested by @fabpot 2014-11-21 17:05:54 +01:00
Korvin Szanto
ad6422304b Fix typo 2014-11-21 17:05:54 +01:00
Korvin Szanto
41627138de Make \Request::get more performant. 2014-11-21 17:05:54 +01:00
Fabien Potencier
d88c60d0df bug #12267 [Form][WebProfiler] Empty form names fix (kix)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #12267).

Discussion
----------

[Form][WebProfiler] Empty form names fix

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

When a Form had no name, the markup was broken in the profiler, making the form tree ugly. This pull request changes the output so that `(no name)` string is displayed when no form name was available.

Before:
![screenshot 2014-10-21 00 06 23](https://cloud.githubusercontent.com/assets/345754/4706329/d596a3ec-5883-11e4-8c67-44a7f357f3e1.png)

After:
![screenshot 2014-10-21 00 08 02](https://cloud.githubusercontent.com/assets/345754/4706359/122674c2-5884-11e4-8237-0177a590f2a0.png)

Commits
-------

6e9642a [Form][WebProfiler] Empty form names fix
2014-11-21 11:16:49 +01:00
Stepan Anchugov
6e9642a9da [Form][WebProfiler] Empty form names fix
When a Form had no name, the markup was broken in the profiler,
making the form tree ugly.
2014-11-21 11:16:49 +01:00
Fabien Potencier
ce3682190c bug #12137 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data (Strate)
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #12137).

Discussion
----------

[FrameworkBundle] cache:clear command fills *.php.meta files with wrong data

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

Test and fix of ticket #12110

Commits
-------

76273bf [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data
2014-11-21 08:48:44 +01:00
Strate
76273bf459 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data 2014-11-21 08:48:44 +01:00
Fabien Potencier
9500411c9a bumped Symfony version to 2.5.8 2014-11-20 17:26:06 +01:00
Fabien Potencier
dd4254fc39 updated VERSION for 2.5.7 2014-11-20 17:00:03 +01:00
Fabien Potencier
3e1f6a3057 update CONTRIBUTORS for 2.5.7 2014-11-20 17:00:01 +01:00
Fabien Potencier
34b5f71d58 updated CHANGELOG for 2.5.7 2014-11-20 16:59:52 +01:00
Fabien Potencier
580de75249 bumped Symfony version to 2.3.23 2014-11-20 16:30:29 +01:00
Fabien Potencier
2f59c8df55 fixed typo 2014-11-20 14:51:29 +01:00
Fabien Potencier
ace20d4885 updated VERSION for 2.3.22 2014-11-20 14:28:56 +01:00
Fabien Potencier
66f194ef85 update CONTRIBUTORS for 2.3.22 2014-11-20 14:28:44 +01:00
Fabien Potencier
2c83825136 updated CHANGELOG for 2.3.22 2014-11-20 14:28:17 +01:00
Fabien Potencier
891ebe594e Merge branch '2.3' into 2.5
* 2.3:
  [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners
  be smarter when guessing the document root
  Azerbaijani locale
  Fixed grammar error in docblock
  Adjust upgrade file rendering
  [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions
  compare version using PHP_VERSION_ID
  [Form] Add doc for FormEvents
  don't override internal PHP constants

Conflicts:
	UPGRADE-3.0.md
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpFoundation/Response.php
2014-11-20 14:22:25 +01:00
Fabien Potencier
30bde8961e bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Bundle][FrameworkBundle] be smarter when guessing the document root

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

Commits
-------

e28f5b8 be smarter when guessing the document root
2014-11-20 13:10:35 +01:00
Fabien Potencier
226b0ce669 bug #12296 [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners (rjkip)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12296).

Discussion
----------

[SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | when relying on this configuration behaviour
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #12261
| License       | MIT
| Doc PR        | —

See symfony/symfony#12261.

I configured a different firewall entry point for one firewall. However, when authentication had to be performed, it still called BasicAuthenticationEntryPoint::start() instead of my service's start(). My service was instantiated, yet never used.

The issue appears to be that the entry point is registered with the firewall's exception listener, but not with the BasicAuthenticationListener. This means that when the BasicAuthenticationListener determines the user has  provided wrong credentials, BasicAuthenticationEntryPoint is still used. Only in case of an exception would my  entry point service be used.

In my opinion, this is not correct behaviour. Can someone confirm this? Are there currently tests that pertain to the `entry_point` configuration on which I can base a test?

---

Test setup:

```yaml
# security.yml
security:
    firewalls:
        api:
            pattern: ^/api/
            http_basic: ~
            entry_point: my.service
        default:
            anonymous: ~
```

Commits
-------

92c8dfb [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners
2014-11-20 11:06:53 +01:00
Reinier Kip
92c8dfb5e6 [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners 2014-11-20 11:06:52 +01:00
Christian Flothmann
e28f5b8356 be smarter when guessing the document root 2014-11-20 10:40:57 +01:00
Fabien Potencier
b9425f0bc6 minor #12496 [Form] Add doc for FormEvents (GromNaN)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Add doc for FormEvents

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

Provide the same level of phpdoc for form events than we have for other event classes.

http://api.symfony.com/2.3/Symfony/Component/HttpKernel/KernelEvents.html
http://api.symfony.com/2.3/Symfony/Component/Form/FormEvents.html

Commits
-------

656d45f [Form] Add doc for FormEvents
2014-11-19 09:31:55 +01:00
Fabien Potencier
8b5a16522b minor #12502 Azerbaijani locale (seferov)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #12502).

Discussion
----------

Azerbaijani locale

[Form] [Validator] [Security] Azerbaijani translation added

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

Commits
-------

7f7b700 Azerbaijani locale
2014-11-19 07:31:32 +01:00
Farhad Safarov
7f7b700234 Azerbaijani locale 2014-11-19 07:31:32 +01:00
Fabien Potencier
b8b0a6bff8 minor #12501 Adjust upgrade file rendering & backport missing notes (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

Adjust upgrade file rendering & backport missing notes

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

Commits
-------

d9c2e6d Adjust upgrade file rendering
2014-11-19 07:29:33 +01:00
Fabien Potencier
84f4c4b35b minor #12510 Fixed grammar error in docblock (gerryvdm)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #12510).

Discussion
----------

Fixed grammar error in docblock

Commits
-------

ba8d937 Fixed grammar error in docblock
2014-11-18 14:50:21 +01:00
gerryvdm
ba8d93705c Fixed grammar error in docblock 2014-11-18 14:50:21 +01:00
Joseph Bielawski
d9c2e6d46f Adjust upgrade file rendering 2014-11-18 09:38:51 +01:00
Fabien Potencier
77f115eacf minor #12497 compare version using PHP_VERSION_ID (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

compare version using PHP_VERSION_ID

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

To let opcode caches optimize cached code, the `PHP_VERSION_ID`
constant is used to detect the current PHP version instead of calling
`version_compare()` with `PHP_VERSION`.

Commits
-------

367ed3c compare version using PHP_VERSION_ID
2014-11-17 21:54:27 +01:00
Fabien Potencier
fa71441e67 minor #12433 [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions (hason)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12433).

Discussion
----------

[Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions

Commits
-------

0bd19aa [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions
2014-11-17 21:30:18 +01:00
Martin Hasoň
0bd19aa491 [Bridge/Propel1] Changed deps to accepts all upcoming propel1 versions 2014-11-17 21:30:08 +01:00
Christian Flothmann
367ed3ce85 compare version using PHP_VERSION_ID
To let opcode caches optimize cached code, the `PHP_VERSION_ID`
constant is used to detect the current PHP version instead of calling
`version_compare()` with `PHP_VERSION`.
2014-11-17 17:27:42 +01:00
Jerome TAMARELLE
656d45f06a [Form] Add doc for FormEvents 2014-11-17 14:54:58 +01:00
Fabien Potencier
8d18c98de0 minor #12372 [Yaml] don't override internal PHP constants (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] don't override internal PHP constants

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

Commits
-------

376cc03 don't override internal PHP constants
2014-11-16 19:04:21 +01:00
Christian Flothmann
376cc0332d don't override internal PHP constants 2014-11-16 18:59:41 +01:00