Commit Graph

10599 Commits

Author SHA1 Message Date
Fabien Potencier 2c6b825068 merged branch zachbadgett/framework_bundle_delegating_engine (PR #4824)
Commits
-------

2fa98e8 [FrameworkBundle] Changed DelegatingEngine::renderResponse to use specified engine's renderResponse

Discussion
----------

[FrameworkBundle] Changed DelegatingEngine::renderResponse to use specified engine's renderResponse

Currently the DelegatingEngine in the FrameworkBundle has a renderResponse method that creates a new response, it should use the engine's renderResponse since EngineInterface requires a renderResponse to be defined and gives more flexibly to change the response object when creating a new templating engine.

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
2012-07-10 08:42:11 +02:00
Fabien Potencier 4bab36b2c7 merged branch bschussek/issue3899 (PR #4813)
Commits
-------

9c94b48 [Form] Fixed the "data" option to supersede default data set in the model

Discussion
----------

[Form] Fixed the "data" option to supersede default data set in the model

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #3899
Todo: -
2012-07-10 08:22:37 +02:00
Fabien Potencier feab81117b merged branch bschussek/bind_request (PR #4811)
Commits
-------

7727de7 [Form] Deprecated Form::bindRequest() and replaced it by a PRE_BIND listener

Discussion
----------

[Form] Deprecated Form::bindRequest() and replaced it by a PRE_BIND listener

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -

Instead of `bindRequest`, you should now simply call `bind`:

Before:

```
$form->bindRequest($request);
```

After:

```
$form->bind($request);
```
2012-07-10 08:21:54 +02:00
Fabien Potencier aa007c235f merged branch fixe/patch-4 (PR #4821)
Commits
-------

c4d4d2e Removed extra new line

Discussion
----------

Removed extra new line
2012-07-10 07:48:15 +02:00
Fabien Potencier 1e138ae702 merged branch fixe/patch-5 (PR #4822)
Commits
-------

f5cf28f Updated Portuguese translation

Discussion
----------

Updated Portuguese translation

Based on #4820
2012-07-10 07:47:32 +02:00
Fabien Potencier 3051a82eb7 merged branch eriksencosta/pt-br-translation (PR #4820)
Commits
-------

19cdc8f updated Brazilian Portuguese translation

Discussion
----------

updated Brazilian Portuguese translation
2012-07-10 07:47:15 +02:00
Fabien Potencier 5345b59dd8 merged branch Nanocom/twigbundle_fix_error_message (PR #4818)
Commits
-------

dc4d343 [TwigBundle] Fixed error message

Discussion
----------

[TwigBundle] Fixed error message

Small fix to display the filename that cannot be read in the Twig Lint command.
2012-07-10 07:46:57 +02:00
Fabien Potencier 4da087e0ae merged branch umpirsky/patch-5 (PR #4817)
Commits
-------

ca67e90 Updated Serbian Cyrillic translation.

Discussion
----------

Updated Serbian Cyrillic translation.
2012-07-10 07:46:25 +02:00
Fabien Potencier 9038edc889 merged branch umpirsky/patch-4 (PR #4816)
Commits
-------

5211a01 Updated Serbian Latin translation.

Discussion
----------

Updated Serbian Latin translation.
2012-07-10 07:46:21 +02:00
Fabien Potencier 578d799dc8 merged branch umpirsky/patch-3 (PR #4815)
Commits
-------

55ac686 Serbian Latin translation updated.

Discussion
----------

Serbian Latin translation updated.
2012-07-10 07:45:54 +02:00
Fabien Potencier ab766dcb3e merged branch umpirsky/patch-2 (PR #4814)
Commits
-------

ec8c023 Serbian Cyrillic translation updated.

Discussion
----------

Serbian Cyrillic translation updated.

Shouldn't source messages be updated in all files in one commit? Also, version is 1.2 in both, en and sr files, but source messages are not.

I would like to be notified whenever translation is changed, maybe we should have some topic on mailing list so all translators can receive notifications once messages are changed.
2012-07-10 07:45:50 +02:00
Fabien Potencier c2a6e37ad7 merged branch Crell/route-serialize (PR #4755)
Commits
-------

a6d44bd When serializing a Route, don't serialize the compiled route.

Discussion
----------

When serializing a Route, don't serialize the compiled route.

The compiled route typically has a reference to the Route.  The Route of course has a reference to the compiled route.  This is a circular reference.  That can sometimes cause issues, say for var_export().  I ran into this issue while serializing route objects, but it could happen in other cases, too.

In any event, since the compiled route object is simply derived data I see no reason to keep it around.  If we serialize a Route, we just want the basic route information.  We can recompile later if needs be.  As a nice side-effect, this makes the serialized string much smaller.

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

by stof at 2012-07-04T21:09:34Z

I would implement the Serializable interface instead. It would be more consistent with what Symfony does elsewhere, and would avoid breaking things when you extend the class (Silex does it). Private properties cannot be accessed from the child class, and this is what PHP tries to do when you use ``__sleep`` as you only return the property name.

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

by Tobion at 2012-07-04T22:52:00Z

I also saw this circular reference. Maybe it's time to remove the reference from compiled route to the original route?!
If a developer needs the original route, he should keep the reference himself. No need to do it for him. It's like offering a "decompiling" reference that shouldnt be there.

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

by Crell at 2012-07-05T00:08:51Z

With Serializable, I'd have to reimplement serialize() myself, wouldn't I?  I just want to exclude the one value, but otherwise serialize normally.  Seems like that would be a non-small amount of work compared to a one-liner.

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

by stof at 2012-07-05T00:09:44Z

@Crell you have to reimplement it in the child class only if you want to add more stuff in the serialized data.

and breaking Silex just to be lazy here is not a good idea

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

by Crell at 2012-07-05T00:24:52Z

I'm not trying to break Silex. :-P

I think this is what you mean, but I'm not sure that completely changing the serialized form (which this does) is wise.  Is that not also a BC break of sorts?

Once we settle on one we can cherry-pick out the commits we want.

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

by stof at 2012-07-05T01:00:29Z

changing the serialization format is not an issue: the only place where serialized routes are likely to be stored is in the cache, and the cache does not need to be BC between 2.0 and 2.1. The user already have to delete it due to other changes.

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

by fabpot at 2012-07-09T15:02:59Z

+1 for implementing `Serializable`. Can you squash your commits and fix the CS (we need 4 spaces)? Thanks.

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

by Crell at 2012-07-10T03:25:04Z

Squshed, Spaced, and Rebased.
2012-07-10 07:44:57 +02:00
Zach Badgett 2fa98e8a23 [FrameworkBundle] Changed DelegatingEngine::renderResponse to use specified engine's renderResponse 2012-07-09 22:41:10 -06:00
Tim Nagel c061c30a9e Router#resolveString should return null instead of empty string when $value is null
Closes #4823
2012-07-10 14:22:39 +10:00
Tim Nagel a1d1a02b47 Null default value route regression 2012-07-10 13:59:45 +10:00
Larry Garfield a6d44bdaa7 When serializing a Route, don't serialize the compiled route. 2012-07-09 22:23:40 -05:00
Tiago Ribeiro f5cf28f308 Updated Portuguese translation 2012-07-10 00:33:19 +01:00
Tiago Ribeiro c4d4d2e772 Removed extra new line 2012-07-10 01:10:06 +02:00
Eriksen Costa 19cdc8f7da updated Brazilian Portuguese translation 2012-07-09 19:48:33 -03:00
Arnaud Kleinpeter dc4d3437ce [TwigBundle] Fixed error message 2012-07-09 23:12:46 +02:00
Саша Стаменковић ca67e90c4a Updated Serbian Cyrillic translation. 2012-07-10 00:08:56 +03:00
Саша Стаменковић 5211a0117f Updated Serbian Latin translation. 2012-07-10 00:04:02 +03:00
Саша Стаменковић 55ac686f6c Serbian Latin translation updated. 2012-07-09 23:42:28 +03:00
Саша Стаменковић ec8c023143 Serbian Cyrillic translation updated. 2012-07-09 23:42:25 +03:00
Bernhard Schussek 9c94b48eeb [Form] Fixed the "data" option to supersede default data set in the model 2012-07-09 21:04:24 +02:00
Bernhard Schussek 7727de73e5 [Form] Deprecated Form::bindRequest() and replaced it by a PRE_BIND listener 2012-07-09 20:34:45 +02:00
Fabien Potencier 5f6a17b8cc merged branch bschussek/issue4427 (PR #4810)
Commits
-------

c0a5207 [Form] Prevented duplicate validation of form constraints

Discussion
----------

[Form] Prevented duplicate validation of form constraints

Bug fix: yes
Feature addition: no
Backwards compatibility break: *yes* (at least that can be argued. I consider it a correction of incorrectly implemented functionality)
Symfony2 tests pass: yes
Fixes the following tickets: #4427
Todo: -
2012-07-09 19:28:59 +02:00
Bernhard Schussek c0a520792b [Form] Prevented duplicate validation of form constraints 2012-07-09 19:28:39 +02:00
Fabien Potencier b4c55bdcf4 merged branch bschussek/issue4573 (PR #4808)
Commits
-------

f093caa [Form] Fixed invalid value passed to the constraint violation by the MinLength and MaxLength validators

Discussion
----------

[Form] Fixed invalid value passed to the constraint violation by the MinLength and MaxLength validators

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4573
Todo: -
2012-07-09 18:57:58 +02:00
Bernhard Schussek f093caa6ac [Form] Fixed invalid value passed to the constraint violation by the MinLength and MaxLength validators 2012-07-09 18:53:54 +02:00
Fabien Potencier 22fea110a5 merged branch bschussek/revert_circ_ref (PR #4807)
Commits
-------

eba7dfe Revert "[Form] added a circular reference safeguard for form type"

Discussion
----------

Revert "[Form] added a circular reference safeguard for form type"

This reverts commit ea93e4cafa.

Conflicts:

	src/Symfony/Component/Form/FormBuilder.php
	src/Symfony/Component/Form/FormFactory.php
2012-07-09 18:45:58 +02:00
Bernhard Schussek eba7dfeb8a Revert "[Form] added a circular reference safeguard for form type"
This reverts commit ea93e4cafa.

Conflicts:

	src/Symfony/Component/Form/FormBuilder.php
	src/Symfony/Component/Form/FormFactory.php
2012-07-09 18:42:18 +02:00
Fabien Potencier 2cf1a0a7e8 merged branch bschussek/issue4615 (PR #4799)
Commits
-------

df5bb4a [Form] Unified rendering of errors for nested elements

Discussion
----------

[Form] Unified rendering of errors for nested elements

Bug fix: yes
Feature addition: no
Backwards compatibility break: yes?
Symfony2 tests pass: yes
Fixes the following tickets: #4615
Todo: -
2012-07-09 18:41:53 +02:00
Fabien Potencier 35e8d086ed merged branch bschussek/issue4450 (PR #4806)
Commits
-------

1345360 [Form] Fixed PropertyPath handling of offsetGet() that returns a constant value
6e1462e [Form] Fixed PropertyPath handling of __get() method that returns a constant

Discussion
----------

[Form] Fixed "Indirect modification.." exceptions in PropertyPath

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4450, #4535?, #4612
Todo: -
2012-07-09 18:25:40 +02:00
Fabien Potencier a1963b483e merged branch clemens-tolboom/pluraltests (PR #4412)
Commits
-------

3462afc Tests for PluralizationRules.

Discussion
----------

[WIP][Translations][tests] Tests for PluralizationRules.

Currently we have no tests PluralizationRules. This patch is an initial one to show we have not enough langcodes in PluralizationRules.

I hope this gets in so others can fix the missing langcodes.

I'm waiting for [RFC [MessageCatalogue*] Add Metadata to MessageCatalogue](https://github.com/symfony/symfony/pull/4399) to get in to continue working on the [[WIP]: Allow Drupal to use Translate component](https://github.com/symfony/symfony/pull/4249).

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

by travisbot at 2012-05-25T14:38:37Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1433558) (merged 3462afc0 into 023dbf80).

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

by drak at 2012-07-01T09:47:05Z

Is there anything pending in this PR?
2012-07-09 18:23:32 +02:00
Bernhard Schussek 1345360e3f [Form] Fixed PropertyPath handling of offsetGet() that returns a constant value 2012-07-09 18:21:55 +02:00
Fabien Potencier 6cf8e298ab merged branch simensen/fix-bundle-tests (PR #4805)
Commits
-------

28b6557 class_exists was returning fals for the container aware interface

Discussion
----------

class_exists was returning fals for the container aware interface

This test was marked skipped when it should not have been.
2012-07-09 18:16:25 +02:00
Bernhard Schussek 6e1462e0c0 [Form] Fixed PropertyPath handling of __get() method that returns a constant 2012-07-09 18:15:56 +02:00
Beau Simensen 28b6557915 class_exists was returning fals for the container aware interface 2012-07-09 09:02:51 -07:00
Fabien Potencier 377b850272 merged branch bschussek/issue4596 (PR #4804)
Commits
-------

e6b5595 [Form] Fixed display of empty values in DateType, TimeType and DateTimeType if they are not required
14e293f [Form] Refactored processing of the "empty_value" option in DateType

Discussion
----------

[Form] Fixed display of empty values in DateType, TimeType and DateTimeType

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4596
Todo: -
2012-07-09 18:00:20 +02:00
Fabien Potencier 12d1e83d2a Merge branch '2.0'
* 2.0:
  [Validator] fixed error message for dates like 2012-02-31 (closes #4223)
2012-07-09 17:56:08 +02:00
Fabien Potencier facbcdcf45 [Validator] fixed error message for dates like 2012-02-31 (closes #4223) 2012-07-09 17:53:53 +02:00
Bernhard Schussek e6b5595f79 [Form] Fixed display of empty values in DateType, TimeType and DateTimeType if they are not required 2012-07-09 17:53:01 +02:00
Fabien Potencier 39e821c1eb [TwigBundle] added a new paths setting to allow configuration of more paths for the filesystem loader (refs #4649) 2012-07-09 17:37:31 +02:00
Fabien Potencier 8f267ada09 merged branch everzet/twig-paths (PR #4649)
Commits
-------

dbeff69 [TwigBundle] added support for custom loader paths

Discussion
----------

[TwigBundle] added support for custom loader paths

Before this commit, there was no ability to specify custom
search paths for Twig loader. Lets say we have twig templates
outside bundles directories (parts of the domain logic, not
application) - we want to be able to load them.

This commit adds `loader_paths` parameter to twig config,
which is used to set custom paths to the loader.

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

by travisbot at 2012-06-25T09:50:44Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1699654) (merged dbeff697 into 03c8d4d2).

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

by vicb at 2012-06-26T06:14:30Z

You also need to support xml in the configuration and update the xsd file.

edit: adding some DI unit tests is probably a good idea.

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

by everzet at 2012-06-26T08:49:20Z

@vicb agree, was just a fast stabbing ;)

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

by fabpot at 2012-06-28T14:06:02Z

I'm +1. Can you "finish" the PR?

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

by fabpot at 2012-07-02T13:23:33Z

@everzet If you don't have time, I can do the remaining work.
2012-07-09 17:37:22 +02:00
Fabien Potencier fe7e57dfa6 merged branch michaelperrin/upgrade_to_21 (PR #4802)
Commits
-------

81eb722 Simpler sentence concerning upgrade of the form_label function
f6f1bb5 Update to the "Upgrade to v2.1" documentation: the way HTML attributes are passed for the `form_label` function has changed.

Discussion
----------

Update upgrade to 2.1 documentation concerning form_label

The way HTML attributes are passed for the `form_label` function has changed since this commit :
167e64f799

I also made a PR for the documentation:
https://github.com/symfony/symfony-docs/pull/1542
2012-07-09 17:25:44 +02:00
Bernhard Schussek 14e293fc66 [Form] Refactored processing of the "empty_value" option in DateType 2012-07-09 17:20:48 +02:00
Michaël Perrin 81eb7222d2 Simpler sentence concerning upgrade of the form_label function 2012-07-09 18:15:43 +03:00
Michaël Perrin f6f1bb5e02 Update to the "Upgrade to v2.1" documentation: the way HTML attributes are passed for the `form_label` function has changed. 2012-07-09 17:14:03 +02:00
Fabien Potencier 8d77d999a1 fixed CS 2012-07-09 17:06:57 +02:00