Improved the Plugin engine

* Added the basis for new plugin engine.
* Fields are generated dinamically, so making new plugins are more easy since now
* Added FreePaymentBundle and PaypalWebCheckoutBundle as plugins
* Added the basis for new payment engine

app/AppKernel.php

@@ -18,12 +18,16 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
+use Elcodi\Bundle\TestCommonBundle\Functional\Abstracts\AbstractElcodiKernel;
+use Elcodi\Bundle\CoreBundle\Traits\BundleDependenciesResolver;
 
 /**
  * Class AppKernel
  */
-class AppKernel extends Kernel
+class AppKernel extends AbstractElcodiKernel
 {
+    use BundleDependenciesResolver;
+
     /**
      * Returns an array of bundles to register.
      *
@@ -62,14 +66,6 @@ public function registerBundles()
             new Mmoreram\ControllerExtraBundle\ControllerExtraBundle(),
             new Mmoreram\CacheFlushBundle\CacheFlushBundle(),
 
-            /**
-             * Payment suite
-             */
-            new PaymentSuite\PaymentCoreBundle\PaymentCoreBundle(),
-            new PaymentSuite\FreePaymentBundle\FreePaymentBundle(),
-            new PaymentSuite\PaypalWebCheckoutBundle\PaypalWebCheckoutBundle(),
-            new PaymentSuite\PaymillBundle\PaymillBundle(),
-
             /**
              * Elcodi core bundles
              */
@@ -94,11 +90,12 @@ public function registerBundles()
             new Elcodi\Bundle\ConfigurationBundle\ElcodiConfigurationBundle(),
             new Elcodi\Bundle\PageBundle\ElcodiPageBundle(),
             new Elcodi\Bundle\MetricBundle\ElcodiMetricBundle(),
-            new Elcodi\Bundle\PluginBundle\ElcodiPluginBundle(),
+            new Elcodi\Bundle\PluginBundle\ElcodiPluginBundle($this),
             new Elcodi\Bundle\CommentBundle\ElcodiCommentBundle(),
             new Elcodi\Bundle\ZoneBundle\ElcodiZoneBundle(),
             new Elcodi\Bundle\ShippingBundle\ElcodiShippingBundle(),
             new Elcodi\Bundle\SitemapBundle\ElcodiSitemapBundle(),
+            new Elcodi\Bundle\PaymentBundle\ElcodiPaymentBundle(),
 
             /**
              * Elcodi store bundle
@@ -131,21 +128,21 @@ public function registerBundles()
             new Elcodi\Admin\MediaBundle\AdminMediaBundle(),
             new Elcodi\Admin\NewsletterBundle\AdminNewsletterBundle(),
             new Elcodi\Admin\ProductBundle\AdminProductBundle(),
-            new Elcodi\Admin\ConfigurationBundle\AdminConfigurationBundle(),
             new Elcodi\Admin\PageBundle\AdminPageBundle(),
             new Elcodi\Admin\TemplateBundle\AdminTemplateBundle(),
             new Elcodi\Admin\MetricBundle\AdminMetricBundle(),
             new Elcodi\Admin\PluginBundle\AdminPluginBundle(),
             new Elcodi\Admin\ShippingBundle\AdminShippingBundle(),
             new Elcodi\Admin\GeoBundle\AdminGeoBundle(),
+            new Elcodi\Admin\ConfigurationBundle\AdminConfigurationBundle(),
+            new Elcodi\Admin\PaymentBundle\AdminPaymentBundle(),
 
             /**
              * Elcodi common bundle
              */
             new Elcodi\Common\FirewallBundle\ElcodiFirewallBundle(),
             new Elcodi\Common\BambooBundle\ElcodiBambooBundle(),
             new Elcodi\Common\ConfigurationBundle\ConfigurationAnnotationBundle(),
-            new Elcodi\Common\PaymentBridgeBundle\PaymentBridgeBundle(),
 
             /**
              * Elcodi Plugins
@@ -158,6 +155,8 @@ public function registerBundles()
             new Elcodi\Plugin\TwitterBundle\ElcodiTwitterBundle(),
             new Elcodi\Plugin\FacebookBundle\ElcodiFacebookBundle(),
             new Elcodi\Plugin\StoreTemplateBundle\StoreTemplateBundle(),
+            new Elcodi\Plugin\PaypalWebCheckoutBundle\ElcodiPaypalWebCheckoutBundle(),
+            new Elcodi\Plugin\FreePaymentBundle\ElcodiFreePaymentBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
@@ -168,10 +167,10 @@ public function registerBundles()
 
         if (class_exists('Visithor\Bundle\VisithorBundle')) {
             $bundles[] = new Visithor\Bundle\VisithorBundle();
-            $bundles[] = new Elcodi\Common\VisithorBridgeBundle\VisithorBridgeBundle();
+            $bundles[] = new Elcodi\Bridge\VisithorBridgeBundle\ElcodiVisithorBridgeBundle();
         }
 
-        return $bundles;
+        return $this->getBundleInstances($bundles);
     }
 
     /**

app/config/config.yml

@@ -11,18 +11,14 @@ imports:
     - { resource: common/metrics.yml }
     - { resource: common/sitemap.yml }
 
-    # Payment-specific bundle and elcodi configuration
-    - { resource: @PaymentBridgeBundle/Resources/config/configuration.yml }
-    - { resource: @PaymentBridgeBundle/Resources/config/payment.yml }
-
     # Specific service overrides
     - { resource: common/services.yml }
 
     # Project-specific configuration
     - { resource: config_local.yml }
 
 framework:
-    secret:          "%secret%"
+    secret: "%secret%"
     router:
         resource: "%kernel.root_dir%/config/routing/routing.yml"
         strict_requirements: ~
@@ -44,7 +40,7 @@ framework:
 
 # Twig Configuration
 twig:
-    debug:            "%kernel.debug%"
+    debug: "%kernel.debug%"
     strict_variables: false
 
     globals:

app/config/routing/routing.yml

@@ -24,15 +24,6 @@ admin_routes:
     options:
         i18n: false
 
-#
-# Plugin routes
-#
-plugin_routes:
-    resource: "routing_plugin.yml"
-    prefix: /%bamboo_admin_prefix%
-    options:
-        i18n: false
-
 #
 # API routes
 #
@@ -49,6 +40,13 @@ media_routes:
     options:
         i18n: false
 
+#
+# Plugin routes
+#
+plugin_routes:
+    resource: .
+    type: elcodi.routes.plugins
+
 #
 # Per project routes
 # Add your routes in this file

app/config/routing/routing_admin.yml

@@ -55,6 +55,9 @@ admin_geo:
 admin_languages:
     resource: "@AdminLanguageBundle/Resources/config/routing.yml"
 
+admin_payments:
+    resource: "@AdminPaymentBundle/Resources/config/routing.yml"
+
 admin_login_check:
     path:  /login_check
 

app/config/routing/routing_store.yml

@@ -22,9 +22,6 @@ store_currency:
 store_page:
     resource: "@StorePageBundle/Resources/config/routing.yml"
 
-store_payment:
-    resource: "@PaymentBridgeBundle/Resources/config/routing.yml"
-
 store_login_check:
     path:  /login_check
 

composer.json

@@ -146,7 +146,10 @@
     },
     "autoload": {
         "psr-4": {
-            "": "src/",
+            "": [
+                "src/",
+                "plugin/"
+            ],
             "Elcodi\\": [
                 "src/Elcodi"
             ]

scripts/.reload

@@ -8,18 +8,16 @@ rm -Rf /tmp/*
 rm -Rf /tmp/Elcodi/*
 rm -Rf /tmp/Bamboo/*
 
-
 php app/console doctrine:database:drop --connection=default --force
 php app/console doctrine:database:create --connection=default
 php app/console doctrine:schema:update --force --em=default
 php app/console doctrine:fixtures:load --fixtures="src/Elcodi/Fixtures" --no-interaction
 mysql -uroot -proot bamboo < ~/location.sql
 
 php app/console elcodi:plugins:load
-php app/console elcodi:configuration:set store.template "\"StoreTemplateBundle\""
-php app/console elcodi:configuration:set store.under_construction false
-php app/console elcodi:configuration:set store.name "\"Engonga store\""
-php app/console elcodi:configuration:set store.enabled true
+/usr/bin/env php app/console elcodi:configuration:set store.enabled 1
+/usr/bin/env php app/console elcodi:configuration:set store.under_construction 0
+/usr/bin/env php app/console elcodi:configuration:set store.template "\"StoreTemplateBundle\""
 
 php app/console ass:install
 php app/console ass:dump

src/Elcodi/Admin/ConfigurationBundle/AdminConfigurationBundle.php

@@ -20,8 +20,6 @@
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-use Elcodi\Admin\ConfigurationBundle\DependencyInjection\AdminConfigurationExtension;
-
 /**
  * Class AdminConfigurationBundle
  */
@@ -34,6 +32,6 @@ class AdminConfigurationBundle extends Bundle
      */
     public function getContainerExtension()
     {
-        return new AdminConfigurationExtension();
+        return null;
     }
 }

src/Elcodi/Common/PaymentBridgeBundle/PaymentBridgeBundle.php → src/Elcodi/Admin/PaymentBundle/AdminPaymentBundle.php

@@ -15,17 +15,15 @@
  * @author Elcodi Team <[email protected]>
  */
 
-namespace Elcodi\Common\PaymentBridgeBundle;
+namespace Elcodi\Admin\PaymentBundle;
 
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-use Elcodi\Common\PaymentBridgeBundle\DependencyInjection\PaymentBridgeExtension;
-
 /**
- * Class PaymentBridgeBundle
+ * Class AdminPaymentBundle
  */
-class PaymentBridgeBundle extends Bundle
+class AdminPaymentBundle extends Bundle
 {
     /**
      * Returns the bundle's container extension.
@@ -34,6 +32,6 @@ class PaymentBridgeBundle extends Bundle
      */
     public function getContainerExtension()
     {
-        return new PaymentBridgeExtension();
+        return null;
     }
 }

src/Elcodi/Admin/ConfigurationBundle/Controller/PaymentController.php → src/Elcodi/Admin/PaymentBundle/Controller/PaymentController.php

@@ -15,13 +15,13 @@
  * @author Elcodi Team <[email protected]>
  */
 
-namespace Elcodi\Admin\ConfigurationBundle\Controller;
+namespace Elcodi\Admin\PaymentBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
 use Elcodi\Admin\CoreBundle\Controller\Abstracts\AbstractAdminController;
+use Elcodi\Component\Plugin\PluginTypes;
 
 /**
  * Class Controller for payment configuration
@@ -39,19 +39,22 @@ class PaymentController extends AbstractAdminController
      *
      * @Route(
      *      path = "",
-     *      name = "admin_payment_configuration_list"
+     *      name = "admin_payment_list",
+     *      methods = {"GET"}
      * )
-     * @Template
-     * @Method({"GET"})
+     * @Template("AdminPluginBundle:Plugin:list.html.twig")
      */
     public function listAction()
     {
-        $enabledPaymentMethods = $this
-            ->container
-            ->getParameter('store.payment_bridge.enabled_methods');
+        $plugins = $this
+            ->get('elcodi.repository.plugin')
+            ->findBy([
+                'type' => PluginTypes::TYPE_PLUGIN,
+                'category' => 'payment',
+            ]);
 
         return [
-            'enabledPaymentMethods' => $enabledPaymentMethods,
+            'plugins' => $plugins,
         ];
     }
 }

src/Elcodi/Admin/PaymentBundle/Resources/config/routing.yml

@@ -0,0 +1,3 @@
+AdminPaymentBundle:
+    resource: "@AdminPaymentBundle/Controller/"
+    type:     annotation

src/Elcodi/Admin/ConfigurationBundle/DependencyInjection/AdminConfigurationExtension.php → src/Elcodi/Bridge/PaymentSuiteBridgeBundle/DependencyInjection/ElcodiPaymentSuiteBridgeExtension.php

@@ -15,21 +15,21 @@
  * @author Elcodi Team <[email protected]>
  */
 
-namespace Elcodi\Admin\ConfigurationBundle\DependencyInjection;
+namespace Elcodi\Bridge\PaymentSuiteBridgeBundle\DependencyInjection;
 
 use Elcodi\Bundle\CoreBundle\DependencyInjection\Abstracts\AbstractExtension;
 
 /**
- * Class AdminConfigurationExtension
+ * Class ElcodiPaymentSuiteBridgeExtension
  */
-class AdminConfigurationExtension extends AbstractExtension
+class ElcodiPaymentSuiteBridgeExtension extends AbstractExtension
 {
     /**
      * @var string
      *
      * Extension name
      */
-    const EXTENSION_NAME = 'admin_configuration';
+    const EXTENSION_NAME = 'elcodi_payment_suite_bridge';
 
     /**
      * Get the Config file location
@@ -44,20 +44,15 @@ public function getConfigFilesLocation()
     /**
      * Config files to load
      *
-     * return array(
-     *      'file1.yml',
-     *      'file2.yml',
-     *      ...
-     * );
-     *
-     * @param array $config Config
+     * @param array $config Config array
      *
      * @return array Config files
      */
     public function getConfigFiles(array $config)
     {
         return [
-            'formTypes',
+            'services',
+            'eventListeners',
         ];
     }
 
@@ -68,6 +63,6 @@ public function getConfigFiles(array $config)
      */
     public function getAlias()
     {
-        return self::EXTENSION_NAME;
+        return static::EXTENSION_NAME;
     }
 }