Commit Graph

13608 Commits

Author SHA1 Message Date
Bernhard Schussek
7b07925fad [Form] Changed isset() to array_key_exists() to be consistent with ParameterBag 2013-04-13 16:46:28 +02:00
Bernhard Schussek
7b438a816b [Form] Made submit buttons able to convey validation groups 2013-04-13 16:46:28 +02:00
Bernhard Schussek
cc2118dd5c [Form] Implemented support for buttons 2013-04-13 16:46:28 +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
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
Jordi Boggiano
659eb663c6 [Console] Add ArgvInput::__toString and ArrayInput::__toString, fixes #7257 2013-04-12 15:43:52 +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
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
Vitaliy Zakharov
7519fdc10f [Process] added exit code to ProcessFailedException message 2013-04-11 19:56:25 +06: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
Dorian Villet
7529664a43 [HttpFoundation] Removed the @api annotation on getClientIps method. 2013-04-09 18:16:59 +02:00
Fabien Potencier
6f0a5ad314 merged branch jakzal/console-tests-cleanup (PR #6989)
This PR was merged into the master branch.

Discussion
----------

[Console] Cleaned up the unit tests.

Cleaned up some unit tests in the Console component as suggested in #6935. I didn't fully cleanup the Application tests to not to delay this PR. I might do it later as a separate one.

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

Commits
-------

5ca04b0 [Console] Cleaned up the unit tests.
2013-04-09 17:42:31 +02:00
Fabien Potencier
17e065facb merged branch canni/prod_server (PR #7507)
This PR was squashed before being merged into the master branch (closes #7507).

Discussion
----------

[FrameworkBundle] Enable possibility to run PHP bultin server in production env

See the referenced ticket for discussion;

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

Commits
-------

12fce13 [FrameworkBundle] Enable possibility to run PHP bultin server in production env
2013-04-09 16:38:45 +02:00
Dariusz Górecki
12fce13dbb [FrameworkBundle] Enable possibility to run PHP bultin server in production env 2013-04-09 16:38:45 +02:00
Fabien Potencier
d9d96351aa merged branch troymccabe/cssselector_namespace_support (PR #7585)
This PR was merged into the master branch.

Discussion
----------

[CssSelector] Updated parsers to support namespaces (fix for ClassParser included)

ClassParser was passing improper parameters to `ElementNode`, as well as namespaces simply not being supported in the various parsers. This is a natural extension of #6650, by properly parsing the requested CSS filter if supplied.

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

Commits
-------

3c015d5 Updated parsers to support namespaces (fix for ClassParser included)
2013-04-09 16:27:36 +02:00
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
Dorian Villet
f0c4ab663a [HttpFoundation] Split the tests into two methods / data providers. 2013-04-09 14:58:53 +02:00
Dorian Villet
80030fb28e [HttpFoundation] Use @see annotation for better documentation generation. 2013-04-09 14:53:11 +02:00
Dorian Villet
3e703a226a [HttpFoundation] Fixing tests. 2013-04-09 14:43:39 +02:00
Dorian Villet
63cbbb5889 [HttpFoundation] Add tests for the newly created Request::getClientIps() method. 2013-04-09 14:29:45 +02:00
Dorian Villet
58347fb9e9 [HttpFoundation] Split getClientIp into two methods for better flexibility. 2013-04-09 13:58:36 +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