Commit Graph

15102 Commits

Author SHA1 Message Date
Philipp Kräutli 62238b87bc CS fix 2013-08-19 16:09:48 +02:00
Fabien Potencier 98e1795915 merged branch jakzal/bugfix/remove-nonexisting-attr-8387 (PR #8790)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] Fixed removing a nonexisting namespaced attribute

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

Commits
-------

85a9c9d [HttpFoundation] Fixed removing a nonexisting namespaced attribute.
2013-08-19 16:06:24 +02:00
Fabien Potencier 395f40a392 merged branch bschussek/fix-identity-translator (PR #8789)
This PR was merged into the 2.2 branch.

Discussion
----------

[Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector

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

This PR fixes the following case:

```php
\Locale::setDefault('en');
$translator = new IdentityTranslator(new MessageSelector());

echo $translator->transChoice('There is one apple|There are %count% apples', 10, array('%count' => 10));
```

Result before PR:

```
There are 1 apples
```

Result after PR:

```
There is one apple
```

The reason for the current behavior is that the locale `null` is passed to `MessageSelector`, but `MessageSelector` is not programmed to accept `null` values.

Commits
-------

191d320 [Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector
2013-08-19 16:05:27 +02:00
Jakub Zalas 85a9c9d114 [HttpFoundation] Fixed removing a nonexisting namespaced attribute. 2013-08-19 11:17:50 +01:00
Bernhard Schussek 191d3203d0 [Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector 2013-08-19 12:15:39 +02:00
Philipp Kräutli c6ecd83b9d SwiftMailerHandler in Monolog bridge now able to react to kernel.terminate event 2013-08-18 12:41:55 +02:00
Fabien Potencier 3a978503e9 Merge branch '2.3'
* 2.3:
  fixed CS
  {HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage
  fixed CS
  Fixes for hasParameterOption and getParameterOption methods of ArgvInput
2013-08-17 18:34:58 +02:00
Fabien Potencier 49eb608b72 Merge branch '2.2' into 2.3
* 2.2:
  fixed CS
  {HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage
  fixed CS
  Fixes for hasParameterOption and getParameterOption methods of ArgvInput
2013-08-17 18:34:49 +02:00
Fabien Potencier b46e0ad556 fixed CS 2013-08-17 18:32:21 +02:00
Fabien Potencier 812900f00b merged branch klmatom/ticket_8460 (PR #8776)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8776).

Discussion
----------

{HttpFoundation] [Session] fixed session compatibility with memcached/re...

...dis session storage

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no (no new failng/errors introduced)
| Fixed tickets | 7380
| License       | MIT

Per https://bugs.php.net/bug.php?id=61470, and in fixing #7380, the following error occurs when using a Memcache or Redis session store w/ Symfony security: "Authentication exception occurred; redirecting to authentication entry point (A Token was not found in the SecurityContext.)".  This patch applies the first fix only if the session store is "files"

Commits
-------

eb8d8eb {HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage
2013-08-17 18:31:21 +02:00
Tom Avery 99adcf1f6a {HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage
Per https://bugs.php.net/bug.php?id=61470, and in fixing #7380, the following error occurs when using a Memcache or Redis session store w/ Symfony security: "Authentication exception occurred; redirecting to authentication entry point (A Token was not found in the SecurityContext.)".  This patch applies the first fix only if the session store is "files"

{HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage

Per https://bugs.php.net/bug.php?id=61470, and in fixing #7380, the following error occurs when using a Memcache or Redis session store w/ Symfony security: "Authentication exception occurred; redirecting to authentication entry point (A Token was not found in the SecurityContext.)".  This patch applies the first fix only if the session store is "files"
2013-08-17 18:31:20 +02:00
Fabien Potencier bd4488b5c8 fixed CS 2013-08-17 18:29:09 +02:00
Fabien Potencier be7172844c merged branch Sirian/argvinput_fix (PR #8768)
This PR was submitted for the 2.3 branch but it was merged into the 2.2 branch instead (closes #8768).

Discussion
----------

[Console] Fixes for hasParameterOption and getParameterOption methods of ArgvInput

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

Commits
-------

7ca9340 Fixes for hasParameterOption and getParameterOption methods of ArgvInput
2013-08-17 18:28:38 +02:00
Vasily Khayrulin ab9a96b774 Fixes for hasParameterOption and getParameterOption methods of ArgvInput 2013-08-17 18:27:58 +02:00
Fabien Potencier d15bb7351e Merge branch '2.3'
* 2.3:
  Added sleep() workaround for windows php rename bug
  [HttpKernel] removed unused variable
  [Form] Fixed: Added "validation_groups" option to submit button
  [Process] Fix for #8754 (Timed-out processes are successful)

Conflicts:
	src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
2013-08-15 19:09:02 +02:00
Fabien Potencier 91e5b10d05 Merge branch '2.2' into 2.3
* 2.2:
  Added sleep() workaround for windows php rename bug
  [HttpKernel] removed unused variable

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-15 19:08:02 +02:00
Fabien Potencier d60fa064f3 merged branch caponica/cache-clear-win-workaround (PR #8767)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8767).

Discussion
----------

Added sleep() workaround for windows php rename bug

For more info see links in issue #8766

Commits
-------

b3c815b Added sleep() workaround for windows php rename bug
2013-08-15 15:44:11 +02:00
Christian Morgan dbd08551f8 Added sleep() workaround for windows php rename bug 2013-08-15 15:44:11 +02:00
Fabien Potencier 282b05cbc1 [HttpKernel] removed unused variable 2013-08-15 15:02:15 +02:00
Fabien Potencier e2f7d1e51a merged branch bschussek/fix-submit (PR #8764)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed: Added "validation_groups" option to submit button

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

Commits
-------

c342715 [Form] Fixed: Added "validation_groups" option to submit button
2013-08-15 14:51:56 +02:00
Bernhard Schussek c342715679 [Form] Fixed: Added "validation_groups" option to submit button 2013-08-15 14:37:02 +02:00
Fabien Potencier e6d0e693fa merged branch romainneutron/fix-8754 (PR #8756)
This PR was squashed before being merged into the 2.3 branch (closes #8756).

Discussion
----------

[Process] Fix for #8754 (Timed-out processes are successful)

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

Commits
-------

fa01e6b [Process] Fix for #8754 (Timed-out processes are successful)
2013-08-15 00:22:46 +02:00
Romain Neutron fa01e6b4d3 [Process] Fix for #8754 (Timed-out processes are successful) 2013-08-15 00:22:46 +02:00
Fabien Potencier a67f5d03d1 Merge branch '2.3'
* 2.3:
  [Process] Revert change
  [Process] Fix #8746 : slowness added in unit tests since #8741
  [Process] Fix #8742 : Signal-terminated processes are not successful
  corrected English grammar (s/does not exists/does not exist)
  [Process] Add more precision to Process::stop timeout
  [Process] Avoid zombie process in case of unit tests failure
  [Process] Fix #8739
  [Process] Add failing test for #8739
  [Process] Fix CS
  [TwigBridge] removed superflous ; when rendering form_enctype() (closes #8660)
  Fixed documentation grammar for AuthenticationManagerInterface::authenticate()
  [Validator] fixed the wrong isAbstract() check against the class (fixed #8589)
  [TwigBridge] Prevent code extension to display warning
  Fix internal sub-request creation
  [FrameworkBundle] made code more generic
  [Form] Moved auto_initialize option to the BaseType
  Use strstr instead of strpos
  Make sure ContextErrorException is loaded during compile time errors
  Fix empty process argument escaping on Windows
  Ignore null value in comparison validators

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
	src/Symfony/Component/Process/Process.php
2013-08-14 15:08:25 +02:00
Fabien Potencier 6526da88df merged branch axhm3a/master (PR #8752)
This PR was merged into the master branch.

Discussion
----------

removed legacy artifact from Component/Routing/Router

Hey,

while using the ConfigCache component I noticed that there is a wrong call of isFresh() in Symfony\Component\Routing\Router. ConfigCache->isFresh() doesn't accept any parameters anymore.

cheers,

Daniel

Commits
-------

8b11ae7 removed legacy artifact from Component/Routing/Router
2013-08-14 15:01:05 +02:00
Fabien Potencier 4af7276f89 merged branch romainneutron/fix-8742 (PR #8744)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Fix #8742 : Signal-terminated processes are not successful

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | require #8741 to be merged to pass tests
| Fixed tickets | #8742
| License       | MIT

Commits
-------

909fab6 [Process] Fix #8742 : Signal-terminated processes are not successful
2013-08-14 14:58:19 +02:00
Fabien Potencier 16413ffcc7 Merge branch '2.2' into 2.3
* 2.2:
  [Process] Revert change
  [Process] Fix #8746 : slowness added in unit tests since #8741
2013-08-14 14:57:12 +02:00
Fabien Potencier b146f75b3f merged branch romainneutron/slowness (PR #8749)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process] Fix #8746 : slowness added in unit tests since #8741

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

Commits
-------

8c4bae3 [Process] Revert change
8d9c7c6 [Process] Fix #8746 : slowness added in unit tests since #8741
2013-08-14 14:56:31 +02:00
Daniel Basten 8b11ae7c5a removed legacy artifact from Component/Routing/Router 2013-08-14 14:48:00 +02:00
Romain Neutron 8c4bae3592 [Process] Revert change 2013-08-14 13:29:25 +02:00
Romain Neutron 8d9c7c6fae [Process] Fix #8746 : slowness added in unit tests since #8741 2013-08-14 12:41:24 +02:00
Romain Neutron 909fab6979 [Process] Fix #8742 : Signal-terminated processes are not successful 2013-08-14 12:31:50 +02:00
Fabien Potencier 11018011dd Merge branch '2.2' into 2.3
* 2.2:
  corrected English grammar (s/does not exists/does not exist)
  [Process] Add more precision to Process::stop timeout
  [Process] Avoid zombie process in case of unit tests failure
  [Process] Fix #8739
  [Process] Add failing test for #8739
  [Process] Fix CS
  Fixed documentation grammar for AuthenticationManagerInterface::authenticate()
  [Validator] fixed the wrong isAbstract() check against the class (fixed #8589)
  [TwigBridge] Prevent code extension to display warning
  Use strstr instead of strpos

Conflicts:
	src/Symfony/Component/Finder/Shell/Command.php
	src/Symfony/Component/Process/Process.php
2013-08-13 22:18:00 +02:00
Fabien Potencier f6e664d9b9 merged branch romainneutron/process-callbacks-2.2 (PR #8741)
This PR was merged into the 2.2 branch.

Discussion
----------

[Process][2.2] Fix #8739

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

This adds a fix to #8739. Whenever a call is done to to any non-blocking methods (`Process::isRunning`, `Process::isStopped`, `Process::isTerminated`, `Process::getStatus`, `Process::getPid`...), buffers are read, and callback executed.

Such code will now work :

```
$process->start(function ($type, $data) {
    echo $data;
});

while ($process->isRunning()) {
    // some stuff
    // callback is executed
}
```

Commits
-------

fa769a2 [Process] Add more precision to Process::stop timeout
57d4159 [Process] Avoid zombie process in case of unit tests failure
3ef517b [Process] Fix #8739
7716fb2 [Process] Add failing test for #8739
bff6f3c [Process] Fix CS
2013-08-13 22:10:11 +02:00
Fabien Potencier d66db41bef merged branch shieldo/grammar_fix (PR #8745)
This PR was merged into the 2.2 branch.

Discussion
----------

Grammar fix

Commits
-------

d74eaf9 corrected English grammar (s/does not exists/does not exist)
2013-08-13 22:01:35 +02:00
Douglas Greenshields d74eaf9603 corrected English grammar (s/does not exists/does not exist) 2013-08-13 20:56:24 +01:00
Romain Neutron fa769a2c21 [Process] Add more precision to Process::stop timeout 2013-08-13 19:23:51 +02:00
Romain Neutron 57d4159133 [Process] Avoid zombie process in case of unit tests failure 2013-08-13 18:52:19 +02:00
Romain Neutron 3ef517b356 [Process] Fix #8739 2013-08-13 18:52:18 +02:00
Romain Neutron 7716fb25ab [Process] Add failing test for #8739 2013-08-13 18:22:32 +02:00
Romain Neutron bff6f3c4a6 [Process] Fix CS 2013-08-13 18:22:25 +02:00
Fabien Potencier 5ca93a5454 merged branch fabpot/esi-fragment-handler (PR #8730)
This PR was merged into the master branch.

Discussion
----------

changed the ESI fragment renderer to be always registered

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

This is an alternative implementation for #8427

Commits
-------

09f727b changed the ESI fragment renderer to be always registered
2013-08-13 16:08:33 +02:00
Fabien Potencier 6b32c36e5a merged branch fabpot/twig-stopwatch-helper (PR #8719)
This PR was merged into the master branch.

Discussion
----------

[TwigBundle] Created stopwatch tag for profiling templates

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

This PR is the continuation of #7953

This PR adds a new tag to Twig which you can use to time parts of a template and see it in the timing tab of the profiler.

Usage:

````jinja
{% stopwatch foo %}
... some things that gets timed
{% endstopwatch %}
````

Commits
-------

29a58e7 change the stopwatch argument to be any valid expression
4590974 removed code that prevents the stopwatch to work properly
2f67776 removed unneeded safeguard as it's already done during compilation
bbad387 fixed CS
f39ed57 Created stopwatch tag
2013-08-13 16:07:19 +02:00
Fabien Potencier df5a32af70 merged branch fabpot/form_enctype-fix (PR #8731)
This PR was merged into the 2.3 branch.

Discussion
----------

form_enctype() fix (closes #8660)

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

Commits
-------

572ba68 [TwigBridge] removed superflous ; when rendering form_enctype() (closes #8660)
2013-08-13 16:06:36 +02:00
Fabien Potencier e587fa8a85 [Config] fixed an edge case 2013-08-13 15:40:07 +02:00
Fabien Potencier 4e45067c8e [Config] fixed handling of negative integer in XML support 2013-08-13 13:38:43 +02:00
Fabien Potencier 494fe74b7e merged branch thunderer/config-support-binary-notation (PR #8727)
This PR was submitted for the 2.2 branch but it was merged into the master branch instead (closes #8727).

Discussion
----------

[Config] Support binary notation.

This PR addresses issue #8066 . Binary notation is not caught by `is_numeric()` function so we need to implement it on our own.

Commits
-------

34f5bd8 [Config] Support binary notation.
2013-08-13 13:04:58 +02:00
Tomasz Kowalczyk 78de59d0b3 Support binary notation. 2013-08-13 13:04:58 +02:00
Fabien Potencier 572ba68338 [TwigBridge] removed superflous ; when rendering form_enctype() (closes #8660) 2013-08-13 11:52:49 +02:00
Fabien Potencier 09f727b1f1 changed the ESI fragment renderer to be always registered 2013-08-13 11:17:13 +02:00