* 2.2:
Fix finding ACLs from ObjectIdentity's with different types
[HttpKernel] tweaked previous merge
#7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
Fix autocompletion of command names when namespaces conflict
Fix timeout in Process::stop method
fixed CS
Round stream_select fifth argument up.
Fix Process timeout
[HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes#7259
bumped Symfony version to 2.2.2-DEV
updated VERSION for 2.2.1
updated CHANGELOG for 2.2.1
Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
[FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes#7562)
[WebProfilerBundle] removed next pointer class in a template
fix overwriting of request's locale if attribute _locale is missing
Conflicts:
src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
src/Symfony/Component/HttpKernel/Kernel.php
This PR was merged into the 2.2 branch.
Discussion
----------
[HttpKernel] fix overwriting of request's locale by LocaleListener if attribute _locale is missing
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7474
| License | MIT
| Doc PR | n.a.
Commits
-------
e8cae94 fix overwriting of request's locale if attribute _locale is missing
This PR was merged into the master branch.
Discussion
----------
[DomCrawler] added support for HTML5 'form' attribute
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7486
| License | MIT
| Doc PR |
Commits
-------
f8178dd [DomCrawler] added support for HTML5 'form' attribute
This PR was squashed before being merged into the master branch (closes#7535).
Discussion
----------
AF_* constants are only available with the sockets extension
Skip test if the extension is not available
Commits
-------
82e550b AF_* constants are only available with the sockets extension
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes#7567).
Discussion
----------
[Security] [ACL] Fix finding ACLs from ObjectIdentity's with different types
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
If more than one ObjectIdentity with different Type (Class name) is given to AclProvider::findAcls() it would throw an exception stating that it could not find the ACLs
This fixes this issue which was introduced in 2.2.0-RC3 - see commit 3c3a90b9e5
/cc @iBiryukov @schmittjoh
Commits
-------
8b0bb57 [Security] [ACL] Fix finding ACLs from ObjectIdentity's with different types
This PR was merged into the 2.2 branch.
Discussion
----------
[Symfony\Bridge\Twig\Extension] fixed two methods' documentation blocks
| Q | A
| ------------- | ---
| Fixed tickets | None
| License | MIT
Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
Commits
-------
2ea5eaa Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
This PR was submitted for the 2.1 branch but it was merged into the master branch instead (closes#7578).
Discussion
----------
dump the list of available bundles (and extension alaises) if no name is provided
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
| Doc PR |
Not sure if this should only go into master or if such a small tweak can also go into 2.1 or at least 2.2
Commits
-------
2ba6fca dump the list of available bundles (and extension alaises) if no name is provided
This PR was merged into the master branch.
Discussion
----------
[Debug] added the component (closes#6828, closes#6834, closes#7330)
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | yes
| Tests pass? | yes
| Fixed tickets | #6828, #6834, #7330
| License | MIT
| Doc PR | symfony/symfony-docs#2479
You can use the individual tools, or register them all:
```php
use Symfony\Component\Debug\Debug;
Debug::enable();
```
Changes in Symfony SE: symfony/symfony-standard#523
Commits
-------
f693128 fixed typos
1ab1146 [Debug] fixed minor bugs
daa3a3c [Debug] changed composer to accept more versions
e455269 [Debug] ensured that the Debug tools can only be registered once
946bfb2 [Debug] made the exception handler independant of HttpFoundation
2b305c2 added a main Debug class to ease integration
2ff0927 [Debug] added the component (closes#6828, closes#6834, closes#7330)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#7537).
Discussion
----------
#7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
Fixed FileLocator in HttpKernel\Config package if global path ($path) is NULL (default).
Commits
-------
8a8239d #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes#7589).
Discussion
----------
[2.2][Console] Fix autocompletion of command names when namespaces conflict
Fixes#7234
Currently autocompletion of namespaces works on *all* namespaces at once. This fixes it to only search inside subnamespaces once we matched the first level namespace. Otherwise if you have `api:doc` and `generate:doctrine:entity` commands, typing `gen:doc:entity` trips it up because it thinks "doc" is "api:doc", and you end up with a completed name of `generate:doc:entity` which does not match any command.
Commits
-------
fa465b1 [2.2][Console] Fix autocompletion of command names when namespaces conflict
This PR was merged into the 2.1 branch.
Discussion
----------
[2.1][Process] Fix timeout in Process::stop method
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7579
| License | MIT
- The timeout is ten times more than set.
- The timeout does not occurs, it is actually blocking until the process dies.
Commits
-------
bec8ff1 Fix timeout in Process::stop method
This PR was squashed before being merged into the master branch (closes#6368).
Discussion
----------
[2.3] [Console] TableHelper
When building a console application it may be useful to display tabular data.
`TableHelper` can display table header and rows, customizable alignment of columns, cell padding and colors.
Basic usage example:
```php
$table = $app->getHelperSet()->get('table');
$table
->setHeaders(array('ISBN', 'Title', 'Author'))
->setRows(array(
array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'),
array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'),
array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
))
;
$table->render($output);
```
Output:
If this PR gets merged I will submit doc PR as well.
I'm sure there is a plenty of room for improvements so any feedback is welcome.
Commits
-------
8de7813 [2.3] [Console] TableHelper
This PR was merged into the 2.1 branch.
Discussion
----------
[2.1][Process] Fix Process timeout
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6976
| License | MIT
This PR fixes timeout in the process component.
Timeout can now be float values. The precision of the timeout is given by the `Process::TIMEOUT_PRECISION` constant.
Note : The timeout works when running the process with the `Process::run` method. When using the `Process::start` method, the `Process::checkTimeout` method should be regularly triggered to perform a check.
example :
```php
$process->start();
while ($condition) {
// some stuff
$process->checkTimeout(); // throws an Symfony\Process\Exception\RuntimeException if timeout is reached
usleep(1000);
}
```
Commits
-------
bf4a9b0 Round stream_select fifth argument up.
3780fdb Fix Process timeout
This PR was merged into the 2.2 branch.
Discussion
----------
[2.2][HttpKernel] Remove args from 5.3 stack traces to avoid filling log files
Fixes#7259 - it just makes the PHP 5.3 behavior match the one on 5.4.
Commits
-------
99256e4 [HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes#7259
* 2.1:
[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
[FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes#7562)
[WebProfilerBundle] removed next pointer class in a template
This PR was merged into the 2.1 branch.
Discussion
----------
[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
| Q | A
| ------------- | ---
| Bug fix? | [no]
| New feature? | [no]
| BC breaks? | [no]
| Deprecations? | [no]
| Tests pass? | [yes] I assume : only changed a comment word
| License | MIT
Commits
-------
815eb61 [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
This PR was merged into the 2.1 branch.
Discussion
----------
[WebProfilerBundle] removed next pointer class in a template
It's not needed as there is nothing after the span here, eg. on a 404, see :
http://awesomescreenshot.com/0d5149an51
It displays "n/a ::".
Commits
-------
b0ba9fd [WebProfilerBundle] removed next pointer class in a template
