Commit Graph

197 Commits

Author SHA1 Message Date
Johannes Schmitt
9c0db88851 updated to latest changes in Doctrine 2011-05-24 13:29:44 +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
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
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
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
Johannes Schmitt
2d8afd8dd6 Merge remote branch 'origin/master' into annotations
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
2011-05-14 12:51:05 +02:00
Fabien Potencier
f7aea2a830 [FrameworkBundle] re-introduced parameters in the DIC for better overridability 2011-05-13 14:34:17 +02:00
Johannes Schmitt
f7e03f2d87 Merge remote branch 'origin/master' into annotations
Conflicts:
	UPDATE.md
	src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
	src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
2011-05-08 07:28:23 +02:00
Bernhard Schussek
eb50d766da [Form] Fixed variable scope when entering nested form helpers
The consequence of this commit is that variables are accessible that have been passed to a surrounding form helper.

Example template:

{% block my_widget_label %}
    <label>{{ label }}
{% endblock %}

{% block my_widget_row %}
    {# It is not necessary to explicitely pass through the label variable #}
    {{ form_label(form) }}
    {{ form_widget(form) }}
{% endblock %}

Example usage:

{{ form_row(form.mywidget, { 'label': 'My Widget' }) }}
2011-05-04 15:40:15 +02:00
Bernhard Schussek
38098604af [Form] Added tests for blocks/templates in the format _<ID>_(widget|row|label|...) 2011-05-04 15:33:51 +02:00
Johannes Schmitt
672c4ef122 Merge remote branch 'origin/master' into annotations
Conflicts:
	UPDATE.md
2011-05-03 14:38:51 +02:00
Johannes Schmitt
d29c7811aa [FrameworkBundle] updated configuration 2011-05-03 14:36:42 +02:00
Fabien Potencier
d31c403bae Merge remote branch 'pborreli/tests-fix-typos'
* pborreli/tests-fix-typos:
  Various typos
  [WebProfilerBundle] Fixed typo
  [WebProfilerBundle] Adding unit tests
2011-04-30 21:53:15 +02:00
Pascal Borreli
391744719a Various typos 2011-04-30 19:40:15 +00:00
Johannes Schmitt
0d0c737630 Merge remote branch 'origin/master' into annotations
Conflicts:
	UPDATE.md
2011-04-30 10:55:43 +02:00
Fabien Potencier
bb7b7e851d [FrameworkBundle] refactored tests 2011-04-30 07:36:59 +02:00
Daniel Holmes
625cb11d1e [FrameworkBundle] added RequstListener test verifying request context http port fix 2011-04-30 14:24:26 +10:00
Johannes Schmitt
8ef0fc4976 fixed unit tests 2011-04-28 23:26:27 +02:00
Fabien Potencier
05f1481c6a [Form] added the possibility to configure the CSRF field name and the disabling of the CSRF feature altogether 2011-04-28 11:28:44 +02:00
Fabien Potencier
2e9278993c added Definition::getArgument() (very useful when unit testing a Container) 2011-04-28 11:26:10 +02:00
Fabien Potencier
e72f1a9873 added a global secret setting to configure CSRF, the temporary storage, and possibly more 2011-04-28 10:49:59 +02:00
Fabien Potencier
e45d5fa857 merged vicb:template-factorization 2011-04-26 14:38:47 +02:00
Fabien Potencier
59c6609aec Merge remote branch 'vicb/service-event'
* vicb/service-event:
  [FrameworkBundle] Optimization of the method ContainerAwareEventDispacther::dispatch()
  [FrameworkBundle] Fix an issue with ContainerAwareEventDispatcher when re-entering a scope
2011-04-24 22:06:56 +02:00
Fabien Potencier
f05801cace [FrameworkBundle] removed the router.options.resource_type and routing.resource arguments 2011-04-23 15:31:13 +02:00
Fabien Potencier
9bffd8c2db [FrameworkBundle] moved some default values to the Configuration class 2011-04-23 12:07:14 +02:00
Fabien Potencier
3ed0ff7b03 [FrameworkBundle] removed two parameters 2011-04-23 11:34:17 +02:00
Victor Berchet
209b95f232 [FrameworkBundle] Add a unit test for the TemplateFinder class 2011-04-23 11:24:28 +02:00
Pascal Borreli
c4623fc2c0 [FrameworkBundle][Windows] Fixed testValidationPaths on windows 2011-04-22 20:49:09 +00:00
Fabien Potencier
7644e86683 refactored session configuration
* made the options array only for "global" options that are valid for all session storages
 * changed the PDO session storage constructor signature to accept an array of options for DB configuration
 * changed the storage_id to be the full service id, instead of just part of it
 * removed the class parameter for session as it can be changed via the .class parameter (it was the only example in the framework)
 * removed the configuration for the PDO session storage for now
2011-04-22 13:34:57 +02:00
Eriksen Costa
589b0ab4ed Merge branch 'master' into form-frameworkbundle-form-guessers-fix
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormGuessersPass.php
	src/Symfony/Component/Form/MoneyField.php
2011-04-21 23:03:40 -03:00
Fabien Potencier
30e907663b [FrameworkBundle] removed unneeded files in tests 2011-04-21 22:43:38 +02:00
Fabien Potencier
d86aa74e3d [FrameworkBundle] removed the need to boot a Kernel in a unit test file 2011-04-21 22:34:53 +02:00
Fabien Potencier
4dc5b8ec78 [FrameworkBundle] removed the need to boot a Kernel in a unit test file 2011-04-21 21:49:05 +02:00
Ryan Weaver
a5aba7dbd7 [FrameworkBundle] Upating XML test fixtures for newer namespace
This wasn't actually affecting anything (which is why it wasn't caught), but this is more correct.
2011-04-20 16:08:55 -05:00
Victor Berchet
cc89d4b1a5 [FrameworkBundle] Fix an issue with ContainerAwareEventDispatcher when re-entering a scope 2011-04-20 15:04:56 +02:00
Victor Berchet
b4df0ea9ed [FrameworkBundle] Added a test for listener services not available in the current scope 2011-04-20 09:56:44 +02:00
Victor Berchet
a4c41179e0 [FrameworkBundle] Add unit tests for ContainerAwareEventDispatcher 2011-04-20 09:51:38 +02:00
Brikou CARRE
e898445b94 removed empty lines/trailing spaces 2011-04-15 21:12:02 +02:00
Fabien Potencier
067bd0009e Merge remote branch 'kriswallsmith/scalar-nodes'
* kriswallsmith/scalar-nodes:
  removed a lot of special normalization logic in the configuration by using xml values instead of attributes
2011-04-15 07:44:22 +02:00
Bernhard Schussek
44af72bbf4 Merge remote branch 'symfony/master' into experimental 2011-04-14 15:04:59 +02:00
Bernhard Schussek
72b17cd67c [Form] Renamed TemplateContext to FormView 2011-04-14 15:02:51 +02:00
Bernhard Schussek
ca6ae09779 [Form] Removed TemplateContext::create() 2011-04-14 14:42:17 +02:00
Bernhard Schussek
c2dcebf6ea [FrameworkBundle] Added test coverage for FormHelper and fixed various rendering bugs 2011-04-14 13:37:27 +02:00
Fabien Potencier
9cc340a262 fixed inconsistencies in file locator classes 2011-04-14 12:52:22 +02:00
Bernhard Schussek
ce5f3073bd Fixed test suite and names of accessor methods in TemplateContext 2011-04-14 03:52:52 +02:00
Fabien Potencier
56a4f0463a Merge remote branch 'vicb/fix-dbg-evt-mgr'
* vicb/fix-dbg-evt-mgr:
  [FrameworkBundle] Fix an issue when adding a scoped service as an event listener
2011-04-13 23:24:04 +02:00
Fabien Potencier
ea84bb025b fixed session management in functional tests 2011-04-13 23:11:25 +02:00
Victor Berchet
3322cdbefc [FrameworkBundle] Fix an issue when adding a scoped service as an event listener 2011-04-13 23:08:08 +02:00
Kris Wallsmith
672291087c removed a lot of special normalization logic in the configuration by using xml values instead of attributes 2011-04-13 05:59:46 -07:00
Fabien Potencier
4e047b5e27 Merge remote branch 'vicb/event_debug'
* vicb/event_debug:
  [FrameworkBundle] Make some TraceableEventDispacther properties private
  [Event] Tweak phpDoc for consistency
  [FrameworkBundle] Add error detection to the TraceableEventDispatcher
2011-04-13 14:07:05 +02:00