Commit Graph

21554 Commits

Author SHA1 Message Date
ogizanagi
58f2fada56 [Console] SymfonyStyle : Fix blocks wordwrapping
Allow to print strings with a length greater than the terminal length in a block by allowing to cut words.
2015-06-09 11:20:12 +02:00
Fabien Potencier
e09874bd98 bug #14740 [Console] SymfonyStyle : fix blocks output is broken on windows cmd (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] SymfonyStyle : fix blocks output is broken on windows cmd

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

Using `SymfonyStyle::block` method, output is broken on windows cmd:
![screenshot 2015-05-23 a 18 00 18 - copie](https://cloud.githubusercontent.com/assets/2211145/7788763/43135ea0-0249-11e5-8a82-7f788384bc03.PNG)

Windows cmd seems to wrap lines as soon as the terminal width is reached, whether there are following characters or not.

I've encountered this behavior with multiple command prompts available on Windows, like Console2, ConEmu, Cmdr, ... But as most of them are simple cmd wrappers, the output is identic. The only good fellow in there is Cygwin which provides an Unix-like env and command-line interface.

This PR solves this issue by assuming that the lineLength (not the terminal width), used to wrap lines internally within the `SymfonyStyle::block` method, should be the terminal width - 1.

Commits
-------

ea3d768 [Console] SymfonyStyle : Fix blocks output is broken on windows cmd
2015-06-08 23:01:01 +02:00
ogizanagi
ea3d7688e4 [Console] SymfonyStyle : Fix blocks output is broken on windows cmd 2015-06-08 22:51:09 +02:00
Fabien Potencier
c62069bc52 bug #14623 [Console] SymfonyStyle : fix & automate block gaps. (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] SymfonyStyle : fix & automate block gaps.

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

---
Depends on https://github.com/symfony/symfony/pull/14741

---
## What it does
- autoprepend appropriate blocks (like cautions, titles, sections, ...) by the correct number of blank lines considering history.
- handle automatically most of the SymfonyStyle guide line breaks and gaps. Fix things such as unwanted double blank lines between titles and admonitions.
- test outputs
- fix an issue using questions with SymfonyStyle, which should not output extra blank lines when using with a non-interactive input.

## Description

`SymfonyStyle` is great, but there are some issues, mostly when using blocks (text blocks, titles and admonitions): some extra blank lines might be generated.

Plus, on the contrary, some line breaks or blank lines around blocks are missing, and the developer need to handle this himself by polluting his code with ugly `if` and `newLine()` statements.

### Before / After :

![screenshot 2015-05-13 a 00 11 59](https://cloud.githubusercontent.com/assets/2211145/7600572/ccfa8904-f90c-11e4-999f-d89612360424.PNG)

As you can see, it's still up to the developper to end his command by a blank line (unless using a block like `SymfonyStyle::success()`) in order to distinct different commands outputs more efficiently.

Everything else is now handled properly, and automatically, according to the rules exposed in the symfony console style guide published some time ago by @javiereguiluz .
Questions (not exposed in the above output) are considered as blocks, and follow, for instance, the same conditions than admonitions: 1 blank line before and after, no more (although, you'll still be able to output more blank lines yourself, using `newLine`).

Commits
-------

fc598ff [Console] SymfonyStyle : fix & automate block gaps.
260702e [Console] SymfonyStyle : Improve EOL consistency by relying on output instance
2015-06-08 21:06:07 +02:00
Fabien Potencier
0315e5dd51 feature #14903 [profiler][request toolbar] Removed route name from the toolbar (MJBGO)
This PR was merged into the 2.8 branch.

Discussion
----------

[profiler][request toolbar] Removed route name from the toolbar

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

The action block takes nearly 1/3 of the bar width which is not good.
The controller + action names are useful but the route name less important.

Before
![capture_before](https://cloud.githubusercontent.com/assets/8344487/8023606/325acb00-0d13-11e5-86db-ab2a08242227.PNG)

After
![capture_after](https://cloud.githubusercontent.com/assets/8344487/8023580/908edc22-0d11-11e5-92bd-37b380cc3433.PNG)

The route name is shown by hovering the action block
![capture_tooltip](https://cloud.githubusercontent.com/assets/8344487/8023584/a5ae08f8-0d11-11e5-97a5-ffec6d3e41cc.PNG)

Commits
-------

9004e29 Removed route name from the debugbar.
2015-06-08 20:23:00 +02:00
Fabien Potencier
567af657a0 feature #14904 [toolbar] Merged colored icons in toolbar (MJBGO)
This PR was squashed before being merged into the 2.8 branch (closes #14904).

Discussion
----------

[toolbar] Merged colored icons in toolbar

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

Status icons are doubled without any apparent reason.

Token before
![capture_token_before](https://cloud.githubusercontent.com/assets/8344487/8023946/203c6fc8-0d22-11e5-9d8f-2760bfdf0c18.PNG)

Token after
![capture_token_after](https://cloud.githubusercontent.com/assets/8344487/8024004/d0f4e9b6-0d23-11e5-9263-dd2a38b14d12.PNG)

Security before
![capture_security_before](https://cloud.githubusercontent.com/assets/8344487/8023949/2441d6ee-0d22-11e5-9fed-168d850633d2.PNG)

Security after
![capture_security_after](https://cloud.githubusercontent.com/assets/8344487/8023950/2444a1da-0d22-11e5-9c8a-1deb654e7ac4.PNG)

Commits
-------

5b67bbd [toolbar] Merged colored icons in toolbar
2015-06-08 20:20:43 +02:00
Jean-Baptiste GOMOND
5b67bbdb3f [toolbar] Merged colored icons in toolbar 2015-06-08 20:20:40 +02:00
Fabien Potencier
807d19207c minor #14905 [DX][Form] Show the class name when the deprecated setDefaultOptions is used (peterrehm)
This PR was merged into the 2.7 branch.

Discussion
----------

[DX][Form] Show the class name when the deprecated setDefaultOptions is used

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

After upgrading to 2.7 I got plenty of deprecation messages which I could not assign directly as I have updated all of my FormTypes.

![bildschirmfoto 2015-06-07 um 12 02 22](https://cloud.githubusercontent.com/assets/2010989/8024784/8108aeee-0d0d-11e5-8f24-415c553ccb4c.png)

Whit this minor improvement the actual class will be show so the upgrade will be much easier.

![bildschirmfoto 2015-06-07 um 12 01 24](https://cloud.githubusercontent.com/assets/2010989/8024788/93ff37d4-0d0d-11e5-8689-c3e8a933102b.png)

I think same should be considered in other deprecation errors as it gets more difficult to trace down if external libraries are involved.

Commits
-------

a276eb0 Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions
2015-06-08 20:19:55 +02:00
Fabien Potencier
29027eead6 minor #14911 [Validator] remove partial deprecation annotation (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Validator] remove partial deprecation annotation

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

Commits
-------

b49c82f [Validator] remove partial deprecation annotation
2015-06-08 20:18:54 +02:00
Christian Flothmann
b49c82ff8c [Validator] remove partial deprecation annotation 2015-06-08 18:16:07 +02:00
Fabien Potencier
6fcdcb509a minor #14866 Updated UPGRADE-2.4.md (mickaelandrieu)
This PR was submitted for the 2.8 branch but it was merged into the 2.6 branch instead (closes #14866).

Discussion
----------

Updated UPGRADE-2.4.md

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

A missing deprecation in the upgrade guide.

Commits
-------

b631a56 Updated UPGRADE-2.4.md
2015-06-08 16:44:58 +02:00
Mickaël Andrieu
b631a561b6 Updated UPGRADE-2.4.md 2015-06-08 16:44:57 +02:00
Fabien Potencier
90f771c751 minor #14909 added missing " (OskarStark)
This PR was merged into the 2.8 branch.

Discussion
----------

added missing "

Commits
-------

1baf05a added missing "
2015-06-08 16:00:21 +02:00
Fabien Potencier
a48d36ae31 bug #14895 [Form] Support DateTimeImmutable in transform() (c960657)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Support DateTimeImmutable in transform()

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

When passing a DateTimeImmutable instance to DateTimeToLocalizedStringTransformer::transform($dateTime), it throws an exception, `TransformationFailedException('Expected a \DateTime.')`.

The method just converts a date-time object into a string, so there is no reason that it should not support all DateTimeInterface implementations.

DateTimeInterface was added in PHP 5.5, so in order to support earlier versions, we need to do instanceof checks for both DateTime and DateTimeInterface. When Symfony requires PHP 5.5 or larger, we can remove the DateTime check and only check for DateTimeInterface.

This was originally submitted as a PR against the 2.7 branch in #14676.

Commits
-------

17346c5 [Form] Support DateTimeImmutable in transform()
2015-06-08 15:59:27 +02:00
Oskar Stark
1baf05a584 added missing " 2015-06-08 13:38:51 +02:00
reecefowell
73bbaa6cc7 Silence invasive deprecation warnings, opt-in for warnings 2015-06-08 10:37:21 +01:00
Christian Schmidt
17346c53dc [Form] Support DateTimeImmutable in transform() 2015-06-08 07:38:09 +02:00
Peter Rehm
a276eb055f Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions 2015-06-07 13:04:25 -04:00
Fabien Potencier
97050dc582 minor #14901 [Form] add test to avoid regression of #14891 (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Form] add test to avoid regression of #14891

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

Commits
-------

12a19c8 [Form] add test to avoid regression of #14891
2015-06-07 18:46:00 +02:00
Fabien Potencier
53d9003616 minor #14902 [FrameworkBundle] Document form.csrf_provider service deprecation (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Document form.csrf_provider service deprecation

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

`form.csrf_provider` was deprecated in #9216.

Commits
-------

0fea66f [FrameworkBundle] Document form.csrf_provider service deprecation
2015-06-07 18:44:21 +02:00
Jean-Baptiste GOMOND
9004e29735 Removed route name from the debugbar. 2015-06-07 12:20:27 +02:00
Jakub Zalas
0fea66faf4 [FrameworkBundle] Document form.csrf_provider service deprecation 2015-06-07 11:05:37 +01:00
Christian Flothmann
12a19c8980 [Form] add test to avoid regression of #14891 2015-06-07 08:50:12 +02:00
Fabien Potencier
a39dafaae3 minor #14896 [Form] Fix call to removed method (BC broken in 2.3) (taueres)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fix call to removed method (BC broken in 2.3)

ResolvedFormType#getTypeExtensions() was calling method
AbstractType#getExtensions() which has been removed in
commit b3081e85a0

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

Commits
-------

fa9da42 [Form] Fix call to removed method (BC broken in 2.3)
2015-06-06 20:32:18 +02:00
Fabien Potencier
847a3e3348 bug #14891 without this change allways the legacy code get called (dominikzogg)
This PR was submitted for the 2.8 branch but it was merged into the 2.6 branch instead (closes #14891).

Discussion
----------

without this change allways the legacy code get called

[Form] [Validator] prevent that always the legacy validator logic get called

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

Commits
-------

96a30bf without this change allways the legacy code get called
2015-06-06 20:31:04 +02:00
Dominik Zogg
96a30bf31d without this change allways the legacy code get called 2015-06-06 20:31:04 +02:00
Sergio Santoro
fa9da42c22 [Form] Fix call to removed method (BC broken in 2.3)
ResolvedFormType#getTypeExtensions() was calling method
AbstractType#getExtensions() which has been removed in
commit b3081e85a0

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2015-06-06 18:24:30 +02:00
Fabien Potencier
18f0dda25a bug #14888 [Console] Fix ask and askHidden methods (dosten)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Fix ask and askHidden methods

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

Commits
-------

5bb2cc8 Fix ask and askHidden methods
2015-06-06 16:06:47 +02:00
Diego Saint Esteben
5bb2cc8331 Fix ask and askHidden methods 2015-06-05 20:29:24 -03:00
Fabien Potencier
b1003d57f3 minor #14738 [HttpFoundation] Get response content as resource several times for PHP >= 5.6 (dunglas)
This PR was squashed before being merged into the 2.3 branch (closes #14738).

Discussion
----------

[HttpFoundation] Get response content as resource several times for PHP >= 5.6

| 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

Since PHP 5.6, `php://input` can be opened several times.

Commits
-------

9f9b0f7 [HttpFoundation] Get response content as resource several times for PHP >= 5.6
2015-06-05 22:09:35 +02:00
Kévin Dunglas
9f9b0f73aa [HttpFoundation] Get response content as resource several times for PHP >= 5.6 2015-06-05 22:09:27 +02:00
Fabien Potencier
d1404a6c34 minor #14884 Change error message to reflect SecurityContext deprecation. (nickbyfleet)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #14884).

Discussion
----------

Change error message to reflect SecurityContext deprecation.

This PR was submitted on the symfony/Security read-only repository by @nickbyfleet and moved automatically to the main Symfony repository (closes symfony/Security#6).

Commits
-------

4212bda Change error message to reflect SecurityContext deprecation.
2015-06-05 21:57:46 +02:00
Nicholas Byfleet
4212bdaf72 Change error message to reflect SecurityContext deprecation. 2015-06-05 21:57:45 +02:00
Fabien Potencier
04630ad60e fixed merge 2015-06-05 21:54:43 +02:00
Fabien Potencier
31eb16c03e Merge branch '2.6' into 2.7
* 2.6:
  Issue #14815
2015-06-05 21:54:27 +02:00
Fabien Potencier
75d5d547bb minor #14819 [Yaml] [Validator] Removed conditional @deprecated tags and moved their descriptions to the method description as a note (gerritdrost)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14819).

Discussion
----------

[Yaml] [Validator] Removed conditional @deprecated tags and moved their descriptions to the method description as a note

[Yaml] [Validator] Removed conditional @deprecated tags and moved their descriptions to the method description as a note.

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

Commits
-------

17b4251 Issue #14815
2015-06-05 21:54:11 +02:00
Gerrit Drost
17b4251310 Issue #14815
Removed @deprecated tags and moved their descriptions to the method description as a note.
2015-06-05 21:54:03 +02:00
Fabien Potencier
4133aadd0c feature #14781 [TwigBundle] Reconfigure twig paths when they are updated (chbruyand)
This PR was squashed before being merged into the 2.8 branch (closes #14781).

Discussion
----------

[TwigBundle] Reconfigure twig paths when they are updated

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14771, #14768, #14262, #14778
| License       | MIT

Refresh twig paths upon creation and deletion. As we don't care neither about path's modification time nor path's content, a new Resource has been added in the Config Component.
Full discussion in #14778.

Commits
-------

3cbff05 [TwigBundle] Reconfigure twig paths when they are updated
2015-06-05 19:28:20 +02:00
Charles-Henri Bruyand
3cbff05e70 [TwigBundle] Reconfigure twig paths when they are updated 2015-06-05 19:28:18 +02:00
Fabien Potencier
99ec717a22 Merge branch '2.7' into 2.8
* 2.7:
  [Security] Update tests after a merge
  [Console] Remove an unused argument and fix a small cs issue
  [Translator] avoid serialize unserializable resources.
2015-06-05 18:29:33 +02:00
Fabien Potencier
72b2a79972 Merge branch '2.6' into 2.7
* 2.6:
  [Security] Update tests after a merge
  [Console] Remove an unused argument and fix a small cs issue
2015-06-05 18:29:23 +02:00
Fabien Potencier
2fa3585d08 minor #14882 [Security] Update tests after a merge (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

[Security] Update tests after a merge

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

Security component was split into three and test fixture namespaces are different between 2.3 and 2.6 branches.

Commits
-------

322f629 [Security] Update tests after a merge
2015-06-05 18:28:56 +02:00
Jakub Zalas
322f629020 [Security] Update tests after a merge
Security component was split into three and test fixture namespaces are different between 2.3 and 2.6 branches.
2015-06-05 15:24:01 +01:00
Fabien Potencier
d04cc5e66b feature #14700 [DependencyInjection] [Routing] [Config] Recursive directory loading (lavoiesl, nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] [Routing] [Config] Recursive directory loading

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

Commits
-------

60b1c5b Added CHANGELOG entries, cleanups
73f0ee2 [DI][Routing] recursive directory loading
2015-06-05 15:59:18 +02:00
Fabien Potencier
662e2816e3 minor #14746 [Config] Improved duplicated code in FileLocator (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Improved duplicated code in FileLocator

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

This PR improves a duplicate check prepending the current path (if exists) to the list of paths.

Commits
-------

30aa4e9 Improved duplicated code in FileLocator
2015-06-05 15:57:41 +02:00
Fabien Potencier
34ad82e1d2 bug #14705 [Translator] avoid serialize unserializable resources. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translator] avoid serialize unserializable resources.

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

Commits
-------

7220f2c [Translator] avoid serialize unserializable resources.
2015-06-05 15:55:54 +02:00
Fabien Potencier
c2ea763fbe minor #14880 [Console] Remove an unused argument (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

[Console] Remove an unused argument

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

It was overlooked when doing a refactoring in #8800

I also fixed a small cs issue indicated by fabbot.

Commits
-------

ec14143 [Console] Remove an unused argument and fix a small cs issue
2015-06-05 15:50:22 +02:00
Jakub Zalas
ec14143922 [Console] Remove an unused argument and fix a small cs issue 2015-06-05 14:36:34 +01:00
Fabien Potencier
5593bdd56e Merge branch '2.7' into 2.8
* 2.7: (95 commits)
  [DependencyInjection] provide better error message when using deprecated configuration options
  [console][TableCell] get cell width without decoration.
  Improve the config validation in TwigBundle
  [VarDumper] Changed tooltip to expand-all keybinding in OS X
  [Bridge\PhpUnit] Fix composer installed phpunit detection
  [VarDumper] Fix generic casters calling order
  [2.7][SecurityBundle] Remove SecurityContext from Compile
  [WebProfilerBundle][logger] added missing deprecation message.
  Fix profiler CSS
  [Security][Acl] enforce string identifiers
  [FrameworkBundle] make `templating.helper.router` service available again for BC reasons
  [BrowserKit] Fix bug when uri starts with http.
  bumped Symfony version to 2.7.1
  updated VERSION for 2.7.0
  updated CHANGELOG for 2.7.0
  bumped Symfony version to 2.6.10
  updated VERSION for 2.6.9
  updated CHANGELOG for 2.6.9
  fixed tests
  bumped Symfony version to 2.3.31
  ...

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Translation/Loader/JsonFileLoader.php
2015-06-04 22:21:09 +02:00
Fabien Potencier
d65adc07a9 Merge branch '2.6' into 2.7
* 2.6:
  Improve the config validation in TwigBundle
  [WebProfilerBundle][logger] added missing deprecation message.
  [Security][Acl] enforce string identifiers
  [BrowserKit] Fix bug when uri starts with http.
  bumped Symfony version to 2.3.31
  updated VERSION for 2.3.30
  updated CHANGELOG for 2.3.30
  Php Inspections (EA Extended):     - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString     -resolved implicit magic methods calls     -resolved callable name case mismatches
2015-06-04 22:11:48 +02:00