Commit Graph

15074 Commits

Author SHA1 Message Date
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
Fabien Potencier e617ddb746 merged branch naitsirch/process-inherit-env-fix (PR #8718)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8718).

Discussion
----------

[Process] always manually inherit $_SERVER by kriswallsmith #8067

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

The `$_ENV` superglobal is not populated if `E` is not present in the `variables_order` directive. Since populating this variable is not recommended (for performance reasons), we should not rely on it.

This change updates the builder so `$env=null` is never passed to `proc_open()`. Instead we always merge the `$_SERVER` superglobal into any environment variables that were manually set on the builder (unless inherit has been disabled).

This is a copy of PR https://github.com/symfony/symfony/pull/8067 by @kriswallsmith. I have created a new PR because there were some failing tests and kriswallsmith seems to have no time to rebase.

Commits
-------

75be4d9 [Process] always manually inherit $_SERVER
2013-08-13 09:53:25 +02:00
Christian 2baa2c610e always manually inherit $_SERVER
The $_ENV superglobal is not populated if E is not present in the variables_order directive. Since populating this variable is not recommended (for performance reasons), we should not rely on it.

This change updates the builder so $env=null is never passed to proc_open(). Instead we always merge the $_SERVER superglobal into any environment variables that were manually set on the builder (unless inherit has been disabled).
2013-08-13 09:53:25 +02:00
Fabien Potencier 2c466d2a25 merged branch jaikdean/documentation-grammar (PR #8722)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8722).

Discussion
----------

Fixed documentation grammar for AuthenticationManagerInterface::authenticate()

Commits
-------

8306be2 Fixed documentation grammar for AuthenticationManagerInterface::authenticate()
2013-08-13 09:47:15 +02:00
Jaik Dean 9a29e5bade Fixed documentation grammar for AuthenticationManagerInterface::authenticate() 2013-08-13 09:47:14 +02:00
Fabien Potencier a0a1c314e4 merged branch denderello/strategy-validation (PR #8710)
This PR was merged into the master branch.

Discussion
----------

[Security] Added a check for strategies in AccessDecisionManager

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

Commits
-------

ee36380 [Security] Added a check for strategies in AccessDecisionManager
2013-08-13 09:38:51 +02:00
Fabien Potencier cb14afca40 merged branch marcj/ticket_8589 (PR #8728)
This PR was merged into the 2.2 branch.

Discussion
----------

[Validator] Fixed the wrong isAbstract() call in PR #8592

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

Commits
-------

18896d5a [Validator] fixed the wrong isAbstract() check against the class (fixed #8589)
2013-08-13 09:37:59 +02:00
Fabien Potencier c07aa94664 merged branch lyrixx/twig-code-ext-warning (PR #8721)
This PR was merged into the 2.2 branch.

Discussion
----------

[TwigBridge] Prevent code extension to display warning

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

During functional testing with phpunit and browserkit (and all their friends) when the application returns a `4XX` or a `5XX` response, symfony displays the trace with code context.

During a training, few people experienced a very weird issue with php 5.4, symfony 2.3.2, phpunit 3.7, Windows 7 or 8 and SensioLabsDesktop 0.5.

When they run functional  tests, and the application returns a `404`, in the "console" there was lot of warnings. It was something like that `Warning: Unexpected character in input:  '\' (ASCII=92) state=1 in /XXXXX on line 9` With the `@`, no more warnings.

I can't reproduce this issue on my computer (not windows). If needed, I can try to reproduce this bug on Monday at work.

Commits
-------

e8e76ec [TwigBridge] Prevent code extension to display warning
2013-08-13 09:32:38 +02:00
Fabien Potencier cb7aebe2fe merged branch romainneutron/process-tweaks (PR #8723)
This PR was merged into the master branch.

Discussion
----------

[Process] Process tweaks

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

Commits
-------

f759f87 [Process] Make Process::start method chainable
ca47f3b [Process] Fix Process::checkTimeout docblock
2013-08-13 09:31:17 +02:00
marcj 18896d5a9e [Validator] fixed the wrong isAbstract() check against the class (fixed #8589) 2013-08-12 23:46:36 +02:00
Dennis Benkert ee36380524 [Security] Added a check for strategies in AccessDecisionManager 2013-08-12 21:21:22 +02:00
Romain Neutron f759f871a9 [Process] Make Process::start method chainable 2013-08-12 14:20:11 +02:00
Romain Neutron ca47f3b675 [Process] Fix Process::checkTimeout docblock 2013-08-12 14:18:24 +02:00
Grégoire Pineau e8e76ece5a [TwigBridge] Prevent code extension to display warning 2013-08-12 10:19:38 +02:00
Fabien Potencier 29a58e7a03 change the stopwatch argument to be any valid expression 2013-08-12 08:31:36 +02:00
Fabien Potencier 459097413d removed code that prevents the stopwatch to work properly 2013-08-11 22:55:10 +02:00
Fabien Potencier 2f67776a66 removed unneeded safeguard as it's already done during compilation 2013-08-11 22:55:07 +02:00
Fabien Potencier bbad387e4b fixed CS 2013-08-11 22:48:33 +02:00
WouterJ f39ed5706d Created stopwatch tag 2013-08-11 20:05:14 +02:00
Fabien Potencier 615bd0ba7d merged branch lazyhammer/fix-inline-fragment (PR #7893)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #7893).

Discussion
----------

[HttpKernel] Fix internal sub-request creation

| 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

Fixes the creation of internal sub-request in case of disabled trusted
client-ip header.

Commits
-------

85d5413 [HttpKernel] Fix internal sub-request creation
2013-08-11 19:29:22 +02:00
Dmitrii Chekaliuk 96aec0f49c Fix internal sub-request creation
Fixes the creation of internal sub-request in case of disabled trusted
client-ip header
2013-08-11 19:29:22 +02:00
Fabien Potencier 43e066f7ab merged branch fabpot/referer-in-404 (PR #8708)
This PR was merged into the master branch.

Discussion
----------

Add the referer information that could help you findout where's the link comes from

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

#8218 rebased on master and slightly tweaked.

Commits
-------

8eb163d [HttpKernel] tweaked previous commit
bb5954e Add the referer information that could help you findout where's the link comes from.
2013-08-10 21:56:33 +02:00
Fabien Potencier 0121699fa4 merged branch lyrixx/email-validator-php533 (PR #8712)
This PR was merged into the master branch.

Discussion
----------

 	[Validator] Removed unnecessary check as symfony requires php >= 5.3.3.

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

Commits
-------

cf31dfb [Validator] Removed unnecessary check as symfony require php >= 5.3.3.
2013-08-10 21:50:40 +02:00
Fabien Potencier fd1e61ac70 merged branch dawehner/exception-clone-request (PR #8716)
This PR was merged into the master branch.

Discussion
----------

extract clone duplication logic in exceptionlistener

Drupal needs potentially to adapt the exception listener to add more information from the original request. (see http://drupal.org/node/2057607) so what about extracing some of the logic into a new method.

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

Commits
-------

6af2801 extract method
2013-08-10 21:48:47 +02:00
Daniel Wehner 6af28015d4 extract method 2013-08-10 19:43:16 +00:00
Grégoire Pineau cf31dfb080 [Validator] Removed unnecessary check as symfony require php >= 5.3.3. 2013-08-10 10:41:36 +02:00
Fabien Potencier 8eb163d254 [HttpKernel] tweaked previous commit 2013-08-09 16:13:12 +02:00
scourgen bb5954eed0 Add the referer information that could help you findout where's the link comes from. 2013-08-09 16:12:03 +02:00
Fabien Potencier bcd7ab1eae merged branch willdurand/propel-logger (PR #8706)
This PR was merged into the master branch.

Discussion
----------

[Propel1] Refactor PropelLogger

* Implement `BasicLogger` interface (Propel)

Commits
-------

50435aa [Propel1] Refactor PropelLogger
2013-08-09 14:55:43 +02:00