Commit Graph

14584 Commits

Author SHA1 Message Date
Arturs Vonda
31da839447 Make rootPath part of regex greedy
- Fixes #10977
2014-05-26 18:03:48 +02:00
Fabien Potencier
b62d4592ad Merge branch '2.5'
* 2.5:
  [TwigBridge][Trans]set %count% only on transChoice
  [Debug] throw even in stacking mode to preserve code paths
  [Debug] preserve modified error level
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15
2014-05-26 17:36:48 +02:00
Fabien Potencier
487e6ed466 Merge branch '2.4' into 2.5
* 2.4:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:38 +02:00
Fabien Potencier
4ba44a786c Merge branch '2.3' into 2.4
* 2.3:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:05 +02:00
Abdellatif AitBoudad
d176ffca51 [TwigBridge][Trans]set %count% only on transChoice 2014-05-26 14:22:36 +01:00
Fabien Potencier
0572674ac0 minor #10988 [Debug] preserve modified error level (nicolas-grekas)
This PR was merged into the 2.5 branch.

Discussion
----------

[Debug] preserve modified error level

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

Minor edge case, but still a bug fix.
Replaces https://github.com/symfony/symfony/pull/10978

Commits
-------

e40b717 [Debug] preserve modified error level
2014-05-25 16:44:21 +02:00
Nicolas Grekas
d06b206762 [Debug] throw even in stacking mode to preserve code paths 2014-05-25 12:15:31 +02:00
Nicolas Grekas
e40b717b17 [Debug] preserve modified error level 2014-05-25 11:36:54 +02:00
Christophe Coevoet
a9de61e86d [DomCrawler] Fixed a forgotten case of complex XPath queries 2014-05-24 19:16:55 +02:00
Fabien Potencier
a11645c637 updated version to 2.6 2014-05-23 16:36:49 +02:00
Fabien Potencier
e705499f34 bumped Symfony version to 2.4.6 2014-05-23 16:00:26 +02:00
Romain Neutron
9887b831d2 [Process] Deprecate using values that are not string for Process::setStdin and ProcessBuilder::setInput 2014-05-23 11:02:52 +02:00
Fabien Potencier
885b6d1744 updated VERSION for 2.4.5 2014-05-22 23:04:05 +02:00
Romain Neutron
3454d6084f [Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation 2014-05-22 22:37:04 +02:00
Fabien Potencier
29341fab1b bumped Symfony version to 2.3.16 2014-05-22 22:22:30 +02:00
Fabien Potencier
424a567d2c updated VERSION for 2.3.15 2014-05-22 19:23:49 +02:00
Tobias Schultze
ad348a9b07 [HttpFoundation] implement session locking for PDO 2014-05-22 18:22:20 +02:00
Fabien Potencier
26bc81e5a0 Merge branch '2.4'
* 2.4:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14
2014-05-22 18:21:05 +02:00
Fabien Potencier
513483fb49 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
  bumped Symfony version to 2.3.15
  updated VERSION for 2.3.14
  update CONTRIBUTORS for 2.3.14
  updated CHANGELOG for 2.3.14

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-22 18:21:00 +02:00
Fabien Potencier
57a64a0fa6 Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-22 18:20:26 +02:00
Fabien Potencier
08bc4d9203 bumped Symfony version to 2.3.15 2014-05-22 18:18:05 +02:00
Fabien Potencier
a037f31de8 updated VERSION for 2.3.14 2014-05-22 16:27:03 +02:00
Fabien Potencier
c296c9ca19 Merge branch '2.4'
* 2.4:
  [WIP][Finder] Fix wrong implementation on sortable callback comparator
  ommited space
  [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
  Include file path in exception
  [Process] Add validation on Process input

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
	src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
2014-05-22 15:47:45 +02:00
Fabien Potencier
6ceb6556fe Merge branch '2.3' into 2.4
* 2.3:
  [WIP][Finder] Fix wrong implementation on sortable callback comparator
  ommited space
  [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
  Include file path in exception
  [Process] Add validation on Process input
2014-05-22 15:46:01 +02:00
Fabien Potencier
059042ef92 feature #10932 [Process] Deprecate Process::setStdin in favor of Process::setInput (romainneutron)
This PR was merged into the 2.3-dev branch.

Discussion
----------

[Process] Deprecate Process::setStdin in favor of Process::setInput

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

From the `Process` point of view, what we pass is an *input*, as well as we retrieve *output* and *error output*.
As we use `getOutput` and `getErrorOutput` we should use `setInput` and let the underlying `ProcessPipes` deal with the actual `STDIN`.

By the way, `ProcessBuilder` already has `setInput` method and no `setStdin` method

Commits
-------

53b9d73 [Process] Deprecate Process::setStdin in favor of Process::setInput
2014-05-22 15:44:17 +02:00
Romain Neutron
53b9d737f1 [Process] Deprecate Process::setStdin in favor of Process::setInput 2014-05-22 15:42:53 +02:00
prophet777
b965fa23a6 [WIP][Finder] Fix wrong implementation on sortable callback comparator 2014-05-22 15:42:36 +02:00
Fabien Potencier
c8476ee744 bug #10929 [2.3][Process] Add validation on Process input (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Add validation on Process input

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

This adds validation on Process input. For the moment, passing a stream would result in a PHP error.
I propose to deprecate values that are not strictly string in 2.6 (see upcoming PR)

Commits
-------

583092b [Process] Add validation on Process input
2014-05-22 15:40:43 +02:00
Fabien Potencier
3c9d8837cf minor #10951 Made use of "kB" vs. "KiB" consistent (Yannick, webmozart)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Made use of "kB" vs. "KiB" consistent

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

Continuation of #10661.

This PR makes the usage of "kB" and "KiB" consistent across the project. The notations equal the internationally recognized ones:

Short form | Long form | Value in Bytes
--- | --- | ---
B | bytes | 1
kB | kilobytes | 1000
KiB | kibibytes | 1024
MB | megabytes | 1000000
MiB | mebibytes | 1048576
GB | gigabytes | 1000000000
GiB | gibibytes | 1073741824

The reason for differentiating between the two is that several users got confused with the current mix (see #10648, #10917, #10661).

FileValidator, UploadedFile and the ProgressBar helper were changed accordingly.

Follow-up feature request: #10962

Commits
-------

e4c6da5 [Validator] Improved to-string conversion of the file size/size limit
bbe1045 [Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB")
2014-05-22 15:36:06 +02:00
Fabien Potencier
c505a639b2 minor #10956 [Validator] Fixed StaticMethodLoaderTest on systems that don't have E_STRICT enabled by default (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed StaticMethodLoaderTest on systems that don't have E_STRICT enabled by default

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

Commits
-------

a470ae2 [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default
2014-05-22 15:29:31 +02:00
apodgorbunschih
7d0811cfba ommited space 2014-05-22 14:40:41 +02:00
Bernhard Schussek
e4c6da548b [Validator] Improved to-string conversion of the file size/size limit 2014-05-22 11:16:37 +02:00
Yannick
bbe1045989 [Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB") 2014-05-22 10:54:24 +02:00
Bernhard Schussek
a470ae2bb9 [Validator] Fixed StaticMethodLoader on systems that don't have E_STRICT enabled by default 2014-05-22 10:35:37 +02:00
ilyes kooli
3d576eff19 Include file path in exception 2014-05-21 18:08:05 +02:00
Fabien Potencier
85e08278ca Merge branch '2.4'
* 2.4:
  Fixed the XPath filtering to have the same behavior than Symfony 2.4
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Added more tests for the XPath filtering
  [PropertyAccess] Fixed inverted logic
  [HttpKernel] fixed file uploads in functional tests when no file was selected
  [PropertyAccess] fixed CS
  Fixed test cases failing when the Intl extension is not installed
  Fixed the Travis build to avoid exiting too early
  [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations
  [PropertyAccess] Refactored PropertyAccessorCollectionTest
  [PropertyAccess] Refactored PropertyAccessorTest
2014-05-21 18:04:07 +02:00
Fabien Potencier
8954a1a88d bug #10946 [2.5][PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations (webmozart)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[2.5][PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations

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

Previously, when the following code was executed:

```php
$object = new ImplOfArrayAccess();

$propertyAccessor->setValue($object, '[index]', 'Value');
```

and that index did not exist, a fatal error would be generated because `array_keys()` was executed on `$object`. This error is fixed now.

Commits
-------

fef698e [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations
2014-05-21 17:54:53 +02:00
Fabien Potencier
54ab31a7fc Merge branch '2.3' into 2.4
* 2.3:
  Fixed the XPath filtering to have the same behavior than Symfony 2.4
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Added more tests for the XPath filtering
  [HttpKernel] fixed file uploads in functional tests when no file was selected
  Fixed test cases failing when the Intl extension is not installed
  Fixed the Travis build to avoid exiting too early

Conflicts:
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
2014-05-21 17:50:42 +02:00
Christophe Coevoet
80438c2dd9 Fixed the XPath filtering to have the same behavior than Symfony 2.4 2014-05-21 15:39:40 +02:00
Robbert Klarenbeek
711ac32d71 [DomCrawler] Fixed filterXPath() chaining 2014-05-21 15:37:53 +02:00
Christophe Coevoet
8f706c97b9 [DomCrawler] Added more tests for the XPath filtering
This will ensure we don't introduce regressions again when fixing #10206.
2014-05-21 15:33:53 +02:00
Bernhard Schussek
fef698e22f [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations 2014-05-21 15:18:38 +02:00
Bernhard Schussek
f42e588de6 [PropertyAccess] Fixed inverted logic 2014-05-21 15:15:17 +02:00
realmfoo
6f56d878c9 [HttpKernel] fixed file uploads in functional tests when no file was selected
Allow user to submit a form with no file selected.
2014-05-21 14:41:36 +02:00
Nicolas Grekas
e3255bf525 [Debug] better ouf of memory error handling 2014-05-21 14:34:28 +02:00
Fabien Potencier
3e81333823 [PropertyAccess] fixed CS 2014-05-21 13:53:20 +02:00
Bernhard Schussek
fad38e82f4 Fixed test cases failing when the Intl extension is not installed 2014-05-21 13:33:13 +02:00
Bernhard Schussek
5b5a6b6bcf [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations 2014-05-20 10:57:53 +02:00
Bernhard Schussek
91ee82107b [PropertyAccess] Refactored PropertyAccessorCollectionTest 2014-05-20 10:47:30 +02:00
Bernhard Schussek
56143036c9 [PropertyAccess] Refactored PropertyAccessorTest 2014-05-20 10:44:34 +02:00
Nicolas Grekas
dfa8ff87f3 [Debug] cleanup interfaces before 2.5-final 2014-05-20 09:56:04 +02:00
Fabien Potencier
b2855a55dd Merge branch '2.4'
* 2.4:
  fixed CS
  Fix "absolute path" when we look to the cache directory
2014-05-18 17:36:54 +02:00
Fabien Potencier
04fb11305f Merge branch '2.3' into 2.4
* 2.3:
  fixed CS
  Fix "absolute path" when we look to the cache directory
2014-05-18 17:36:48 +02:00
Fabien Potencier
11816c5e51 fixed CS 2014-05-18 17:36:43 +02:00
Benoît Lévêque
4735e56c44 Fix "absolute path" when we look to the cache directory
We should get __DIR__ instead of __DIR__ . '/.'
2014-05-18 17:35:30 +02:00
Romain Neutron
583092b6da [Process] Add validation on Process input 2014-05-17 23:49:26 +02:00
Fabien Potencier
492f7a38c7 bug #10933 Changed the default value of checkbox and radio to match the HTML spec (stof)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Changed the default value of checkbox and radio to match the HTML spec

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

When the checkbox or radio input does not have a value attribute, the [HTML spec](http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#checkbox-state-%28type=checkbox%29) defines that the value [should be ``on``](http://www.whatwg.org/specs/web-apps/current-work/multipage/common-input-element-attributes.html#dom-input-value-default-on), not ``1``.

This change is a small BC break as a testsuite with an assertion on the ``1`` value would fail after the change. However, this means that such testsuite would assert a different behavior than the real usage of the application.
Note that people using the DomCrawler component on pages using the Symfony Form component are not affected by the change as the Form component always set an explicit value on checkboxes and radio buttons

Commits
-------

186b65e Changed the default value of checkbox and radio to match the HTML spec
2014-05-17 22:50:45 +02:00
Fabien Potencier
53661a2338 Merge branch '2.4'
* 2.4:
  [HttpFoundation] implement session locking for PDO
  [DomCrawler] Fixed the coding standards to use strict comparisons
  [HttpKernel] removed absolute paths from the generated container
  [DomCrawler] Fixed the initial state for options without value attribute
  Fixed the handling of boolean attributes in ChoiceFormField
  Fixed FormDataExtractorTest_SimpleValueExporter::exportValue not implementing the interface correctly
  Updated form dev dependencies
2014-05-17 22:48:44 +02:00
Fabien Potencier
7027068f21 Merge branch '2.3' into 2.4
* 2.3:
  [HttpFoundation] implement session locking for PDO
  [DomCrawler] Fixed the coding standards to use strict comparisons
  [HttpKernel] removed absolute paths from the generated container
  [DomCrawler] Fixed the initial state for options without value attribute
  Fixed the handling of boolean attributes in ChoiceFormField

Conflicts:
	src/Symfony/Component/DomCrawler/Tests/Field/ChoiceFormFieldTest.php
	src/Symfony/Component/HttpKernel/Tests/KernelTest.php
2014-05-17 22:48:34 +02:00
Christophe Coevoet
186b65ea5d Changed the default value of checkbox and radio to match the HTML spec
When the checkbox or radio input does not have a value attribute, the HTML
spec defines that the value should be 'on', not '1'.
2014-05-17 22:15:05 +02:00
Fabien Potencier
309046a207 minor #10928 [DomCrawler] Fixed the coding standards to use strict comparisons (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Fixed the coding standards to use strict comparisons

| 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

Many places in DomCrawler are using loose comparison instead of strict comparison. I saw them while checking the whole component for DOMNode vs DOMElement usage whe working on #10927. However, I submitted this change to 2.3 instead, to ease merging between branches (applying the change only in master would likely create conflicts regularly when merging changes in DomCrawler between branches later)

Commits
-------

77b446c [DomCrawler] Fixed the coding standards to use strict comparisons
2014-05-17 18:25:57 +02:00
Fabien Potencier
8c71454f47 bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] implement session locking for PDO

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

This is probably the first Session Handler for databases that actually works with locking. I've seen many implementations of session handlers (mostly only for one database vendor) while researching and none used locking. Not even the [PHPs SQLite session handler](https://github.com/php/php-src/blob/PHP-5.3/ext/sqlite/sess_sqlite.c) or [PECL Postgres Handler](http://svn.php.net/viewvc/pecl/session_pgsql/trunk/session_pgsql.c?revision=326806&view=markup) implemented locking  correctly which is probably the reason why they have been discontinued. [Zend Session](https://github.com/zendframework/zf2/blob/master/library/Zend/Session/SaveHandler/DbTableGateway.php) seems not to use locking either. But it saves the lifetime together with the session which seems like a good idea because you could have different lifetimes for different sessions.

- Implements session locking for MySQL, Postgres, Oracle, SQL Server and SQLite.
Only tested it for MySQL. So would be good if someone can confirm it works as intended on the other databases as well.
- Also removed the custom RuntimeException which is not useful and a PDOException extends RuntimeException anyway, so no BC break.
- I added a default for the table name to be in line with the DoctrineSessionHandler.
- Check session.gc_maxlifetime in read(). Imagine we have only ever one user on an app. If maxlifetime is not checked in read, his session would never expire! What I don't get is why PHP calls gc() after read() instead of calling it before... Strange decision. For this reason I also had to do the following to improve performance.
- I delay gc() to close() so that it is executed outside the transactional and blocking read-write process. This way, pruning expired sessions does not block them from being started while the current session is used.
- Fixed time update for Oracle and SQL Server.

Commits
-------

50ec828 [HttpFoundation] implement session locking for PDO
2014-05-17 18:24:28 +02:00
Tobias Schultze
50ec828642 [HttpFoundation] implement session locking for PDO 2014-05-17 17:01:15 +02:00
Christophe Coevoet
77b446c904 [DomCrawler] Fixed the coding standards to use strict comparisons 2014-05-17 15:36:43 +02:00
Christophe Coevoet
f416e7044c [DomCrawler] Changed typehints form DomNode to DomElement
Closes #10924
2014-05-17 15:27:23 +02:00
Fabien Potencier
735e9a4768 bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] removed absolute paths from the generated container

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | first step to resolve #6484, #3079, and #9238
| License       | MIT
| Doc PR        | n/a

This PR converts absolute paths to relative ones in the dumped container. The code is a bit "ugly", but it gets the job done and I'm not sure that there is a more elegant way without breaking everything.

Commits
-------

c1450b4 [HttpKernel] removed absolute paths from the generated container
2014-05-17 15:25:10 +02:00
Fabien Potencier
c1450b465c [HttpKernel] removed absolute paths from the generated container 2014-05-17 14:44:20 +02:00
Fabien Potencier
5c91dc1a3a bug #10926 [DomCrawler] Fixed the initial state for options without value attribute (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Fixed the initial state for options without value attribute

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

Commits
-------

78cff96 [DomCrawler] Fixed the initial state for options without value attribute
2014-05-17 13:54:50 +02:00
Christophe Coevoet
78cff96230 [DomCrawler] Fixed the initial state for options without value attribute 2014-05-17 12:51:37 +02:00
Christophe Coevoet
b505708ddd Fixed the handling of boolean attributes in ChoiceFormField
An option is marked as selected by the presence of the selected attribute,
not by the presence of a non-empty selected attribute. The same is true
for checked radio buttons or checkboxes.
2014-05-17 12:38:54 +02:00
Issei.M
f9f385252d [Security] removed an unused parameter in some private methods 2014-05-17 17:07:33 +09:00
Fabien Potencier
825867208e feature #10882 Fix issue #10867 (umpirsky)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fix issue #10867

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

Commits
-------

0cc9746 Fix issue #10867
2014-05-16 16:54:34 +02:00
Fabien Potencier
3c179454f6 minor #10900 Update MessageSelector.php to show which value was passed (t3chn0r)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Update MessageSelector.php to show which value was passed

When the translator can't find a correct match using transChoice() a string is logged today with the following text:

<em>Unable to choose a translation for "[string]" with locale "[locale]". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").</em>

This change introduces the value that was passed to transChoice() so the developer will have more information as to what value did not match any of the translation options:

<em>Unable to choose a translation for "[string]" with locale "[locale]" for value "[value]". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").</em>

Commits
-------

af99997 Update MessageSelector.php to show which value was passed
2014-05-16 16:53:25 +02:00
Fabien Potencier
0eddb84a93 bug #10902 [Yaml] Fixed YAML Parser does not ignore duplicate keys, violating YAML spec. (sun)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Yaml] Fixed YAML Parser does not ignore duplicate keys, violating YAML spec.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | **mayhaps**
| Deprecations? | no
| Tests pass?   | yes
| Needs merge to | 2.4
| Fixed tickets | —
| License       | MIT
| Doc PR        | —

The current [YAML 1.2] specification clearly states:

> JSON's RFC4627 requires that mappings keys merely “SHOULD” be unique, while YAML insists they “MUST” be.

The outdated [YAML 1.1] spec contained a crystal clear note on how the error of duplicate keys is to be handled by parsers, which is (sadly) no longer contained in the latest 1.2 spec (only leaving the requirement):

> It is an error for two equal keys to appear in the same mapping node.  In such a case the YAML processor may continue, ignoring the second `key: value` pair and issuing an appropriate warning.  This strategy preserves a consistent information model for one-pass and random access applications.

[YAML 1.2]: http://yaml.org/spec/1.2/spec.html#id2759572
[YAML 1.1]: http://yaml.org/spec/1.1/#id932806

Commits
-------

951acca Fixed YAML Parser does not ignore duplicate keys, violating YAML spec.
2014-05-16 16:51:09 +02:00
Fabien Potencier
a61fddb202 minor #10916 [Validator] Updated outdated dependencies. (csarrazi)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Validator] Updated outdated dependencies.

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

Fixes tests for the ```Validator``` component when using it as a standalone library (when running ```phpunit``` from the ```src/Symfony/Component/Form``` directory.

Commits
-------

1984a36 [Validator] Updated outdated dependencies.
2014-05-16 16:48:43 +02:00
Charles Sarrazin
86f9cb90eb Added support for injecting HttpFoundation's RequestStack in ServerParams 2014-05-16 16:44:46 +02:00
Charles Sarrazin
1984a364f8 [Validator] Updated outdated dependencies. 2014-05-16 16:25:29 +02:00
sun
951acca387 Fixed YAML Parser does not ignore duplicate keys, violating YAML spec.
The current [YAML 1.2] specification clearly states:

> JSON's RFC4627 requires that mappings keys merely “SHOULD” be unique, while YAML insists they “MUST” be.

The outdated [YAML 1.1] spec contained a crystal clear note on how the error of duplicate keys is to be handled by parsers, which is (sadly) no longer contained in the latest 1.2 spec (only leaving the requirement):

> It is an error for two equal keys to appear in the same mapping node.  In such a case the YAML processor may continue, ignoring the second `key: value` pair and issuing an appropriate warning.  This strategy preserves a consistent information model for one-pass and random access applications.

[YAML 1.2]: http://yaml.org/spec/1.2/spec.html#id2759572
[YAML 1.1]: http://yaml.org/spec/1.1/#id932806
2014-05-16 16:25:18 +02:00
Fabien Potencier
5be0125c82 minor #10911 [Form] Composer dependencies (csarrazi)
This PR was merged into the 2.4 branch.

Discussion
----------

[Form] Composer dependencies

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

Right now, launching tests from the Form component's directory doesn't work, due to missing dev dependencies. This should be merged back into master afterwards.

Also fixed a problem related to a bad method signature in ```Symfony\Component\Form\Tests\Extension\DataCollector\FormDataExtractorTest_SimpleValueExporter```

Commits
-------

7b5857c Fixed FormDataExtractorTest_SimpleValueExporter::exportValue not implementing the interface correctly
e4fa5d8 Updated form dev dependencies
2014-05-16 15:43:51 +02:00
Charles Sarrazin
7b5857ca61 Fixed FormDataExtractorTest_SimpleValueExporter::exportValue not implementing the interface correctly 2014-05-16 13:59:23 +02:00
Charles Sarrazin
e4fa5d8cc3 Updated form dev dependencies 2014-05-16 13:58:11 +02:00
Fabien Potencier
be1b917d21 Merge branch '2.4'
* 2.4:
  [Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed
  Fixed incorrect regular plural for -ves words
  [HttpKernel] Replace sha1 with sha256 in recently added tests.
2014-05-16 13:54:37 +02:00
Fabien Potencier
c94f69ddcb Merge branch '2.3' into 2.4
* 2.3:
  [Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed
  Fixed incorrect regular plural for -ves words
2014-05-16 13:54:29 +02:00
Fabien Potencier
0762bae059 bug #10777 [Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed (tucksaun)
This PR was squashed before being merged into the 2.3 branch (closes #10777).

Discussion
----------

[Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed

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

Same issue as #9976 and #10203: when you add a `time` field to a form with options `single_text` (so HTML5) and `with_seconds`, the generated input does not contain the `step` attribute, therefore the browser does not show them, leading to an error at the submit because of an invalid format.

Compared to #9976/#10203:
* Unit testable
* Available directly in the component
* Available in other templating format than twig
* Still able to customise the step attribute by hand

Commits
-------

a379298 [Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed
2014-05-16 13:54:17 +02:00
Tugdual Saunier
a379298db9 [Form] Automatically add step attribute to HTML5 time widgets to display seconds if needed 2014-05-16 13:54:15 +02:00
Charles Sarrazin
c7a77c55b7 Fixed incorrect regular plural for -ves words
Fixes singularization for words like caves (cave), staves (staff).
2014-05-16 11:27:00 +02:00
Jakub Zalas
8e2d69e458 [Console] Update test fixtures to match the new way we handle colors. 2014-05-15 09:56:35 +01:00
Jakub Zalas
255544f194 [HttpKernel] Replace sha1 with sha256 in recently added tests. 2014-05-15 08:35:53 +01:00
Fabien Potencier
c0187c1465 Merge branch '2.4'
* 2.4:
  Explicitly define the encoding.
2014-05-14 23:48:41 +02:00
Fabien Potencier
35a0ee6f03 Merge branch '2.3' into 2.4
* 2.3:
  Explicitly define the encoding.
2014-05-14 23:48:29 +02:00
Jakub Zalas
619ff5818f Explicitly define the encoding. 2014-05-14 14:35:53 +01:00
t3chn0r
af999971b4 Update MessageSelector.php to show which value was passed
When the translator can't find a correct match using transChoice() a string is logged today with the following text:
<code>Unable to choose a translation for "<string>" with locale "<locale>". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").</code>
This change introduces the value that was passed to transChoice() to the developer will have more information as to what value did not match any of the translation options:
<code>Unable to choose a translation for "<string>" with locale "<locale>" for value "<value>". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").</code>
2014-05-14 09:24:58 -04:00
Fabien Potencier
f50c382979 Merge branch '2.4'
* 2.4:
  Disable 5.6 until it is stable again.
  Update the fixtures.
  fixed CS
  [HttpKernel] fixed default TTL not applied under certain conditions
  Added test when TTL has expired
  [DomCrawler] Fixed image input case sensitive
2014-05-14 08:54:00 +02:00
Fabien Potencier
fad6a591fc Merge branch '2.3' into 2.4
* 2.3:
  Disable 5.6 until it is stable again.
  Update the fixtures.
  [HttpKernel] fixed default TTL not applied under certain conditions
  Added test when TTL has expired
2014-05-14 08:53:52 +02:00
Fabien Potencier
7b93db5ba8 bug #10897 [Console] Fix a console test (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fix a console test

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

re #10714

Every wide character in the fixture file is actually 3 ansi-characters long.

Commits
-------

61108b9 Disable 5.6 until it is stable again.
8cadb49 Update the fixtures.
2014-05-14 08:44:39 +02:00
Fabien Potencier
a44945a306 bug #10896 [HttpKernel] Fixed cache behavior when TTL has expired and a default "global" TTL is defined (alquerci, fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Fixed cache behavior when TTL has expired and a default "global" TTL is defined

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

From #9919:

"When the cache is stale the `validate` method `forward` the request to the backend. A new response will be created with or without TTL configuration. If the TTL was not set then the default one should be set like in the `fetch` method."

This PR fixes this issue, the tests provided in #9919 pass, and I've tweaked them to avoid the costly sleep calls.

Commits
-------

e3983e8 [HttpKernel] fixed default TTL not applied under certain conditions
bc42dae Added test when TTL has expired
2014-05-13 17:22:15 +02:00
Jakub Zalas
8cadb49613 Update the fixtures. 2014-05-13 14:44:05 +01:00
Fabien Potencier
c56c198e52 Merge branch '2.3' into 2.4
* 2.3:
  fixed CS
  [DomCrawler] Fixed image input case sensitive
2014-05-13 10:58:07 +02:00
Fabien Potencier
46725c9cc8 fixed CS 2014-05-13 10:47:23 +02:00
Fabien Potencier
e3983e8ec5 [HttpKernel] fixed default TTL not applied under certain conditions 2014-05-12 17:25:47 +02:00
alquerci
bc42dae162 Added test when TTL has expired 2014-05-12 17:07:07 +02:00
Geoffrey Brier
ab1198f4da [DomCrawler] Fixed image input case sensitive 2014-05-12 11:38:26 +02:00
Fabien Potencier
7e4b4a7ebb Merge branch '2.4'
* 2.4:
  Lower mbstring dependency
  [Console]Improve formatter for double-width character
  Lower mbstring dep, remove it for Yaml and CssSelector components
  [Security] Add check for supported attributes in AclVoter
  [Form] Fixed TrimListenerTest as of PHP 5.5
  Added more IDE links
  [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface
  [Security] fixed wrong PHPDoc of the TokenGeneratorInterface
  [Finder] fixed typehint of the Finder::addAdapter() method
  [TwigBridge][Transchoice] set %count% from the current context.
  [DependencyInjection] Fix travis unit tests
  Update PHPUnit before run
  [Validator] fixed wrong test
  [WebProfilerBundle] added test case for #10773
  [WebProfilerBundle] fixed profiler homepage, fixed #10806
  [WebProfilerBundle] Added test case for #10806
  changed travis to run on the nightly builds of HHVM until everything gets stable
  Fixed issue #5427
  Allow URLs that don't contain a path

Conflicts:
	.travis.yml
	src/Symfony/Component/Console/Application.php
2014-05-12 11:28:39 +02:00
Fabien Potencier
934cd28ba6 Merge branch '2.3' into 2.4
* 2.3:
  [Console]Improve formatter for double-width character
  Lower mbstring dep, remove it for Yaml and CssSelector components
  [Security] Add check for supported attributes in AclVoter
  [Form] Fixed TrimListenerTest as of PHP 5.5
  Added more IDE links
  [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface
  [Finder] fixed typehint of the Finder::addAdapter() method
  [TwigBridge][Transchoice] set %count% from the current context.
  [DependencyInjection] Fix travis unit tests
  Update PHPUnit before run
  [Validator] fixed wrong test
  [WebProfilerBundle] added test case for #10773
  [WebProfilerBundle] fixed profiler homepage, fixed #10806
  [WebProfilerBundle] Added test case for #10806
  changed travis to run on the nightly builds of HHVM until everything gets stable
  Fixed issue #5427
  Allow URLs that don't contain a path

Conflicts:
	.travis.yml
2014-05-12 11:27:48 +02:00
Fabien Potencier
d9fec7065b minor #10890 Lower mbstring dep, remove it for Yaml and CssSelector components (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Lower mbstring dep, remove it for Yaml and CssSelector components

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

Commits
-------

a4b805d Lower mbstring dep, remove it for Yaml and CssSelector components
2014-05-12 11:26:07 +02:00
Nicolas Grekas
6ab671361b Lower mbstring dependency 2014-05-12 11:22:51 +02:00
Fabien Potencier
a29a60debd bug #10714 [Console]Improve formatter for double-width character (denkiryokuhatsuden)
This PR was squashed before being merged into the 2.3 branch (closes #10714).

Discussion
----------

[Console]Improve formatter for double-width character

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes for one that expecting current broken output
| Deprecations? | no
| Fixed tickets |
| Tests pass?   | yes
| License       | MIT
| Doc PR        |

EDIT: fixed the table above not to remove irrelevant line

As mb_strlen just returns "how many chars in the string",
formatting with double-width character is bit broken.

The test I add is skipped when mbstring extension is not loaded.
I'm afraid if some of you cannot properly display japanese string.
(表示するテキスト just means "Some text to display")

Commits
-------

a52f41d [Console]Improve formatter for double-width character
2014-05-12 11:19:00 +02:00
Daisuke Ohata
a52f41d414 [Console]Improve formatter for double-width character 2014-05-12 11:16:18 +02:00
Nicolas Grekas
a4b805dbf2 Lower mbstring dep, remove it for Yaml and CssSelector components 2014-05-12 11:13:35 +02:00
Fabien Potencier
1a64fef828 bug #10872 [Form] Fixed TrimListenerTest as of PHP 5.5 (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed TrimListenerTest as of PHP 5.5

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

Commits
-------

b0bc83d [Form] Fixed TrimListenerTest as of PHP 5.5
2014-05-12 11:08:11 +02:00
Fabien Potencier
fe75bc6248 feature #10880 [DependencyInjection] GraphvizDumper now displays unresolved parameters (rosstuck)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[DependencyInjection] GraphvizDumper now displays unresolved parameters

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

Previously, the graphviz dumper would throw an exception if given a container with an unresolved parameter. This change allows it to render the parameter name instead of the class name if the class can not be resolved. This is also closer to the other DI dumpers which do not error out in these circumstances but simply carry the parameter name over.

For a practical use case, see: https://github.com/rosstuck/TuckConverterBundle/issues/1

Commits
-------

f800e15 GraphizDumper now displays unresolved parameters
2014-05-09 17:34:01 +02:00
umpirsky
0cc9746f87 Fix issue #10867 2014-05-09 17:32:36 +02:00
Fabien Potencier
894b4a09b5 bug #10762 [BrowserKit] Allow URLs that don't contain a path when creating a cookie from a string (thewilkybarkid)
This PR was merged into the 2.3 branch.

Discussion
----------

[BrowserKit] Allow URLs that don't contain a path when creating a cookie from a string

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

The Cookie class doesn't require a path, but the `fromString()` static method does, so when URL given is something like http://www.example.com (ie no trailing slash) it currently throws an exception. This PR removes the requirement.

Commits
-------

fc1223f Allow URLs that don't contain a path
2014-05-09 17:26:55 +02:00
Ross Tuck
f800e15020 GraphizDumper now displays unresolved parameters
Previously it would crash when given a container with an unresolved
parameter. This change will instead show the parameter name on the
final diagram, instead of the class name.
2014-05-09 16:22:29 +02:00
Joseph Bielawski
de2410a8c2 [Console] Make Helper\Table::setStyle() chainable
Fixes #10874.
2014-05-09 10:15:02 +02:00
Arturs Vonda
a605a3d925 [Security] Add check for supported attributes in AclVoter 2014-05-08 18:38:48 +02:00
Bernhard Schussek
b0bc83d2ac [Form] Fixed TrimListenerTest as of PHP 5.5 2014-05-08 17:34:38 +02:00
Nicolas Grekas
485e04749c [Debug] enhance perf of DebugClassLoader 2014-05-08 10:31:54 +02:00
Wouter J
239b738e98 Added more IDE links 2014-05-05 21:19:04 +02:00
Nicolas Grekas
95f3276309 [Debug] fix handling deprecated warnings and stacked errors turned into exceptions 2014-05-05 07:50:37 +00:00
Fabien Potencier
19db5f7c4b feature #10843 [TwigBridge] Added compile-time issues checking in twig:lint command (maxromanovsky)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[TwigBridge] Added compile-time issues checking in twig:lint command

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

Commits
-------

418cea1 [TwigBridge] Added compile-time issues checking in twig:lint command
2014-05-04 19:06:57 +02:00
umpirsky
25f1d85d6b Fix issue 9172 2014-05-04 18:56:58 +02:00
Max
418cea174d [TwigBridge] Added compile-time issues checking in twig:lint command 2014-05-03 09:54:10 +00:00
n-aleha
93544aadfa [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface
| Q             | A
| ------------- | ---
| Fixed tickets | #10845
| License       | MIT

This fixes the description of parameter `array $config` in file ConfigurationExtensionInterface.php by removing the extra `$config`.
2014-05-02 22:42:57 +00:00
Hugo Hamon
0e32676032 [Security] fixed wrong PHPDoc of the TokenGeneratorInterface 2014-05-02 15:46:37 +02:00
Fabien Potencier
c6d88a8cf8 bug #10833 [TwigBridge][Transchoice] set %count% from the current context. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge][Transchoice] set %count% from the current context.

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

Commits
-------

8f7b2cc [TwigBridge][Transchoice] set %count% from the current context.
2014-05-02 09:31:13 +02:00
Hugo Hamon
f3b0ef1a6f [Finder] fixed typehint of the Finder::addAdapter() method 2014-05-02 00:38:16 +02:00
Abdellatif Ait boudad
8f7b2cc44d [TwigBridge][Transchoice] set %count% from the current context. 2014-05-01 19:10:47 +01:00
Fabien Potencier
d1267cb2d7 minor #10819 Fix a test that was ambiguous (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix a test that was ambiguous

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | see #9634 for a discussion of this and #9383 for the report
| License       | MIT
| Doc PR        | n/a

This PR fixes a test that was always passing as the exception catch was catching the PHP notice but also the exception sent by `fail`, so it was useless. That said, I'm not even convinced that this test is useful at all.

Commits
-------

a94b4e0 [Validator] fixed wrong test
2014-05-01 08:28:42 +02:00
Fabien Potencier
1b6daf304f minor #10826 [2.3] Fix phpunit test suite on travis #2 (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix phpunit test suite on travis #2

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

This is a second approach to solve #10821.
Something is weird: `Symfony\Component\Form\Tests\Extension\Core\EventListener\TrimListenerTest` passes when using PHPUnit as phar and fails when using a composer global install

Commits
-------

32e5f67 [DependencyInjection] Fix travis unit tests
c7befd5 Update PHPUnit before run
2014-04-30 18:56:37 +02:00
Romain Neutron
32e5f6727a [DependencyInjection] Fix travis unit tests 2014-04-30 17:29:47 +02:00
Fabien Potencier
a94b4e0ae2 [Validator] fixed wrong test 2014-04-30 16:30:03 +02:00
Tugdual Saunier
16dd0e5dda [WebProfilerBundle] added test case for #10773 2014-04-30 10:15:45 +02:00
Tugdual Saunier
5b91e70777 [WebProfilerBundle] fixed profiler homepage, fixed #10806 2014-04-30 10:11:17 +02:00
Tugdual Saunier
7b425d229d [WebProfilerBundle] Added test case for #10806 2014-04-30 10:11:11 +02:00
Fabien Potencier
8f8b20c16f minor #10811 Use absolute URLs to assets on Symfony its internal pages. (RubenKruiswijk)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Use absolute URLs to assets on Symfony its internal pages.

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

Commits
-------

e401533 Use absolute URLs to assets on Symfony its internal pages.
2014-04-30 09:36:21 +02:00
Fabien Potencier
135c174ee1 bug #10809 Fixed composer to include config component for mocks in phpunit (jpauli)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fixed composer to include config component for mocks in phpunit

Commits
-------

939e92d Fixed composer to include config component for mocks in phpunit
2014-04-30 08:46:20 +02:00
umpirsky
f308f521a6 Fixed issue #5427 2014-04-30 08:40:38 +02:00
Fabien Potencier
afca3cdf2d Revert "bug #10817 [Debug] fix #10313: FlattenException not found (nicolas-grekas)"
reverted in 2.5 as it does not make sense here.

This reverts commit c18bf19016, reversing
changes made to 585b61db95.
2014-04-30 08:24:35 +02:00
Fabien Potencier
49bc4f1469 Merge branch '2.4'
* 2.4:
  [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098
2014-04-30 08:22:38 +02:00
Fabien Potencier
272490312a Merge branch '2.3' into 2.4
* 2.3:
  [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098
2014-04-30 08:22:28 +02:00
Nicolas Grekas
b147cfaf15 [Debug] fix #10313: FlattenException not found because of https://bugs.php.net/42098 2014-04-29 21:42:43 +02:00
Ruben Kruiswijk
e40153354d Use absolute URLs to assets on Symfony its internal pages. 2014-04-29 13:32:21 +02:00
Fabien Potencier
89f7907c4f bumped Symfony version to 2.5.0 2014-04-29 12:38:03 +02:00
Julien Pauli
939e92d3ca Fixed composer to include config component for mocks in phpunit 2014-04-29 12:13:57 +02:00
Fabien Potencier
aea2c6427e updated VERSION for 2.5.0-BETA2 2014-04-29 09:08:19 +02:00
Fabien Potencier
9c202eacbc Merge branch '2.4'
* 2.4:
  [Debug] fix ErrorHandlerTest when context is not an array
2014-04-29 08:56:05 +02:00
Fabien Potencier
f800ade034 Merge branch '2.3' into 2.4
* 2.3:
  [Debug] fix ErrorHandlerTest when context is not an array

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
2014-04-29 08:55:57 +02:00
Nicolas Grekas
988a5dc937 [Debug] fix ErrorHandlerTest when context is not an array 2014-04-28 20:50:14 +02:00
Fabien Potencier
63d1255078 Merge branch '2.4'
* 2.4:
  [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292
  Allow File instance to be passed to BinaryFileResponse
  Add upgrade instructions for the LoggerInterface
  fixed CS
  Removed strict check when found variables inside a translation
  [ExpressionLanguage] Test for the non-strict in_array check in parsePrimaryExpression in Parser.php
  Strict in_array check in Parser.php
  Updated Serbian latin validation translation

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
2014-04-28 19:44:51 +02:00
Fabien Potencier
b1c4ece2d5 Merge branch '2.3' into 2.4
* 2.3:
  [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292
  Allow File instance to be passed to BinaryFileResponse
  Add upgrade instructions for the LoggerInterface
  fixed CS
  Removed strict check when found variables inside a translation
2014-04-28 19:43:58 +02:00
Fabien Potencier
48f26f7e94 bug #10801 [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292

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

Commits
-------

ed0ed80 [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292
2014-04-28 18:51:21 +02:00
Nicolas Grekas
ed0ed80286 [Debug] ErrorHandler: remove $GLOBALS from context in PHP5.3 fix #10292 2014-04-28 18:43:50 +02:00
Andreas Lutro
fc04ad2134 Allow File instance to be passed to BinaryFileResponse 2014-04-28 18:17:17 +02:00
Nicolas Grekas
d7a186f5ca [Debug] less intrusive work around for https://bugs.php.net/54275 2014-04-28 18:08:18 +02:00
Fabien Potencier
f4f09d176b bug #10798 [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared (romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Console] Fix #10795: Allow instancing Console Application when STDIN is not declared

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

Commits
-------

3a5a525 [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared
2014-04-28 15:26:08 +02:00
Romain Neutron
3a5a525aee [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared 2014-04-28 14:32:01 +02:00
Fabien Potencier
17d7186cf8 fixed CS 2014-04-28 11:30:24 +02:00
Asmir Mustafic
074191e705 Removed strict check when found variables inside a translation 2014-04-28 11:28:59 +02:00
Dmitry Parnas
154c4a598a [ExpressionLanguage] Test for the non-strict in_array check in parsePrimaryExpression in Parser.php 2014-04-28 11:05:23 +02:00
parnas
e46513557a Strict in_array check in Parser.php
Otherwise it doesn't throw an error for the cases when passed parameters array includes zero key.
2014-04-28 11:05:23 +02:00
umpirsky
43e65dea9a Updated Serbian latin validation translation 2014-04-28 07:16:03 +02:00
Fabien Potencier
23286bc512 Merge branch '2.4'
* 2.4:
  bumped Symfony version to 2.4.5
  updated VERSION for 2.4.4
  updated CHANGELOG for 2.4.4
  bumped Symfony version to 2.3.14
  updated VERSION for 2.3.13
  update CONTRIBUTORS for 2.3.13
  updated CHANGELOG for 2.3.13
  Updated Serbian validation translation
  [Console] Fixed the rendering of exceptions on HHVM with a terminal width
  [WebProfilerBundle ] Fixed an edge case on WDT loading
  [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument
  fixed typo
  [Process] Disable TTY mode on Windows platform
  [Validator] added missing ANNOTATION config to @Target annotation
  [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-04-28 07:15:04 +02:00
Fabien Potencier
47d1af1ef1 bumped Symfony version to 2.4.5 2014-04-27 20:41:56 +02:00
Fabien Potencier
4697c33cdf updated VERSION for 2.4.4 2014-04-27 15:39:18 +02:00
Fabien Potencier
8003cfe801 Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.14
  updated VERSION for 2.3.13
  update CONTRIBUTORS for 2.3.13
  updated CHANGELOG for 2.3.13
  [Console] Fixed the rendering of exceptions on HHVM with a terminal width
  [WebProfilerBundle ] Fixed an edge case on WDT loading
  fixed typo
  [Process] Disable TTY mode on Windows platform
  [Validator] added missing ANNOTATION config to @Target annotation
  [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Validator/Constraints/Callback.php
2014-04-27 15:34:57 +02:00
Fabien Potencier
d28149f75e bumped Symfony version to 2.3.14 2014-04-27 15:17:08 +02:00
Lars Strojny
b67ed43d32 Allow overloading ContextListener::refreshUser() 2014-04-27 11:38:05 +02:00
Fabien Potencier
9c4b11915d updated VERSION for 2.3.13 2014-04-27 10:34:33 +02:00
umpirsky
c9bb6c3990 Updated Serbian validation translation 2014-04-26 20:23:59 +02:00
Christophe Coevoet
6e57380d14 [Console] Fixed the rendering of exceptions on HHVM with a terminal width 2014-04-26 13:09:19 +02:00
Kévin Dunglas
a702124efb [SecurityBundle] added acl:set command 2014-04-25 18:41:16 +02:00
Fabien Potencier
555fde54fa bug #10773 [WebProfilerBundle ] Fixed an edge case on WDT loading (tucksaun)
This PR was squashed before being merged into the 2.3 branch (closes #10773).

Discussion
----------

[WebProfilerBundle ] Fixed an edge case on WDT loading

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

In some case you can notice the WDT just disappears.
By tracking it down, I noticed that the XHR call returns an empty response with 200 as status code, but if you go directly on the _wdt/my_token URL it works correctly.
What's happening is that when you have a slow listener on `kernel.terminate` (for example the SwiftMailer one with a slow connection), you response (and therefore the WDT javascript) is sent and processed by the browser, the XHR call is done, but the Profiler storage didn't happened yet so no profiling data is available and the `ProfilerController` just sends an empty response with 200 as status code.

Here we change to instead send a specific status code, and treat it in javascript by retrying several times before failing.

The question are:
* Is 204 the most appropriate response code?
* Are 500 ms and 5 max retries good values?

Commits
-------

9d885ed [WebProfilerBundle ] Fixed an edge case on WDT loading
2014-04-25 14:19:16 +02:00
Tugdual Saunier
9d885ed898 [WebProfilerBundle ] Fixed an edge case on WDT loading 2014-04-25 14:19:13 +02:00
Fabien Potencier
7f7e2d8954 [FrameworkBundle] removed support for HHVM built-in web server as it is deprecated now 2014-04-25 13:40:15 +02:00
Choong Wei Tjeng
b0202077fe [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument 2014-04-25 09:06:20 +02:00
Arash Tabriziyan
dc3f3505e8 fixed typo 2014-04-25 08:54:53 +02:00
Nicolas Grekas
e3566c27b7 [Debug] fix #10771 DebugClassLoader can't load PSR4 libs 2014-04-24 17:48:28 +02:00
Fabien Potencier
544e43f5e2 bug #10763 [Process] Disable TTY mode on Windows platform (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Disable TTY mode on Windows platform

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

Commits
-------

7942c2a [Process] Disable TTY mode on Windows platform
2014-04-24 15:28:08 +02:00
Romain Neutron
7942c2a64c [Process] Disable TTY mode on Windows platform 2014-04-24 14:53:00 +02:00
Fabien Potencier
67be44737e [Validator] added missing ANNOTATION config to @Target annotation 2014-04-24 07:32:02 +02:00
Jakub Zalas
13466415c4 [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator. 2014-04-23 22:00:27 +01:00
Fabien Potencier
aa5d62d8bc fixed typo 2014-04-23 17:17:21 +02:00
Fabien Potencier
61e287e0b6 Merge branch '2.4'
* 2.4:
  [Validator] added missing @Target
  [Validator] fixed @Target config
  added @Target annotations
  [Process] Add missing docblocks, remove variable declarations

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
2014-04-23 16:08:54 +02:00
Fabien Potencier
dd175cfcd8 [Validator] added missing @Target 2014-04-23 16:07:18 +02:00
Fabien Potencier
99ca3f384e [Validator] fixed @Target config 2014-04-23 16:07:13 +02:00
Fabien Potencier
2a947953d5 Merge branch '2.3' into 2.4
* 2.3:
  added @Target annotations
2014-04-23 16:04:21 +02:00
Fabien Potencier
542d6fa580 added @Target annotations 2014-04-23 15:35:47 +02:00
Fabien Potencier
c87cfa2f5c Merge branch '2.3' into 2.4
* 2.3:
  [Process] Add missing docblocks, remove variable declarations

Conflicts:
	src/Symfony/Component/Process/ProcessBuilder.php
2014-04-23 08:33:25 +02:00
Fabien Potencier
5947eec36f minor #10756 [2.3][Process] Add missing docblocks, remove variable declarations (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Add missing docblocks, remove variable declarations

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

Commits
-------

ff77f24 [Process] Add missing docblocks, remove variable declarations
2014-04-23 08:32:13 +02:00
thewilkybarkid
fc1223f924 Allow URLs that don't contain a path 2014-04-22 15:58:51 +01:00
Romain Neutron
ff77f24092 [Process] Add missing docblocks, remove variable declarations 2014-04-22 10:47:56 +02:00
Fabien Potencier
6658989fb8 Merge branch '2.4'
* 2.4:
  fix docblock
  Fixed incompatibility of x509 auth with nginx
  [Process] Setting STDIN while running should not be possible
  [Validator] slovenian translation updated
  [FrameworkBundle] improve English in RouterMatchCommand
  [Validator] Updated Hungarian translations
  [Doctrine Bridge] simplify session handler by using main connection
  [Validator] Fixed typos in German translation
  [Validator] Completed French translations
  [Validator] Completed German translations
  [Validator] Completed Luxembourgish translations
2014-04-22 10:11:23 +02:00
Fabien Potencier
0deaceb2ff Merge branch '2.3' into 2.4
* 2.3:
  fix docblock
  Fixed incompatibility of x509 auth with nginx
  [Process] Setting STDIN while running should not be possible
  [FrameworkBundle] improve English in RouterMatchCommand
  [Doctrine Bridge] simplify session handler by using main connection

Conflicts:
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2014-04-22 10:11:06 +02:00
Loick Piera
68debfb190 fix docblock 2014-04-22 10:09:28 +02:00
Fabien Potencier
5cae63f084 minor #10752 [FrameworkBundle] improve English in RouterMatchCommand (shieldo)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] improve English in RouterMatchCommand

Improve English in command output.

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

dd26d1e [FrameworkBundle] improve English in RouterMatchCommand
2014-04-22 09:21:18 +02:00
Fabien Potencier
882e9bac1e bug #10757 [2.3][Process] Setting STDIN while running should not be possible (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Setting STDIN while running should not be possible

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

Commits
-------

3e3517a [Process] Setting STDIN while running should not be possible
2014-04-22 09:18:13 +02:00
Fabien Potencier
4dcb158ba1 bug #10749 Fixed incompatibility of x509 auth with nginx (alcaeus)
This PR was squashed before being merged into the 2.3 branch (closes #10749).

Discussion
----------

Fixed incompatibility of x509 auth with nginx

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

This commit fixes x509 authentication when using nginx as web server.
X509AuthenticationListener depends on the SSL_CLIENT_S_DN_Email field being set.
As is, this field is specific to Apache and cannot be provided by nginx. nginx
can provide the DN of the certificate in SSL_CLIENT_S_DN. If the email field is
not set, the listener tries to extract the email address from the DN.

Commits
-------

ba8fc16 Fixed incompatibility of x509 auth with nginx
2014-04-22 09:12:34 +02:00
alcaeus
ba8fc166ca Fixed incompatibility of x509 auth with nginx 2014-04-22 09:12:31 +02:00
Romain Neutron
3e3517abfd [Process] Setting STDIN while running should not be possible 2014-04-21 23:11:42 +02:00
Peter Kokot
c6c5cad5a3 [Validator] slovenian translation updated 2014-04-21 21:16:29 +02:00
Douglas Greenshields
dd26d1e50a [FrameworkBundle] improve English in RouterMatchCommand 2014-04-21 15:42:14 +01:00
Gábor Egyed
e9e09fd48a [Validator] Updated Hungarian translations 2014-04-21 03:18:54 +02:00
Tobias Schultze
6518b74995 [Doctrine Bridge] simplify session handler by using main connection 2014-04-20 18:21:59 +02:00
Michel Weimerskirch
5e1ee8aa3c [Validator] Fixed typos in German translation 2014-04-20 11:40:39 +02:00
Fabien Potencier
a594e46199 minor #10744 [Validator] Completed Luxembourgish translations (mweimerskirch)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Completed Luxembourgish translations

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

Commits
-------

bc66e8f [Validator] Completed Luxembourgish translations
2014-04-20 09:33:50 +02:00
Fabien Potencier
00d779e120 minor #10745 [Validator] Completed German translations (mweimerskirch)
This PR was merged into the 2.4 branch.

Discussion
----------

[Validator] Completed German translations

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

Commits
-------

47e5a4b [Validator] Completed German translations
2014-04-20 09:32:46 +02:00
Michel Weimerskirch
dcc34c1698 [Validator] Completed French translations
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | n/a
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2014-04-20 01:24:43 +02:00
Michel Weimerskirch
47e5a4b198 [Validator] Completed German translations 2014-04-20 01:08:17 +02:00
Michel Weimerskirch
bc66e8f158 [Validator] Completed Luxembourgish translations 2014-04-20 01:07:01 +02:00
Fabien Potencier
27e1a893a0 feature #10725 [Debug] Handled errors (nicolas-grekas)
This PR was squashed before being merged into the 2.5-dev branch (closes #10725).

Discussion
----------

[Debug] Handled errors

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

Enhance error handling and thus displaying for catchable PHP errors.
Code is tricky thanks to https://bugs.php.net/54275

Before:

![capture du 2014-04-17 10 03 40](https://cloud.githubusercontent.com/assets/243674/2729324/4de3eedc-c607-11e3-8b23-c88657bbecd0.png)

After:

![capture du 2014-04-17 10 03 14](https://cloud.githubusercontent.com/assets/243674/2729326/534ec504-c607-11e3-82dd-49b7770b1e75.png)

Commits
-------

0279fbf [Debug] Handled errors
2014-04-19 10:12:20 +02:00
Nicolas Grekas
0279fbfdad [Debug] Handled errors 2014-04-19 10:12:16 +02:00
Fabien Potencier
02fdbb25ad Merge branch '2.4'
* 2.4:
  Little correction for case 'ar'
  No need to use mb functions here
  Fix doc-blocks
  Fix doc blocks
  [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface
  [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite)
  [Finder] Marked test skipped when ftp stream wrapper is not available

Conflicts:
	src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php
2014-04-18 23:02:40 +02:00
Fabien Potencier
bbadcfd01b Merge branch '2.3' into 2.4
* 2.3:
  Little correction for case 'ar'
  No need to use mb functions here
  [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface
  [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite)
  [Finder] Marked test skipped when ftp stream wrapper is not available
2014-04-18 23:02:05 +02:00
klyk50
ef85f4cd97 Little correction for case 'ar' 2014-04-18 23:01:08 +02:00
Fabien Potencier
7b7a0efce2 minor #10719 [Finder] Marked test skipped when ftp stream wrapper is not available (deguif)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] Marked test skipped when ftp stream wrapper is not available

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

This should prevent test from failing on hhvm as ftp stream wrapper is not currently implemented.
See https://github.com/facebook/hhvm/issues/2108 for more details.

Commits
-------

f35fc81 [Finder] Marked test skipped when ftp stream wrapper is not available
2014-04-18 22:56:28 +02:00
Fabien Potencier
5eacace321 bug #10720 [HttpFoundation] Fix DbalSessionHandler (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix DbalSessionHandler

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

This is basically the same as #10652 for the DbalSessionHandler.

- First commit fixes fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite).
- Second commit updates phpdoc of SessionHandlerInterface and unifies parameters of all handlers according to interface (so inheritdoc actually makes sense).

Commits
-------

524bf84 [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface
ccdfbe6 [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite)
2014-04-18 22:55:02 +02:00
Romain Neutron
90294ec90c Fix doc blocks 2014-04-18 22:54:24 +02:00
Miha Vrhovnik
4e8ba13874 No need to use mb functions here
When mb functions are used and a large response is given the OOM happens as mb functions will use large quantities of memory.
2014-04-18 22:46:01 +02:00
Romain Neutron
7fab25e48d Fix doc-blocks 2014-04-18 22:45:55 +02:00
Fabien Potencier
7505c19dec minor #10738 [2.4] Fix doc blocks (romainneutron)
This PR was merged into the 2.4 branch.

Discussion
----------

[2.4] Fix doc blocks

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

this follows #10737

Commits
-------

c01915d Fix doc blocks
2014-04-18 22:41:38 +02:00
Fabien Potencier
8ef8a1d289 unified return null usages 2014-04-18 22:40:52 +02:00
Fabien Potencier
0bab829372 Merge branch '2.4'
* 2.4:
  unified return null usages
  [Validator] added Japanese translation
  Textarea value should default to empty string instead of null.
  Fix doc blocks
  [Process] Fix #10681, process are failing on Windows Server 2003
  updated doc
  [Security] fix DBAL connection typehint
  [HttpFoundation] status 201 is allowed to have a body
  unified return null usages

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
2014-04-18 22:40:13 +02:00
Fabien Potencier
e50d263f7a unified return null usages 2014-04-18 22:38:54 +02:00
Romain Neutron
c01915da95 Fix doc blocks 2014-04-18 22:37:14 +02:00
Fabien Potencier
2827747108 Merge branch '2.3' into 2.4
* 2.3:
  Textarea value should default to empty string instead of null.
  Fix doc blocks
  [Process] Fix #10681, process are failing on Windows Server 2003
  [Security] fix DBAL connection typehint
  [HttpFoundation] status 201 is allowed to have a body
  unified return null usages

Conflicts:
	src/Symfony/Component/Console/Helper/DescriptorHelper.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
	src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
2014-04-18 22:37:09 +02:00
Fabien Potencier
5b72e5ab04 minor #10717 unified return null usages (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

unified return null usages

| Q             | A
| ------------- | ---
| License       | MIT

This PR unifies the way we return `null` from a function or method:

 * always use `return;` instead of `return null;` (the current code base uses both);
 * never use `return;` at the end of a function/method.

Commits
-------

d1d569b unified return null usages
2014-04-18 22:35:25 +02:00
Fabien Potencier
b2e906ea41 minor #10726 [HttpFoundation] factorize out the way output buffers should be closed (nicolas-grekas)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[HttpFoundation] factorize out the way output buffers should be closed

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

Closing output buffers was done in three different files, but not exactly the same way, with subtle differences.
This PR factorizes out the best way to do this in a new public static function of the Response class.

Commits
-------

469943c [HttpFoundation] factorize out the way output buffers should be closed
2014-04-18 22:33:23 +02:00
Fabien Potencier
78e72fe3bf bug #10721 [HttpFoundation] status 201 is allowed to have a body (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] status 201 is allowed to have a body

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | only if someone relied on wrong behavior
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10673
| License       | MIT

Status 201 is allowed to have a response body.

Commits
-------

1761f64 [HttpFoundation] status 201 is allowed to have a body
2014-04-18 22:26:13 +02:00
Fabien Potencier
45184aac06 bug #10728 [2.3][Process] Fix #10681, process are failing on Windows Server 2003 (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Process] Fix #10681, process are failing on Windows Server 2003

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

Commits
-------

46fdfbb [Process] Fix #10681, process are failing on Windows Server 2003
2014-04-18 22:23:17 +02:00
Issei.M
7b91e03251 [Validator] added Japanese translation 2014-04-18 22:22:10 +02:00
Fabien Potencier
4f9e05cb55 minor #10737 [2.3] Fix doc blocks (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix doc blocks

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

Commits
-------

de5d627 Fix doc blocks
2014-04-18 22:20:50 +02:00
Sascha Grossenbacher
f6725648cc Textarea value should default to empty string instead of null. 2014-04-18 22:19:23 +02:00
Romain Neutron
de5d62775a Fix doc blocks 2014-04-18 22:17:16 +02:00
Fabien Potencier
3c42345293 fixed typo 2014-04-18 21:44:02 +02:00
ibasaw
e0433297b2 Update PackageInterface.php 2014-04-18 13:56:04 +02:00
Nicolas Grekas
469943cd1c [HttpFoundation] factorize out the way output buffers should be closed 2014-04-17 16:18:17 +00:00
Romain Neutron
46fdfbbdef [Process] Fix #10681, process are failing on Windows Server 2003 2014-04-17 14:29:47 +02:00
Issei.M
b1202b030b updated doc 2014-04-17 15:05:16 +09:00
Tobias Schultze
c05edcc68d [Security] fix DBAL connection typehint 2014-04-17 00:04:03 +02:00
Tobias Schultze
1761f64023 [HttpFoundation] status 201 is allowed to have a body 2014-04-16 23:31:51 +02:00
Tobias Schultze
524bf846db [HttpFoundation] update phpdoc of SessionHandlerInterface and unify parameters of all handlers according to interface 2014-04-16 17:40:08 +02:00
Tobias Schultze
ccdfbe6628 [Doctrine Bridge] fix DbalSessionHandler for high concurrency, interface compliance, compatibility with all drivers (oci8, mysqli, pdo with mysql, sqlsrv, sqlite) 2014-04-16 17:38:17 +02:00
Fabien Potencier
f72eb34fc4 fixed types in phpdocs 2014-04-16 12:36:34 +02:00
Fabien Potencier
2314328b16 Merge branch '2.4'
* 2.4:
  fixed types in phpdocs
  fixed types in phpdocs

Conflicts:
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
2014-04-16 12:36:21 +02:00
Fabien Potencier
0ecdda1770 fixed types in phpdocs 2014-04-16 12:34:42 +02:00
Fabien Potencier
d5bd9bdd68 Merge branch '2.3' into 2.4
* 2.3:
  fixed types in phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Templating/PhpEngine.php
2014-04-16 12:34:31 +02:00
Fabien Potencier
e96b018805 fixed types in phpdocs 2014-04-16 12:30:19 +02:00
François-Xavier de Guillebon
f35fc818d1 [Finder] Marked test skipped when ftp stream wrapper is not available 2014-04-16 11:24:56 +02:00
Fabien Potencier
339c0c8099 made {@inheritdoc} annotations consistent across the board 2014-04-16 10:09:16 +02:00