Commit Graph

20956 Commits

Author SHA1 Message Date
Nicolas Grekas
acac734d08 [PhpUnitBridge] new bridge for testing with PHPUnit 2015-02-18 11:38:04 +01:00
Fabien Potencier
e759bc3836 minor #13725 Add phpdoc for SecurityFactoryInterface::getPosition (adrienbrault)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13725).

Discussion
----------

Add phpdoc for SecurityFactoryInterface::getPosition

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

Commits
-------

bcb2e09 Add phpdoc for SecurityFactoryInterface::getPosition
2015-02-18 11:13:53 +01:00
Adrien Brault
bcb2e09dc1 Add phpdoc for SecurityFactoryInterface::getPosition 2015-02-18 11:13:53 +01:00
Fabien Potencier
5843745258 minor #13726 FilesLoader - fix git conflict (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

FilesLoader - fix git conflict

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

Commits
-------

5c9835f FilesLoader - fix git conflict
2015-02-18 11:12:30 +01:00
Dariusz Ruminski
5c9835f230 FilesLoader - fix git conflict 2015-02-18 08:07:05 +01:00
Nicolas Grekas
9e7b10915b minor #13722 [VarDumper] Ignore /vendor/ directory in git (lyrixx)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Ignore /vendor/ directory in git

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

Commits
-------

cbec76c [VarDumper] Ignore /vendor/ directory in git
2015-02-17 21:47:41 +01:00
Grégoire Pineau
cbec76c099 [VarDumper] Ignore /vendor/ directory in git 2015-02-17 17:54:47 +01:00
Fabien Potencier
1cc1d8d12e minor #13716 [Console] make an assertion more precise in testGetOptionDefaults (nanocom)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] make an assertion more precise in testGetOptionDefaults

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

Minor fix, the default values expected in the test were not exactly the same as what is actually returned.

Commits
-------

06a42e1 [Console] fix assertion in testGetOptionDefaults
2015-02-17 17:18:55 +01:00
Fabien Potencier
69f901fd89 minor #13718 Small syntax fix in CHANGELOG (WouterJ)
This PR was merged into the 2.6 branch.

Discussion
----------

Small syntax fix in CHANGELOG

Markdown list items have to start with a space (both render correctly, but this is the standard and consistent with the rest of the file).

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

Commits
-------

e45d514 Small syntax fix
2015-02-17 17:18:28 +01:00
Wouter J
e45d514bfc Small syntax fix 2015-02-17 14:25:32 +01:00
Arnaud Kleinpeter
06a42e12e2 [Console] fix assertion in testGetOptionDefaults
The default values expected n the test were not exactly the same as what is actually returned.
2015-02-17 14:04:06 +01:00
Fabien Potencier
a630d87d57 bug #13711 [FrameworkBundle] Check if templating is enabled. (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Check if templating is enabled.

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

templating can be disabled.

Commits
-------

c75b276 [FrameworkBundle] Check if templating is enabled.
2015-02-17 12:55:01 +01:00
Jakub Zalas
c75b276a17 [FrameworkBundle] Check if templating is enabled. 2015-02-17 11:00:18 +00:00
Fabien Potencier
42e6540224 bug #13693 [HttpKernel] Fixed DumpDataCollector: dump.name for Windows file paths (King2500)
This PR was merged into the 2.6 branch.

Discussion
----------

[HttpKernel] Fixed DumpDataCollector: dump.name for Windows file paths

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

When using VarDumper on Windows files, the automatic "dump.name" generated wrong names.
`dump()` call in:

```
F:\HtDocs\demo\src\Acme\Controller\DemoController.php
```

Displayed:
```
dump()
in :\HtDocs\demo\src\Acme\Controller\DemoController.php line 35
```
Expected result is:
```
dump()
in DemoController.php line 35
```

The existing code in line 118 didn't use the variable from the previous line.

Commits
-------

a025dea Fix dump.name for Windows file paths
2015-02-17 09:22:34 +01:00
Javier Spagnoletti
9f9f2300d7 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
| 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

fixes #13502

Inverted path and location directives for x-accel-redirect header

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

After:
```proxy_set_header X-Accel-Mapping /var/www/example.com/=/internal/```
2015-02-16 14:04:09 -03:00
Fabien Potencier
31bfc9508b minor #13586 [DX][Config] Changed return type definition for some methods of NodeDefinition (Strate)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13586).

Discussion
----------

[DX][Config] Changed return type definition for some methods of NodeDefinition

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

Discussed in #12280

Commits
-------

89ca585 Changed return type definition for some methods of NodeDefinition
2015-02-16 10:51:32 +01:00
Artur Eshenbrener
89ca585185 Changed return type definition for some methods of NodeDefinition 2015-02-16 10:51:32 +01:00
Fabien Potencier
e18d2ad80d minor #13645 fixed possible race condition when creating a directory (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed possible race condition when creating a directory

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

Commits
-------

8542866 fixed possible race condition when creating a directory
2015-02-16 10:48:41 +01:00
Fabien Potencier
ee47901456 bug #13618 [PropertyAccess] Fixed invalid feedback -> foodback singularization (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] Fixed invalid feedback -> foodback singularization

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

Commits
-------

bc50125 Fixed invalid feedback -> foodback singularization
2015-02-16 10:25:34 +01:00
Fabien Potencier
ce009624aa minor #13684 Fixes event listener attaching error (bartru)
This PR was merged into the 2.6 branch.

Discussion
----------

Fixes event listener attaching error

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

Commits
-------

34b489d Fixes event listener attaching error
2015-02-16 10:22:28 +01:00
Fabien Potencier
f44eef4525 minor #13672 [FrameworkBundle] Enable assets by default (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Enable assets by default

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

This should make the tests pass again.

There are two templates from TwigBundle that are used with functional tests, and require the asset() helper:
* src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
* src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig

Commits
-------

f5c0a69 [FrameworkBundle] Enable assets by default.
2015-02-16 10:20:28 +01:00
Fabien Potencier
fd0fd31ac3 minor #13688 [WebProfilerBundle] fix html lint on (other) empty onclick (jrobeson)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] fix html lint on (other) empty onclick

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

*This is for the empty onclick that appeared in 2.6*

The request collector has an empty onclick="" attribute
when {{ link }} isn't available. This tends to happen when
rendering the debug toolbar.

Commits
-------

58bd16c [WebProfilerBundle] fix html lint on (other) empty onclick
2015-02-16 10:15:54 +01:00
Fabien Potencier
def4fd55e7 minor #13687 [WebProfilerBundle] fix html lint on empty onclick (jrobeson)
This PR was merged into the 2.3 branch.

Discussion
----------

[WebProfilerBundle] fix html lint on empty onclick

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

The request collector has an empty onclick="" attribute
when {{ link }} isn't available. This tends to happen when
rendering the debug toolbar.

Commits
-------

a3a2f15 [WebProfilerBundle] fix html linting on empty onclick
2015-02-16 10:14:57 +01:00
Fabien Potencier
3bbca21630 minor #13692 [Filesystem] Improve exception message for copy method (King2500)
This PR was submitted for the 2.6 branch but it was merged into the 2.7 branch instead (closes #13692).

Discussion
----------

[Filesystem] Improve exception message for copy method

see diff

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

Commits
-------

021206c [Filesystem] Improve exception message for copy method
2015-02-16 10:13:40 +01:00
Thomas Schulz
021206c0ac [Filesystem] Improve exception message for copy method 2015-02-16 10:13:25 +01:00
Fabien Potencier
e09c3cd52c bug #13685 [WebProfilerBundle] Fix for broken profiler layout (kbond)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Fix for broken profiler layout

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

With the latest 2.6 the profiler layout is broken:

![screen](https://cloud.githubusercontent.com/assets/127811/6192633/17f7f192-b382-11e4-90c9-2595fd6079af.png)

I am not sure what broke it...

Commits
-------

af0ea97 Fix for broken profiler layout
2015-02-16 10:11:35 +01:00
Fabien Potencier
90b028bea7 minor #13691 [Console] Added a little explaination about Command#interact() (WouterJ)
This PR was squashed before being merged into the 2.3 branch (closes #13691).

Discussion
----------

[Console] Added a little explaination about Command#interact()

This has confused some long time Symfony users recently: https://twitter.com/jmolivas/status/566283453264850945

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

Commits
-------

38e7b72 [Console] Added a little explaination about Command#interact()
2015-02-16 10:09:41 +01:00
Wouter J
38e7b72371 [Console] Added a little explaination about Command#interact() 2015-02-16 10:09:39 +01:00
Fabien Potencier
f18280923b minor #13700 [Finder] Fixed typo in phpdoc comment (date range) (King2500)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] Fixed typo in phpdoc comment (date range)

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

See changes

Commits
-------

9aece5a [Finder] Fixed typo in phpdoc comment
2015-02-16 10:07:56 +01:00
Fabien Potencier
4c767e64b2 feature #13615 [FrameworkBundle] Made ServerParams a service (rpg600)
This PR was submitted for the 2.5 branch but it was merged into the 2.7 branch instead (closes #13615).

Discussion
----------

[FrameworkBundle] Made ServerParams a service

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

Since 2.5 we can inject the request stack in ServerParams (see #10912).
Now when a request is handled by HttpFoundationRequestHandler, the content length will be fetched via the current request and not the super global anymore.

Commits
-------

455b714 [FrameworkBundle] Made ServerParams a service
2015-02-16 10:06:55 +01:00
rpg600
455b71419d [FrameworkBundle] Made ServerParams a service 2015-02-16 10:06:54 +01:00
Fabien Potencier
baf13c1e32 minor #13701 [2.7] [FrameworkBundle] bugfix in configuration for assets (phansys)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [FrameworkBundle] bugfix in configuration for assets

| 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

If both of configurations are defined, the exception breaks because it isn't
defined properly (missing backslash in FQCN for ```\LogicException```).
Also, the message was wrong (it's referred to "templating.templating" instead of
"framework.templating").

Commits
-------

3b4c23f [2.7] [FrameworkBundle] bugfix in configuration for assets
2015-02-16 10:04:36 +01:00
Javier Spagnoletti
3b4c23fa16 [2.7] [FrameworkBundle] bugfix in configuration for assets
| 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

If both of configurations are defined, the exception is break because it isn't
defined properly (missing backslash in FQCN for ```\LogicException```).
Also, the message was wrong (it's referred to "templating.templating" instead of
"framework.templating").
2015-02-15 18:48:32 -03:00
Jakub Zalas
f5c0a6918a [FrameworkBundle] Enable assets by default. 2015-02-15 21:17:25 +00:00
Thomas Schulz
9aece5a33e [Finder] Fixed typo in phpdoc comment 2015-02-15 15:36:33 +01:00
Thomas Schulz
a025dea06e Fix dump.name for Windows file paths
Wrong variables were used in line 118 ($file -> $name)
2015-02-14 23:44:52 +01:00
Johnny Robeson
58bd16c3d3 [WebProfilerBundle] fix html lint on (other) empty onclick
*This is for the empty onclick that appeared in 2.6*

The request collector has an empty onclick="" attribute
when {{ link }} isn't available. This tends to happen when
rendering the debug toolbar.
2015-02-14 04:26:22 -05:00
Johnny Robeson
a3a2f153c7 [WebProfilerBundle] fix html linting on empty onclick
The request collector has an empty onclick="" attribute
when {{ link }} isn't available. This tends to happen when
rendering the debug toolbar.
2015-02-14 04:09:17 -05:00
Kevin Bond
af0ea978ea Fix for broken profiler layout 2015-02-13 13:11:44 -05:00
Bart Ruysseveldt
34b489d01e Fixes event listener attaching error
| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| Fixed tickets | [none]
| License       | MIT
| Doc PR        | [none]
2015-02-13 16:25:52 +01:00
Fabien Potencier
6d52112743 minor #13679 [Form] OptionsResolver 3.0 is not BC anymore (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] OptionsResolver 3.0 is not BC anymore

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

Commits
-------

a0af484 [Form] OptionsResolver 3.0 is not BC anymore
2015-02-13 10:50:36 +01:00
Fabien Potencier
3dfb539607 minor #13677 [TwigBundle] add missing asset dependency (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] add missing asset dependency

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

Commits
-------

2aead65 [TwigBundle] add missing asset dependency
2015-02-13 10:49:48 +01:00
Nicolas Grekas
a0af4843e4 [Form] OptionsResolver 3.0 is not BC anymore 2015-02-13 09:21:53 +01:00
Nicolas Grekas
2aead657b1 [TwigBundle] add missing asset dependency 2015-02-13 08:56:37 +01:00
Nicolas Grekas
f77d710881 Revert "minor #13673 phpunit --colors=always (nicolas-grekas)"
This reverts commit dd1a5951ae, reversing
changes made to 5f6d235a69.
2015-02-12 19:15:41 +01:00
Fabien Potencier
dd1a5951ae minor #13673 phpunit --colors=always (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

phpunit --colors=always

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

Commits
-------

9d94dbf phpunit --colors=always
2015-02-12 19:05:20 +01:00
Nicolas Grekas
9d94dbf5ee phpunit --colors=always 2015-02-12 19:02:13 +01:00
Fabien Potencier
2d48266f6f feature #12526 Add an auto_alias compiler pass (Daniel Wehner)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #12526).

Discussion
----------

Add an auto_alias compiler pass

Discussion see https://github.com/symfony/symfony/issues/11460

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

Commits
-------

d7432c0 Add an auto_alias compiler pass
2015-02-12 18:47:12 +01:00
Daniel Wehner
d7432c0241 Add an auto_alias compiler pass 2015-02-12 18:47:12 +01:00
Fabien Potencier
22cd78c4a8 Merge branch '2.7'
* 2.7:
  [TwigBundle] Fix typo in ExtensionPass
2015-02-12 17:07:34 +01:00