Commit Graph

10981 Commits

Author SHA1 Message Date
Franz Liedke
7cff461062 [Routing] Improve RouteNotFoundException messages 2013-01-28 10:55:07 +01:00
Fabien Potencier
6755546b8c Merge branch '2.1'
* 2.1:
  [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
  Fixed missing class argument when throwing exception
2013-01-27 17:49:19 +01:00
Fabien Potencier
6f71948023 [Yaml] fixed wrong merge (indentation default is 4 as of 2.1) 2013-01-27 17:12:43 +01:00
Xavier Amado
d77828ca22 Fixed missing class argument when throwing exception 2013-01-26 08:21:53 +01:00
Victor
189a05e8c7 css fix 2013-01-25 15:47:14 +01:00
Fabien Potencier
5381faed6d merged branch fabpot/phpdoc-fix (PR #6869)
This PR was merged into the master branch.

Commits
-------

e3086cc [Console] added some missing information in the phpdoc (closes #6464)

Discussion
----------

[Console] added some missing information in the phpdoc (closes #6464)

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6464
| License       | MIT
| Doc PR        | n/a
2013-01-25 07:59:49 +01:00
Fabien Potencier
6b8617d799 merged branch fabpot/deprecated-calls (PR #6868)
This PR was merged into the master branch.

Commits
-------

ed64413 removed deprecated message in FieldType

Discussion
----------

removed deprecated messages coming for internal calls

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

It's probably not the cleanest code possible, but I don't see any other way to keep the type for BC and avoid the deprecated message when called internally.

That should fix the deprecated messages thrown by the Form and Validator components.

---------------------------------------------------------------------------

by stof at 2013-01-24T15:41:26Z

The cases where you should actually be warned about the deprecation of FieldType is when using ``field`` to create a field with the factory (which would not trigger the constructor)

---------------------------------------------------------------------------

by fabpot at 2013-01-24T15:46:23Z

@stof: what do you mean? That we can remove the `trigger_error()` call altogether?

---------------------------------------------------------------------------

by stof at 2013-01-24T15:49:31Z

Nobody will ever instantiate the FieldType directly as the framework is registering it (btw, you are missing the FrameworkBundle lazy registration here).
The constructor of a form type is not the right place to deprecate it as registering it does not mean it will be used in the app.

---------------------------------------------------------------------------

by fabpot at 2013-01-24T15:51:26Z

@stof: I've updated the PR to remove the `trigger_error` call.
2013-01-24 19:40:31 +01:00
Fabien Potencier
e3086cccf8 [Console] added some missing information in the phpdoc (closes #6464) 2013-01-24 16:55:08 +01:00
Fabien Potencier
ed644133b7 removed deprecated message in FieldType 2013-01-24 16:50:46 +01:00
Fabien Potencier
5923f8bfc8 [Form] updated ValidatorExtension to avoid using a deprecated method 2013-01-24 13:42:16 +01:00
Fabien Potencier
9e8b2f01f6 [Validator] fixed broken tests 2013-01-24 11:00:40 +01:00
Fabien Potencier
a1616efe1f merged branch franmomu/update_deprecated_calls_all_validator (PR #6743)
This PR was merged into the master branch.

Commits
-------

8bfd7a7 Remove custom error handler for deprecations
efbff0c Change deprecated Min and Max constraint
c47f027 [Validator][Constraints] Update AllValidator using new Validator API

Discussion
----------

[Validator][Constraints] Update AllValidator using new Validator API

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets:
License of the code: MIT
2013-01-24 10:29:59 +01:00
Fabien Potencier
70686ac7b3 merged branch franmomu/update_deprecated_calls_collection_validator (PR #6741)
This PR was merged into the master branch.

Commits
-------

9264431 Remove custom error handler for deprecations
c80c17e Change deprecated Min constraint to Range constraint
a39fdd8 Remove getPropertyPath in the tests
ffa4c6f [Validator][Constraints] CollectionValidator

Discussion
----------

[Validator][Constraints] Update CollectionValidator using new Validator API

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #6648
License of the code: MIT

In the tests `$i = 1` is because in `validate` the first call to `$this->context` is `$this->context->getGroup();`, should I write this in a comment before each declaration?

---------------------------------------------------------------------------

by stof at 2013-01-15T21:50:41Z

You should also modify the CollectionValidator tests to use a different constraint than ``Min`` which is deprecated. Once it is done, these tests should not need to register a custom error handler catching deprecations anymore

---------------------------------------------------------------------------

by franmomu at 2013-01-15T22:33:43Z

Perfect, I'm going to do the same in #6743
2013-01-24 10:29:51 +01:00
Fabien Potencier
02738a509f merged branch CEikermann/patch-1 (PR #6728)
This PR was merged into the master branch.

Commits
-------

2061cc0 Update src/Symfony/Component/Validator/Mapping/ClassMetadata.php

Discussion
----------

[Validator] ClassMetadata use deprecated methods

Bug fix: yes
Feature addition: no
Backwards compatibility break: maybe yes (I don't have the knowlegde)
Symfony2 tests pass: yes
Fixes the following tickets: ?
Todo: Nothing
License of the code: MIT
Documentation PR: Nothing

getValue() is deprecated since version 2.2 and will be removed in 2.3. Use getPropertyValue() instead.

ClassMetadata is still using the deprecated method, changed it to getPropertyValue to prevent a trigger error.

---------------------------------------------------------------------------

by fabpot at 2013-01-14T15:35:28Z

ping @bschussek
2013-01-24 09:53:37 +01:00
Fabien Potencier
c3ee8f65f7 bumped Symfony version to 2.2.0-RC1-DEV 2013-01-24 09:14:41 +01:00
Fabien Potencier
86dd5e482d updated VERSION for 2.2.0-BETA2 2013-01-24 08:15:19 +01:00
Fabien Potencier
6a53180aa9 [HttpKernel] added a missing unit test 2013-01-24 07:51:29 +01:00
Fabien Potencier
c0d72d275f [HttpKernel] fixed typo (closes #6859) 2013-01-24 07:50:13 +01:00
Fabien Potencier
e5c3637fbc fixed file mode (refs #6734) 2013-01-23 21:26:57 +01:00
Fabien Potencier
3196dbdf52 Merge branch '2.1'
* 2.1:
  [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
  [Security] PHPDoc in SecurityEvents
  Fix typos in README
  Added an error message in the DebugClassLoader when using / instead of \.
  KNOWN_ISSUES with php 5.3.16
  [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
  [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
  [Yaml] fixed #6773
  [Yaml] fixed #6770
  bumped Symfony version to 2.1.8-DEV
  bumped Symfony version to 2.0.23-DEV

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Client.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-01-23 21:21:00 +01:00
Fabien Potencier
7c957e3411 merged branch MaksSlesarenko/fix-for-choice-widget (PR #6734)
This PR was squashed before being merged into the master branch (closes #6734).

Commits
-------

4d51ec0 Fix for hardcode (#6384) in choice widget

Discussion
----------

Fix for hardcode (#6384) in choice widget

empty_value should not be disabled if field is not required!

#6384

---------------------------------------------------------------------------

by sstok at 2013-01-15T15:51:08Z

You need to revert the file mode changes (100644 → 100755)

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-18T16:44:42Z

fixed tests

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-21T15:36:59Z

ping @fabpot

---------------------------------------------------------------------------

by fabpot at 2013-01-21T15:58:26Z

ping @bschussek

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-23T11:15:37Z

ping @fabpot @bschussek

---------------------------------------------------------------------------

by Tobion at 2013-01-23T12:08:19Z

I think it's good to squash and merge.

---------------------------------------------------------------------------

by fabpot at 2013-01-23T12:16:37Z

Can you rebase and squash before I merge? Thanks.

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-23T19:51:36Z

@fabpot done
2013-01-23 20:54:36 +01:00
Maks Slesarenko
4d51ec05d8 Fix for hardcode (#6384) in choice widget 2013-01-23 20:54:35 +01:00
Fabien Potencier
78e3da501f merged branch vicb/di/prepext (PR #6853)
This PR was merged into the master branch.

Commits
-------

7944860 [DIC] Move PrependExtensionInterface to the Extension namespace

Discussion
----------

[DIC] Move PrependExtensionInterface to the Extension namespace

@fabpot Please merge before 2.2 (no BC break) /cc @lsmith77
2013-01-23 18:53:45 +01:00
Victor
79448600f5 [DIC] Move PrependExtensionInterface to the Extension namespace 2013-01-23 17:42:45 +01:00
Fabien Potencier
65b4112ddb fixed a circular reference (closes #6730) 2013-01-23 14:48:08 +01:00
Fabien Potencier
4bdfb92a35 updated CHANGELOGS 2013-01-23 14:21:06 +01:00
Fabien Potencier
23f51450bd renamed proxy to router_proxy 2013-01-23 13:57:53 +01:00
Fabien Potencier
e5135f67be [HttpKernel] renamed path to _path to avoid collision 2013-01-23 13:57:53 +01:00
Fabien Potencier
3193a90815 made the proxy path configurable 2013-01-23 13:57:53 +01:00
Fabien Potencier
ad82893691 removed the need for a proxy route for rendering strategies 2013-01-23 13:57:52 +01:00
Fabien Potencier
b9f0e17e67 [HttpKernel] made the Request required when using rendering strategies
The previous code allowed to pass null as a Request but that does not
really make sense as rendering a sub-request can only happen from a
master request. This was done to ease testing but that was a mistake.
2013-01-23 13:57:23 +01:00
Kris Wallsmith
731cd49781 made twig extension service private 2013-01-22 10:56:22 -08:00
Fabien Potencier
cdf1d72e2f [FrameworkBundle] fixed requirement of the _controller palceholder for the proxy route (closes #6783)
A controller name can be a service and service names can contain dots.
2013-01-22 10:57:00 +01:00
Fran Moreno
e7624b6b83 [Security] Add PHPDoc to AuthenticationEvents 2013-01-22 10:47:05 +01:00
Fabien Potencier
bdc7e91865 Merge branch '2.0' into 2.1
* 2.0:
  [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
  [Security] PHPDoc in SecurityEvents
  [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
  [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
  [Yaml] fixed #6773
  [Yaml] fixed #6770
  bumped Symfony version to 2.0.23-DEV

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2013-01-22 08:14:57 +01:00
Fabien Potencier
4119cafdbe [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder 2013-01-21 23:08:41 +01:00
Fabien Potencier
696900e68f [HttpKernel] fixed failing test 2013-01-21 22:03:00 +01:00
Fabien Potencier
94f6116f42 renamed hostname to host in the routing system (closes #6775)
As explained in #6775, this has been done for the following reasons:

1. It's also Request::getHost()
2. The term hostname has been obsoleted in
http://tools.ietf.org/html/rfc3986#appendix-D.2 and uses the host only
3. hostname in the RFC was defined as the registered domain name, but we
probably also want to match IP-Adresses with the pattern which is the
host = IP-literal / IPv4address / reg-name for.
2013-01-21 17:57:32 +01:00
Fabien Potencier
001734aa2e [Validator] fixed phpdoc 2013-01-21 17:57:12 +01:00
Fabien Potencier
18b9e68861 [HttpFoundation] renamed hostname to host in the test to be consistent 2013-01-21 17:56:55 +01:00
Fabien Potencier
5663820aa6 merged branch franmomu/added_phpdoc_security_events (PR #6818)
This PR was squashed before being merged into the 2.0 branch (closes #6818).

Commits
-------

598ae9d [Security] PHPDoc in SecurityEvents

Discussion
----------

[Security] PHPDoc in SecurityEvents

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

I'm not sure about the description given.
2013-01-21 16:19:16 +01:00
Fran Moreno
598ae9d050 [Security] PHPDoc in SecurityEvents 2013-01-21 16:19:16 +01:00
Fabien Potencier
b7614e9ca8 merged branch fabpot/content-renderer-refactoring (PR #6810)
This PR was merged into the master branch.

Commits
-------

aadefd3 [HttpKernel] refactored the HTTP content renderer to make it easier to extend

Discussion
----------

[HttpKernel] refactored the HTTP content renderer to make it easier to extend

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

This makes the StreamedResponse logic reusable for other strategies and it also makes the RenderingStrategy interface less fuzzy about its contract.

That also makes features like #4470 easier to implement from the outside.

---------------------------------------------------------------------------

by stof at 2013-01-20T11:01:29Z

👍
2013-01-21 16:18:25 +01:00
Fabien Potencier
aadefd378d [HttpKernel] refactored the HTTP content renderer to make it easier to extend 2013-01-21 16:17:47 +01:00
Fabien Potencier
e769d7f2ca merged branch fabpot/format_file (PR #6811)
This PR was merged into the master branch.

Commits
-------

32322a1 [TwigBridge] fixed format_file to include the line number even if the link text is passed

Discussion
----------

[TwigBridge] fixed format_file to include the line number even if the link text is passed

| 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

That fixes the logs in the profiler where lines were not displayed for deprecated calls.

---------------------------------------------------------------------------

by stof at 2013-01-20T10:58:58Z

shouldn't this be merged in older branches as it is a bugfix ?

---------------------------------------------------------------------------

by fabpot at 2013-01-20T15:14:50Z

It is a bug fix but people might rely on the current behavior. But then, nobody ever reported it. So, I prefer to keep it on 2.2 only.
2013-01-21 16:17:05 +01:00
Fabien Potencier
1ab48db367 tweaked the deprecated error handler to actually display the deprecation message
I've also removed uninterested information (like the trigger_error stack
frame).
2013-01-20 16:29:41 +01:00
Fabien Potencier
32322a13f4 [TwigBridge] fixed format_file to include the line number even if the link text is passed
That fixes the logs in the profiler where lines were not displayed for
deprecated calls.
2013-01-20 11:09:24 +01:00
Fabien Potencier
6923a484c2 fixed markup 2013-01-19 08:50:02 +01:00
Fabien Potencier
62a4cc90cc merged branch beberlei/SerializerOptions (PR #6797)
This PR was merged into the master branch.

Commits
-------

fcabadf Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md
b6bdb45 Completly refactor the Serializer Options Pull Request to push context information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers.
ef652e2 Added context to JsonEncoder
eacb7e2 Rename $options to $context, as it makes the intent much more clear.
8854b85 Fix CS issues, removed global options
9c54a4b [Serializer] Allow options to be passed to SerialiizerInterface#serialize and #unserialize. Thsee options are available to all encoders/decoders/normalizers that implement SerializerAwareInterface.

Discussion
----------

[2.2] [Serializer] Configurable Serializer

Bug fix: no
Feature addition: yes
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #4907, #4938
License of the code: MIT
Todo:

This is an extension of GH-6574 that removes the context state in favor of passing this information around.

---------------------------------------------------------------------------

by beberlei at 2013-01-18T13:12:39Z

@fabpot @lsmith I think this is how it should work from an OOP/OOD perpesctive, avoiding the context state. This makes for a much cleaner code and dependency graph.

---------------------------------------------------------------------------

by lsmith77 at 2013-01-18T14:14:37Z

makes sense. anything fancier would lose this components simplicity which IMHO is the main benefit versus JMS serializer.

---------------------------------------------------------------------------

by fabpot at 2013-01-18T14:26:25Z

Looks very good. 👍

---------------------------------------------------------------------------

by beberlei at 2013-01-18T14:37:32Z

I need to fix the failures with the JsonEncoder and then this is good to merge

---------------------------------------------------------------------------

by stof at 2013-01-18T14:40:21Z

you also need to update the CHANGELOG of the component

---------------------------------------------------------------------------

by beberlei at 2013-01-18T23:17:57Z

Fixed, only the Redis Profiler problem still failing the Travis builds. Also I updated the CHANGELOG.md.

@fabpot  Good to merge from my POV

---------------------------------------------------------------------------

by stof at 2013-01-18T23:27:59Z

@beberlei see #6804 for the Redis profiler issue
2013-01-19 08:48:06 +01:00
Christophe Coevoet
11aaa2e672 Added an error message in the DebugClassLoader when using / instead of \. 2013-01-19 08:47:26 +01:00
Fabien Potencier
c9cfcc1dc3 merged branch davedevelopment/new-twig-notation (PR #6805)
This PR was merged into the master branch.

Commits
-------

d5e73e5 [SecurityBundle] changed includes to use the new Twig notation

Discussion
----------

[SecurityBundle] changed includes to use the new Twig notation

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no - couple of unrelated failures
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A
2013-01-19 08:44:11 +01:00
Benjamin Eberlei
fcabadfc23 Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md 2013-01-19 00:06:48 +01:00
Dave Marshall
d5e73e5e2b [SecurityBundle] changed includes to use the new Twig notation 2013-01-18 21:52:28 +00:00
Christophe Coevoet
3d762dd92f [HttpKernel] Fixed the Redis profiler storage return value 2013-01-18 21:37:54 +01:00
Christophe Coevoet
44fe249bae Fixed some tests on Windows 2013-01-18 21:36:32 +01:00
Fabien Potencier
94cb13df42 [FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762) 2013-01-18 15:46:50 +01:00
Benjamin Eberlei
b6bdb450e3 Completly refactor the Serializer Options Pull Request to push context information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers. 2013-01-18 14:08:59 +01:00
Fabien Potencier
b9963ea078 merged branch fabpot/yaml-fix (PR #6790)
This PR was merged into the 2.0 branch.

Commits
-------

53ccc2c [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)

Discussion
----------

[Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6786
| License       | MIT
| Doc PR        | n/a
2013-01-18 12:35:45 +01:00
Fabien Potencier
ce38069a94 [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737) 2013-01-18 11:08:30 +01:00
Fabien Potencier
53ccc2c677 [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786) 2013-01-18 10:52:07 +01:00
Fabien Potencier
d12011724e merged branch gnugat/refactoring/console-get-help (PR #6789)
This PR was squashed before being merged into the master branch (closes #6789).

Commits
-------

917f473 [Console] Removing unnecessary sprintf in Application->getHelp

Discussion
----------

[Console] Removing unnecessary sprintf in Application->getHelp

Minor change of the `Symfony\Component\Console\Application->getHelp()`  method.

I have spotted:
1. an unnecessary `sprintf` call (no `args` arguments);
2. two ways of adding a new line in the help (an empty string as new entry of the array and a `\n` at the end of the string).

It seems to be there since the begining and it looks like a forgoten change to me, so I fixed them by removing the `sprintf` call and using a new array entry (empty string) instead of the `\n`.

| Q             | A
| ------------- | ---
| License       | MIT
2013-01-18 09:14:58 +01:00
Loic Chardonnet
917f473798 [Console] Removing unnecessary sprintf in Application->getHelp 2013-01-18 09:14:57 +01:00
Fabien Potencier
0391ac770e merged branch ezzatron/yaml-negative-integers (PR #6784)
This PR was merged into the 2.0 branch.

Commits
-------

fea20b7 [Yaml] fixed #6770

Discussion
----------

[Yaml] fixed parsing of negative integers (2.0 branch)

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

Note that an unrelated test fixture for large integers had to be changed to work on systems with 64-bit integer support because of the change from `assertEquals()` to `assertSame()`. Please see the diff for clarification.
2013-01-18 07:25:05 +01:00
Erin Millard
ab0385c633 [Yaml] fixed #6773 2013-01-18 09:42:00 +10:00
Erin Millard
fea20b7eb2 [Yaml] fixed #6770 2013-01-18 09:32:48 +10:00
Fabien Potencier
9155a2382e bumped Symfony version to 2.1.8-DEV 2013-01-18 00:11:33 +01:00
Fabien Potencier
4c437f6be9 bumped Symfony version to 2.0.23-DEV 2013-01-18 00:11:05 +01:00
Fabien Potencier
a04d5d6203 Merge branch '2.1'
* 2.1:
  [Yaml] fixed unneeded BC break
  [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
  [Yaml] fixed typo
  updated VERSION for 2.1.7
  updated CHANGELOG for 2.1.7
  updated VERSION for 2.0.22
  update CONTRIBUTORS for 2.0.22
  updated CHANGELOG for 2.0.22

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-01-17 22:22:20 +01:00
Fabien Potencier
f53784913b Merge branch '2.0' into 2.1
* 2.0:
  [Yaml] fixed unneeded BC break
  [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
  [Yaml] fixed typo
  updated VERSION for 2.0.22
  update CONTRIBUTORS for 2.0.22
  updated CHANGELOG for 2.0.22

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-01-17 22:21:51 +01:00
Fabien Potencier
0138c2d0b3 [Yaml] fixed unneeded BC break 2013-01-17 22:16:19 +01:00
Fabien Potencier
972e1b7a16 [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation 2013-01-17 22:13:26 +01:00
Fabien Potencier
51d1948327 [Yaml] fixed typo 2013-01-17 17:53:40 +01:00
Fabien Potencier
3444290cd6 updated VERSION for 2.1.7 2013-01-17 17:21:47 +01:00
Fabien Potencier
08ccc62aa5 updated VERSION for 2.0.22 2013-01-17 16:40:40 +01:00
Fabien Potencier
1f762c7723 Merge branch '2.1'
* 2.1:
  [Yaml] fixed default value
  Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
  added a way to enable/disable object support when parsing/dumping
  added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
  fixed CS
  [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
  fixes a bug when output/error output contains a % character
  [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
  [Profiler] [Redis] Fix sort of profiler rows.
  Fix version_compare() calls for PHP 5.5.
  Removed underscores from test method names to be consistent with other components.
  [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
  Fix version_compare() calls for PHP 5.5.
  Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
  removed the .gitattributes files (closes #6605, reverts #5674)
  [HttpKernel] Clarify misleading comment in ExceptionListener

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
	src/Symfony/Component/Form/Tests/Util/PropertyPathTest.php
	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
	src/Symfony/Component/Process/Process.php
2013-01-17 16:25:59 +01:00
Fabien Potencier
a25fad847b Merge branch '2.0' into 2.1
* 2.0:
  [Yaml] fixed default value
  Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
  added a way to enable/disable object support when parsing/dumping
  added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
  [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)

Conflicts:
	src/Symfony/Component/Yaml/Dumper.php
	src/Symfony/Component/Yaml/Parser.php
	src/Symfony/Component/Yaml/Tests/DumperTest.php
	src/Symfony/Component/Yaml/Tests/ParserTest.php
	src/Symfony/Component/Yaml/Yaml.php
2013-01-17 16:20:05 +01:00
Fabien Potencier
e17e2327b1 [Yaml] fixed default value 2013-01-17 16:16:00 +01:00
sun
3c87e2ea18 Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
YAML does not specify an absolute indentation level, but a consistent indentation of nested nodes only: http://www.yaml.org/spec/1.2/spec.html#space/indentation/

Projects that are generally using 2 spaces for indentation should be able to retain consistency with their coding standards by supplying a custom value for the new $indent parameter added to Yaml::dump(), or the new Dumper::setIndentation() method.

The new parameter is a backwards-compatible API addition and defaults to the previous default of 4 (which was changed from 2 via PR #2242 only recently).

Conflicts:
	src/Symfony/Component/Yaml/Dumper.php
	src/Symfony/Component/Yaml/Yaml.php
2013-01-17 16:12:58 +01:00
Fabien Potencier
ba6e3159c0 added a way to enable/disable object support when parsing/dumping
By default, object support is disabled, and instead of throwing an
exception when an object is handled, null is returned.

If you do need object support, enable it via:

    Yaml::dump($data, false, true);

If you want an exception to be thrown in case an invalid type is handled
(a PHP resource or a PHP object), pass true as the second argument:

    Yaml::dump($data, true, true);

The same can be done when parsing:

    Yaml::parse($data, 2, false, true);
2013-01-17 16:07:25 +01:00
Fabien Potencier
ac756bf39e added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
PHP support when parsing a file has been disabled by default.
If you do need PHP support when parsing a YAML file, enable it via:

    Yaml::setPhpParsing(true);

As of Symfony 2.1, PHP support is disabled by default, and support will
be removed in Symfony 2.3.
2013-01-17 16:07:24 +01:00
Fabien Potencier
d2ff979306 [Yaml] deprecated the possibility to pass a file name to Yaml::parse() 2013-01-17 15:01:21 +01:00
Fabien Potencier
bfbfa337b6 merged branch MaksSlesarenko/added-support-for-propel-enum-types-forms (PR #6715)
This PR was merged into the master branch.

Commits
-------

2a7ecf7 Merge branch 'master' of github:MaksSlesarenko/symfony into added-support-for-propel-enum-types-forms
3ae5b55 added support for propel enum types in PropelTypeGuesser

Discussion
----------

added support for propel enum types in PropelTypeGuesser

added support for propel enum and mysql enum field types

---------------------------------------------------------------------------

by willdurand at 2013-01-14T19:06:06Z

The build status is a Travis-CI issue. Should be green.

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-16T23:11:52Z

"The build status is a Travis-CI issue. Should be green."
It definitely should...

PHPUnit 3.7.10 by Sebastian Bergmann.

Configuration read from ../symfony/symfony/src/Symfony/Bridge/Propel1/phpunit.xml.dist

.......................................

Time: 0 seconds, Memory: 8.50Mb

OK (39 tests, 96 assertions)
2013-01-17 07:28:06 +01:00
Fabien Potencier
4cc19990ac merged branch lmcd/wdt-padding-fix (PR #6769)
This PR was merged into the master branch.

Commits
-------

4b54156 Fix lack of padding in some WDT boxes (e.g. You are not authenticated.)

Discussion
----------

[WebProfilerBundle] Fix lack of padding in some WDT boxes (e.g. You are not authenticated.)

Fixes bug introduced by https://github.com/symfony/symfony/pull/6615

Before:
![wdt-padding-before](https://f.cloud.github.com/assets/363540/73453/c6779f30-6044-11e2-9df5-682c822ac13c.png)

After:
![wdt-padding-after](https://f.cloud.github.com/assets/363540/73455/cbeaa44e-6044-11e2-9d9b-9184b1351554.png)
2013-01-17 07:27:13 +01:00
Lee McDermott
4b541568ee Fix lack of padding in some WDT boxes (e.g. You are not authenticated.) 2013-01-17 01:20:55 +00:00
Lee McDermott
2d53698134 Make last toolbar info box right-aligned 2013-01-17 01:00:06 +00:00
Fabien Potencier
463b464c10 replaced usage of Route::getPattern() by Route::getPath() 2013-01-16 23:04:10 +01:00
Fabien Potencier
a83d70f543 merged branch dlsniper/wdt-route-change (PR #6764)
This PR was merged into the master branch.

Commits
-------

41d3953 Fix regression in WDT path/pattern naming

Discussion
----------

[WDT] Fix regression in WDT path/pattern naming

Bug fix: yes (master only)
Feature addition: no
Backwards compatibility break: no
Fixes the following tickets: ~
Todo: see below
License of the code: MIT
Documentation PR: ~

This fixes a regression in WDT where clicking routing panel triggers an error.

Let me know if this should be fixed in collector as well as it could be considered a regression.

---------------------------------------------------------------------------

by fabpot at 2013-01-16T16:12:27Z

It should be also fixed in the collector as the profiler data are not compatible between versions anyway.

---------------------------------------------------------------------------

by dlsniper at 2013-01-16T18:21:42Z

@fabpot everything needed seems to be done. Either that or I'm missing something, if you can point me in the right direction, let me know. Thank you!
2013-01-16 22:59:34 +01:00
Fabien Potencier
8c62123533 merged branch vicentgodella/master (PR #6755)
This PR was merged into the master branch.

Commits
-------

1c5d74c Fixed coding standards issues in invalid-xml-resources.xlf file.
552a806 Fixed coding standards issues.
293991d [Translation] Added some tests to QtFileLoader.

Discussion
----------

[Translation] Added some tests to QtFileLoader.

Added one test for testing exception is thrown if resource is not local.
Added one test for testing exception is thrown if xml resource is invalid.

QtFileLoader has now 100% code coverage.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
2013-01-16 22:49:14 +01:00
Fabien Potencier
a83a60fd39 merged branch toin0u/SecurityTranslation (PR #6761)
This PR was merged into the master branch.

Commits
-------

68ac23f [Security] Added Danish translation

Discussion
----------

[Security] Added Danish translation

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Deprecations: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
2013-01-16 22:48:50 +01:00
umpirsky
ed2d542b4b Added Serbian Latin tanslation for security component 2013-01-16 22:29:52 +01:00
Florin Patan
41d3953e76 Fix regression in WDT path/pattern naming 2013-01-16 17:51:26 +02:00
Antoine Corcy
68ac23fe22 [Security] Added Danish translation 2013-01-16 11:53:34 +01:00
Fabien Potencier
efabb1e9ae merged branch lmcd/wdt-shadow-fix (PR #6615)
This PR was squashed before being merged into the master branch (closes #6615).

Commits
-------

490c746 [WDT] Toolbar cleanups

Discussion
----------

[WDT] Toolbar cleanups

Ok this is ridiculously minor, but it's one of those little things that winds me up on a daily basis so I fixed it.

When you mouseover a section on the WDT, the box-shadow is blurry on the right edge.

Edit: this PR now covers a few other minor tweaks - see below.

---------------------------------------------------------------------------

by lmcd at 2013-01-09T07:41:42Z

Just pushed a couple more changes that cleanup WDT popup boxes a little bit. Again the changes are subtle, but better imo.

Before:
![box1-before](https://f.cloud.github.com/assets/363540/52807/efc2cf7e-5a2f-11e2-9c42-1f5a33d667a9.png)

After:
![box1-after](https://f.cloud.github.com/assets/363540/52808/f4929c8c-5a2f-11e2-9195-7583979d8ce9.png)

Before:
![box2-before](https://f.cloud.github.com/assets/363540/52809/f8b1752c-5a2f-11e2-8166-a602e9e80d3a.png)

After:
![box2-after](https://f.cloud.github.com/assets/363540/52812/11791ede-5a30-11e2-92d4-b35c0d7ecc6b.png)

Note: requires cross-browser testing
2013-01-16 10:29:16 +01:00
Lee McDermott
490c746be9 [WDT] Toolbar cleanups 2013-01-16 10:29:15 +01:00
Fabien Potencier
2dfe9660a2 fixed CS 2013-01-16 10:27:54 +01:00
Fabien Potencier
4c366252a5 merged branch stloyd/bugfix/process_phpdocs (PR #6626)
This PR was merged into the 2.1 branch.

Commits
-------

a62e04f [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`

Discussion
----------

[2.1][Process] Fix docblocks, remove `return` from `PhpProcess#start()`
2013-01-16 10:23:50 +01:00
Gordon Franke
37af92d979 add test for compiler replace alias with invalid alias 2013-01-16 09:59:03 +01:00
Gordon Franke
27d9385d4d wrap the exception to get information about where the exception comes from 2013-01-16 09:37:50 +01:00
vicentgodella
1c5d74c891 Fixed coding standards issues in invalid-xml-resources.xlf file. 2013-01-16 09:33:58 +01:00
Vicent
552a806762 Fixed coding standards issues. 2013-01-16 01:28:01 +01:00
Vicent
293991df7b [Translation] Added some tests to QtFileLoader.
Added one test for testing exception is thrown if resource is not local.
Added one test for testing exception is thrown if xml resource is invalid.
2013-01-16 00:45:18 +01:00
Fran Moreno
8bfd7a7a35 Remove custom error handler for deprecations 2013-01-16 00:14:35 +01:00
Fran Moreno
efbff0c425 Change deprecated Min and Max constraint 2013-01-16 00:10:57 +01:00
Fran Moreno
9264431e37 Remove custom error handler for deprecations 2013-01-15 23:53:36 +01:00
Fran Moreno
c80c17ebee Change deprecated Min constraint to Range constraint 2013-01-15 23:50:37 +01:00
Tobias Schultze
632023d7b0 [Routing] fix typo in phpdoc and make it more consistent 2013-01-15 18:01:40 +01:00
Fabien Potencier
89f9b24575 merged branch fabpot/routing-options (PR #6738)
This PR was merged into the master branch.

Commits
-------

9fc7def added the UPGRADE file for Symfony 3.0
e84cad2 [Routing] updated CHANGELOG
65eca8a [Routing] added new schemes and methods options to the annotation loader
5082994 [Routing] renamed pattern to path
b357caf [Routing] renamed hostname pattern to just hostname
e803f46 made schemes and methods available in XmlFileLoader
d374e70 made schemes and methods available in YamlFileLoader
2834e7e added scheme and method setter in RouteCollection
10183de make scheme and method requirements first-class citizen in Route

Discussion
----------

Routing options

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

In #5989, it has unanimously been decided to renamed `hostname_pattern` to `hostname` and `pattern` to `path`. That makes a lot of sense and I would like to do the renaming now as `hostname_pattern` is new in Symfony 2.2, so I'd like to avoid breaking BC just after the release. As we are modifying the route options, I've also included changes introduced by @Tobion in #6049 which were discussed in #5990.

As everything is BC, I think it's wise to include that in 2.2. What do you think?

---------------------------------------------------------------------------

by Tobion at 2013-01-14T18:25:53Z

I agree it should be done in 2.2. Thanks for working on it.

---------------------------------------------------------------------------

by vicb at 2013-01-14T23:11:12Z

@fabpot "Everything is BC" until it breaks BC in 3.0, that's why I'd like to see [deprecations in PR summary](https://github.com/symfony/symfony-docs/pull/2116) what do you think ?

---------------------------------------------------------------------------

by vicb at 2013-01-14T23:16:40Z

it would also be great to update the CHANGELOG with deprecations (it could also help people answering your question)

---------------------------------------------------------------------------

by fabpot at 2013-01-15T07:07:03Z

@vicb: I've just updated the CHANGELOG and created the UPGRADE file for 3.0.

---------------------------------------------------------------------------

by vicb at 2013-01-15T07:15:32Z

@fabpot thanks.
2013-01-15 17:25:04 +01:00
Fabien Potencier
e84cad28f0 [Routing] updated CHANGELOG 2013-01-15 17:22:41 +01:00
Fabien Potencier
65eca8a3d9 [Routing] added new schemes and methods options to the annotation loader 2013-01-15 17:22:41 +01:00
Fabien Potencier
508299400d [Routing] renamed pattern to path 2013-01-15 17:22:36 +01:00
Fran Moreno
c47f02735a [Validator][Constraints] Update AllValidator using new Validator API 2013-01-15 01:52:28 +01:00
Fran Moreno
a39fdd88f4 Remove getPropertyPath in the tests 2013-01-15 00:53:09 +01:00
Fran Moreno
ffa4c6f25b [Validator][Constraints] CollectionValidator 2013-01-15 00:03:31 +01:00
Fabien Potencier
b357cafd00 [Routing] renamed hostname pattern to just hostname 2013-01-14 17:14:02 +01:00
Victor Berchet
fb526a4809 [FileProfilerStorage] optimize file reads 2013-01-14 15:59:38 +01:00
oscartv
a0ba4cf537 Update src/Symfony/Component/Form/Resources/translations/validators.ca.xlf 2013-01-14 14:48:41 +01:00
Fabien Potencier
45a8c1a691 merged branch inmarelibero/patch-1 (PR #6729)
This PR was merged into the master branch.

Commits
-------

a5a04b8 fixed italian translation typo

Discussion
----------

fixed italian translation typo
2013-01-14 12:08:23 +01:00
Martin Hasoň
cd3d6de849 [Security] Fixed typo in cs translation 2013-01-14 10:10:39 +01:00
Emanuele Gaspari
a5a04b81f3 fixed italian translation typo 2013-01-14 09:21:46 +01:00
Christian Eikermann
2061cc03b7 Update src/Symfony/Component/Validator/Mapping/ClassMetadata.php
getValue() is deprecated since version 2.2 and will be removed in 2.3. Use getPropertyValue() instead.

ClassMetadata is still using the deprecated method, changed it to getPropertyValue to prevent a trigger error.
2013-01-14 09:10:09 +01:00
Maks Slesarenko
2a7ecf76c2 Merge branch 'master' of github:MaksSlesarenko/symfony into added-support-for-propel-enum-types-forms 2013-01-13 16:51:39 -05:00
Fabien Potencier
e2f85cad89 merged branch philipphoffmann/patch-1 (PR #6722)
This PR was merged into the master branch.

Commits
-------

c1d5f16 Update src/Symfony/Component/HttpKernel/Tests/EventListener/RouterProxyListenerTest.php

Discussion
----------

Typo fix

Just a typo fix
2013-01-13 20:55:12 +01:00
rubenrua
309067a897 Added Galician translation in security component 2013-01-13 20:31:40 +01:00
Philipp Hoffmann
c1d5f16c87 Update src/Symfony/Component/HttpKernel/Tests/EventListener/RouterProxyListenerTest.php
Just a typo fix
2013-01-13 12:48:31 +01:00
Gábor Fási
f58213867a [Security] fix Hungarian translation 2013-01-12 21:57:43 +01:00
Joseph Bielawski
a62e04f8d1 [Process] Fix docblocks, remove return from PhpProcess#start() as parent returns nothing, cleaned up ExecutableFinder 2013-01-12 13:49:05 +01:00
Johannes M. Schmitt
785d3655dd fixes a bug when output/error output contains a % character 2013-01-12 11:09:29 +01:00
Fabien Potencier
43a9e6caee merged branch franmomu/rename_catalonian_translation (PR #6714)
This PR was merged into the master branch.

Commits
-------

eeceafa [Security] Renamed catalonian translation file

Discussion
----------

[Security] Renamed catalonian translation file

Renamed as validators file in [Validator](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf) and in [Form](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf) following ISO639-1 language code.
2013-01-12 08:14:18 +01:00
Fabien Potencier
4be5ae4203 merged branch alexolmos/patch-1 (PR #6712)
This PR was merged into the master branch.

Commits
-------

fb52d94 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf

Discussion
----------

Update src/Symfony/Component/Security/Resources/translations/security.es...

..._CA.xlf
2013-01-12 08:12:58 +01:00
Fabien Potencier
3245c1ce3a merged branch pborreli/typophpdoc (PR #6710)
This PR was merged into the master branch.

Commits
-------

b1c6881 Fixed PHPDoc

Discussion
----------

Fixed PHPDoc
2013-01-12 08:12:39 +01:00
Fabien Potencier
5fb9bc6af6 merged branch jorgemartind/patch-1 (PR #6709)
This PR was merged into the master branch.

Commits
-------

9d31064 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf

Discussion
----------

Update src/Symfony/Component/Security/Resources/translations/security.es...

..._CA.xlf

[Security] update catalonian translation
2013-01-12 08:12:01 +01:00
Fabien Potencier
9a579062b0 merged branch lazyhammer/security-translations (PR #6711)
This PR was merged into the master branch.

Commits
-------

0a060ca Fix Russian and Ukrainian translations for Security component

Discussion
----------

[Security] Fix Russian and Ukrainian translations
2013-01-12 08:11:32 +01:00
umpirsky
67f7ed5358 Added Serbian Cyrillic tanslation for security component 2013-01-11 19:40:23 +01:00
Fran Moreno
eeceafa45c [Security] Renamed catalonian translation file 2013-01-11 19:36:08 +01:00
Alex Olmos
fb52d941f4 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf 2013-01-11 19:16:45 +01:00
Pascal Borreli
b1c68815f5 Fixed PHPDoc 2013-01-11 17:38:19 +00:00
Dmitrii Chekaliuk
0a060cabeb Fix Russian and Ukrainian translations for Security component 2013-01-11 19:28:56 +02:00
jorgemartind
9d310647e9 Update src/Symfony/Component/Security/Resources/translations/security.es_CA.xlf
[Security] update catalonian translation
2013-01-11 18:10:54 +01:00
Fabien Potencier
dc2cc6b13c [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689) 2013-01-11 14:49:52 +01:00
Fabien Potencier
92f951fd7a merged branch LawnGnome/PHP-5.5-compat (PR #6647)
This PR was merged into the 2.1 branch.

Commits
-------

4991607 Fix version_compare() calls for PHP 5.5.
34def9f Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.

Discussion
----------

[Form] [Locale] PHP 5.5 compatibility fixes

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: N/A
Todo: None
License of the code: MIT
Documentation PR: N/A

IntlDateFormatter::setTimeZoneId() is deprecated in PHP 5.5, which results in E_DEPRECATED errors when using the date form type. This PR works around that.

Furthermore, the version_compare() tests used in locale to detect PHP 5.5 are broken with snapshot and Git builds of PHP. I've also committed a fix for those tests in this PR.

---------------------------------------------------------------------------

by stof at 2013-01-10T08:24:15Z

shouldn't it even be done in 2.0 as it is a bugfix ?

---------------------------------------------------------------------------

by LawnGnome at 2013-01-11T00:49:11Z

Possibly — I don't know enough about Symfony's release management to know whether this is appropriate for 2.0, and I was mostly scratching my own itch, honestly.

---------------------------------------------------------------------------

by stof at 2013-01-11T01:51:35Z

well, it is a bugfix and 2.0 is also impacted, so it should be done in it.

---------------------------------------------------------------------------

by LawnGnome at 2013-01-11T02:52:21Z

The diff for 2.0 looks like it'll be just the StubIntlDateFormatter.php changes — the deprecated method isn't called in DateType on that branch, and there aren't any StubIntlDateFormatter tests on 2.0. How do you want that submitted — as a separate PR against 2.0?

---------------------------------------------------------------------------

by fabpot at 2013-01-11T07:20:18Z

@LawnGnome A separate pull request would be good. Thanks.

---------------------------------------------------------------------------

by LawnGnome at 2013-01-11T08:29:48Z

2.0 PR added as #6699.
2013-01-11 14:37:17 +01:00
Fabien Potencier
e463a63906 Merge branch '2.0' into 2.1
* 2.0:
  Fix version_compare() calls for PHP 5.5.
  [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)

Conflicts:
	src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php
2013-01-11 14:37:04 +01:00
Fabien Potencier
aec3c8aa1d merged branch Burgov/patch-3 (PR #6702)
This PR was merged into the master branch.

Commits
-------

6b669fb Update src/Symfony/Component/Security/Resources/translations/security.nl.xlf

Discussion
----------

Update src/Symfony/Component/Security/Resources/translations/security.nl.xlf

see #6668

Some more minor tweaks
2013-01-11 14:34:34 +01:00
Fabien Potencier
1d548d4168 merged branch Engerim/patch-1 (PR #6706)
This PR was merged into the master branch.

Commits
-------

f127781 Update src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php

Discussion
----------

[FrameworkBundle] add missing use statement HttpKernelInterface for forward method

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

---------------------------------------------------------------------------

by lsmith77 at 2013-01-11T13:31:01Z

+1
2013-01-11 14:33:21 +01:00
Fabien Potencier
d96b96e942 merged branch cristobal/master (PR #6707)
This PR was merged into the master branch.

Commits
-------

83d0469 Create security.no.xlf

Discussion
----------

Norwegian Translation for Security

Norwegian Translation
2013-01-11 14:15:10 +01:00
Joan Cruz
5ee65aa8be Contribution to translation to Catalan of the security messages 2013-01-11 14:12:53 +01:00
Cristobal Dabed
83d04699d2 Create security.no.xlf
Norwegian Translation
2013-01-11 05:12:25 -08:00
Maks Slesarenko
3ae5b55882 added support for propel enum types in PropelTypeGuesser 2013-01-11 07:44:40 -05:00
Alexander Miehe
f127781f2e Update src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
Add use HttpKernelInterface for refactored forward method
2013-01-11 13:33:14 +01:00
Stéphane PY
9257b0371c [Profiler] [Redis] Fix sort of profiler rows. 2013-01-11 11:35:43 +01:00
Joseph Bielawski
eb0d2abb1b [HttpKernel] Remove conflicting use from NullLogger 2013-01-11 11:33:37 +01:00