Commit Graph

16293 Commits

Author SHA1 Message Date
Nicolas Grekas 65862c9947 minor #11667 [HttpFoundation] revert #11510, moved to 2.6 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] revert #11510, moved to 2.6

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

This reverts PR #11510 from 2.3.

Commits
-------

fb120c7 revert #11510, moved to 2.6
2014-08-14 17:05:58 +02:00
Nicolas Grekas a8b13a2999 bug #11529 [WebProfilerBundle] Fixed double height of canvas (hason)
This PR was merged into the 2.3 branch.

Discussion
----------

[WebProfilerBundle] Fixed double height of canvas

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

Commits
-------

c689186 [WebProfilerBundle] Fixed double height of canvas
2014-08-14 16:41:09 +02:00
Bernhard Schussek 0ecb34f23b minor #11646 [Validator] Backported constraint validator tests from 2.5 (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Backported constraint validator tests from 2.5

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

This PR backports the constraint validator tests from 2.5 to 2.3 to facilitate maintenance. When we adapt a test in 2.3, we can now easily merge the change forward to 2.5.

Commits
-------

87a47ea [Validator] Backported constraint validator tests from 2.5
2014-08-14 16:28:19 +02:00
Bernhard Schussek 87a47eadc9 [Validator] Backported constraint validator tests from 2.5 2014-08-14 15:44:06 +02:00
Yosmany Garcia 000bd0d863 Made optimization deprecating modulus operator 2014-08-14 12:15:45 +00:00
Nicolas Grekas fb120c7827 revert #11510, moved to 2.6 2014-08-14 10:11:24 +02:00
Nicolas Grekas 48b150aa02 bug #11641 [WebProfilerBundle ] Fix toolbar vertical alignment (blaugueux)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11641).

Discussion
----------

[WebProfilerBundle ] Fix toolbar vertical alignment

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

Fix the vertical alignment of texts in the toolbar.

This issue appears when a reset css contain ```vertical-align: top/bottom/middle;```

Commits
-------

65220e7 Fix toolbar vertical alignment.
2014-08-13 21:39:43 +02:00
Benjamin Laugueux 65220e77b4 Fix toolbar vertical alignment. 2014-08-13 21:39:42 +02:00
Nicolas Grekas 6b9ce52a11 bug #11559 [Validator] Convert objects to string in comparison validators (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Convert objects to string in comparison validators

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

In the [latest merge from 2.3 into 2.4](/symfony/symfony/commit/3bed1b7988e94a897a64c6a2ad3bf70bde9005c1), the changes from 6cf5e0812e in 2.4 got lost. This PR brings back these changes and backports them to 2.3.

The change is BC, because the former value `true` of the `$prettyDateTime` will be cast to `1`, which corresponds to the `PRETTY_DATE` format constant.

Commits
-------

273671e [Validator] Convert objects to string in comparison validators. Reapplies 6cf5e0812e
2014-08-13 21:13:32 +02:00
Nicolas Grekas 4f098dc5a4 feature #11510 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field (catchamonkey)
This PR was squashed before being merged into the 2.3 branch (closes #11510).

Discussion
----------

[HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field

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

ToDo

 * [x] Fix Tests

Looking for feedback on this early PR.

This adds a config option that disables the PHP GC method call from doing anything,
It also means that the write method sets up the auto expiring index.

Ref: #11508

Commits
-------

b56b740 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field
2014-08-13 21:10:05 +02:00
Chris Sedlmayr b56b740940 [HttpFoundation] MongoDbSessionHandler supports auto expiry via configurable expiry_field 2014-08-13 21:06:50 +02:00
Nicolas Grekas 511b20d837 bug #11408 [HttpFoundation] Update QUERY_STRING when overrideGlobals (yguedidi)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Update QUERY_STRING when overrideGlobals

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

Commits
-------

777666f [HttpFoundation] Update QUERY_STRING when overrideGlobals
2014-08-13 21:04:07 +02:00
Fabien Potencier ac6e3a1e9e bug #11633 [FrameworkBundle] add missing attribute to XSD (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] add missing attribute to XSD

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

The ``hinclude_default_template`` configuration option couldn't have been set in XML configurations since it wasn't defined in the XML schema definition.

Commits
-------

8a2b423 [FrameworkBundle] add missing attribute to XSD
2014-08-10 19:05:08 +02:00
Christian Flothmann 8a2b423b53 [FrameworkBundle] add missing attribute to XSD
The hinclude_default_template configuration option couldn't have been
set in XML configurations since it wasn't defined in the XML schema
definition.
2014-08-10 15:07:49 +02:00
Fabien Potencier 64543909f8 bug #11601 [Validator] Allow basic auth in url when using UrlValidator. (blaugueux)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11601).

Discussion
----------

[Validator] Allow basic auth in url when using UrlValidator.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |
Now an url with basic auth like ```http://username:password@symfony.com``` can be valid.

Commits
-------

f1ea987 Allow basic auth in url. Improve regex. Add tests.
2014-08-09 12:41:29 +02:00
Benjamin Laugueux f1ea987f35 Allow basic auth in url.
Improve regex. Add tests.
2014-08-09 12:41:29 +02:00
Fabien Potencier 7b3bd56f77 minor #11603 remove volatile tests (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

remove volatile tests

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

Commits
-------

24fb66d remove volatile tests
2014-08-09 12:40:05 +02:00
Fabien Potencier 5b1d913174 bug #11609 [Console] fixed style creation when providing an unknown tag option (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] fixed style creation when providing an unknown tag option

| 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

When formatting a string, the console ignore style it cannot parse. But if a string looks like an option (`<setting=value>`) for instance, instead of displaying the text as is, it currently throws an exception.

Commits
-------

8814920 [Console] fixed style creation when providing an unknown tag option
2014-08-09 12:37:57 +02:00
Fabien Potencier 38688b7fa6 minor #11605 [WebProfilerBundle] Fix typos and syntax in Profiler controller method comments (pgodel)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11605).

Discussion
----------

[WebProfilerBundle] Fix typos and syntax in Profiler controller method comments

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

Commits
-------

be03b75 fix typos and syntax in Profiler controller method comments
2014-08-09 12:37:11 +02:00
Pablo Godel be03b7552a fix typos and syntax in Profiler controller method comments 2014-08-09 12:37:11 +02:00
Christian Flothmann d26040f356 [DomCrawler] fix the axes handling in a bc way
The previous fix in #11548 for handling XPath axes was not backward
compatible. In previous Symfony versions the Crawler handled nodes
by holding a "fake root node". This must be taken into account when
evaluating (relativizing) XPath expressions.
2014-08-09 11:40:56 +02:00
Fabien Potencier 61763452b7 bug #10914 [HttpKernel] added an analyze of environment parameters for built-in server (mauchede)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10914).

Discussion
----------

[HttpKernel] added an analyze of environment parameters for built-in server

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

With the built-in server, it is not possible to use the external parameters: environment variables are only in `$_ENV`.

Commits
-------

696b978 [HttpKernel] added an analyze of environment parameters for built-in server.
2014-08-08 17:50:03 +02:00
Morgan Auchede 696b978742 [HttpKernel] added an analyze of environment parameters for built-in server. 2014-08-08 17:50:03 +02:00
Christian Flothmann f5bc18d648 return empty metadata collection if none do exist
The PropertyMetadataContainerInterface defines that the method
getPropertyMetadata() has to return an empty collection if no
metadata have been configured for the given property. Though, its
implementation in the ClassMetadata class didn't check for
existence of such metadata. This behavior led to unexpected PHP
notices when validating a property or a property value of a property
without any configured constraints (only affects the new 2.5 API).
Additionally, the getMemberMetadatas() didn't check for existing
array keys as well which has also been fixed.
2014-08-08 11:23:54 +02:00
Christian Flothmann 24fb66ddf3 remove volatile tests
Some tests relying on timings and external network resources were not
reliable and occasionally made builds on Travis fail.
2014-08-08 10:12:23 +02:00
Fabien Potencier 88149209ae [Console] fixed style creation when providing an unknown tag option 2014-08-07 17:55:24 +02:00
Fabien Potencier 56a75179d1 minor #11565 [Process] Added process synchronization to the incremental output tests (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] Added process synchronization to the incremental output tests

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

The tests currently fail from time to time if the executing machine is under
heavy load. This leads to false negatives on Travis CI.

A side effect of the change is that the tests are much faster now.

Commits
-------

6dd3946 [Process] Added process synchronization to the incremental output tests
2014-08-07 15:08:01 +02:00
Fabien Potencier 976a1cc11c bug #11598 [Finder] Shell escape and windows support (Gordon Franke, gimler)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] Shell escape and windows support

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

Add escaping of command passed to Shell::testCommand().
Fix todo add support for windows.

Commits
-------

c70a226 change command to which available under most unix systems
85e77b1 add way to test command under windows
4fa9288 fix shell command injection
2014-08-07 15:06:53 +02:00
Gordon Franke c70a226121 change command to which available under most unix systems
agree i will change it which is available under suse, ubuntu, debian, fedora, bsd
2014-08-07 14:55:21 +02:00
Gordon Franke 85e77b14f7 add way to test command under windows 2014-08-07 09:02:32 +02:00
Gordon Franke 4fa9288fda fix shell command injection 2014-08-07 09:01:16 +02:00
Bernhard Schussek 72b70636ba minor #11576 [Form] allowed CallbackTransformer to use callable (issei-m)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11576).

Discussion
----------

[Form] allowed CallbackTransformer to use callable

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

I want to use the callable(i.e. inner class methods) in CallbackTransformer, but its current constructor is defined argument type hinting for \Closure so i can't.

Commits
-------

e77022b [Form] allowed CallbackTransformer to use callable
2014-08-06 15:53:52 +02:00
Issei.M e77022ba6d [Form] allowed CallbackTransformer to use callable 2014-08-06 15:53:52 +02:00
Bernhard Schussek 6dd3946a7e [Process] Added process synchronization to the incremental output tests
The tests currently fail from time to time if the executing machine is under
heavy load. This leads to false negatives on Travis CI.

A side effect of the change is that the tests are much faster now.
2014-08-06 15:45:25 +02:00
Fabien Potencier 678f7728eb bug #11499 [BrowserKit] Fixed relative redirects for ambiguous paths (pkruithof)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11499).

Discussion
----------

[BrowserKit] Fixed relative redirects for ambiguous paths

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

This fixes a problem I discovered today during Mink testing: I have a route with a slug and id, separated by colon (`/{slug}:{id}`). When the `HTTP_HOST` is being normalized it only checks for array key existence, not emptyness. In this case it was `false` due to the `parse_url` call in `updateServerFromUri`, which cannot handle this case:

```
$> php -r "var_dump(parse_url('/redirect', PHP_URL_HOST));"                                                                               NULL

$> php -r "var_dump(parse_url('/redirect:1234', PHP_URL_HOST));"                                                                          bool(false)
```

So now the url becomes `http:///redirect:1234`, because of the missing host.

Commits
-------

5ecc449 Fixed relative redirects for ambiguous paths
2014-08-05 09:20:56 +02:00
Peter Kruithof 5ecc449898 Fixed relative redirects for ambiguous paths 2014-08-05 09:20:55 +02:00
Fabien Potencier 6094b5b3a9 bug #11516 [BrowserKit] Fix browser kit redirect with ports (dakota)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11516).

Discussion
----------

[BrowserKit] Fix browser kit redirect with ports

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

Whilst using Mink to do automated tests, I encountered a problem where redirects with ports would not work as the port was removed in the `updateServerFromURI()` method. This PR fixes the problem.

During my testing I encountered `$client->followRedirects(false);` in the ClientTest class that was causing the redirectWithPort test to pass even though it should have been failing (Removing the line caused the test to correctly fail before the patch was written)

Commits
-------

39973de [BrowserKit] Fix browser kit redirect with ports
2014-08-05 09:17:23 +02:00
Walther Lalk 39973de230 [BrowserKit] Fix browser kit redirect with ports 2014-08-05 09:17:23 +02:00
Fabien Potencier e76561dbc0 bug #11545 [Bundle][FrameworkBundle] built-in server: exit when docroot does not exist (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Bundle][FrameworkBundle] built-in server: exit when docroot does not exist

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

When the server:run command is run with an invalid document root
directory (for example, when being in the app directory and not
changing the document root to ../web/), the command crashes on Windows
with a 267 exit code. On Linux, the server starts but just publishes
internal server errors.

Commits
-------

f143254 built-in server: exit when docroot does not exist
2014-08-05 09:12:57 +02:00
Fabien Potencier 24c49841c8 minor #11554 [TwigBridge] [Form] Fixed some extra empty spaces (eiannone)
This PR was squashed before being merged into the 2.3 branch (closes #11554).

Discussion
----------

[TwigBridge] [Form] Fixed some extra empty spaces

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

Extra empty spaces for choice_widget_collapsed, they were introduced by commit 8f9ed3ebb9 by @chrisguitarguy

Commits
-------

16bd88e [TwigBridge] [Form] Fixed some extra empty spaces
2014-08-05 09:07:37 +02:00
Emanuele Iannone 16bd88e61f [TwigBridge] [Form] Fixed some extra empty spaces 2014-08-05 09:07:37 +02:00
Fabien Potencier 1ba7c72b09 minor #11550 [Form] fix whitespace in Twig form template (craue)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] fix whitespace in Twig form template

| Q             | A
| ------------- | ---
| Bug fix?      | kind of (after updating from 2.3.17 to 2.3.18, some of my tests were broken because of this)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | they should, let's see what Travis has to say...
| Fixed tickets | --
| License       | MIT
| Doc PR        | --

This fixes some whitespace rendering.

after merging #11386:
```html
<input type="text" id="myfield" name="myfield"     value="blah" />
```

before merging #11386 and with this PR again:
```html
<input type="text" id="myfield" name="myfield" value="blah" />
```

Commits
-------

8504d02 fixed whitespace in Twig form template
2014-08-05 09:06:43 +02:00
Fabien Potencier e17276b197 bug #11560 Plural fix (1emming)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11560).

Discussion
----------

Plural fix

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

*BC note - this breaks code if people build on top of the incorrect returned value `drife`.

Fixes the `singular` for `drives`. I've added more test values to prove more edge cases and to show this changes doesn't break other `singular`-look ups.
In the test class i've added a few `known issues` for later reference/fixure.

Commits
-------

9b550d6 Plural fix
2014-08-05 09:05:25 +02:00
Seb Koelen 9b550d6324 Plural fix 2014-08-05 09:05:24 +02:00
Fabien Potencier 59d6912b40 bug #11558 [DependencyInjection] Fixed missing 'factory-class' attribute in XmlDumper output (kerdany)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Fixed missing 'factory-class' attribute in XmlDumper output

| 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

Problem: XmlDumper doesn't write 'factory-class' XML attribute for definitions on which setFactoryClass() was called.

Impact: Container[Builder] to throws an exception when the relevant service is being requested/initiated after loading the dumped XML.
`Uncaught Exception Symfony\Component\DependencyInjection\Exception\RuntimeException: "Cannot create service "xxx" from factory method without a factory service or factory class." at /<path>/<to>//DependencyInjection/ContainerBuilder.php`

Solution: Made XmlDumper write the 'factory-class' attribute, and updated the relevant test fixture.

Another related problem, is that XMLFileLoader doesn't complain if the 'factory-class' attribute is missing for a 'service' elements that include 'factory-method' attribute, resulting in an ill-configured Definition object in the ContainerBuilder. I'll post an issue/ticket, and probably send another PR for that.

Commits
-------

18e3e6f [DependencyInjection] fixed missing 'factory-class' attribute in XmlDumper output
2014-08-05 09:04:05 +02:00
Bernhard Schussek 273671ec59 [Validator] Convert objects to string in comparison validators. Reapplies 6cf5e0812e 2014-08-04 12:43:57 +02:00
Fabien Potencier 99ee01d482 removed some .gitattributes that should have been removed a lot time ago 2014-08-04 12:32:26 +02:00
Fabien Potencier d754467d0e minor #11557 Fix incorrect romanian plural translations (moldcraft)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11557).

Discussion
----------

Fix incorrect romanian plural translations

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

In romanian plural translations was only one or two forms, but is required three, because it throws errors when transchoice has number that is translated to the third form.

Before fix

![staticshot_04-08-2014_11-27-51](https://cloud.githubusercontent.com/assets/1475489/3794833/ff9047c4-1bb2-11e4-8965-61d53803eb7c.png)

After fix

![staticshot_04-08-2014_11-33-18](https://cloud.githubusercontent.com/assets/1475489/3794844/1f8c48ca-1bb3-11e4-8654-69e0f3107e6d.png)

Info about romanian plural forms

![staticshot_04-08-2014_11-39-41](https://cloud.githubusercontent.com/assets/1475489/3794849/3cb03e70-1bb3-11e4-9151-7075ec9c8f4d.png)

Commits
-------

0c6f750 Fix incorrect romanian plural translations
2014-08-04 11:02:02 +02:00
moldcraft 0c6f750c1e Fix incorrect romanian plural translations 2014-08-04 11:02:01 +02:00
Hany el-Kerdany 18e3e6fe20 [DependencyInjection] fixed missing 'factory-class' attribute in XmlDumper output
Symfony\Component\DependencyInjection\Dumper\XmlDumper didn't write 'factory-class' XML attribute for definitions on which setFactoryClass() was called.

This caused the Container[Builder] to throw an exception when the relevant service is being requested/initiated after loading the dumped XML:

`Uncaught Exception Symfony\Component\DependencyInjection\Exception\RuntimeException: "Cannot create service "xxx" from factory method without a factory service or factory class." at /<path>/<to>/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerBuilder.php`

Fixed the problem, and updated the relevant test fixture.
2014-08-04 10:10:46 +03:00