Commit Graph

2173 Commits

Author SHA1 Message Date
Johannes Schmitt
51f1add9b3 Merge remote branch 'origin/master' into doctrine 2011-05-23 07:09:58 +02:00
Fabien Potencier
0d68470638 [FrameworkBundle] made a small cleanup 2011-05-22 08:47:38 +02:00
Fabien Potencier
a2a1a88291 Merge remote branch 'schmittjoh/annotations'
* schmittjoh/annotations:
  removed obsolete compiler pass
  fixed some more tests
  fixed tests
  removed unused vendor
  some cleanups
  updated to latest changes
  [WebProfilerBundle] removed @ignorePhpDoc annotations
  [FrameworkBundle] fixed default
  [FrameworkBundle] updated configuration
  [Validator] updated fixtures
  updated UPDATE file
  updated Annotations integration
  [Routing] updated to changes
  [FrameworkBundle] added framework-wide annotation reader, updated validator tests
  [WebProfilerBundle] fixed controllers
  fixed unit tests
  added Annotations library
2011-05-22 08:45:24 +02:00
Fabien Potencier
003fe6743d Merge remote branch 'vicb/form-render'
* vicb/form-render:
  [Twig][Form] Optimize form rendering
2011-05-22 08:19:20 +02:00
hidenorigoto
c9f188b658 [FrameworkBundle] replaced Util/Mustache to Generator/Generator 2011-05-22 00:10:22 +09:00
Victor Berchet
eb10c66a55 [Twig][Form] Optimize form rendering 2011-05-20 16:45:57 +02:00
Fabien Potencier
f3b92cb1ad [FrameworkBundle] renamed Mustache to Generator and moved it to a new Generator sub-namespace 2011-05-20 09:32:54 +02:00
Johannes Schmitt
ddc00fa0f6 removed obsolete compiler pass 2011-05-20 06:59:30 +02:00
Johannes Schmitt
98ed7dd030 fixed some more tests 2011-05-19 23:15:41 +02:00
Johannes Schmitt
6c0b0449a6 Merge remote branch 'origin/master' into annotations
Conflicts:
	UPDATE.md
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
2011-05-19 22:49:59 +02:00
Johannes Schmitt
42fb34b647 fixed tests 2011-05-19 22:46:34 +02:00
stealth35
286961c47f Removed unnecessary array_push 2011-05-19 18:11:22 +02:00
Johannes Schmitt
b70d7a7462 [DoctrineBundle] added some tests 2011-05-19 18:03:56 +02:00
Fabien Potencier
9fe1c3ae0e Merge remote branch 'bschussek/form'
* bschussek/form: (22 commits)
  Fix merge error (function "guess" was in there twice)
  [Form] Added test case for bf2f9d2a02
  [Form] Form::isBound() and Form::isValid() work correctly now for read-only forms
  [Locale] Improved error reporting and added stubs for intl_is_failure(), intl_get_error_code() and intl_get_error_message()
  [Form] Implemented fix for 361c67f54f
  [Form] Add test for the handling of array values in the constraint violation
  [Form] Further simplified PropertyPath code
  [Form] Added test for 6c337d1cc0
  [Form] Removed unused option "pattern" of date and time type
  [Form] Renamed view variable "name" to "full_name"
  [Form] Renamed collection option "type_options" to "options" to be consistent with the repeated type
  [Form] CSRF documentation and a few CS changes
  [Form] Move CSRF options from types to the CSRF extension
  [Form] Added a search form field type
  [Form] Optimization of PropertyPath
  [Form] replace assertEquals by assertFalse, assertTrue, assertNull
  [Form] fix file permissions to 644 again ;)
  [Form] add tests for type_options in collectionType
  fix file permissions to 644
  [Form] add type_options for CollectionType to be abble to set options to type
  ...
2011-05-19 16:25:30 +02:00
Fabien Potencier
75e7a7a76f Merge remote branch 'kriswallsmith/assetic/combine'
* kriswallsmith/assetic/combine:
  [AsseticBundle] added missing filter to test
  [AsseticBundle] added config for cssimport filter
  [AsseticBundle] added config for packager filter
  [AsseticBundle] removed problematic test
  [AsseticBundle] fixed various bugs in PHP templating, added new "combine" option
2011-05-19 15:47:35 +02:00
Fabien Potencier
c4232b11fa Merge remote branch 'beberlei/DoctrineUniqueValidator'
* beberlei/DoctrineUniqueValidator:
  [Doctrine] Fix default value to null for entity manager to make fluent integration with Doctrine Registry work
  [Doctrine] Add fields as default option and allow strings to be passed.
  [Doctrine] Add DoctrineBundle integration (DI Container registration) for the UniqueEntityValidator
  [Doctrine] Implement suggested changes by Stof, added functional test to verify unique validator works.
  [Doctrine] Add Unique Validator
2011-05-19 15:38:20 +02:00
Kris Wallsmith
4f37b9e9fb [AsseticBundle] added missing filter to test 2011-05-19 05:55:36 -07:00
Kris Wallsmith
fa248e00fb [AsseticBundle] added config for cssimport filter 2011-05-19 05:55:36 -07:00
Kris Wallsmith
e74c6edc34 [AsseticBundle] added config for packager filter 2011-05-19 05:55:36 -07:00
Kris Wallsmith
7ed5518554 [AsseticBundle] removed problematic test 2011-05-19 05:55:35 -07:00
Kris Wallsmith
7eeb945a4c [AsseticBundle] fixed various bugs in PHP templating, added new "combine" option 2011-05-19 05:55:35 -07:00
Johannes Schmitt
dbf577cc2b [DoctrineBundle] use dot instead of slash 2011-05-19 14:44:28 +02:00
Johannes Schmitt
0d16ceed9b [DoctrineBundle] allow entities in sub directories 2011-05-19 14:41:23 +02:00
Johannes Schmitt
5b007e3ae2 Merge remote branch 'origin/master' into doctrine 2011-05-19 14:34:24 +02:00
Bernhard Schussek
dcc61a9a98 Merge remote branch 'shieldo/search_field' into shieldo_merge 2011-05-19 01:41:59 +02:00
Benjamin Eberlei
86f9b17254 [Doctrine] Add DoctrineBundle integration (DI Container registration) for the UniqueEntityValidator 2011-05-18 23:09:46 +02:00
Bernhard Schussek
216d7e415d Merge remote branch 'mweimerskirch/form_pattern_attribute' into mweimerskirch_merge
Conflicts:
	src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
	src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
	src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
2011-05-18 22:49:27 +02:00
Bernhard Schussek
f467317bab [Form] Renamed view variable "name" to "full_name"
The variable "name" now contains the local, short name (equivalent to $form->getName()).
2011-05-18 22:16:16 +02:00
Fabien Potencier
a15e846568 added a way to disable forms, and force validation to be enabled when forms are enabled (closes #840) 2011-05-18 15:45:34 +02:00
Fabien Potencier
0687aadad2 fixed form configuration when no session is available (closes #841) 2011-05-18 12:54:16 +02:00
Fabien Potencier
fdbdcbbd0a Merge remote branch 'kriswallsmith/assetic/dump-fixes'
* kriswallsmith/assetic/dump-fixes:
  [AsseticBundle] fixed command unit test
  [AsseticBundle] added env and debug mode to assetic:dump output
  [AsseticBundle] made --watch sleep period a command option
  [AsseticBundle] added a --force option to assetic:dump --watch
  [AsseticBundle] fixed typo in dump --watch
2011-05-17 22:06:51 +02:00
Kris Wallsmith
8e85a36e37 [FrameworkBundle] fixed renamed routing exception 2011-05-17 12:55:24 -07:00
Kris Wallsmith
f29aba534c [AsseticBundle] fixed command unit test 2011-05-17 12:27:39 -07:00
Kris Wallsmith
26a31bfc9d [AsseticBundle] added env and debug mode to assetic:dump output 2011-05-17 12:13:17 -07:00
Kris Wallsmith
e65a4535b5 [AsseticBundle] made --watch sleep period a command option 2011-05-17 12:08:14 -07:00
Kris Wallsmith
84d5cbfba8 [AsseticBundle] added a --force option to assetic:dump --watch 2011-05-17 12:05:01 -07:00
Kris Wallsmith
5877b11478 [AsseticBundle] fixed typo in dump --watch 2011-05-17 11:57:44 -07:00
Fabien Potencier
68a0b7aded Merge remote branch 'kriswallsmith/framework/package-config-fix'
* kriswallsmith/framework/package-config-fix:
  [FrameworkBundle] updated extension to use replaceArgument() rather than a parameter
2011-05-17 19:04:47 +02:00
Kris Wallsmith
1a49296b59 [FrameworkBundle] updated extension to use replaceArgument() rather than a parameter 2011-05-17 09:53:42 -07:00
Fabien Potencier
7b4c12b7dc Merge remote branch 'ornicar/twigAssetsVersion'
* ornicar/twigAssetsVersion:
  Add `assets_version` twig function. Also add some phpDoc.
2011-05-17 18:48:53 +02:00
Fabien Potencier
eb202bb7b7 merged kriswallsmith/form/csrf-intention 2011-05-17 15:25:50 +02:00
Fabien Potencier
02e77ec4e3 [Routing] moved Matcher exceptions 2011-05-17 10:11:27 +02:00
Fabien Potencier
3d85008141 Merge remote branch 'danielholmes/widget_templates'
* danielholmes/widget_templates:
  [TwigBundle] fixed form templates so divs won't have all the input attributes, some of which are invalid (such as required, maxlength, name, etc)
2011-05-17 09:19:03 +02:00
Johannes Schmitt
54ae90d36d some cleanups 2011-05-17 07:41:49 +02:00
Johannes Schmitt
44950ddb77 updated to latest changes 2011-05-17 07:24:33 +02:00
Kris Wallsmith
b645278f8b [Security] updated with "intention" 2011-05-16 14:16:30 -07:00
Johannes Schmitt
796d9af0c4 some updates 2011-05-16 22:26:24 +02:00
Kris Wallsmith
663f8a052e [AsseticBundle] added configuration for cssembed filter 2011-05-16 07:05:07 -07:00
Fabien Potencier
122a61b5cc Merge remote branch 'kriswallsmith/assetic/filter-pass-fix'
* kriswallsmith/assetic/filter-pass-fix:
  [AsseticBundle] fixed previous PR
2011-05-16 08:22:56 +02:00
Fabien Potencier
3949b8e3f1 [FrameworkBundle] fixed redirect controller when a non-standard port is used (closes #965) 2011-05-16 08:21:58 +02:00