Commit Graph

19054 Commits

Author SHA1 Message Date
Romain Neutron 0a76b7e9fc Rename Symfony2 to Symfony 2014-11-24 15:09:11 +01:00
Fabien Potencier 4a1a0ed686 bumped Symfony version to 2.6.0 2014-11-24 08:41:00 +01:00
Fabien Potencier d56d198aa4 updated VERSION for 2.6.0-BETA2 2014-11-23 21:57:16 +01:00
Fabien Potencier da3d5d4036 updated CHANGELOG for 2.6.0-BETA2 2014-11-23 21:57:10 +01:00
Fabien Potencier 7fd45f7d08 bug #12555 [Debug] fix ENT_SUBSTITUTE usage (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] fix ENT_SUBSTITUTE usage

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

Commits
-------

58476e1 [Debug] fix ENT_SUBSTITUTE usage
2014-11-23 21:33:43 +01:00
Nicolas Grekas 58476e1814 [Debug] fix ENT_SUBSTITUTE usage 2014-11-23 21:21:44 +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 ce2adfaf4a removed unneeded check
It is already checked in the `isEnabled()` method of the parent
`ServerCommand` class if the current PHP build is HHVM and the
`server:start` command is never enabled then. Thus, it's not needed
to check for HHVM on every command execution.

This was pointed out by @stof in #12489 for the `server:run` command.
2014-11-23 20:13:47 +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 4838cdec58 minor #12439 Remove block submit_widget (ip512)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #12439).

Discussion
----------

Remove block submit_widget

submit_widget parent block already renders button_widget_block. btn is already added by button_widget_block. I propose to remove this block as it adds btn twice and has no other use.

Commits
-------

9a08b77 Remove block submit_widget
2014-11-23 19:28:54 +01:00
Grégory Pelletier 9a08b776a2 Remove block submit_widget 2014-11-23 19:28:53 +01:00
Fabien Potencier 31792b01f1 Merge branch '2.5' into 2.6
* 2.5:
  reformat code as suggested by @fabpot
  Fix typo
  Make `\Request::get` more performant.
  [Form][WebProfiler] Empty form names fix
  [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data
  bumped Symfony version to 2.5.8
  updated VERSION for 2.5.7
  update CONTRIBUTORS for 2.5.7
  updated CHANGELOG for 2.5.7
  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/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
	src/Symfony/Component/HttpKernel/Kernel.php
2014-11-21 17:08:03 +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 b3be900ece feature #12538 [FrameworkBundle] be smarter when guessing the document root (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

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

83d768d be smarter when guessing the document root
2014-11-21 16:58:20 +01:00
Fabien Potencier 45613b3ec5 bug #12539 [TwigBundle] properly set request attributes in controller test (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBundle] properly set request attributes in controller test

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

Commits
-------

b3db574 properly set request attributes in controller test
2014-11-21 16:55:01 +01:00
Christian Flothmann b3db574a9f properly set request attributes in controller test 2014-11-21 16:23:19 +01:00
Christian Flothmann 83d768d09e be smarter when guessing the document root 2014-11-21 15:51:03 +01:00
Fabien Potencier aec10e6a24 fixed typo 2014-11-21 11:39:32 +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 8047dc37c5 minor #12268 [DX] [Form] [WebProfiler] Added abbrs with type classes (kix)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #12268).

Discussion
----------

[DX] [Form] [WebProfiler] Added abbrs with type classes

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

This adds an `<abbr/>` element having a descriptive title that displays the form element's type class name. Everyone wants to know what's the type behind a form child, yes?

Looks like this:
![screenshot 2014-10-21 00 22 09](https://cloud.githubusercontent.com/assets/345754/4706604/32cf2d7a-5886-11e4-9fae-b9bff7a419ac.png)

Commits
-------

0d20753 [DX] [Form] [WebProfiler] Added abbrs with type classes
2014-11-21 11:13:57 +01:00
Stepan Anchugov 0d20753e0e [DX] [Form] [WebProfiler] Added abbrs with type classes
This adds an <abbr> element having a descriptive title that
displays the form element's type class name.
2014-11-21 11:13:57 +01:00
Nicolas Grekas 94a04cba54 [2.5] Remove possible call_user_func() 2014-11-21 10:52:15 +01:00
Nicolas Grekas fad7aba3ba [2.3] Remove possible call_user_func() 2014-11-21 10:26:02 +01:00
Nicolas Grekas 1de4920fc5 [2.6] Remove possible call_user_func() 2014-11-21 10:20:58 +01:00
Fabien Potencier 7bb1abe6f3 fixed typo 2014-11-21 09:24:15 +01:00
Fabien Potencier c7b899c8aa minor #12147 [TwigBundle] Fix error page preview for custom twig.exception_controller (mpdude)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #12147).

Discussion
----------

[TwigBundle] Fix error page preview for custom twig.exception_controller

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

The `testErrorPageAction()` always used the `showAction()` of TwigBundle's `ExceptionController`.
You can, however, configure an alternate controller by setting `twig.exception_controller`.

Thus, in order to get a proper preview, we need to forward to this configured controller (which
may be the default one).

This requires us to pass an additional parameter to `ExceptionController::showAction` to be able to
get the *error* page even if configured otherwise in the constructor.

(The other approach would have been to fiddle around with `ExceptionController`'s `debug` flag through a setter when going through the preview action, but that would have been even more messy.)

Commits
-------

2065e00 [TwigBundle] Fix error page preview for custom twig.exception_controller
2014-11-21 09:23:31 +01:00
Matthias Pigulla 2065e00b58 [TwigBundle] Fix error page preview for custom twig.exception_controller 2014-11-21 09:23:27 +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 f288a69ae5 Merge branch '2.5' into 2.6
* 2.5:
  [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
  [Session] Fix parameter names in WriteCheckSessionHandler
  Add consistency with request type checking
  [FrameworkBundle] Fix server run in case the router script does not exist

Conflicts:
	composer.json
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Debug/ExceptionHandler.php
2014-11-20 14:24:23 +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 10e208b9e7 minor #12131 Extract an AbstractEventDispatcherTest from EventDispatcherTest (znerol)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #12131).

Discussion
----------

Extract an AbstractEventDispatcherTest from EventDispatcherTest

Allow third party implementations of `EventDispatcherInterface` to reuse the `EventDispatcherTest` unit tests. Also instantly expand test coverage of `ContainerAwareEventDispatcher` by rebasing it onto the new `AbstractEventDispatcherTest`.

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

Commits
-------

8871368 Extract an AbstractEventDispatcherTest from EventDispatcherTest and also use it in ContainerAwareEventDispatcherTest
2014-11-20 13:16:12 +01:00
Lorenz Schori 8871368ca3 Extract an AbstractEventDispatcherTest from EventDispatcherTest and also use it in ContainerAwareEventDispatcherTest 2014-11-20 13:16:05 +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