Fabien Potencier
4594cd223b
[HttpKernel] fixed a test that randomly fails
2011-03-26 12:07:57 +01:00
Fabien Potencier
7bda949e41
Merge remote branch 'schmittjoh/security'
...
* schmittjoh/security:
changed condition nesting
[Security] ACL: AclVoter::vote only gets an ObjectIdentity if $object is not an instance of ObjectIdentityInterface
[SecurityBundle] fixed missing argument EventDisplatcher in RememberMe service
2011-03-26 10:44:37 +01:00
Fabien Potencier
4de468e181
[Routing] makes the parameters argument of generate() optional
2011-03-26 09:54:44 +01:00
Benjamin Eberlei
73d8470a76
[Form] Fix children implementation, setChildren() is not used, the attribute "fields" is.
2011-03-26 09:42:45 +01:00
Johannes Schmitt
031bf35bb1
changed condition nesting
2011-03-26 09:06:03 +01:00
Fabien Potencier
cc46e8d46a
moved the Filesystem class form FrameworBundle to HttpKernel (refactored it slightly)
2011-03-26 08:37:25 +01:00
Fabien Potencier
124f1d8e44
moved the Filesystem class form FrameworBundle to HttpKernel (refactored it slightly)
2011-03-26 08:37:10 +01:00
Fabien Potencier
1a6f138fe8
[FrameworkBundle] simplified code
2011-03-26 08:22:29 +01:00
Fabien Potencier
3553ed89d4
Merge remote branch 'stealth35/use_filesystemiterator'
...
* stealth35/use_filesystemiterator:
simplify folders deletion
work with Traversable
added FilesystemIterator namespace
tab to spaces
use FilesytemIterator insteed opendir
2011-03-26 08:20:44 +01:00
Fabien Potencier
d9af9890a3
Merge remote branch 'umpirsky/master'
...
* umpirsky/master:
Fixed Russian translation according to suggestions on be63154655 (commitcomment-312900)
.
2011-03-26 08:17:23 +01:00
Johannes Schmitt
1282a595f2
Merge branch 'remember_me_dispatcher' of https://github.com/patashnik/symfony into security
2011-03-26 01:26:20 +01:00
Johannes Schmitt
db2089de0d
Merge branch 'acl-fix' of https://github.com/comfortablynumb/symfony into security
2011-03-26 01:11:11 +01:00
umpirsky
37d7c400ce
Fixed Russian translation according to suggestions on be63154655 (commitcomment-312900)
.
2011-03-25 10:56:41 -07:00
Fabien Potencier
1d94a525ee
fixed assetic vendor
2011-03-25 18:44:35 +01:00
stealth35
41bdfe25c0
simplify folders deletion
2011-03-25 17:51:47 +01:00
Bernhard Schussek
18b98353d5
Merge branch 'master' into experimental
...
Conflicts:
src/Symfony/Component/Form/Resources/config/validation.xml
2011-03-25 16:07:19 +01:00
stealth35
566320d1a9
work with Traversable
2011-03-25 15:58:27 +01:00
Fabien Potencier
8d84fdfedc
[Finder] added Finder::append() method to be able to combine several Finder instances into one
2011-03-25 15:50:47 +01:00
Bernhard Schussek
7585dce8dd
[Form] Added options validation to field creation
2011-03-25 15:30:33 +01:00
stealth35
280eca4af4
added FilesystemIterator namespace
2011-03-25 15:28:14 +01:00
Fabien Potencier
2d27b13338
Merge remote branch 'bschussek/validator'
...
* bschussek/validator:
[Form] Fixed validation.xml (now really)
2011-03-25 14:57:16 +01:00
Fabien Potencier
a2fcd0cf6b
Merge remote branch 'stealth35/removed_alias'
...
* stealth35/removed_alias:
sanitize die (exit)
2011-03-25 14:54:18 +01:00
Fabien Potencier
3a46ed58b3
Merge remote branch 'stealth35/use_splfileinfo'
...
* stealth35/use_splfileinfo:
tab to spaces
use SplFileInfo insteed fgetcsv
2011-03-25 14:50:19 +01:00
Kris Wallsmith
2e1924ec1c
[AsseticBundle] updated for Assetic changes
2011-03-25 06:14:20 -07:00
stealth35
dedf9b4fc0
tab to spaces
2011-03-25 13:38:09 +01:00
stealth35
4d62fd5e6c
tab to spaces
2011-03-25 13:35:59 +01:00
stealth35
58cd03cedf
use SplFileInfo insteed fgetcsv
2011-03-25 11:51:32 +01:00
stealth35
bdaee9dd09
use FilesytemIterator insteed opendir
2011-03-25 11:38:24 +01:00
Bernhard Schussek
0ace068a52
[Form] PropertyPathMapper now only maps if the form data is synchronized to avoid duplicate form errors ('invalid'+'NotNull', for example)
2011-03-25 11:27:22 +01:00
Bernhard Schussek
6825ea2489
[Form] Improved test coverage of PropertyPathMapper
2011-03-25 11:27:20 +01:00
stealth35
cee94be277
sanitize die (exit)
2011-03-25 11:26:43 +01:00
Bernhard Schussek
e3ac248617
[Form] Errors are mapped to subforms correctly and bubble up again if necessary
2011-03-25 10:53:36 +01:00
Bernhard Schussek
4f360109ed
[Form] Fixed validation.xml (now really)
2011-03-25 10:41:18 +01:00
Bernhard Schussek
eb18676354
Merge branch 'master' into experimental
2011-03-25 09:24:38 +01:00
Fabien Potencier
0e57943531
[HttpKernel] fixed typo
2011-03-25 07:19:02 +01:00
Fabien Potencier
043988f670
Merge remote branch 'aurelijus/wrong_arguments_for_exception'
...
* aurelijus/wrong_arguments_for_exception:
removed 0
Updated arguments for MethodNotAllowedHttpException
2011-03-25 06:59:44 +01:00
Fabien Potencier
6051577b7e
Merge remote branch 'kriswallsmith/framework/asset-packages-fix'
...
* kriswallsmith/framework/asset-packages-fix:
[FrameworkBundle] fixed build of config for asset packages
2011-03-25 06:57:53 +01:00
Fabien Potencier
e5a5c63050
Merge remote branch 'bschussek/rename-execute'
...
* bschussek/rename-execute:
[Form] Fixed validation.xml
[Validator] Added support for static callbacks to Callback constraint
[Validator] Renamed Execute constraint to Callback
2011-03-25 06:57:17 +01:00
Bernhard Schussek
7b412cc762
[Form] Removed FormFactory::addGuessers() and moved guessers to constructor arg instead
2011-03-25 02:26:14 +01:00
Bernhard Schussek
9c4095a356
[FrameworkBundle] AddFormTypesPass now uses the service ID as alias if no alias is given
2011-03-25 02:18:21 +01:00
Bernhard Schussek
40ee22c8b4
[Form] Fixed call to DataEvent::getForm() in Doctrine bridge
2011-03-25 02:17:40 +01:00
Bernhard Schussek
9b1b8cbffa
[Form] Replaced various occurences of 'field' by 'form'
2011-03-25 02:12:01 +01:00
Bernhard Schussek
3c412ffba0
[Form] Moved Form::validateData() to DelegatingValidator::validateFormData()
2011-03-25 01:59:28 +01:00
Gustavo Adrian
bedbe51081
[Security] ACL: AclVoter::vote only gets an ObjectIdentity if $object is not an instance of ObjectIdentityInterface
2011-03-24 21:54:21 -03:00
Bernhard Schussek
ec38901572
Merge branch 'rename-execute' into experimental
...
Conflicts:
src/Symfony/Component/Form/Resources/config/validation.xml
2011-03-25 01:49:17 +01:00
Bernhard Schussek
71230a094b
[Form] Fixed validation.xml
2011-03-25 01:46:05 +01:00
Bernhard Schussek
729438fdea
Merge branch 'rename-execute' into experimental
...
Conflicts:
src/Symfony/Component/Form/FileField.php
src/Symfony/Component/Form/Resources/config/validation.xml
2011-03-25 01:38:49 +01:00
Bernhard Schussek
3e29348d21
[Validator] Added support for static callbacks to Callback constraint
2011-03-25 01:36:58 +01:00
Bernhard Schussek
9c6a6e13bf
[Validator] Renamed Execute constraint to Callback
2011-03-25 01:34:35 +01:00
Bernhard Schussek
4c43aa07ea
[Form] Fixed: Elements are removed from collections when a 'collection' field is sized down
2011-03-25 01:15:33 +01:00