From b7f1ed1d1ebcb0132f9c5b541e1064a7338d0796 Mon Sep 17 00:00:00 2001 From: Christian Raue Date: Wed, 1 Apr 2015 18:50:01 +0200 Subject: [PATCH] playground for symfony/symfony#14165 --- app/AppKernel.php | 1 - app/Resources/views/default/index.html.twig | 5 +- composer.json | 5 +- composer.lock | 60 ++----------------- .../Controller/DefaultController.php | 40 ++++++++----- src/AppBundle/Entity/Vehicle.php | 15 +++++ src/AppBundle/Form/CreateVehicleForm.php | 28 +++++++++ 7 files changed, 79 insertions(+), 75 deletions(-) create mode 100644 src/AppBundle/Entity/Vehicle.php create mode 100644 src/AppBundle/Form/CreateVehicleForm.php diff --git a/app/AppKernel.php b/app/AppKernel.php index 1e8325cd24..502007b8f0 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -23,7 +23,6 @@ public function registerBundles() $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); - $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); } return $bundles; diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index ed261498cb..2e7bc9f00b 100644 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -1,5 +1,8 @@ {% extends 'base.html.twig' %} {% block body %} - Homepage. + {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} + {{ form_widget(form) }} + + {{ form_end(form) }} {% endblock %} diff --git a/composer.json b/composer.json index 5d5968be52..639ac9e258 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require": { "php": ">=5.3.3", - "symfony/symfony": "2.7.x-dev", + "symfony/symfony": "2.7.x-dev#ef886548a0b6d1467876a60ef8f2c0f1e5a3ac3c", "doctrine/orm": "~2.2,>=2.2.3,<2.5", "doctrine/dbal": "<2.5", "doctrine/doctrine-bundle": "~1.4", @@ -47,7 +47,8 @@ ] }, "config": { - "bin-dir": "bin" + "bin-dir": "bin", + "notify-on-install": false }, "extra": { "symfony-app-dir": "app", diff --git a/composer.lock b/composer.lock index a6013e9b90..11f513c6e5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "73f15ad91f600008506b4294b7b7d01c", + "hash": "ed603a545faa482df1848f06ae4b6924", "packages": [ { "name": "doctrine/annotations", @@ -1393,12 +1393,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "755ea09a440c1b8ea560e403b442fc9f53e0ae93" + "reference": "ef886548a0b6d1467876a60ef8f2c0f1e5a3ac3c" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/symfony/symfony/zipball/755ea09a440c1b8ea560e403b442fc9f53e0ae93", - "reference": "755ea09a440c1b8ea560e403b442fc9f53e0ae93", + "reference": "ef886548a0b6d1467876a60ef8f2c0f1e5a3ac3c", "shasum": "" }, "require": { @@ -1431,7 +1431,6 @@ "symfony/locale": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", - "symfony/phpunit-bridge": "self.version", "symfony/process": "self.version", "symfony/property-access": "self.version", "symfony/proxy-manager-bridge": "self.version", @@ -1502,7 +1501,7 @@ "keywords": [ "framework" ], - "time": "2015-03-02 10:21:01" + "time": "2015-04-01 07:24:08" }, { "name": "twig/extensions", @@ -1614,56 +1613,7 @@ "time": "2015-01-25 17:32:08" } ], - "packages-dev": [ - { - "name": "sensio/generator-bundle", - "version": "v2.5.2", - "target-dir": "Sensio/Bundle/GeneratorBundle", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4b09746520a826a7bf34a466ba31c7d8740fef7e", - "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e", - "shasum": "" - }, - "require": { - "symfony/console": "~2.5", - "symfony/framework-bundle": "~2.2" - }, - "require-dev": { - "doctrine/orm": "~2.2,>=2.2.3", - "symfony/doctrine-bridge": "~2.2", - "twig/twig": "~1.11" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.5.x-dev" - } - }, - "autoload": { - "psr-0": { - "Sensio\\Bundle\\GeneratorBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle generates code for you", - "time": "2015-02-11 07:21:23" - } - ], + "packages-dev": null, "aliases": [], "minimum-stability": "stable", "stability-flags": { diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index 541a768838..b2dea6055f 100644 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -1,17 +1,25 @@ -render('default/index.html.twig'); - } +createForm(new CreateVehicleForm(), new Vehicle()); + $form->handleRequest($request); + + return $this->render('default/index.html.twig', array( + 'form' => $form->createView(), + )); + } + } diff --git a/src/AppBundle/Entity/Vehicle.php b/src/AppBundle/Entity/Vehicle.php new file mode 100644 index 0000000000..06bed9e26d --- /dev/null +++ b/src/AppBundle/Entity/Vehicle.php @@ -0,0 +1,15 @@ +add('numberOfWheels', 'choice', array( + 'choices' => array_combine($choices, $choices), + 'empty_value' => '', + )); + } + + /** + * {@inheritDoc} + */ + public function getName() { + return 'createVehicle'; + } + +}