Commit Graph

13578 Commits

Author SHA1 Message Date
Fabien Potencier
69c57947b6 merged branch Brammm/master (PR #7601)
This PR was merged into the master branch.

Discussion
----------

[Security] [Acl] [BasicPermissionMap] Made $map protected and moved it to __construct

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

By making $map protected and moving it to the construct, you can simply extend the BasicPermissionMap class if you want to simply add some extra permissions. In it's current form, you have to copy/paste the entire array AND the getMasks and contains functions. 

Commits
-------

1369d54 Made $map protected and moved it to construct.
2013-04-09 16:18:38 +02:00
Fabien Potencier
b265c9ee0a merged branch elnur/chain-user-provider-getter (PR #7077)
This PR was merged into the master branch.

Discussion
----------

[2.3] [Security] Add a getter for providers to the ChainUserProvider class

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

I've got a use case where I need to check if any of the chained user providers implement a particular interface. This getter would really help with that.

Commits
-------

0a82d73 Add a getter for providers to the ChainUserProvider class
2013-04-09 16:17:51 +02:00
Fabien Potencier
c9c687ea41 merged branch palex-fpt/I-7542 (PR #7595)
This PR was merged into the master branch.

Discussion
----------

YamlDumper should dump Definition::$factoryClass setting

It should fix #7542

Commits
-------

77f00d2 YamlDumper should dump Definition::getFactoryClass() setting
2013-04-09 16:14:25 +02:00
Bram Van der Sype
1369d54db8 Made $map protected and moved it to construct.
By making $map protected and moving it to the construct, you can simply extend the BasicPermissionMap class if you want to simply add some extra permissions. In it's current form, you have to copy/paste the entire array AND the getMasks and contains functions.
2013-04-08 16:10:03 +03:00
Alexey Prilipko
77f00d263a YamlDumper should dump Definition::getFactoryClass() setting 2013-04-08 12:18:40 +11:00
Fabien Potencier
83e078a035 Merge branch '2.2'
* 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
2013-04-07 22:25:23 +02:00
Fabien Potencier
2965a52d20 Merge branch '2.1' into 2.2
* 2.1:
  [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

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
2013-04-07 22:19:55 +02:00
Fabien Potencier
689653f51d merged branch uwej711/fix_locale_is_overridden (PR #7516)
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
2013-04-07 19:31:06 +02:00
Fabien Potencier
3a3ff284ba merged branch kepten/ticket_7486 (PR #7500)
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
2013-04-07 18:48:09 +02:00
Fabien Potencier
98f598368a merged branch webfactory/fix-af-inet-define (PR #7535)
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
2013-04-07 18:33:41 +02:00
Matthias Pigulla
82e550b24c AF_* constants are only available with the sockets extension 2013-04-07 18:33:41 +02:00
Fabien Potencier
7379b9e4d1 merged branch gordalina/multiple-classes-oids-acls (PR #7567)
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
2013-04-07 18:31:20 +02:00
Samuel Gordalina
8a9e898c9a Fix finding ACLs from ObjectIdentity's with different types 2013-04-07 18:31:20 +02:00
Fabien Potencier
b11b0f7f26 merged branch caponica/HttpKernelExtension_phpdoc_fix (PR #7573)
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)
2013-04-07 18:29:31 +02:00
Fabien Potencier
ef52139310 merged branch lsmith77/config_dump_ref_list_bundles (PR #7578)
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
2013-04-07 18:28:22 +02:00
Lukas Kahwe Smith
d36f4aed80 dump the list of available bundles (and extension alaises) if no name is provided 2013-04-07 18:28:21 +02:00
Fabien Potencier
6d552c956e merged branch fabpot/debug-component (PR #7441)
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)
2013-04-07 18:19:55 +02:00
Fabien Potencier
f693128d68 fixed typos 2013-04-07 18:19:06 +02:00
Fabien Potencier
1ab1146761 [Debug] fixed minor bugs 2013-04-07 18:19:06 +02:00
Fabien Potencier
daa3a3c819 [Debug] changed composer to accept more versions 2013-04-07 18:19:06 +02:00
Fabien Potencier
e455269ba3 [Debug] ensured that the Debug tools can only be registered once 2013-04-07 18:19:05 +02:00
Fabien Potencier
946bfb2180 [Debug] made the exception handler independant of HttpFoundation 2013-04-07 18:19:05 +02:00
Fabien Potencier
2b305c21d8 added a main Debug class to ease integration 2013-04-07 18:19:05 +02:00
Fabien Potencier
2ff09277bd [Debug] added the component (closes #6828, closes #6834, closes #7330) 2013-04-07 18:19:05 +02:00
Fabien Potencier
12b7073607 [HttpKernel] tweaked previous merge 2013-04-07 17:51:54 +02:00
Fabien Potencier
171aa1d670 merged branch ro0NL/master (PR #7537)
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
2013-04-07 17:48:35 +02:00
Roland Franssen
a3826ab4f4 #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path 2013-04-07 17:48:35 +02:00
Fabien Potencier
95927c772c merged branch Seldaek/autocomplete_fix (PR #7589)
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
2013-04-07 16:54:28 +02:00
Jordi Boggiano
9d71ebe8e2 Fix autocompletion of command names when namespaces conflict 2013-04-07 16:54:11 +02:00
Fabien Potencier
ebbb96ee46 merged branch romainneutron/process-timeout (PR #7580)
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
2013-04-07 16:41:36 +02:00
Fabien Potencier
22adfdf504 merged branch umpirsky/console-helper-table (PR #6368)
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:
![table](https://f.cloud.github.com/assets/208957/14955/6fb4f500-46ca-11e2-8435-0f6b22f96e58.png)

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
2013-04-07 16:24:42 +02:00
umpirsky
8de7813cab [2.3] [Console] TableHelper 2013-04-07 16:24:41 +02:00
Romain Neutron
bec8ff16e8 Fix timeout in Process::stop method
- The timeout is ten times more than set.
 - The timeout does not occurs, it is actually blocking until the process dies.
2013-04-07 16:17:09 +02:00
Fabien Potencier
783ae3adff fixed CS 2013-04-07 16:10:23 +02:00
Fabien Potencier
72b4f86d09 merged branch romainneutron/process-timeout-2 (PR #7583)
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
2013-04-07 15:42:08 +02:00
Fabien Potencier
bf30a3df11 merged branch Seldaek/fix-deprecated-logs (PR #7587)
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
2013-04-07 15:30:10 +02:00
Romain Neutron
bf4a9b083c Round stream_select fifth argument up.
- This argument must be an integer
- An argument equal to 0 should be avoided as it consumes too much CPU time
2013-04-07 14:38:17 +02:00
Romain Neutron
3780fdb214 Fix Process timeout 2013-04-07 14:29:57 +02:00
Jordi Boggiano
99256e44a0 [HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes #7259 2013-04-07 13:10:22 +02:00
Fabien Potencier
6c114ca8c4 bumped Symfony version to 2.2.2-DEV 2013-04-06 15:17:40 +02:00
Fabien Potencier
8d0cb78fbf updated VERSION for 2.2.1 2013-04-06 12:16:33 +02:00
Fabien Potencier
9a7c56788e Merge branch '2.1' into 2.2
* 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
2013-04-06 12:15:43 +02:00
Fabien Potencier
3c5ee556fd updated CHANGELOG for 2.2.1 2013-04-06 12:15:29 +02:00
Christian Morgan
2ea5eaadc6 Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string) 2013-04-05 22:29:42 +01:00
Fabien Potencier
7221d25fc4 merged branch phc/2.1 (PR #7569)
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
2013-04-05 15:22:11 +02:00
phc
815eb6144c [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag 2013-04-05 14:59:25 +02:00
Fabien Potencier
375ded4227 [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562) 2013-04-05 08:39:48 +02:00
Fabien Potencier
d65788b3c8 merged branch bamarni/patch-3 (PR #7544)
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
2013-04-05 06:53:36 +02:00
Fabien Potencier
a7c9863b3a merged branch canni/fix_cs (PR #7546)
This PR was merged into the master branch.

Discussion
----------

[Fix CS] Fix whitespace around concatenation operator

| Q             | A
| ------------- | ---
| Fixed tickets | n/a
| License       | MIT

Commits
-------

553e294 [Fix CS] Unneeded whitespace around negation operator
7c47e34 [CS Fix] Consistent coding-style of concatenation operator usage
2013-04-02 15:28:54 +02:00
Dariusz Górecki
553e294f77 [Fix CS] Unneeded whitespace around negation operator 2013-04-02 10:46:23 +01:00