Commit Graph

6533 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Benjamin Eberlei
fcabadfc23 Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md 2013-01-19 00:06:48 +01: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
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
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