Commit Graph

13650 Commits

Author SHA1 Message Date
Fabien Potencier
6a2c71bad5 fixed previous merge 2013-04-17 07:37:48 +02:00
Fabien Potencier
1b2619078d Merge branch '2.2'
* 2.2:
  Fix default value handling for multi-value options
  [HttpKernel] truncate profiler token to 6 chars (see #7665)
  Disabled APC on Travis for PHP 5.5+ as it is not available
  [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
  Fix download over SSL using IE < 8 and binary file response
  [Console] Fix merging of application definition, fixes #7068, replaces #7158
  [HttpKernel] fixed the Kernel when the ClassLoader component is not available (closes #7406)
  fixed output of bag values
  [Yaml] improved boolean naming ($notEOF -> !$EOF)
  [Yaml] fixed handling an empty value
  [Routing][XML Loader] Add a possibility to set a default value to null
  [Console] fixed handling of "0" input on ask
  The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
  fixed handling of "0" input on ask
  [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
  [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
  Update PhpEngine.php
  [PropertyAccess] Add objectives to pluralMap
  [Security] Removed unused var
  [HttpFoundation] getClientIp is fixed.

Conflicts:
	src/Symfony/Component/Console/Tests/Command/CommandTest.php
	src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-04-17 07:31:37 +02:00
Fabien Potencier
fd58a5f424 Merge branch '2.1' into 2.2
* 2.1:
  Fix default value handling for multi-value options
  [HttpKernel] truncate profiler token to 6 chars (see #7665)
  Disabled APC on Travis for PHP 5.5+ as it is not available
  [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
  [Yaml] improved boolean naming ($notEOF -> !$EOF)
  [Yaml] fixed handling an empty value
  [Routing][XML Loader] Add a possibility to set a default value to null
  The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
  [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
  [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
  Update PhpEngine.php
  [HttpFoundation] getClientIp is fixed.

Conflicts:
	.travis.yml
	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
	src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
2013-04-17 07:27:14 +02:00
Fabien Potencier
41fef9310a merged branch jmikola/2.2-fix/gh7689 (PR #7690)
This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes #7690).

Discussion
----------

[Console] Fix default value handling for multi-value options

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

The default value for array options will be an array, so it is not suitable to use as the default when processing one of many values for a multi-value option. Using null seems appropriate here, as it indicates the absence of a value and also converts nicely to an empty string (as opposed to an empty array).

Commits
-------

a9c28ff [Console] Fix default value handling for multi-value options
2013-04-17 07:12:51 +02:00
Jeremy Mikola
5abf887180 Fix default value handling for multi-value options
The default value for array options will be an array, so it is not suitable to use as the default when processing one of many values for a multi-value option. Using null seems appropriate here, as it indicates the absence of a value and also converts nicely to an empty string (as opposed to an empty array).

Fixes #7689
2013-04-17 07:12:51 +02:00
Fabien Potencier
d060c40503 merged branch stloyd/feature/form_date_dep (PR #7677)
This PR was merged into the master branch.

Discussion
----------

[Form] Remove deprecated code from Date & Time related fields

Commits
-------

f8b0994 [Form] Remove deprecated code from Date & Time related fields
2013-04-15 15:37:17 +02:00
Joseph Bielawski
f8b0994b5d [Form] Remove deprecated code from Date & Time related fields 2013-04-15 13:52:45 +02:00
Fabien Potencier
324686cf25 merged branch 1ed/token-length (PR #7665)
This PR was merged into the 2.1 branch.

Discussion
----------

[WebProfilerBundle] made token shorter in WDT

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

The length of the profiler token was increased by [this](b9cdb9a26d
) commit. This PR makes the visible token shorter.

Before:
![before](https://f.cloud.github.com/assets/162986/376901/338b9684-a461-11e2-9806-fc77d5ce5039.png)
After:
![after](https://f.cloud.github.com/assets/162986/376902/338ee078-a461-11e2-88c8-78748739565c.png)

Commits
-------

1adbe3c [HttpKernel] truncate profiler token to 6 chars (see #7665)
2013-04-14 20:15:16 +02:00
Fabien Potencier
46efc9b4ac merged branch romainneutron/EnhanceSigchild (PR #5476)
This PR was squashed before being merged into the master branch (closes #5476).

Discussion
----------

[Process] Add signal and getPid methods

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

This PR replaces #5391 ; it adds :

 - sigchild compatibility mode. This means that if you activate it you have access to this exitcode of the process in case your php has been compiled with --enable-sigchild. This can happen when you deal with Oracle databases.

```php
$process->setEnhanceSigchildCompatibility(true);
```

 - `getPid` method to get the actual process identifier of the process

```php
$process->getPid();
```

 - `signal` method to send Posix signal to the process

```php
$process->signal(SIGHUP);
```

 - Add optionnal `$signal` as second argument to `stop`method. If provided, the signal is sent at timeout to the process. Example of use :

```php
$process->stop(5, SIGKILL);
```

Tests have been enhanced and now run both sigchild / non-sigchild mode.

By the way, tests are successful with a PHP compiled with the --enable-sigchild option ;)

Commits
-------

5ed2737 [Process] Add signal and getPid methods
2013-04-14 18:37:33 +02:00
Romain Neutron
5ed2737d54 [Process] Add signal and getPid methods 2013-04-14 18:37:33 +02:00
Gábor Egyed
1adbe3cad6 [HttpKernel] truncate profiler token to 6 chars (see #7665) 2013-04-13 20:20:36 +02:00
Fabien Potencier
ef0cebfaa6 merged branch stof/fix_travis_5_5 (PR #7663)
This PR was merged into the 2.1 branch.

Discussion
----------

Disabled APC on Travis for PHP 5.5+ as it is not available

As APC is not available, PHP triggers a warning when trying to load the extension, which lead to many test failures.

Commits
-------

6084176 Disabled APC on Travis for PHP 5.5+ as it is not available
2013-04-13 16:47:44 +02:00
Christophe Coevoet
60841766db Disabled APC on Travis for PHP 5.5+ as it is not available 2013-04-13 16:35:03 +02:00
Fabien Potencier
9b6d30cf37 merged branch stof/fix_5_3 (PR #7662)
This PR was merged into the master branch.

Discussion
----------

Fixed the Console code on PHP 5.3

| Q             | A
| ------------- | ---
| Fixed tickets | none (catched by the Travis builds)
| License       | MIT

The PR #7657 introduced a requirement on PHP 5.4 by mistake.

Commits
-------

1356050 Fixed the Console code on PHP 5.3
2013-04-13 16:14:46 +02:00
Christophe Coevoet
1356050f21 Fixed the Console code on PHP 5.3
The PR #7657 introduced a requirement on PHP 5.4 by mistake.
2013-04-13 16:06:01 +02:00
Fabien Potencier
bedac11d57 merged branch Olden/issue_7639 (PR #7653)
This PR was squashed before being merged into the master branch (closes #7653).

Discussion
----------

[HttpKernel] Improve TraceableEventDispatcher to not call Stopwatch::stop() when not started

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

Commits
-------

e638e01 [HttpKernel] Improve TraceableEventDispatcher to not call Stopwatch::stop() when not started
2013-04-12 17:56:02 +02:00
Alexander Kotynia
e638e01ea7 [HttpKernel] Improve TraceableEventDispatcher to not call Stopwatch::stop() when not started 2013-04-12 17:56:02 +02:00
Fabien Potencier
e52fe4db1d merged branch gnutix/issue-7349-fix (PR #7612)
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] Split getClientIp into two methods for better flexibility

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Locally: NO (HttpFoundation tests passes, but all Symfony tests fails because of my local setup). Travis : YES
| Fixed tickets | #7349
| License       | MIT
| Doc PR        | none (yet?)

Split the ``Request::getClientIp`` method in two to allow better overriding flexibility. See #7349 for more information.

Commits
-------

2678dd5 [HttpFoundation] Move comments from one method to the other [ci skip].
7529664 [HttpFoundation] Removed the @api annotation on getClientIps method.
f0c4ab6 [HttpFoundation] Split the tests into two methods / data providers.
80030fb [HttpFoundation] Use @see annotation for better documentation generation.
3e703a2 [HttpFoundation] Fixing tests.
63cbbb5 [HttpFoundation] Add tests for the newly created Request::getClientIps() method.
58347fb [HttpFoundation] Split getClientIp into two methods for better flexibility.
2013-04-12 17:30:12 +02:00
Fabien Potencier
0c88f22c08 merged branch Seldaek/argv-tostring (PR #7657)
This PR was merged into the master branch.

Discussion
----------

[Console] Input::__toString escaping fixes

Follow up to #7648, also includes a fix for StringInput to parse newlines and other whitespace chars properly instead of normalizing them all to spaces. It was kinda needed to test it properly, so I bundled both in one.

Commits
-------

93b1369 [Console] Fix StringInput parsing to accept newlines and tabs
8642b67 [Console] Fix escaping of args
2013-04-12 17:26:58 +02:00
Jordi Boggiano
93b1369bb5 [Console] Fix StringInput parsing to accept newlines and tabs 2013-04-12 17:23:00 +02:00
Jordi Boggiano
8642b676b3 [Console] Fix escaping of args 2013-04-12 17:22:47 +02:00
Fabien Potencier
ff56a9e8a3 merged branch Tobion/apache-pathinfo (PR #7656)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] do not use server variable PATH_INFO

because it is already decoded (see http://www.ietf.org/rfc/rfc3875) and thus symfony is fragile to double encoding of the path. This is not really a security issue (in contrast to a [previous problem](http://symfony.com/blog/security-release-symfony-2-0-20-and-2-1-5-released)) but when using the apacherequest, one could access pages with double encoded characters although the path should not match.

BC break: no
tests pass: yes

Commits
-------

d552e4c [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
2013-04-12 17:12:59 +02:00
Tobias Schultze
d552e4c396 [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path 2013-04-12 17:03:10 +02:00
Fabien Potencier
6cf491d747 merged branch Seldaek/argv-tostring (PR #7648)
This PR was merged into the master branch.

Discussion
----------

[Console] Add ArgvInput::__toString, fixes #7257

Commits
-------

659eb66 [Console] Add ArgvInput::__toString and ArrayInput::__toString, fixes #7257
2013-04-12 16:22:55 +02:00
Fabien Potencier
4b967b1fcb merged branch nlegoff/ie_download_over_ssl (PR #7651)
This PR was merged into the 2.2 branch.

Discussion
----------

[HTTPFoundation]  Fix download over SSL using IE < 8 and binary file response

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

related to #7153

Commits
-------

4c51ec7 Fix download over SSL using IE < 8 and binary file response
2013-04-12 16:22:22 +02:00
Nicolas Le Goff
4c51ec7866 Fix download over SSL using IE < 8 and binary file response 2013-04-12 15:45:42 +02:00
Jordi Boggiano
659eb663c6 [Console] Add ArgvInput::__toString and ArrayInput::__toString, fixes #7257 2013-04-12 15:43:52 +02:00
Fabien Potencier
96251acbae merged branch Seldaek/consmerge (PR #7650)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Fix merging of application definition

Fixes #7068, replaces #7158 - the fix there introduces a regression and always shows the application arguments in the commands help (i.e. it lists "command" as an argument to every command, except list because it overrides getNativeDefinition).

Commits
-------

46909fa [Console] Fix merging of application definition, fixes #7068, replaces #7158
2013-04-12 15:21:28 +02:00
Jordi Boggiano
46909faff0 [Console] Fix merging of application definition, fixes #7068, replaces #7158 2013-04-12 15:15:07 +02:00
Dorian Villet
2678dd519a [HttpFoundation] Move comments from one method to the other [ci skip]. 2013-04-12 15:07:20 +02:00
Fabien Potencier
972bde73ce [HttpKernel] fixed the Kernel when the ClassLoader component is not available (closes #7406) 2013-04-12 14:45:07 +02:00
Fabien Potencier
9714cc2682 merged branch pvolok/fix_7540 (PR #7643)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7643).

Discussion
----------

[WebProfilerBundle] fixed output of bag values

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

Call json_encode with flags: JSON_UNESCAPED_SLASHES and
JSON_UNESCAPED_UNICODE

Commits
-------

7ee8b10 [WebProfilerBundle] fixed output of bag values
2013-04-12 14:36:59 +02:00
Pavel Volokitin
f1632266e4 fixed output of bag values
Call json_encode with flags: JSON_UNESCAPED_SLASHES and
JSON_UNESCAPED_UNICODE
2013-04-12 14:36:58 +02:00
Fabien Potencier
c8889c2c73 merged branch pvolok/fix-7274 (PR #7641)
This PR was merged into the 2.1 branch.

Discussion
----------

[2.2][Yaml] Fixed resolving blank values

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

Also, Seldaek suggested to rename the $notEOF variable.

Commits
-------

fb686d8 [Yaml] improved boolean naming ($notEOF -> !$EOF)
047212a [Yaml] fixed handling an empty value
2013-04-12 12:34:18 +02:00
Pavel Volokitin
fb686d83de [Yaml] improved boolean naming ($notEOF -> !$EOF) 2013-04-12 16:27:36 +06:00
Pavel Volokitin
047212a439 [Yaml] fixed handling an empty value 2013-04-12 16:19:23 +06:00
Fabien Potencier
0d32445414 merged branch MaxVandervelde/fix/namespaced-parameter-issue (PR #7586)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag

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

Fixed a bug in NamespacedAttributeBag causing a result to be falsely found when
the last key of the attribute matched the last of the queried name regardless of
if the key did not exist in the search.
Added Tests to demonstrate the issue and resolved by setting keys to null when
iterating through query and returning proper responses in the case that the
given array does in fact not exist.

Commits
-------

0f0c29c [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
2013-04-12 08:49:49 +02:00
Fabien Potencier
09fd2af1cd merged branch zakharovvi/process_exception_exitcode (PR #7628)
This PR was merged into the master branch.

Discussion
----------

[Process] added exit code to ProcessFailedException message

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

Commits
-------

7519fdc [Process] added exit code to ProcessFailedException message
2013-04-12 08:33:25 +02:00
Fabien Potencier
de275b5ba9 merged branch Aitboudad/ticket__7335 (PR #7635)
This PR was merged into the 2.1 branch.

Discussion
----------

[Routing][XML Loader] Add a possibility to set a default value to null

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/7335
| License       | MIT

Example:

    <route id="acme_user_show" pattern="/{id}">
        <default key="_controller">AcmeUserBundle:User:show</default>
        <default key="id" xsi:nil="true" />
    </route>

Commits
-------

94a9cdc [Routing][XML Loader] Add a possibility to set a default value to null
2013-04-12 08:26:26 +02:00
Fabien Potencier
65ee3233a8 merged branch kibao/datetime-rfc3339-transformer (PR #7618)
This PR was merged into the 2.1 branch.

Discussion
----------

[Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation

Handle _Exception_ throwed by DateTime constructor if an invalid date is passed.
Then throws proper transformation exception.

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

7fc429f [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
2013-04-12 08:22:59 +02:00
Abdellatif Ait boudad
94a9cdc473 [Routing][XML Loader] Add a possibility to set a default value to null 2013-04-11 23:37:28 +00:00
Vitaliy Zakharov
7519fdc10f [Process] added exit code to ProcessFailedException message 2013-04-11 19:56:25 +06:00
Fabien Potencier
3c44d487f2 merged branch kipit/ticket_7549 (PR #7625)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] fixed handling of "0" input on ask

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

Commits
-------

302d44f [Console] fixed handling of "0" input on ask
2013-04-11 12:20:28 +02:00
Rénald Casagraude
302d44fb40 [Console] fixed handling of "0" input on ask 2013-04-11 12:05:07 +02:00
Fabien Potencier
3cb87a3f95 merged branch dantleech/enforce_sprintf_for_exceptions (PR #7620)
This PR was squashed before being merged into the master branch (closes #7620).

Discussion
----------

Enforce sprintf for exceptions

| Q             | A
| ------------- | ---
| Bug fix?      |no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | [yes|no]
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/2483

Changed format of exceptions which concatenate strings as follows

````
throw new \Exception('The '.$something.' needs the '.$foobar.' parameter');
````

to

````
throw new \Exception(sprintf('The %s needs the %s parameter', $something, $foobar));
````

This follows discussion on mailing list: https://groups.google.com/forum/?fromgroups#!topic/symfony-devs/tecj3UOAueM

Unit test results are pending...

Commits
-------

e655120 Enforce sprintf for exceptions
2013-04-11 08:50:46 +02:00
dantleech
e655120f05 Enforce sprintf for exceptions 2013-04-11 08:50:46 +02:00
Fabien Potencier
fb83589661 merged branch Tatsh/master (PR #7624)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7624).

Discussion
----------

[FrameworkBundle] RegisterKernelListenersPass: Removed and replaced use of deprecated preg_match() /e modifier with regards to PHP 5.5

More information: https://wiki.php.net/rfc/remove_preg_replace_eval_modifier

As of beta 2 of PHP 5.5, the above is implemented. Attempting to run the current version of Symfony FrameworkBundle (or 2.1) will cause an `ErrorException`.

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

Commits
-------

c1e98b9 The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
2013-04-11 08:41:27 +02:00
Andrew Udvare
b22d2ff925 The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback() 2013-04-11 08:41:26 +02:00
Fabien Potencier
6c05afa92d merged branch kipit/ticket_7549 (PR #7623)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7623).

Discussion
----------

[Console] fixed handling of "0" input on ask

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

Commits
-------

18a9eaf [Console] fixed handling of "0" input on ask
2013-04-11 07:30:49 +02:00
Rénald Casagraude
383a84b807 fixed handling of "0" input on ask 2013-04-11 07:30:49 +02:00