Commit Graph

6288 Commits

Author SHA1 Message Date
Johannes Schmitt
9bcce9fcdb fix tests 2011-07-18 10:10:04 +02:00
Johannes Schmitt
fc4787ac90 fix non-extensible router 2011-07-18 10:06:01 +02:00
Noel GUILBERT
872d308e9c [DoctrineBundle] Allowed to configure dql functions without using the multiple entity mangers syntax 2011-07-18 19:51:38 +12:00
Fabien Potencier
f18e3fc333 merged branch excelwebzone/hebrew_translations (PR #1717)
Commits
-------

0d39cbb  Fixed grammar
254ce24  Translated missed row

Discussion
----------

[Hebrew] Fixed some translate values
2011-07-17 18:40:28 +02:00
excelwebzone
0d39cbb2d3 Fixed grammar 2011-07-17 09:35:52 -07:00
excelwebzone
254ce24a11 Translated missed row 2011-07-17 09:27:04 -07:00
Fabien Potencier
a1d8c70890 [Routing] fixed a bug when a default value is an integer
A default value is always a string in the context of routing.
2011-07-17 17:30:35 +02:00
Fabien Potencier
23ef6059d7 updated Twig dep 2011-07-17 16:00:18 +02:00
Fabien Potencier
061ce6d833 merged branch geoffreytran/doctrine-acl-cache (PR #1708)
Commits
-------

b9bdab8 DoctrineAclCache unserialize sets the acl to the wrong field

Discussion
----------

DoctrineAclCache unserialize sets the acl to the wrong field

Upon unserialize of the acl, the acl is currently set to the id field which should be a string. Currently it passes the acl object into the id field which causes the following error upon unserialize.

Warning: Illegal offset type in isset or empty in Symfony/Component/Security/Acl/Dbal/AclProvider.php line 404
This is because at line 404, $ace->getId() returns an Acl object not an id and the acl field in $ace is null.
     if (isset($this->loadedAces[$ace->getId()])) {

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

by fabpot at 2011/07/16 09:31:42 -0700

@schmittjoh?

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

by schmittjoh at 2011/07/16 23:19:06 -0700

Yes, this fix is good.
2011-07-17 09:00:09 +02:00
Fabien Potencier
059af7964b merged branch jdreesen/fix-01 (PR #1715)
Commits
-------

3a33c65 Fixed typo

Discussion
----------

Fixed typo

Fixed a small typo in the docblock
2011-07-17 07:49:38 +02:00
Fabien Potencier
ebaf290d0a merged branch doup/euskara_translations (PR #1714)
Commits
-------

39e476f Basque translations added.
6f650f8 Basque file added

Discussion
----------

Euskara translations

Basque (euskara) translations added.
2011-07-17 07:49:14 +02:00
doup
39e476f921 Basque translations added. 2011-07-16 23:02:24 +02:00
Fabien Potencier
634131bc77 [Twig] made a small optimization to avoid problems with XDebug when rendering forms with deep nested collections 2011-07-16 20:40:19 +02:00
Fabien Potencier
e3a14c8ece merged branch yethee/choice_validator (PR #1713)
Commits
-------

0f328d2 [Validator] Fixed using the strict option in the choice validator.

Discussion
----------

[Validator] Fixed using the strict option in the choice validator.
2011-07-16 19:46:32 +02:00
Deni
0f328d228b [Validator] Fixed using the strict option in the choice validator. 2011-07-16 21:16:21 +04:00
Fabien Potencier
760b11cbeb fixed UPDATE file markup 2011-07-16 18:33:57 +02:00
Fabien Potencier
d9048658d9 merged branch schmittjoh/lazyParameterBag (PR #1712)
Commits
-------

d37ff15 removed unused code
2d3051f tabs -> spaces
2c224ce improves the exception message, and removes unnecessary constraint to only allow strings inside strings
d0b056c fixes a bug where getParameterBag() always returns null

Discussion
----------

Fixes a bug in PHPDumper, and in parameter resolving
2011-07-16 18:30:54 +02:00
Fabien Potencier
52543e7a32 merged branch schmittjoh/cookieFix (PR #1702)
Commits
-------

eb85cc5 fixes a bug where the cookie was wrongly considered expired

Discussion
----------

fixes a bug where the cookie was wrongly considered expired

On a related note, what do you think about adding some more functional tests here? Not only phpunit, but I would also suggest to add behat tests since there are a lot of things which are not picked up by the in process request emulation, but only by a real client.

@fabpot, @everzet, what do you think?
2011-07-16 18:24:26 +02:00
Fabien Potencier
8e1f420e12 merged branch schmittjoh/sessionRename (PR #1705)
Commits
-------

5e80c68 fixes a naming inconsistency
8cfca15 added change to upgrade file
4123ec4 updated some missing references

Discussion
----------

Fix inconsistent naming

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

by jalliot at 2011/07/15 08:15:01 -0700

I think you forgot one commit (the one effectively changing Session and that you reverted in the main repo)

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

by schmittjoh at 2011/07/15 09:07:17 -0700

You're right, fixed now.
2011-07-16 18:23:21 +02:00
Fabien Potencier
c7b18887f8 merged branch xmontana/patch-1 (PR #1710)
Commits
-------

b64c15a Updated spanish translation

Discussion
----------

Updated spanish translation
2011-07-16 18:22:45 +02:00
Johannes Schmitt
d37ff152c0 removed unused code 2011-07-16 16:14:43 +02:00
Johannes Schmitt
2d3051f9cc tabs -> spaces 2011-07-16 16:13:26 +02:00
Johannes Schmitt
2c224ce42b improves the exception message, and removes unnecessary constraint to only allow strings inside strings 2011-07-16 16:10:11 +02:00
Johannes Schmitt
d0b056cce9 fixes a bug where getParameterBag() always returns null 2011-07-16 15:52:02 +02:00
xmontana
b64c15a17a Updated spanish translation 2011-07-16 00:59:04 -07:00
Fabien Potencier
827bfb94e6 merged branch hidenorigoto/translate-UPDATE-rc5 (PR #1709)
Commits
-------

21b0153 updated translation of UPDATE file (Japanese RC5)

Discussion
----------

Update translation of UPDATE file (Japanese RC5)
2011-07-16 08:15:12 +02:00
Geoffrey Tran
8e169e4457 Improved performance when assetic's use_controller is enabled
When assetic's use_controller is enabled, assetic has to loop through all the templates and create TemplateReferences through the assetic FileResource. This in turn causes a lot of calls to getLogicalName() leading to 5x the calls to the TemplateReference's get() (16k in my case). By accessing the protected field directly compared to using get() we achieve better performance during development (33% in my case).
2011-07-15 20:52:23 -05:00
hidenorigoto
21b0153969 updated translation of UPDATE file (Japanese RC5) 2011-07-16 10:21:58 +09:00
Fabien Potencier
af67e65cbd [Form] fixed validation when using the 'validation_constraint' option 2011-07-16 00:45:53 +02:00
Fabien Potencier
5182a0c2c4 [Form] removed a constraint in PropertyPath as the path can definitely be an empty string for errors attached on the main form (when using a constraint defined with the 'validation_constraint' option) 2011-07-16 00:34:50 +02:00
Fabien Potencier
c04512086e [Validator] fixed error message property path when a collection error occurs 2011-07-16 00:29:54 +02:00
Fabien Potencier
1238bb3d53 [HttpKernel] lowered the number of level to keep in Flattened exceptions to make the tests pass when XDebug is enabled (beause of the default max nesting level of 100) 2011-07-16 00:29:33 +02:00
Geoffrey Tran
b9bdab8bd4 DoctrineAclCache unserialize sets the acl to the wrong field
Upon unserialize of the acl, the acl is currently set to the id field which should be a string. Currently it passes the acl object into the id field which causes the following error.

Warning: Illegal offset type in isset or empty in Symfony/Component/Security/Acl/Dbal/AclProvider.php line 404
2011-07-15 12:41:15 -05:00
Fabien Potencier
06a90bb91e merged branch schniper/patch-1 (PR #1703)
Commits
-------

5395c6c Few RO translation tweaks

Discussion
----------

Few RO translation tweaks

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

by lsmith77 at 2011/07/15 02:48:01 -0700

you seem to have done something to the line endings ..

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

by schniper at 2011/07/15 03:13:32 -0700

The file was edited on the site and because of some 404 error I couldn't save it so I copy/pasted it entirely, after I have corrected the problem.
Want me to retry?
2011-07-15 18:40:26 +02:00
Johannes Schmitt
5e80c68fab fixes a naming inconsistency 2011-07-15 18:06:18 +02:00
Johannes Schmitt
8cfca155a6 added change to upgrade file 2011-07-15 18:03:17 +02:00
Johannes Schmitt
4123ec4a1f updated some missing references 2011-07-15 18:03:17 +02:00
Johannes Schmitt
3cb4b031b6 Revert "fixed inconsistent naming"
Incomplete, and wrong repo anyway.
2011-07-15 15:55:30 +02:00
Johannes
eaa173b788 fixed inconsistent naming 2011-07-15 06:41:41 -07:00
Costin Bereveanu
5395c6c675 Few RO translation tweaks 2011-07-15 02:46:38 -07:00
Johannes Schmitt
eb85cc550b fixes a bug where the cookie was wrongly considered expired 2011-07-15 11:07:35 +02:00
Fabien Potencier
43543bb85d merged branch francisbesset/httpfoundation_requestmatcher (PR #1690)
Commits
-------

71cfb56 Thrown a \RuntimeException in RequestMatcher::checkIp6() if PHP is compiled with the option "disable-ipv6"

Discussion
----------

[HttpFoundation] Problem with RequestMatcher if PHP is compiled with the option "disable-ipv6"

Thrown a \RuntimeException in RequestMatcher::checkIp6() if PHP is compiled with the option "disable-ipv6".
2011-07-15 10:35:42 +02:00
Fabien Potencier
b64fb60a0f merged branch schmittjoh/sessionAutoStartFix (PR #1701)
Commits
-------

af6d4e4 changed test
6d1eb48 fixes a bug during session initialization in test environment

Discussion
----------

fixes a bug during session initialization in test environment
2011-07-15 10:34:57 +02:00
Johannes Schmitt
af6d4e4c8e changed test 2011-07-15 10:29:16 +02:00
Francis Besset
71cfb56917 Thrown a \RuntimeException in RequestMatcher::checkIp6() if PHP is compiled with the option "disable-ipv6" 2011-07-15 10:28:46 +02:00
Johannes Schmitt
6d1eb48a9b fixes a bug during session initialization in test environment 2011-07-15 10:23:38 +02:00
Fabien Potencier
2a0178c2b5 merged branch jmikola/yaml-numeric-strings (PR #1688)
Commits
-------

05cc24c [Yaml] Wrap numeric strings in quotes when dumping

Discussion
----------

[Yaml] Wrap numeric strings in quotes when dumping

This addresses an obscure case where a hash string (actually a commit-ish, "686e444") was dumped to YAML as an unquoted string value. It was later parsed from YAML as an exponential numeric and changed to ".Inf".

This commit should not change the existing behavior when dumping non-string numerics. It also doesn't appear to disturb any of the other test cases. I realize it's a huge edge case, so I'm open to discussion.

The alternative to this fix was an ugly `preg_replace()` to apply quoting around the commit-ish after dumping. I would look forward to removing that :)
2011-07-15 08:39:27 +02:00
Fabien Potencier
3f33826c15 merged branch jmikola/yaml-skipped-tests (PR #1689)
Commits
-------

5803a8e [Yaml] Do not skip consistency checks in InlineTest::testDump()

Discussion
----------

[Yaml] Do not skip consistency checks in InlineTest::testDump()

These conditionals were excluding 12.30e+02 from being checked. Removing the conditionals does not break any tests.

I investigated the conditionals with git blame, but that stops at previous commits for code formatting changes. These appear to be very old. Perhaps they were added for test failures on certain platforms? I don't spot any failures on Linux.
2011-07-15 08:35:43 +02:00
jdreesen
3a33c65bd5 Fixed typo 2011-07-15 04:59:03 +02:00
doup
6f650f8e8d Basque file added 2011-07-15 02:16:30 +02:00