Commit Graph

14597 Commits

Author SHA1 Message Date
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
2f915f72f6 Merge branch '2.2' into 2.3
* 2.2:
  Revert "[Console] ensure exit code between 0-254"
  fix many-to-many Propel1 ModelChoiceList
  [Console] ensure exit code between 0-254
  [DomCrawler] Fixed a fatal error when setting a value in a malformed field name.
  [Console] fix status code when Exception::getCode returns something like 0.1
  Fixed exit code for exceptions with error code 0
  instantiate valid commands only

Conflicts:
	src/Symfony/Component/Console/Application.php
2013-06-11 09:15:14 +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
847951ec80 merged branch rubenrua/master (PR #8236)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8236).

Discussion
----------

Added missing galician (gl) translations

Commits
-------

e179510 Added missing galician (gl) translations
2013-06-10 18:23:26 +02:00
rubenrua
b8c13b670f Added missing galician (gl) translations 2013-06-10 18:23:25 +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
Fabien Potencier
af098ebb2d merged branch lancergr/greek_validator (PR #8225)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8225).

Discussion
----------

[Validator] Added Greek translation

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

Commits
-------

278090b [Validator] Added Greek translation
2013-06-08 16:57:40 +02:00
lancergr
68b33604e5 Added Greek translation 2013-06-08 16:57:40 +02:00
Fabien Potencier
b2d2c12cad merged branch saem/ticket_8228 (PR #8229)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fixed OutOfBoundException when session handler_id is null

[FrameworkBundle] Fixed OutOfBoundException when session handler_id is null

When a null is provided for framework.session.handler_id the FrameworkExtension attempts to set the session storage to null for the 'session.storage.php_bridge' by altering the second argument. According to the session.xml service definition, there is no second argument, and it is in fact the first (read, 0 index) argument that should be changed.

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

Commits
-------

e3561ce [FrameworkBundle] Fixed OutOfBoundException when session handler_id is null
2013-06-08 16:54:12 +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
Saem Ghani
e3561ce49c [FrameworkBundle] Fixed OutOfBoundException when session handler_id is null
When a null is provided for framework.session.handler_id the FrameworkExtension attempts to set the session storage to null for the 'session.storage.php_bridge' by altering the second argument. According to the session.xml service definition, there is no second argument, and it is in fact the first (read, 0 index) argument that should be changed.
2013-06-07 15:05:01 -07:00
Fabien Potencier
df0a02dc10 merged branch Seldaek/fix-container-opt (PR #8193)
This PR was merged into the 2.3 branch.

Discussion
----------

[DI] Fixes access of aliases shared services

Fixes #8096 and I noticed that the aliases methods weren't really needed anymore so I removed them. I think it's fine since they were protected, but did it in a separate commit in case you just want the bugfix.

Note that while the DI tests pass, I didn't run this patch as part of a real app. I'd appreciate if someone has the time to verify it still works given it's slightly critical code.

Commits
-------

81b122d [DependencyInjection] Add support for aliases of aliases + regression test
d8c0ef7 [DependencyInjection] Rename ContainerBuilder::$aliases to avoid conflicting with the parent class
bb797ee [DependencyInjection] Remove get*Alias*Service methods from compiled containers
379f5e0 [DependencyInjection] Fix aliased access of shared services, fixes #8096
2013-06-05 19:12:01 +02:00
Jordi Boggiano
81b122dd7b [DependencyInjection] Add support for aliases of aliases + regression test 2013-06-05 11:51:05 +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
b219e0a9c6 merged branch jakzal/2.3-config-tests (PR #8178)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Added few tests

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

Commits
-------

804b182 [Config] Added tests for the FileResource and DirectoryResource.
c5dda79 [Config] Fixed @covers annotation which ignored some of the methods from the code coverage.
bf769e0 [Config] Added tests for the ConfigCache.
2013-06-04 17:04:14 +02:00
Fabien Potencier
e1f530eb7a merged branch jakzal/2.3-more-security-tests (PR #8177)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Added more tests

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

Continuation of #8136

Commits
-------

5409852 [Security] Added few new test cases for the HttpUtils and improved readability of existing tests.
d6ab77e [Security] Added tests for the SwitchUserListener.
cccd005 [Security] Added tests for the ContextListener.
307bc91 [Security] Added a test to the BasicAuthenticationListener.
314f29a [Security] Removed an unnecessary call to sprintf() and added a test case.
2013-06-04 17:03:43 +02:00
Fabien Potencier
47a0a4c692 merged branch lyrixx/filesystem-docblock (PR #8181)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8181).

Discussion
----------

[2.4][Filesystem] Fixed doc block on Filesystem::rename

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

Commits
-------

891032c [Filesystem] Fixed doc block on Filesystem::rename
2013-06-04 17:02:05 +02:00
Grégoire Pineau
9527001399 Fixed doc block on Filesystem::rename
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2013-06-04 17:02:05 +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
Jordi Boggiano
d8c0ef705c [DependencyInjection] Rename ContainerBuilder::$aliases to avoid conflicting with the parent class 2013-06-04 15:12:01 +02:00
Jordi Boggiano
bb797ee755 [DependencyInjection] Remove get*Alias*Service methods from compiled containers 2013-06-04 14:33:18 +02:00
Jordi Boggiano
379f5e08b4 [DependencyInjection] Fix aliased access of shared services, fixes #8096 2013-06-04 14:33:14 +02:00
Toni Uebernickel
afad9c7894 instantiate valid commands only 2013-06-04 12:08:18 +02:00
Fabien Potencier
8d2cda3395 bumped Symfony version to -DEV 2013-06-03 17:11:57 +02:00
Fabien Potencier
6da9c5d35b updated VERSION for 2.3.0 2013-06-03 16:13:35 +02:00
Fabien Potencier
38259707ba updated CHANGELOG for 2.3.0 2013-06-03 16:13:02 +02:00
Jakub Zalas
804b1829ef [Config] Added tests for the FileResource and DirectoryResource. 2013-06-03 01:18:25 +01:00
Jakub Zalas
c5dda79778 [Config] Fixed @covers annotation which ignored some of the methods from the code coverage. 2013-06-03 01:05:06 +01:00
Jakub Zalas
bf769e0437 [Config] Added tests for the ConfigCache. 2013-06-03 00:52:04 +01:00
Jakub Zalas
540985275d [Security] Added few new test cases for the HttpUtils and improved readability of existing tests. 2013-06-02 23:50:02 +01:00
Jakub Zalas
d6ab77e7e8 [Security] Added tests for the SwitchUserListener. 2013-06-02 22:56:02 +01:00
Jakub Zalas
cccd0059dc [Security] Added tests for the ContextListener. 2013-06-02 18:27:22 +01:00
Jakub Zalas
307bc91e02 [Security] Added a test to the BasicAuthenticationListener. 2013-06-02 18:27:21 +01:00
Jakub Zalas
314f29a718 [Security] Removed an unnecessary call to sprintf() and added a test case. 2013-06-02 18:27:21 +01:00
Fabien Potencier
6b25213e23 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.3-DEV
  updated VERSION for 2.2.2
  updated CHANGELOG for 2.2.2
  removed CHANGELOG for 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 18:04:08 +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