Commit Graph

19739 Commits

Author SHA1 Message Date
Fabien Potencier
53570ebd61 minor #13863 [2.6] [Console] [OptionsResolver] static code analysis, code cleanup (kalessil)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13863).

Discussion
----------

[2.6]  [Console] [OptionsResolver] static code analysis, code cleanup

| 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

Split <a href="https://github.com/symfony/symfony/pull/13813">PR 13813</a>: part 2 - targeting v2.6

Following is included (no functional changes, found with <a href="https://plugins.jetbrains.com/plugin/7622?pr=phpStorm">Php Inspections (EA Extended)</a>):
- Unset calls can be merged inspection fixes
- Alias functions usage inspection fixes

Commits
-------

1530c35 Php Inspections (EA Extended): squash all PR-13813 commits
2015-03-07 08:39:22 +01:00
Vladimir Reznichenko
1530c355d5 Php Inspections (EA Extended): squash all PR-13813 commits 2015-03-07 08:39:22 +01:00
Fabien Potencier
2f7bd7cf8c minor #13850 [FrameworkBundle] simplify dep declaration (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] simplify dep declaration

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

I'm not sure this will work, travis will tell.

Commits
-------

37035b0 [FrameworkBundle] simplify dep declaration
2015-03-07 08:34:45 +01:00
Nicolas Grekas
37035b0696 [FrameworkBundle] simplify dep declaration 2015-03-06 22:21:22 +01:00
Nicolas Grekas
76df0455c3 bug #13860 [VarDumper] Fix "next element is already occupied" (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix "next element is already occupied"

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

<3 PHP

Commits
-------

32a81f7 [VarDumper] Fix "next element is already occupied"
2015-03-06 17:47:51 +01:00
Nicolas Grekas
32a81f79aa [VarDumper] Fix "next element is already occupied" 2015-03-06 17:45:31 +01:00
Fabien Potencier
700447df8d bug #13806 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty (ogizanagi)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty

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

Commits
-------

9689639 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
2015-03-05 17:55:29 +01:00
Tobias Schultze
0cead0f17a bug #13835 [PropertyAccess] stop overwriting once a reference is reached (3rd) (bananer)
This PR was squashed before being merged into the 2.6 branch (closes #13835).

Discussion
----------

[PropertyAccess] stop overwriting once a reference is reached (3rd)

I commited with a different email address in [PR 13831](https://github.com/symfony/symfony/pull/13831), so here is the third attempt. Also removed unnecessary test as suggested by @Tobion

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | [13731](https://github.com/symfony/symfony/issues/13731)
| License       | MIT
| Doc PR        | none

I added test cases for the scenario described in my issue. After looking through the PropertyAccessor source my conclusion was that there is no reason to overwrite parents of references, so I changed that. None of the previous test cases disagreed and my new tests also passed.

Or maybe I got it all wrong, I'm willing to learn.

Commits
-------

d733a88 [PropertyAccess] stop overwriting once a reference is reached (3rd)
2015-03-03 20:22:24 +01:00
Philip Frank
d733a887df [PropertyAccess] stop overwriting once a reference is reached (3rd) 2015-03-03 20:22:08 +01:00
Tobias Schultze
0e3090b19c minor #13834 [OptionsResolver] Remove Unused Variable from Foreach Cycles (vadim2404)
This PR was merged into the 2.6 branch.

Discussion
----------

[OptionsResolver] Remove Unused Variable from Foreach Cycles

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

Commits
-------

77f4dbf [OptionsResolver] Remove Unused Variable from Foreach Cycles
2015-03-03 20:15:31 +01:00
Vadim Kharitonov
77f4dbfa10 [OptionsResolver] Remove Unused Variable from Foreach Cycles 2015-03-03 17:59:03 +03:00
Fabien Potencier
eb99c78358 bug #13814 [Twig] bootstrap_3_layout.html.twig is traitable (Dusan Kasan)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13814).

Discussion
----------

[Twig] bootstrap_3_layout.html.twig is traitable

| Q             | A
| ------------- | ---
| Fixed tickets | #13639
| License       | MIT

bootstrap_3_layout.html.twig is now traitable in the same way as form_table_layout.html.twig

Commits
-------

4509d36 [Twig] bootstrap_3_layout.html.twig is usable as a trait
2015-03-03 09:30:41 +01:00
Dusan Kasan
4509d36991 [Twig] bootstrap_3_layout.html.twig is usable as a trait 2015-03-03 09:30:40 +01:00
Tobias Schultze
38a5ebdb05 bug #13816 [OptionsResolver] fix allowed values with null (Tobion)
This PR was merged into the 2.6 branch.

Discussion
----------

[OptionsResolver] fix allowed values with null

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

1. setNormalizers was missing deprecated annotation
2. setAllowedValues/addAllowedValues with `null` was broken because `(array) null === array()`

Commits
-------

cb37fbe [OptionsResolver] fix allowed values with null
e3e9a4d [OptionsResolver] add missing deprecated phpdoc for setNormalizers
2015-03-02 11:19:04 +01:00
Tobias Schultze
cb37fbe707 [OptionsResolver] fix allowed values with null 2015-03-01 03:42:24 +01:00
Tobias Schultze
e3e9a4d269 [OptionsResolver] add missing deprecated phpdoc for setNormalizers 2015-03-01 03:08:17 +01:00
ogizanagi
96896390d7 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty 2015-02-27 01:57:35 +01:00
Nicolas Grekas
c9da1ae73f Merge branch '2.3' into 2.6
* 2.3:
  [Form] NativeRequestHandler file handling fix
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 13:51:23 +01:00
Fabien Potencier
e0ba4d65af bug #13744 minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource (bijibox)
This PR was merged into the 2.3 branch.

Discussion
----------

minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource

| Q             | A
| ------------- | ---
| Fixed tickets | #13377
| License       | MIT

FileResource and tests update

Commits
-------

87800ae minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
2015-02-25 12:39:01 +01:00
Fabien Potencier
46d05ecad4 bug #13708 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping (phansys)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping

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

Inverted path and location directives for x-accel-mapping header (fixes #13502).

Before:
```proxy_set_header X-Accel-Mapping /internal/=/var/www/example.com/```

After:
```proxy_set_header X-Accel-Mapping /var/www/example.com/=/internal/```

It could be a BC break since the response will fail if someone sends this header
honoring the previous signature, thus I need some feedback in order to choose the right branch for this change.

Commits
-------

9f9f230 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 12:23:04 +01:00
Fabien Potencier
7d6c7a3cef bug #13767 [HttpKernel] Throw double-bounce exceptions (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Throw double-bounce exceptions

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

Commits
-------

0ebcf63 [HttpKernel] Throw double-bounce exceptions
2015-02-25 12:22:04 +01:00
Fabien Potencier
70ba475156 bug #13785 [VarDumper] Workaround stringy numeric keys (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Workaround stringy numeric keys

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

Commits
-------

46bea3a [VarDumper] Workaround stringy numeric keys
2015-02-25 09:36:14 +01:00
Fabien Potencier
ab7b3a8119 bug #13769 [Form] NativeRequestHandler file handling fix (mpajunen)
This PR was squashed before being merged into the 2.3 branch (closes #13769).

Discussion
----------

[Form] NativeRequestHandler file handling fix

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

`NativeRequestHandler` reused the local variable for the form name `$name` as a loop variable for processing the `$_FILES` array. A separate variable is now used.

Two new test cases are included:
- Handling a request with multiple files
- Handling a request with file upload and a nameless form

Both tests fail without the fix. The test cases could probably be better though.

Commits
-------

9b3421f [Form] NativeRequestHandler file handling fix
2015-02-25 09:33:53 +01:00
Mikael Pajunen
9b3421f18a [Form] NativeRequestHandler file handling fix 2015-02-25 09:33:49 +01:00
Nicolas Grekas
46bea3ab30 [VarDumper] Workaround stringy numeric keys 2015-02-25 09:21:12 +01:00
Nicolas Grekas
0ebcf639c3 [HttpKernel] Throw double-bounce exceptions 2015-02-24 20:09:42 +01:00
Nicolas Grekas
9f5a2caf3a Merge branch '2.3' into 2.6
* 2.3:
  [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 20:07:32 +01:00
Fabien Potencier
cea862935c bug #13779 [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] silence E_USER_DEPRECATED in insulated clients

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

Commits
-------

7558c23 [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 18:38:20 +01:00
Nicolas Grekas
7558c232af [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients 2015-02-24 17:59:59 +01:00
Nicolas Grekas
76e736eeb7 [minor] composer.json fix 2015-02-24 14:39:59 +01:00
Nicolas Grekas
decd82eef7 Merge branch '2.3' into 2.6
* 2.3:
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 14:39:25 +01:00
Nicolas Grekas
4a638a4269 [minor] composer.json fix 2015-02-24 14:38:15 +01:00
Nicolas Grekas
2f3692aca7 Merge branch '2.3' into 2.6
* 2.3:
  Minor hot fix
  [PROCESS] make sure /dev/tty is readable
  [2.3] require-dev PHPUnit bridge
  [FrameworkBundle] Fixed Shell logo
  [2.3] Update CONTRIBUTING.md
  [2.3][Process] Fixed PhpProcess::getCommandLine() result
  [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
  Enforce UTF-8 charset for core controllers

Conflicts:
	CONTRIBUTING.md
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 12:52:21 +01:00
Nicolas Grekas
4a63bde710 Minor hot fix 2015-02-24 12:41:28 +01:00
Fabien Potencier
98bf339673 minor #13772 [2.3] require-dev PHPUnit bridge (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] require-dev PHPUnit bridge

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

Commits
-------

8b02796 [2.3] require-dev PHPUnit bridge
2015-02-24 12:37:24 +01:00
Fabien Potencier
463b24b27c bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

Enforce UTF-8 charset for core controllers

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

See https://github.com/symfony/symfony/issues/7617 and https://github.com/symfony/symfony/pull/7532 for the context of this PR.

Commits
-------

3032014 Enforce UTF-8 charset for core controllers
2015-02-24 12:31:58 +01:00
Fabien Potencier
c475704c8f bug #13683 [PROCESS] make sure /dev/tty is readable (staabm)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13683).

Discussion
----------

[PROCESS] make sure /dev/tty is readable

When using Process from Web-SAPI it is likely that the webserver user
doesn't has rights to use /dev/tty

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

Commits
-------

935afe6 [PROCESS] make sure /dev/tty is readable
2015-02-24 12:07:24 +01:00
Markus Staab
935afe650a [PROCESS] make sure /dev/tty is readable
When using Process from Web-SAPI it is likely that the webserver user
doesn't has rights to use /dev/tty
2015-02-24 12:07:24 +01:00
Fabien Potencier
cae6de6f43 minor #13771 [2.3] Update CONTRIBUTING.md (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Update CONTRIBUTING.md

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

Commits
-------

6726a40 [2.3] Update CONTRIBUTING.md
2015-02-24 11:55:28 +01:00
Fabien Potencier
238eaccdbb minor #13776 [2.3][FrameworkBundle] Fixed Shell logo (francisbesset)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][FrameworkBundle] Fixed Shell logo

This PR fix #12565.

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

d7f008d [FrameworkBundle] Fixed Shell logo
2015-02-24 11:50:34 +01:00
Nicolas Grekas
8b02796e9e [2.3] require-dev PHPUnit bridge 2015-02-24 11:24:26 +01:00
Francis Besset
d7f008d692 [FrameworkBundle] Fixed Shell logo 2015-02-24 11:23:15 +01:00
Nicolas Grekas
6726a40654 [2.3] Update CONTRIBUTING.md 2015-02-24 10:01:10 +01:00
Fabien Potencier
7fb03e0942 bug #13733 [2.3][Process] Fixed PhpProcess::getCommandLine() result (francisbesset)
This PR was squashed before being merged into the 2.3 branch (closes #13733).

Discussion
----------

[2.3][Process] Fixed PhpProcess::getCommandLine() result

The `PhpProcess::getCommandLine()` return `null` if `PhpProcess::start()` was not called.

```php
$process = new PhpProcess(<<<PHP
<?php echo "foobar";
PHP
);

$process->getCommandLine(); // return null
$process->start();
$process->getCommandLine(); // return the PHP binary path
```

This PR fix the problem.

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

Commits
-------

d0f1d32 [2.3][Process] Fixed PhpProcess::getCommandLine() result
2015-02-24 09:27:08 +01:00
Francis Besset
d0f1d3236c [2.3][Process] Fixed PhpProcess::getCommandLine() result 2015-02-24 09:27:06 +01:00
Fabien Potencier
ed8f5c819c bug #13729 Fix the toolbar JS for IE (stof)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix the toolbar JS for IE

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

- fix the binding of listeners on XMLHttpRequest to always use the addEventListener method. It does not make sense to change it to attachEvent as it is about binding listeners on DOM elements.
- fix the feature detection for the event binding on DOM elements:
    - the attachEvent and addEventListener methods are on DOM elements, not on the document object
    - the standard method should be preferred in IE versions supporting both methods
- avoid JS errors when XMLHttpRequest is not defined by avoiding to override its open method when the object is not there (old IE versions will still not intercept ajax calls though)

this is the complete fix for the code submitted in #13636 (the fix in https://github.com/symfony/symfony/pull/13684 was incomplete).

Commits
-------

b7aa171 Fix the toolbar JS for IE
2015-02-24 09:23:43 +01:00
Fabien Potencier
075002a29a minor #13754 [PropertyAccess] unify and fix doc (Tobion)
This PR was merged into the 2.6 branch.

Discussion
----------

[PropertyAccess] unify and fix doc

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

Commits
-------

d1c8c5d [PropertyAccess] unify and fix doc
2015-02-24 09:20:19 +01:00
Fabien Potencier
c0dcbed7a5 minor #13755 [Console] assertion for ArgvInput::getFirstArgument() with no arguments (nanocom)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] assertion for ArgvInput::getFirstArgument() with no arguments

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

Commits
-------

11b2a9b [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
2015-02-23 12:51:48 +01:00
Fabien Potencier
51a22406a7 minor #13753 [FrameworkBundle] move Routing dep up to make tests pass (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] move Routing dep up to make tests pass

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

Ping @Tobion

Commits
-------

c71e2d5 [FrameworkBundle] move Routing dep up to make tests pass
2015-02-22 12:43:34 +01:00
Arnaud Kleinpeter
11b2a9bfde [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments 2015-02-21 18:28:56 +01:00