Commit Graph

14705 Commits

Author SHA1 Message Date
Artem Lopata a2b15359d8 [Form] Fix of "PATCH'ed forms are never valid"
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8111
| License       | MIT
2013-06-27 09:49:09 +03:00
Fabien Potencier 939f8720ac merged branch cordoval/patch-3 (PR #8363)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8363).

Discussion
----------

typo first->second

Commits
-------

2d9a84b typo first->second
2013-06-27 08:12:15 +02:00
Luis Cordova 1b0f69373c typo first->second 2013-06-27 08:12:14 +02:00
Christophe Coevoet a830001ca3 Passed the config when building the Configuration in ConfigurableExtension 2013-06-26 14:56:23 +02:00
Fabien Potencier c60bdf5459 removed unused code 2013-06-26 10:36:28 +02:00
Fabien Potencier f4c1a3a131 merged branch Burgov/patch-4 (PR #8355)
This PR was merged into the master branch.

Discussion
----------

Fixed typo

Commits
-------

6fdf8cf Fixed typo
2013-06-25 16:31:00 +02:00
Bart van den Burg 6fdf8cf56d Fixed typo 2013-06-25 16:33:52 +03:00
Fabien Potencier 465965a71b merged branch gnutix/2.3 (PR #8339)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8339).

Discussion
----------

[Routing] Add an extension-point for DI into the Matcher/Generator Dumpers

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

The Routing's MatcherDumper and GeneratorDumper classes are instantiated very deeply into the `Router::getGenerator()` and `Router::getMatcher()` methods.

This pull requests aims to :
 1. separate the instances creation
 2. ease overriding (lesser risks of changes at framework updates)
 3. ease dependencies injection for these classes (as we can't inject dependencies in another way, be it service definition, compiler pass or whatever I'm aware of).

An example of usage would be the following : https://gist.github.com/gnutix/5844630
It's a real case I'm having in my company's current project.

Commits
-------

5a03a7f [Routing] Add an extension-point for DI into the Matcher/Generator Dumpers
2013-06-24 21:22:42 +02:00
Dorian Villet 40b598c82e Add an extension-point for DI into the Matcher/Generator Dumpers 2013-06-24 21:22:42 +02:00
Fabien Potencier 1a0b38a48a merged branch cedric-g/patch_translator (PR #8310)
This PR was submitted for the 2.3 branch but it was merged into the 2.2 branch instead (closes #8310).

Discussion
----------

[FrameworkBundle] Fixed variable name used in translation cache

This simply fixes the `$catalogueXXX` variable name used in the translation cache files in case the user use locales such as `en-US`, the generated variable's name was `$catalogueEn-Us`, with this fix it will be `$catalogueEnUs`.

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

Commits
-------

e50399c [FrameworkBundle] Fixed variable name used in translation cache
2013-06-24 09:44:23 +02:00
Cédric Girard b272419ab9 Fixed variable name used in translation cache 2013-06-24 09:44:05 +02:00
Fabien Potencier 31ac13bcd1 Merge branch '2.3'
* 2.3: (33 commits)
  [Form] fixed INF usage which does not work on Solaris (closes #8246)
  Fix grammar
  Removed PHP 5.5 from the allowed failures.
  [Intl] Fixed tests failing on PHP 5.5
  bumped Symfony version to 2.2.4
  updated VERSION for 2.2.3
  update CONTRIBUTORS for 2.2.3
  updated CHANGELOG for 2.2.3
  [DependencyInjection] Replaced try/catch block with an @expectedException annotation in a test.
  [CssSelector] tweaked README file (closes #8287)
  added a node about HTML extension in readme
  [Console] Fixed the table rendering with multi-byte strings.
  Feature/fix unit tests
  [Process] Disable exception on stream_select timeout
  [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
  [DomCrawler] added a note about the default charset
  Throw exception if value is passed to VALUE_NONE input, long syntax
  fixed date type format pattern regex
  [Security] fixed usage of the salt for the bcrypt encoder (refs #8210)
  [FrameworkBundle] tweaked previous merge (refs #8242)
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-23 10:16:33 +02:00
Fabien Potencier d7999d7108 Merge branch '2.2' into 2.3
* 2.2:
  [Form] fixed INF usage which does not work on Solaris (closes #8246)
  Fix grammar
  bumped Symfony version to 2.2.4
  updated VERSION for 2.2.3
  update CONTRIBUTORS for 2.2.3
  updated CHANGELOG for 2.2.3
  [Process] Disable exception on stream_select timeout
  [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
  [DomCrawler] added a note about the default charset
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
  force the Content-Type to html in the web profiler controllers

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-23 10:16:02 +02:00
Fabien Potencier c875d0aae1 [Form] fixed INF usage which does not work on Solaris (closes #8246) 2013-06-23 09:35:41 +02:00
Fabien Potencier fa42a90bd8 merged branch jakzal/2.3-tests-on-php-5.5 (PR #8324)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fixed tests failing on PHP 5.5 and removed this version from the allowed failures

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

Commits
-------

69ec7c8 Removed PHP 5.5 from the allowed failures.
3492186 [Intl] Fixed tests failing on PHP 5.5
2013-06-23 09:01:37 +02:00
Fabien Potencier 66e2227c2d merged branch sqmk/patch-1 (PR #8337)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8337).

Discussion
----------

Fix grammar

Commits
-------

4163f71 Fix grammar
2013-06-23 08:56:04 +02:00
Michael Squires a2e440a52c Fix grammar 2013-06-23 08:56:04 +02:00
Vitaliy Zakharov 266df16add [Filesystem] create FilesystemTestCase from FilesystemTest 2013-06-21 23:11:07 +06:00
Jakub Zalas 69ec7c8363 Removed PHP 5.5 from the allowed failures. 2013-06-21 09:32:21 +01:00
Jakub Zalas 349218692e [Intl] Fixed tests failing on PHP 5.5 2013-06-21 09:19:25 +01:00
Fabien Potencier 5b14665964 bumped Symfony version to 2.2.4 2013-06-19 15:03:30 +02:00
Fabien Potencier 74a033d95b updated VERSION for 2.2.3 2013-06-19 14:09:49 +02:00
Fabien Potencier 8c353ddde6 update CONTRIBUTORS for 2.2.3 2013-06-19 14:09:22 +02:00
Fabien Potencier bf881db902 updated CHANGELOG for 2.2.3 2013-06-19 14:09:01 +02:00
Fabien Potencier 1815f5998a Merge branch '2.1' into 2.2
* 2.1:
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
2013-06-19 14:03:55 +02:00
Fabien Potencier 8fd817b4d2 merged branch Strate/strate/improvement/get-parent-of-node (PR #8302)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8302).

Discussion
----------

[Config] Allow to get parent of BaseNode

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

Like an ArrayNode have method `getChildren`, I might to be good idea for having method `getParent` of all nodes.

Commits
-------

a9a7ecc [Config] Allow to get parent of BaseNode
2013-06-19 11:29:08 +02:00
Strate d95c245d65 Allow to get parent of BaseNode 2013-06-19 11:29:07 +02:00
Fabien Potencier 0c8eb2a3f4 merged branch pauluz/master (PR #8304)
This PR was squashed before being merged into the master branch (closes #8304).

Discussion
----------

Sorting files while extracting translation messages from a twig templates

Hello
When we generate a translations via command:
```php
app\console translation:update
```
is nice if order of found items don't change over the time (inside the file).
So we need to sort the *.twig files to prevent changes in output lang files.

This very simple fix do this.

Please consider this in your code :)

Thanks

Commits
-------

ba0bcb1 Sorting files while extracting translation messages from a twig templates
2013-06-19 11:26:21 +02:00
pauluz ba0bcb1bb3 Sorting files while extracting translation messages from a twig templates 2013-06-19 11:26:21 +02:00
Fabien Potencier e01c6c22e8 merged branch jakzal/bugfix/di-tests-segfault (PR #8298)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Replaced try/catch block with an @expectedException annotation

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

This fix doesn't seem like changing anything but thanks to it, PHP 5.3.3 stops segfaulting.

Tests started failing after merging #8285. However, it's not the change which made them failing (the change is totally unrelated to the segfaulting test case). I suspect it has something to do with memory management in the early PHP 5.3 versions. We've had this kind of failures in the past.

Commits
-------

494e803 [DependencyInjection] Replaced try/catch block with an @expectedException annotation in a test.
2013-06-17 15:51:03 +02:00
Jakub Zalas 494e8035ad [DependencyInjection] Replaced try/catch block with an @expectedException annotation in a test. 2013-06-17 14:32:29 +01:00
Fabien Potencier caaaec3155 [CssSelector] tweaked README file (closes #8287) 2013-06-17 09:15:51 +02:00
Fabien Potencier 46cb3b8095 merged branch jfsimon/css-selector-readme-update (PR #8287)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8287).

Discussion
----------

[CssSelector] added a node about HTML extension in readme

It's a common mistake to use `CssSelector` with XML without knowing that `HTML` extension must be disbaled first (see #8286). This PR adds a note about that in the component's readme file.

Commits
-------

4235b26 [CssSelector] added a node about HTML extension in readme
2013-06-17 09:13:34 +02:00
Jean-François Simon 0cb95e07ac added a node about HTML extension in readme 2013-06-17 09:13:34 +02:00
Fabien Potencier d744ffaaeb merged branch jakzal/templating-delegating-engine (PR #8280)
This PR was merged into the master branch.

Discussion
----------

[Templating|FrameworkBundle] Made DelegatingEngine::getEngine() public

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

As a bonus I've covered both classes with tests.

Commits
-------

a54cbff [FrameworkBundle] Made DelegatingEngine::getEngine() public.
3f84cd3 [Templating] Made DelegatingEngine::getEngine() public.
0a72a99 [FrameworkBundle] Added tests for the DelegatingEngine.
6c31ab2 [Templating] Added tests for the DelegatingEngine.
2013-06-17 09:11:26 +02:00
Fabien Potencier 0da84dac18 merged branch jakzal/bugfix/table-helper-multi-byte (PR #8285)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fixed the table rendering with multi-byte strings.

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

Commits
-------

ab1439e [Console] Fixed the table rendering with multi-byte strings.
2013-06-16 14:10:21 +02:00
Jakub Zalas ab1439eb32 [Console] Fixed the table rendering with multi-byte strings. 2013-06-15 18:55:04 +01:00
Jakub Zalas a54cbfffc3 [FrameworkBundle] Made DelegatingEngine::getEngine() public. 2013-06-14 13:55:39 +01:00
Jakub Zalas 3f84cd398a [Templating] Made DelegatingEngine::getEngine() public. 2013-06-14 13:44:33 +01:00
Jakub Zalas 0a72a995ba [FrameworkBundle] Added tests for the DelegatingEngine. 2013-06-14 13:42:13 +01:00
Jakub Zalas 6c31ab2581 [Templating] Added tests for the DelegatingEngine. 2013-06-14 13:34:01 +01:00
Fabien Potencier 092fae1f6b merged branch hostnet/feature/fix-unit-tests (PR #8275)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8275).

Discussion
----------

Feature/fix unit tests

Fixed two cases where tests were relying on the pcntl extension

Commits
-------

39477dd Feature/fix unit tests
2013-06-14 11:45:32 +02:00
Rick Prent 3381f3f897 Feature/fix unit tests 2013-06-14 11:45:32 +02:00
Fabien Potencier add4207838 merged branch romainneutron/process-stream-select2.2 (PR #8274)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Process] Disable exception on stream_select timeout

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

Commits
-------

c0da3ae [Process] Disable exception on stream_select timeout
2013-06-13 18:05:48 +02:00
Romain Neutron c0da3ae445 [Process] Disable exception on stream_select timeout 2013-06-13 17:57:04 +02:00
Fabien Potencier 6a15a3adc7 merged branch fabpot/session-regenerate-fix (PR #8270)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpFoundation] fixed issue with session_regenerate_id (closes #7380)

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

Commits
-------

77f2aa8 [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
2013-06-13 17:25:25 +02:00
Fabien Potencier f554ada374 merged branch fabpot/bcrypt-salt (PR #8266)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] fixed usage of the salt for the bcrypt encoder (refs #8210)

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

see #8210

Commits
-------

b5ded81 [Security] fixed usage of the salt for the bcrypt encoder (refs #8210)
2013-06-13 17:24:34 +02:00
Fabien Potencier 77f2aa8ec8 [HttpFoundation] fixed issue with session_regenerate_id (closes #7380) 2013-06-13 14:48:26 +02:00
Fabien Potencier ed3bcb047a [DomCrawler] added a note about the default charset 2013-06-13 13:40:37 +02:00
Fabien Potencier 6d2bec72b4 merged branch lsmith77/container_check_alias_in_has_method (PR #8252)
This PR was merged into the 2.3 branch.

Discussion
----------

Container check alias in has method

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=container_check_alias_in_has_method)](https://travis-ci.org/lsmith77/symfony)
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

This bug might also be in 2.2 but we encountered it in 2.3 and the relevant code was changed slightly from 2.2 to 2.3. We noticed this issue here:
https://github.com/symfony-cmf/RoutingBundle/issues/109

The issue is caused by the ``$container->has->('router')`` check in the Router related commands:
https://github.com/symfony/FrameworkBundle/blob/master/Command/RouterDebugCommand.php#L32

As with the CMF we use a chain router service that is aliased to ``router``, the commands do not get registered.

One could classify this as a BC break, but imho its a bug fix.

Commits
-------

aa79393 also consider alias in Container::has()
2013-06-13 12:54:18 +02:00