WIP - Propel2 support

Builder/Propel2/ActionsBuilderAction.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\ActionsBuilderAction as AdminActionsBuilderAction;
+
+/**
+ * This builder generate php for actions in propel
+ * @author Piotr Gołębiewski <[email protected]>
+ */
+class ActionsBuilderAction extends AdminActionsBuilderAction
+{
+}

Builder/Propel2/ActionsBuilderTemplate.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\ActionsBuilderTemplate as AdminActionsBuilderTemplate;
+
+/**
+ * This builder generate php for actions for propel
+ * @author Piotr Gołębiewski <[email protected]>
+ */
+class ActionsBuilderTemplate extends AdminActionsBuilderTemplate
+{
+}

Builder/Propel2/EditBuilderAction.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\EditBuilderAction as AdminEditBuilderAction;
+
+/**
+ * This builder generate php for edit actions in Propel
+ * @author cedric Lombardot
+ */
+class EditBuilderAction extends AdminEditBuilderAction
+{
+}

Builder/Propel2/EditBuilderTemplate.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\EditBuilderTemplate as AdminEditBuilderTemplate;
+
+/**
+ * This builder generate php for edit actions for Propel
+ * @author cedric Lombardot
+ */
+class EditBuilderTemplate extends AdminEditBuilderTemplate
+{
+}

Builder/Propel2/EditBuilderType.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\EditBuilderType as AdminEditBuilderType;
+
+/**
+ * This builder generate php for edit form
+ * @author cedric Lombardot
+ */
+class EditBuilderType extends AdminEditBuilderType
+{
+}

Builder/Propel2/ExcelBuilderAction.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\ExcelBuilderAction as AdminExcelBuilderAction;
+
+/**
+ * This builder generate php for Excel actions in Propel
+ * @author cedric Lombardot
+ * @author Bob van de Vijver
+ */
+class ExcelBuilderAction extends AdminExcelBuilderAction
+{
+}

Builder/Propel2/FiltersBuilderType.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\FiltersBuilderType as AdminFiltersBuilderType;
+
+/**
+ * This builder generate php for Filters form
+ * @author cedric Lombardot
+ */
+class FiltersBuilderType extends AdminFiltersBuilderType
+{
+}

Builder/Propel2/ListBuilderAction.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\ListBuilderAction as AdminListBuilderAction;
+
+/**
+ * This builder generate php for lists actions in Propel
+ * @author cedric Lombardot
+ */
+class ListBuilderAction extends AdminListBuilderAction
+{
+}

Builder/Propel2/ListBuilderTemplate.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\ListBuilderTemplate as AdminListBuilderTemplate;
+
+/**
+ * This builder generate php for lists actions for Propel
+ * @author cedric Lombardot
+ */
+class ListBuilderTemplate extends AdminListBuilderTemplate
+{
+}

Builder/Propel2/NestedListBuilderAction.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\NestedListBuilderAction as AdminNestedListBuilderAction;
+
+/**
+ * This builder generate php for lists actions in Propel
+ * @author cedric Lombardot
+ */
+class NestedListBuilderAction extends AdminNestedListBuilderAction
+{
+}

Builder/Propel2/NestedListBuilderTemplate.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\NestedListBuilderTemplate as AdminNestedListBuilderTemplate;
+
+/**
+ * This builder generate php for lists actions for Propel
+ * @author cedric Lombardot
+ */
+class NestedListBuilderTemplate extends AdminNestedListBuilderTemplate
+{
+}

Builder/Propel2/NewBuilderAction.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\NewBuilderAction as AdminNewBuilderAction;
+
+/**
+ * This builder generate php for New actions in Propel
+ * @author cedric Lombardot
+ */
+class NewBuilderAction extends AdminNewBuilderAction
+{
+}

Builder/Propel2/NewBuilderTemplate.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\NewBuilderTemplate as AdminNewBuilderTemplate;
+
+/**
+ * This builder generate php for New actions for Propel
+ * @author cedric Lombardot
+ */
+class NewBuilderTemplate extends AdminNewBuilderTemplate
+{
+}

Builder/Propel2/NewBuilderType.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\NewBuilderType as AdminNewBuilderType;
+
+/**
+ * This builder generate php for New form
+ * @author cedric Lombardot
+ */
+class NewBuilderType extends AdminNewBuilderType
+{
+}

Builder/Propel2/ShowBuilderAction.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\ShowBuilderAction as AdminShowBuilderAction;
+
+/**
+ * This builder generate php for edit actions in Propel
+ * @author Eymen Gunay
+ */
+class ShowBuilderAction extends AdminShowBuilderAction
+{
+}

Builder/Propel2/ShowBuilderTemplate.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Admingenerator\GeneratorBundle\Builder\Propel2;
+
+use Admingenerator\GeneratorBundle\Builder\Admin\ShowBuilderTemplate as AdminShowBuilderTemplate;
+
+/**
+ * This builder generate php for edit actions for Propel
+ * @author Eymen Gunay
+ */
+class ShowBuilderTemplate extends AdminShowBuilderTemplate
+{
+}

CacheWarmer/GeneratorCacheWarmer.php

@@ -96,9 +96,13 @@ protected function buildFromYaml($file)
      */
     protected function propelInit()
     {
-        if (!\Propel::isInit()) {
-            \Propel::setConfiguration($this->container->get('propel.configuration'));
-            \Propel::initialize();
+        if (class_exists('Propel')) { // Propel 1
+            if (!\Propel::isInit()) {
+                \Propel::setConfiguration($this->container->get('propel.configuration'));
+                \Propel::initialize();
+            }
+
+            return;
         }
     }
 }

DependencyInjection/AdmingeneratorGeneratorExtension.php

@@ -76,7 +76,7 @@ public function load(array $configs, ContainerBuilder $container)
         if ($config['use_jms_security']) {
             $container->getDefinition('twig.extension.admingenerator.security')->addArgument(true);
             $container->getDefinition('twig.extension.admingenerator.echo')->addArgument(true);
-        } 
+        }
 
         $this->registerGeneratedFormsAsServices($container);
         $this->processModelManagerConfiguration($config, $container);
@@ -91,7 +91,7 @@ public function load(array $configs, ContainerBuilder $container)
      */
     private function processModelManagerConfiguration(array $config, ContainerBuilder $container)
     {
-        if (!($config['use_doctrine_orm'] || $config['use_doctrine_odm'] || $config['use_propel'])) {
+        if (!($config['use_doctrine_orm'] || $config['use_doctrine_odm'] || $config['use_propel'] || $config['use_propel2'])) {
             throw new ModelManagerNotSelectedException();
         }
 
@@ -105,6 +105,7 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde
             $doctrineOrmTemplatesDirs[] = $dir . DIRECTORY_SEPARATOR . 'Doctrine';
             $doctrineOdmTemplatesDirs[] = $dir . DIRECTORY_SEPARATOR . 'DoctrineODM';
             $propelTemplatesDirs[] = $dir . DIRECTORY_SEPARATOR . 'Propel';
+            $propel2TemplatesDirs[] = $dir . DIRECTORY_SEPARATOR . 'Propel2';
         }
 
         if ($config['use_doctrine_orm']) {
@@ -155,6 +156,23 @@ private function processModelManagerConfiguration(array $config, ContainerBuilde
                 ->addArgument($config['guess_required'])
                 ->addArgument($config['default_required']);
         }
+
+
+        if ($config['use_propel2']) {
+            $loader->load('propel2.xml');
+            $this->addTemplatesInitialization($container->getDefinition('admingenerator.generator.propel2'), $propel2TemplatesDirs);
+            if ($config['overwrite_if_exists']) {
+                $container
+                    ->getDefinition('admingenerator.generator.propel2')
+                    ->addMethodCall('forceOverwriteIfExists');
+            }
+
+            $container->getDefinition('admingenerator.fieldguesser.propel2')
+                ->addArgument($config['form_types']['propel2'])
+                ->addArgument($config['filter_types']['propel2'])
+                ->addArgument($config['guess_required'])
+                ->addArgument($config['default_required']);
+        }
     }
 
     /**