Commit Graph

13621 Commits

Author SHA1 Message Date
Fabien Potencier
66e2227c2d merged branch sqmk/patch-1 (PR #8337)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8337).

Discussion
----------

Fix grammar

Commits
-------

4163f71 Fix grammar
2013-06-23 08:56:04 +02:00
Michael Squires
a2e440a52c Fix grammar 2013-06-23 08:56:04 +02:00
Fabien Potencier
5b14665964 bumped Symfony version to 2.2.4 2013-06-19 15:03:30 +02:00
Fabien Potencier
74a033d95b updated VERSION for 2.2.3 2013-06-19 14:09:49 +02:00
Fabien Potencier
8c353ddde6 update CONTRIBUTORS for 2.2.3 2013-06-19 14:09:22 +02:00
Fabien Potencier
bf881db902 updated CHANGELOG for 2.2.3 2013-06-19 14:09:01 +02:00
Fabien Potencier
1815f5998a Merge branch '2.1' into 2.2
* 2.1:
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
2013-06-19 14:03:55 +02:00
Fabien Potencier
add4207838 merged branch romainneutron/process-stream-select2.2 (PR #8274)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Process] Disable exception on stream_select timeout

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

Commits
-------

c0da3ae [Process] Disable exception on stream_select timeout
2013-06-13 18:05:48 +02:00
Romain Neutron
c0da3ae445 [Process] Disable exception on stream_select timeout 2013-06-13 17:57:04 +02:00
Fabien Potencier
6a15a3adc7 merged branch fabpot/session-regenerate-fix (PR #8270)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] fixed issue with session_regenerate_id (closes #7380)

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

Commits
-------

77f2aa8 [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
2013-06-13 17:25:25 +02:00
Fabien Potencier
77f2aa8ec8 [HttpFoundation] fixed issue with session_regenerate_id (closes #7380) 2013-06-13 14:48:26 +02:00
Fabien Potencier
ed3bcb047a [DomCrawler] added a note about the default charset 2013-06-13 13:40:37 +02:00
Fabien Potencier
d0983f0a79 merged branch lsmith77/force_content_type (PR #8050)
This PR was merged into the 2.2 branch.

Discussion
----------

[WebProfilerBundle] force the Content-Type to html in the web profiler controllers

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=force_content_type)](https://travis-ci.org/lsmith77/symfony)
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This just forces the Content-Type to match what will be returned, otherwise if the request format happens to be something else than HTML (which can be the case when building an app that only does JSON/XML with FOSRestBundle) it can happen that the Response class automatically sets a different Content-Type.

The approach taken here matches https://github.com/nelmio/NelmioApiDocBundle/blob/master/Controller/ApiDocController.php#L24

Commits
-------

6d2135b force the Content-Type to html in the web profiler controllers
2013-06-13 10:00:03 +02:00
Fabien Potencier
9a76c4f017 merged branch tiagojsag/console_input_options_fix (PR #8199)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8199).

Discussion
----------

[Console] Throw exception if value is passed to VALUE_NONE input optin, long syntax

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

Input options with InputOption::VALUE_NONE accept values in both short and long syntaxes:
- When using the long syntax, no exception is thrown;
- When using short, a "The %s option does not exist" exception is thrown.

This PR only addresses the long syntax case. The short syntax case would require considerable refactoring of the parse code, which I believe should be discussed.

I included a test that illustrates the above mentioned problem for the long syntax scenario.

Commits
-------

32ea77f Throw exception if value is passed to VALUE_NONE input, long syntax
2013-06-13 09:48:34 +02:00
Tiago Garcia
bcbbb28f76 Throw exception if value is passed to VALUE_NONE input, long syntax 2013-06-13 09:47:06 +02:00
Fabien Potencier
fb0a0a708b merged branch bamarni/date-format-regex (PR #8198)
This PR was submitted for the 2.1 branch but it was merged into the 2.2 branch instead (closes #8198).

Discussion
----------

[Form] fixed date type format pattern regex

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

I don't understand what is the rationale behind the current regex, why is there mandatory in-between characters?

The current regex passes with the format option set to ```dMyyyy``` while it doesn't with ```dMy```, on the linked icu documentation it is stated that ```y``` is equivalent to ```yyyy```.

So when setting this format option to dMy, fields are rendered in a wrong order because of the fallback (year, month, day).

Commits
-------

6a91bbb [Form] fixed date type format pattern regex
2013-06-13 09:35:18 +02:00
Bilal Amarni
6b715136c8 fixed date type format pattern regex 2013-06-13 09:35:18 +02:00
Fabien Potencier
24a07fbab8 [FrameworkBundle] tweaked previous merge (refs #8242) 2013-06-13 09:07:59 +02:00
Fabien Potencier
3b068378e8 merged branch tomglue/console_reregister_commands_fix (PR #8242)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8242).

Discussion
----------

[FrameworkBundle] do not re-register commands each time a Console\Application is run

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

I have been experimenting with using the Symfony console application inside of a React event loop which works quite well.

In this scenario, I re-use an instances of a Console\Application to run multiple tasks. This works well apart from unnecessarily reloading the command classes from all included bundles each time doRun() is called (https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Console/Application.php#L68). This can also lead to running out of file descriptors under heavy load as bootstrap.php.cache uses a RecursiveDirectoryIterator to load the command.

Commits
-------

1983fc3 [FrameworkBundle] do not re-register commands each time a Console\Application is run
2013-06-13 09:04:56 +02:00
Tom Maguire
842f3fa3d2 do not re-register commands each time a Console\Application is run 2013-06-13 09:04:38 +02:00
Fabien Potencier
0991cd0b9d [Process] moved env check to the Process class (refs #8227) 2013-06-13 08:52:49 +02:00
Fabien Potencier
6089f32d61 merged branch oodle/ticket_7196 (PR #8227)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8227).

Discussion
----------

[Process] fix issue where $_ENV contains array vals

There are cases where $env or $_ENV can contain a value that is an array
This will cause Process to throw an Array to String conversion exception
Initially I submitted a patch of Process.php, however Fabien indicated
that it shouldn't be fixed there (see below pull request).

Before recently, a simple work around would be in php.ini to set:

  register_argc_argv = On

However with recent changes, this seems to no longer work.

Original pull request: https://github.com/symfony/symfony/pull/7354

See ticket https://github.com/symfony/symfony/issues/7196

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

Commits
-------

2c6af95 [Process] fix issue where $_ENV contains array vals
2013-06-13 08:44:22 +02:00
Matthew J Mucklo
8764944c69 fix issue where $_ENV contains array vals
There are cases where $env or $_ENV can contain a value that is an array
This will cause Process to throw an Array to String conversion exception
Initially I submitted a patch of Process.php, however Fabien indicated
that it shouldn't be fixed there (see below pull request).

Before recently, a simple work around would be in php.ini to set:

  register_argc_argv = On

However with recent changes, this seems to no longer work.

Original pull request: https://github.com/symfony/symfony/pull/7354

See ticket https://github.com/symfony/symfony/issues/7196
2013-06-13 08:44:22 +02:00
Fabien Potencier
c27735df29 merged branch lazyhammer/fix-crawler-file-scheme (PR #8264)
This PR was merged into the 2.2 branch.

Discussion
----------

[DomCrawler] Fix handling file:// without a host

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

Commits
-------

4139936 [DomCrawler] Fix handling file:// without a host
2013-06-13 08:39:46 +02:00
Dmitrii Chekaliuk
41399360e8 [DomCrawler] Fix handling file:// without a host 2013-06-13 02:54:36 +03:00
Fabien Potencier
839047bafa merged branch alquerci/ticket_8219 (PR #8243)
This PR was merged into the 2.2 branch.

Discussion
----------

[Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol

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

Commits
-------

849f3ed [Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol
2013-06-11 22:19:40 +02:00
Fabien Potencier
8ec7962f92 merged branch shieldo/correct_bind_interface (PR #8248)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] corrected interface bind() method defined against in deprecation ...

...notice

The 'bind' method is defined against `FormInterface` not `FormConfigInterface`. This corrects the deprecation notice in the `Form` implementation.

Commits
-------

de289d2 [Form] corrected interface bind() method defined against in deprecation notice
2013-06-11 13:39:42 +02:00
Douglas Greenshields
de289d2cfd [Form] corrected interface bind() method defined against in deprecation notice 2013-06-11 12:21:03 +01:00
Fabien Potencier
0c0a3e90e7 [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245) 2013-06-11 09:34:22 +02:00
Fabien Potencier
d85ce5e5ad Merge branch '2.1' into 2.2
* 2.1:
  Revert "[Console] ensure exit code between 0-254"
  [Console] ensure exit code between 0-254
  [Console] fix status code when Exception::getCode returns something like 0.1
  Fixed exit code for exceptions with error code 0
2013-06-11 09:14:33 +02:00
Fabien Potencier
84867b78f8 Revert "[Console] ensure exit code between 0-254"
This reverts commit 6b9180a23d.
2013-06-11 09:13:58 +02:00
Fabien Potencier
82e555263f merged branch Tobion/console-status-code (PR #8202)
This PR was merged into the 2.1 branch.

Discussion
----------

[Console] fix status and exit code

Fix https://github.com/symfony/symfony/pull/8183#discussion_r4525267
and
http://www.php.net/manual/en/function.exit.php
> Exit statuses should be in the range 0 to 254, the exit status 255 is reserved by PHP and shall not be used. The status 0 is used to terminate the program successfully.

Commits
-------

6b9180a [Console] ensure exit code between 0-254
445b2e3 [Console] fix status code when Exception::getCode returns something like 0.1
2013-06-11 09:13:57 +02:00
alquerci
849f3ed7e9 [Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol 2013-06-10 20:35:46 +02:00
Fabien Potencier
f4788121eb merged branch havvg/2.2 (PR #8240)
This PR was merged into the 2.2 branch.

Discussion
----------

[Propel1] fix many-to-many Propel1 ModelChoiceList

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

replaces #8223

Commits
-------

25e3abd fix many-to-many Propel1 ModelChoiceList
2013-06-10 16:56:21 +02:00
Toni Uebernickel
25e3abd683 fix many-to-many Propel1 ModelChoiceList 2013-06-10 12:43:24 +02:00
Tobias Schultze
6b9180a23d [Console] ensure exit code between 0-254
255 is reserved by PHP and should not be used

also put this code inside the codeCoverageIgnore block because it cannot be tested with phpunit
2013-06-09 14:59:14 +02:00
Fabien Potencier
1f26887d4b merged branch pylebecq/2.2 (PR #8221)
This PR was merged into the 2.2 branch.

Discussion
----------

[DomCrawler] Fixed a fatal error when setting a value in a malformed field name

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

Hi,

I found a case where a fatal error happen when trying to set a value in a form field with a malformed name.

```
Fatal error: Call to a member function setValue() on a non-object in /home/pierreyves/projects/symfony2/symfony/src/Symfony/Component/DomCrawler/FormFieldRegistry.php on line 128

Call Stack:
    0.0001     231832   1. {main}() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/composer/bin/phpunit:0
    0.0035     688768   2. PHPUnit_TextUI_Command::main() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/composer/bin/phpunit:63
    0.0035     689000   3. PHPUnit_TextUI_Command->run() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/TextUI/Command.php:129
    0.0224    2705448   4. PHPUnit_TextUI_TestRunner->doRun() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/TextUI/Command.php:176
    0.0301    2997392   5. PHPUnit_Framework_TestSuite->run() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php:349
    0.0477    3613296   6. PHPUnit_Framework_TestSuite->runTest() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite.php:745
    0.0477    3613296   7. PHPUnit_Framework_TestCase->run() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite.php:775
    0.0477    3613296   8. PHPUnit_Framework_TestResult->run() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php:776
    0.0478    3614208   9. PHPUnit_Framework_TestCase->runBare() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestResult.php:648
    0.0478    3630992  10. PHPUnit_Framework_TestCase->runTest() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php:831
    0.0478    3631856  11. ReflectionMethod->invokeArgs() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php:976
    0.0478    3631888  12. Symfony\Component\DomCrawler\Tests\FormTest->testSetValueOnMultiValuedFieldsWithMalformedName() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php:976
    0.0481    3635560  13. Symfony\Component\DomCrawler\Form->offsetSet() /home/pierreyves/projects/symfony2/symfony/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php:255
    0.0481    3635560  14. Symfony\Component\DomCrawler\FormFieldRegistry->set() /home/pierreyves/projects/symfony2/symfony/src/Symfony/Component/DomCrawler/Form.php:320
```

In this case, `FormFieldRegistry::getSegments('foo[bar')` method is called and it will return `array('foo')` only. Therefore the return of `FormFieldRegistry::get('foo[bar')` returns an array instead of a `FormField` and so the `setValue()` call happen on the array which leads to the fatal error.

I tried to fix that. I don't know if it's the best way to do this so, as always, comments are welcome.

Commits
-------

bce6bd2 [DomCrawler] Fixed a fatal error when setting a value in a malformed field name.
2013-06-08 17:01:11 +02:00
Pierre-Yves LEBECQ
bce6bd2858 [DomCrawler] Fixed a fatal error when setting a value in a malformed field name. 2013-06-08 13:27:47 +02:00
Tobias Schultze
445b2e3dad [Console] fix status code when Exception::getCode returns something like 0.1 2013-06-05 10:14:54 +02:00
Fabien Potencier
18f55ffe5e merged branch havvg/hotfix/fix-bundle-command-instantiation (PR #8182)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpKernel] instantiate valid commands only

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

This skips the default behavior to instantiate `Command` that cannot simply be instantiated. The respective commands have to be registered by other means.

Commits
-------

afad9c7 instantiate valid commands only
2013-06-04 17:00:11 +02:00
Fabien Potencier
28a900150e merged branch Stelian/2.2 (PR #8183)
This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes #8183).

Discussion
----------

Fixed exit code for exceptions with error code 0

Covers https://github.com/symfony/symfony/issues/8180

Commits
-------

48e77f8 Fixed exit code for exceptions with error code 0
2013-06-04 16:58:25 +02:00
Stelian
bbfde62d7c Fixed exit code for exceptions with error code 0 2013-06-04 16:58:25 +02:00
Toni Uebernickel
afad9c7894 instantiate valid commands only 2013-06-04 12:08:18 +02:00
Fabien Potencier
bc1bf3202d bumped Symfony version to 2.2.3-DEV 2013-06-02 18:01:55 +02:00
Fabien Potencier
34430e8dbf updated VERSION for 2.2.2 2013-06-02 15:03:09 +02:00
Fabien Potencier
b9ca806048 updated CHANGELOG for 2.2.2 2013-06-02 15:02:48 +02:00
Fabien Potencier
93585f6514 removed CHANGELOG for 2.1 2013-06-02 14:54:39 +02:00
Fabien Potencier
57f93b89e8 Merge branch '2.1' into 2.2
* 2.1:
  updated VERSION for 2.1.11
  update CONTRIBUTORS for 2.1.11
  updated CHANGELOG for 2.1.11

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-02 14:53:48 +02:00
Fabien Potencier
e029409fc8 updated VERSION for 2.1.11 2013-06-02 14:29:05 +02:00
Fabien Potencier
b2c0861089 update CONTRIBUTORS for 2.1.11 2013-06-02 14:28:43 +02:00