Commit Graph

19683 Commits

Author SHA1 Message Date
Tobias Schultze
f9ddaebe09 [PropertyAccess] use data provider for isReadable/isWritable tests 2015-02-21 13:54:33 +01:00
Tobias Schultze
eabad39dd5 Merge branch '2.3' into 2.6
Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
2015-02-21 13:49:08 +01:00
Fabien Potencier
2d6fbc5984 minor #13738 [Security] Fix expectation in a test. (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

[Security] Fix expectation in a test.

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

This is related to #13466, which worked perfectly fine in 2.3. It breaks in 2.6 since we've changed the way we check for master request.

Commits
-------

8299a44 [Security] Fix expectation in a test.
2015-02-21 09:14:03 +01:00
Guilherme Blanco
a10844587b Optimize EntityType by only loading choices for values in the same way that EntityLoader customization does (if you provide a query_builder). 2015-02-21 09:10:28 +01:00
Fabien Potencier
7b9bc804e7 minor #13742 [PropertyAccess] refactor type checks (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[PropertyAccess] refactor type checks

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

#13735 for 2.3

Commits
-------

9cacecb [PropertyAccess] the property path constructor already implements the type check
4e11c07 [PropertyAccess] refactor type checks to remove duplicate logic
2015-02-21 09:06:16 +01:00
Tobias Schultze
9cacecbf79 [PropertyAccess] the property path constructor already implements the type check 2015-02-19 13:40:39 +01:00
Tobias Schultze
4e11c0710b [PropertyAccess] refactor type checks to remove duplicate logic
and thus improve performance
2015-02-19 13:30:42 +01:00
Jakub Zalas
8299a44c27 [Security] Fix expectation in a test. 2015-02-19 09:39:13 +00:00
Fabien Potencier
19aa6dcf65 minor #13737 [HttpFoundation] Fix getHost and getPort functions in docblock (jwpage)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #13737).

Discussion
----------

[HttpFoundation] Fix getHost and getPort functions in docblock

This fixes the incorrect  references to the functions `getClientHost` and `getClientPort` in the docblock for Request::setTrustedHeaderName.

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

Commits
-------

1ae9f9c [HttpFoundation] Fix getHost and getPort functions in docblock
2015-02-19 09:08:04 +01:00
Johnson Page
1ae9f9ca0f [HttpFoundation] Fix getHost and getPort functions in docblock 2015-02-19 09:08: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
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
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
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
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
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
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
2cca8617b9 fixed a test 2015-02-12 12:03:23 +01:00
Fabien Potencier
5f6d235a69 removed redundant phpdocs 2015-02-11 14:35:55 +01:00
Fabien Potencier
5ce1dc383c minor #12201 [Validator] Fixed: The state of the XML/YAML loaders was changed even if an exception was thrown upon loading (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed: The state of the XML/YAML loaders was changed even if an exception was thrown upon loading

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

Commits
-------

85d464a [Validator] Fixed: The state of the XML/YAML loaders was changed even if an exception was thrown upon loading
2015-02-11 14:32:27 +01:00
Fabien Potencier
7356876c33 bug #13636 [WebProfilerBundle] Fixes event listener attaching error in IE (aik099)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Fixes event listener attaching error in IE

I haven't tested the change, because I don't any working Symfony installation at hand. By the looks of changes it should work.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | not sure (do we have JS tests?)
| Fixed tickets | #13447
| License       | MIT
| Doc PR        |

Commits
-------

21693e4 [WebProfilerBundle] Fixes event listener attaching error in IE
2015-02-11 11:38:49 +01:00
Fabien Potencier
c6029aad14 bug #13630 [Console] fixed ArrayInput, if array contains 0 key. (arima-ryunosuke)
This PR was submitted for the 2.6 branch but it was merged into the 2.3 branch instead (closes #13630).

Discussion
----------

[Console] fixed ArrayInput, if array contains 0 key.

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

```php
$input = new ArrayInput(array('Fabien', '--foo' => 'bar'));
var_dump($input->getParameterOption('--foo')); // this is 'Fabien'.
```

Because `in_array` third argument's default is `false`.
`in_array(0, $values)` returns `true` in many cases.

Commits
-------

a642e4b [Console] fixed ArrayInput, if array contains 0 key.
2015-02-11 11:33:23 +01:00
ryunosuke
a642e4b9f1 [Console] fixed ArrayInput, if array contains 0 key. 2015-02-11 11:33:23 +01:00
Fabien Potencier
38f03bd2f5 Merge branch '2.3' into 2.6
* 2.3:
  [FrameworkBundle] Fix title and placeholder rendering in php form templates.
  RequestDataCollector - small fix
  renamed composer.phar to composer to be consistent with the Symfony docs
  [FrameworkBundle] bumped min version of Routing to 2.3
  removed composer --dev option everywhere
  fixed a test
  [Console] Fixed output bug, if escaped string in a formatted string.
  [Security] Remove ContextListener's onKernelResponse listener as it is used
  Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
  Revert "fixed assertion"
  fixed assertion
  [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
  fixed URL
  Add reference to documentation in FormEvents phpdocs
  [YAML] Fix one-liners to work with multiple new lines
  Keep "pre" meaning for var_dump quick-and-dirty debug
  [Console][Table] Fix cell padding with multi-byte

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Console/Helper/TableHelper.php
2015-02-11 08:12:14 +01:00
Fabien Potencier
917067e940 bug #13647 [FrameworkBundle] Fix title and placeholder rendering in php form templates (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix title and placeholder rendering in php form templates

Small fix for rendering placeholder on widgets in php templates.

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

This is a test case for #13290, including a fix applied on 2.3, since that's the earliest supported branch the bug exist.

In 2.6 the template is a bit different, and unfortunately I couldn't re-use #13290's fix.

When this is merged into 2.3, and then to 2.6 I think we can also merge #13290.

Commits
-------

f82193d [FrameworkBundle] Fix title and placeholder rendering in php form templates.
2015-02-11 08:05:50 +01:00
Jakub Zalas
f82193db99 [FrameworkBundle] Fix title and placeholder rendering in php form templates. 2015-02-10 17:14:04 +00:00