Commit Graph

355 Commits

Author SHA1 Message Date
Fabien Potencier
a487c5200e Revert "[TwigBundle] removed the extends tags from the table layout (it's not needed anymore)"
This reverts commit 66a01855f7.
2011-04-29 11:03:45 +02:00
Fabien Potencier
66a01855f7 [TwigBundle] removed the extends tags from the table layout (it's not needed anymore) 2011-04-29 10:25:01 +02:00
Fabien Potencier
4bef9995c6 fixed typo 2011-04-26 16:02:24 +02:00
Fabien Potencier
e45d5fa857 merged vicb:template-factorization 2011-04-26 14:38:47 +02:00
Fabien Potencier
d6bdb7af88 Merge remote branch 'vicb/tweaks_110425'
* vicb/tweaks_110425:
  [AsseticBundle] Remove an unused property
  [Cache warmers] A few tweaks
2011-04-25 20:54:08 +02:00
Victor Berchet
829bc54392 [Cache warmers] A few tweaks 2011-04-25 11:57:41 +02:00
Pascal Borreli
8c0beea677 [Phpdoc] Cleaning/fixing 2011-04-23 15:18:47 +00:00
Victor Berchet
33dd89fd02 [Template cache warmers] Factorize common code 2011-04-23 11:24:28 +02:00
Fabien Potencier
b347aebee8 [TwigBundle] removed obsolete code 2011-04-23 11:00:54 +02:00
Fabien Potencier
55e6883a88 [TwigBundle] removed obsolete code 2011-04-23 10:55:52 +02:00
Pascal Borreli
325801b00a [TwigBundle] Removed useless code 2011-04-22 22:54:11 +00:00
Fabien Potencier
de8f10e236 Merge remote branch 'Infranology/framework-bundle-updated-method-call' into form
* Infranology/framework-bundle-updated-method-call: (91 commits)
  [FrameworkBundle] updated method call
  moved DoctrineMongoDBBundle to its own repository
  [AsseticBundle] fixed unit tests
  [FrameworkBundle] removed unneeded files in tests
  updated vendors
  [FrameworkBundle] removed the need to boot a Kernel in a unit test file
  [FrameworkBundle] removed the need to boot a Kernel in a unit test file
  [Routing] added getContext() accessor
  [HttpFoundation] fixed a potential security problem in Request
  updated vendors
  Added 201 to the possible status codes that indicate a response is a redirect.
  [FrameworkBundle] made ESI URL relative as allowed by the spec (no need to generate absolute URLs)
  [AsseticBundle] fixed router and controller
  [AsseticBundle] removed fake front controller from URL before creating route
  [AsseticBundle] updated twig integration to check debug mode at runtime rather than compile time since twig cannot vary its cache by debug mode
  [Routing] the global parameters must not be added in the QS when generating URLs
  removed the possibility to pass a message to the trans tag
  simplified exceptions as Twig is now smart enough to automatically add line information
  made the %count% variable automatically available when using the transchoice filter (similar to how the tag works)
  [Container] Added function array_unique on getServiceIds to return only one service name
  ...
2011-04-22 09:35:11 +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
Ryan Weaver
f98916dcc8 [TwigBundle] Removing dbug text in form template 2011-04-21 19:49:45 -05:00
Fabien Potencier
9694ac77a7 [Form] fixed translations escaping 2011-04-21 07:48:12 +02:00
Bernhard Schussek
273d72ef75 [Form] Changed separator for Twig blocks from double underscore to single underscore to match the PHP template separator 2011-04-18 14:28:01 +02:00
Miha Vrhovnik
50011fa344 Added html5 email input to the forms 2011-04-18 11:17:41 +02:00
Brikou CARRE
e898445b94 removed empty lines/trailing spaces 2011-04-15 21:12:02 +02:00
Bernhard Schussek
7b1bf621e1 [Form] Removed obsolete code from div_layout.html.twig 2011-04-15 16:40:28 +02:00
Bernhard Schussek
990bef8afb [Form][FrameworkBundle][TwigBundle] Fixed: CSRF fields are not rendered for nested forms anymore 2011-04-15 14:05:33 +02:00
Henrik Bjørnskov
fbb0ca5c4e [Form] Fixed tests for previous commit 2011-04-14 18:32:51 +02:00
Henrik Bjørnskov
5547243f53 [Form] Starting to bring back resouces as configurable 2011-04-14 18:32:34 +02:00
Fabien Potencier
44edd8fe96 [TwigBundle] renamed default widget files 2011-04-14 16:47:44 +02:00
Bernhard Schussek
c6fe6a750d [Form] Added functional test for the 'size' attribute in the select tags of a time field 2011-04-14 15:29:55 +02:00
Bernhard Schussek
72b17cd67c [Form] Renamed TemplateContext to FormView 2011-04-14 15:02:51 +02:00
Bernhard Schussek
4907c7d81d [Form] Added test coverage for expanded choice fields 2011-04-14 14:18:25 +02:00
Bernhard Schussek
4c0d53a7b6 [TwigBundle] Merged div_layout.html.twig and widget.html.twig 2011-04-14 13:46:11 +02:00
Bernhard Schussek
ce5f3073bd Fixed test suite and names of accessor methods in TemplateContext 2011-04-14 03:52:52 +02:00
Bernhard Schussek
602846f386 [Form] Added tests for table_layout.html.twig 2011-04-14 03:38:19 +02:00
Bernhard Schussek
96f040cec1 [Form] Added extensive test coverage for div_layout.html.twig 2011-04-14 03:15:56 +02:00
Bernhard Schussek
8031ad77c8 Merge remote branch 'fabpot/form' into fabpot_merge 2011-04-13 15:58:15 +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
Bernhard Schussek
2a18be1c9f Merge remote branch 'symfony/master' into experimental 2011-04-13 13:53:20 +02:00
Fabien Potencier
0c93b6bbe4 Merge remote branch 'vicb/locate_template2'
* vicb/locate_template2:
  [FrameworkBundle] Enforce templates instances of TemplateReferenceInterface
  [FrameworkBundle] Add unit tests for the CacheTemplateLocator class
  [FrameworkBundle] Add unit tests for the TemplateLocator class
  [TwigBundle] Fix the cache warmer
  [TwigBundle] Tweak cache warmer configuration
  [FrameworkBundle] Fix resource inheritance in the template cache warmer
2011-04-13 13:38:11 +02:00
Fabien Potencier
7f2294395c [Form] reverted the templating part to be similar to what we have today 2011-04-11 16:42:51 +02:00
Victor Berchet
e254ff8cc6 Display template logical names in exception messages 2011-04-08 19:56:12 +02:00
Victor Berchet
87000a163b [TwigBundle] Fix the cache warmer 2011-04-08 18:54:19 +02:00
Victor Berchet
e1ab14ba08 [TwigBundle] Tweak cache warmer configuration 2011-04-08 18:54:19 +02:00
Fabien Potencier
a230090537 removed some json_encode() calls to use the new getLogicalName() method instead 2011-04-08 17:28:27 +02:00
Bernhard Schussek
67582c9a5c Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php
2011-04-06 16:06:26 +02:00
Victor Berchet
b640fcb0f0 [Config] Introduction of an ConfigurationInterface 2011-04-05 11:26:28 +02:00
Ryan Weaver
22beeb2549 [TwigBundle] Cleaning up several portions of the exception message received when a template cannot be loaded
* The quotations are redundant when the template is a string - json_encode() adds the quotes
 * The exception should not end in a period, as the exception class may add a line number (not in this case, but generall)
 * Made the line number -1, so that no line number was displayed in the message (error at line 0 looks worse than nothing at all)
2011-04-04 21:35:00 -05:00
Fabien Potencier
dd150fc478 Merge remote branch 'vicb/twig_warmer'
* vicb/twig_warmer:
  [TwigBundle] Update the cache warmer
2011-04-04 18:52:56 +02:00
Bernhard Schussek
bfa3c71140 [Form] Added Bundle suffixes again 2011-04-04 15:33:21 +02:00
Bernhard Schussek
0cf8cc762a Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
2011-04-04 15:16:08 +02:00
Fabien Potencier
f232b3cdda reverted Merge remote branch 'kriswallsmith/kernel/shorter-bundle-names' 2011-04-04 11:10:56 +02:00
Fabien Potencier
743592d81e Revert "fixed remaining Bundle suffixes"
This reverts commit 315147c6c8.
2011-04-04 11:08:56 +02:00
Bernhard Schussek
d3b7c4e8c1 [Form] Moved getLabel(), isChoiceSelected() and isChoiceGroup() from ChoiceListInterface to ThemeRenderer 2011-04-02 14:14:18 +02:00
Bernhard Schussek
37e8e1270c [Form][FrameworkBundle][TwigBundle] Renamed view variable 'disabled' to 'read_only' to match with the according FormInterface methods 2011-04-02 12:18:43 +02:00
Fabien Potencier
b219e92bf4 [Form] fixed Twig theme tests 2011-03-31 07:27:55 +02:00
ornicar
d72b1d4f61 Add assets_version twig function. Also add some phpDoc.
I need to get the assets version to pass it to JavaScript. As there is
no obvious way to get it from a twig template actually, I think this
new `assets_version` function makes sense.
2011-03-30 11:14:19 -07:00
Bernhard Schussek
544f763c2c [FrameworkBundle][TwigBundle] Adapted bundle references to latest symfony/master changes 2011-03-28 22:58:05 +02:00
Bernhard Schussek
53838abf3f Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
	src/Symfony/Component/Form/Resources/config/validation.xml
2011-03-28 22:52:15 +02:00
Victor Berchet
95f5ba1ccd [TwigBundle] Update the cache warmer 2011-03-28 22:04:39 +02:00
Fabien Potencier
315147c6c8 fixed remaining Bundle suffixes 2011-03-28 19:04:02 +02:00
Fabien Potencier
49063a5314 Merge remote branch 'kriswallsmith/kernel/shorter-bundle-names'
* kriswallsmith/kernel/shorter-bundle-names:
  updated codebase to use shorter bundle names
  [HttpKernel] updated component to work with shorter bundle names
  [HttpKernel] updated Bundle::getName() to validate bundle class name and rtrim "Bundle"
2011-03-28 18:06:41 +02:00
Fabien Potencier
faf9782e6f renamed Twig TransExtension to TranslationExtension 2011-03-28 16:16:54 +02:00
Kris Wallsmith
ade83e2e80 updated codebase to use shorter bundle names
Controllers:
"BlogBundle:Post:show" is now "Blog:Post:show"

Templates:
"BlogBundle:Post:show.html.twig" is now "Blog:Post:show.html.twig"

Resources:
"@BlogBundle/Resources/config/blog.xml" is now "@Blog/Resources/config/blog.xml"

Doctrine:
"$em->find('BlogBundle:Post', $id)" is now "$em->find('Blog:Post', $id)"
2011-03-27 06:25:43 -07:00
Bernhard Schussek
b21929423e [Form] Completely removed the fields variable in the renderer. The renderer itself supports ArrayAccess and Traversable 2011-03-27 13:48:36 +02:00
Bernhard Schussek
fae319e77a [Form] Renderers are now created explicitely using FormFactory::createRenderer(). This improves performance on requests where a form does not need to be rendered 2011-03-26 16:03:34 +01:00
Bernhard Schussek
d84d167b71 [Form] Fixed display of enctype for file fields in Twig theme 2011-03-25 00:16:30 +01:00
Benjamin Eberlei
8d6dd2b9af [Form] Add Arbitrary Attribute Support to Form Rendering. 2011-03-24 22:08:08 +01:00
Bernhard Schussek
9839aafb7d Merge remote branch 'symfony/master' into experimental 2011-03-23 19:18:38 +01:00
Fabien Potencier
82dec51b30 moved integration between the Yaml component and Twig to a Symfony Bridge 2011-03-23 15:50:55 +01:00
Fabien Potencier
e912b347f0 moved integration between the Translation component and Twig to a Symfony Bridge 2011-03-23 15:23:52 +01:00
Fabien Potencier
3e5bd67dac moved integration between Routing and Twig to a Symfony Bridge 2011-03-23 15:16:57 +01:00
Bernhard Schussek
1c5bbb5426 Merge remote branch 'johnwards/experimental' into johnwards-merge 2011-03-21 22:14:59 +01:00
John Wards
31647d3662 [TwigBundle] Changed twig variable from 'this' to 'renderer' 2011-03-21 20:46:19 +00:00
Bernhard Schussek
61804bbd8b Merge remote branch 'symfony/master' into experimental 2011-03-21 20:27:39 +01:00
Miha Vrhovnik
e57075ea60 removed unused and undefined namespace and use statement 2011-03-21 10:50:13 +01:00
Benjamin Eberlei
32e1a7c8f9 Merge bschussek/experimental into branch forms. 2011-03-19 15:18:52 +01:00
Bernhard Schussek
3e17b26105 [Form] Moved CSRF protection into separate field 2011-03-19 15:06:54 +01:00
Bernhard Schussek
89215d167d Merge remote branch 'symfony/master' into experimental 2011-03-19 13:25:41 +01:00
Benjamin Eberlei
bb8c2a9b9d Rename this to renderer to be able to use it in Php Templating 2011-03-19 11:54:46 +01:00
Fabien Potencier
2d9ae36119 Merge remote branch 'vicb/one_more_thing' 2011-03-18 16:32:35 +01:00
Fabien Potencier
0c8ff92ecd made the controller name in the WDT clickable 2011-03-18 16:09:21 +01:00
Victor Berchet
d959a3ed4b [TwigBundle] Rename the cache warmer service 2011-03-18 15:48:34 +01:00
Fabien Potencier
c5a6c8432f Merge remote branch 'vicb/templating' 2011-03-18 11:54:20 +01:00
Victor Berchet
f89a5ff3b8 [TwigBundle] Fix some typos 2011-03-18 11:30:23 +01:00
Victor Berchet
7f523466f4 [TwigBundle] Fix the cache warmer 2011-03-18 11:23:23 +01:00
Christophe Coevoet
2743abc35d [DoctrineBundle] Fix some typos 2011-03-17 23:14:18 +01:00
Victor Berchet
0e84757d94 Tweak PHPDocs in the extension configuration files 2011-03-17 16:29:03 +01:00
Victor Berchet
1e0ed22c55 [Config] Component refactoring
The Config component API have changed and the extension configuration files must be updated accordingly:

1. Array nodes must enclosed their children definition in ->children() ... ->end() calls:

Before:

    $treeBuilder->root('zend', 'array')
        ->arrayNode('logger')
            ->scalarNode('priority')->defaultValue('INFO')->end()
            ->booleanNode('log_errors')->defaultFalse()->end()
        ->end();

After:

    $treeBuilder->root('zend', 'array')
        ->children()
            ->arrayNode('logger')
                ->children()
                    ->scalarNode('priority')->defaultValue('INFO')->end()
                    ->booleanNode('log_errors')->defaultFalse()->end()
                ->end()
            ->end()
        ->end();

2. The 'builder' method (in NodeBuilder) has been dropped in favor of an 'append' method (in ArrayNodeDefinition)

Before:

    $treeBuilder->root('doctrine', 'array')
        ->arrayNode('dbal')
            ->builder($this->getDbalConnectionsNode())
        ->end();

After:

    $treeBuilder->root('doctrine', 'array')
        ->children()
            ->arrayNode('dbal')
                ->append($this->getDbalConnectionsNode())
            ->end()
        ->end();

3. The root of a TreeBuilder is now an NodeDefinition (and most probably an ArrayNodeDefinition):

Before:

    $root = $treeBuilder->root('doctrine', 'array');
    $this->addDbalSection($root);

    public function addDbalSection(NodeBuilder $node)
    {
        ...
    }

After:

    $root = $treeBuilder->root('doctrine', 'array');
    $this->addDbalSection($root);

    public function addDbalSection(ArrayNodeDefinition $node)
    {
        ...
    }

4. The NodeBuilder API has changed (this is seldom used):

Before:

    $node = new NodeBuilder('connections', 'array');

After:

The recommended way is to use a tree builder:

    $treeBuilder = new TreeBuilder();
    $node = $treeBuilder->root('connections', 'array');

An other way would be:

    $builder = new NodeBuilder();
    $node = $builder->node('connections', 'array');

Some notes:

- Tree root nodes should most always be array nodes, so this as been made the default:

    $treeBuilder->root('doctrine', 'array') is equivalent to $treeBuilder->root('doctrine')

- There could be more than one ->children() ... ->end() sections. This could help with the readability:

    $treeBuilder->root('doctrine')
        ->children()
            ->scalarNode('default_connection')->end()
        ->end()
        ->fixXmlConfig('type')
        ->children()
            ->arrayNode('types')
                ....
            ->end()
        ->end()
2011-03-17 16:26:15 +01:00
Bernhard Schussek
1c9a00733f Merge branch 'event-manager' into experimental
Conflicts:
	src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
	src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
2011-03-17 13:38:24 +01:00
Fabien Potencier
005287ac88 Merge remote branch 'kriswallsmith/templating/asset-packages' 2011-03-16 16:18:45 +01:00
Bernhard Schussek
f64f55002b Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
	src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
2011-03-16 16:00:54 +01:00
Christophe Coevoet
61abc3d01f Added the global variable in PHP templates too 2011-03-16 13:11:29 +01:00
Fabien Potencier
539e0e4870 Merge remote branch 'mweimerskirch/master' 2011-03-14 14:38:00 +01:00
Bernhard Schussek
0bf566310c Merge branch 'event-manager' into experimental
Conflicts:
	src/Symfony/Component/Form/BirthdayField.php
	src/Symfony/Component/Form/CheckboxField.php
	src/Symfony/Component/Form/ChoiceField.php
	src/Symfony/Component/Form/ChoiceList/TimeZoneChoiceList.php
	src/Symfony/Component/Form/CollectionField.php
	src/Symfony/Component/Form/DateField.php
	src/Symfony/Component/Form/DateTimeField.php
	src/Symfony/Component/Form/EntityChoiceField.php
	src/Symfony/Component/Form/Events.php
	src/Symfony/Component/Form/FieldFactory/FieldFactory.php
	src/Symfony/Component/Form/FieldFactory/FieldFactoryInterface.php
	src/Symfony/Component/Form/FileField.php
	src/Symfony/Component/Form/Filters.php
	src/Symfony/Component/Form/FormContext.php
	src/Symfony/Component/Form/FormContextInterface.php
	src/Symfony/Component/Form/FormFactoryInterface.php
	src/Symfony/Component/Form/HybridField.php
	src/Symfony/Component/Form/IntegerField.php
	src/Symfony/Component/Form/LanguageField.php
	src/Symfony/Component/Form/LocaleField.php
	src/Symfony/Component/Form/MoneyField.php
	src/Symfony/Component/Form/NumberField.php
	src/Symfony/Component/Form/PasswordField.php
	src/Symfony/Component/Form/PercentField.php
	src/Symfony/Component/Form/RepeatedField.php
	src/Symfony/Component/Form/TextField.php
	src/Symfony/Component/Form/TimeField.php
	src/Symfony/Component/Form/ToggleField.php
	src/Symfony/Component/Form/UrlField.php
	src/Symfony/Component/HttpFoundation/File/UploadedFile.php
	tests/Symfony/Tests/Component/Form/FileFieldTest.php
	tests/Symfony/Tests/Component/Form/FormContextTest.php
	tests/Symfony/Tests/Component/Form/HiddenFieldTest.php
2011-03-13 21:04:24 +01:00
Don Pinkster
f8493842d3 [TwigBundle] Fixed PHPDoc 2011-03-11 22:44:32 +01:00
Don Pinkster
c4923fc57e [TwigBundle] Fixed typo 2011-03-11 22:39:47 +01:00
Kris Wallsmith
7d9ddb546e [TwigBundle] updated to support asset packages 2011-03-08 09:24:43 -08:00
Fabien Potencier
8c423edfef replaced symfony-project.org by symfony.com 2011-03-06 12:40:06 +01:00
Bernhard Schussek
e53c688a6b [Form] Fixed RepeatedField, improved structure of the Twig templates 2011-03-02 16:00:31 +01:00
Bernhard Schussek
68013f4db2 Merge remote branch 'symfony/master' into experimental 2011-03-02 12:27:30 +01:00
Pascal Borreli
19f931a231 [TwigBundle] Fixed Typo 2011-03-01 18:58:07 +01:00
Bernhard Schussek
c1edf116f2 [Form] Removed notion of "hidden" fields
Instead, hidden fields now override the "row" template to not include a label or errors.

The "rest" (former "hidden") helper has been adapted to output any fields that were not
rendered manually. It should usually be called at the end of a form.
2011-02-28 17:01:11 +01:00
Bernhard Schussek
02d2121dcd [Form] Improved rendering
Fields are not available in the templates anymore. Instead, all required information can be
accessed through view variables.

Example usage of helpers and variables in a form theme:

// use the label helper
{{ this.label('my label') }}

// use the label variable
{{ this.vars.label }}
{{ label }}

Example usage of helpers and variables in a normal template:

// use the label helper
{{ field.label('my label') }}

// use the label variable
{{ field.vars.label }}
2011-02-28 16:50:23 +01:00
Christophe Coevoet
92bfbf575c Fixed CS 2011-02-27 20:56:29 +01:00
Pascal Borreli
0c9951f676 [TwigBundle] Fixed typo 2011-02-26 20:02:05 +01:00