Allow support for per-siteaccess parameters; update docs for 1.1 release

Command/GenerateCommand.php

@@ -142,7 +142,7 @@ protected function getWorkflowDirectory($bundleName)
         }
 
         $bundle = $this->getApplication()->getKernel()->getBundle($bundleName);
-        $workflowDirectory = $bundle->getPath() . '/' . $this->getContainer()->getParameter('ez_workflowengine_bundle.workflow_directory');
+        $workflowDirectory = $bundle->getPath() . '/' . $this->getContainer()->get('ez_migration_bundle.helper.config.resolver')->getParameter('ez_workflowengine_bundle.workflow_directory');
 
         return $workflowDirectory;
     }

Core/Loader/Filesystem.php

@@ -4,13 +4,14 @@
 
 use Kaliop\eZMigrationBundle\Core\Loader\Filesystem as BaseLoader;
 use Kaliop\eZWorkflowEngineBundle\API\Value\WorkflowDefinition;
+use Kaliop\eZMigrationBundle\API\ConfigResolverInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 class Filesystem extends BaseLoader
 {
-    public function __construct(KernelInterface $kernel, $versionDirectory = 'Workflows')
+    public function __construct(KernelInterface $kernel, $versionDirectoryParameter = 'Workflows', ConfigResolverInterface $configResolver = null)
     {
-        $this->versionDirectory = $versionDirectory;
+        $this->versionDirectory = $configResolver ? $configResolver->getParameter($versionDirectoryParameter) : $versionDirectoryParameter;
         $this->kernel = $kernel;
     }
 

Core/StorageHandler/Database/Workflow.php

@@ -5,6 +5,7 @@
 use Kaliop\eZMigrationBundle\Core\StorageHandler\Database\Migration as StorageMigration;
 use Kaliop\eZMigrationBundle\API\Value\Migration;
 use Kaliop\eZMigrationBundle\API\Value\MigrationDefinition;
+use Kaliop\eZMigrationBundle\API\ConfigResolverInterface;
 use Kaliop\eZWorkflowEngineBundle\API\Value\Workflow as APIWorkflow;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Schema\Schema;
@@ -16,6 +17,17 @@ class Workflow extends StorageMigration
 {
     protected $fieldList = 'migration, md5, path, execution_date, status, execution_error, signal_name';
 
+    /**
+     * @param DatabaseHandler $dbHandler
+     * @param string $tableNameParameter
+     * @param ConfigResolverInterface $configResolver
+     * @throws \Exception
+     */
+    public function __construct(DatabaseHandler $dbHandler, $tableNameParameter = 'kaliop_workflows', ConfigResolverInterface $configResolver = null)
+    {
+        parent::__construct($dbHandler, $tableNameParameter, $configResolver);
+    }
+
     /**
      * @param MigrationDefinition $migrationDefinition
      * @return APIWorkflow

Resources/config/services.yml

@@ -1,6 +1,11 @@
 parameters:
+    # NB: supports per-siteaccess configuration as an override of global configuration. For that, just define parameters:
+    #     ez_workflowengine_bundle.<siteaccess_group>.table_name
     ez_workflowengine_bundle.table_name: 'kaliop_workflows'
+    # NB: supports per-siteaccess configuration as an override of global configuration. For that, just define parameters:
+    #     ez_workflowengine_bundle.<siteaccess_group>.workflow_directory
     ez_workflowengine_bundle.workflow_directory: 'WorkflowDefinitions'
+
     # Set to false to disable completely the debug log of executed migration steps (also echoed to cli in verbose mode)
     ez_workflowengine_bundle.enable_debug_output: true
     # Abort execution when workflows triggered in cascade reach this limit
@@ -59,7 +64,8 @@ services:
         class: '%ez_workflowengine_bundle.loader.filesystem.class%'
         arguments:
             - '@kernel'
-            - '%ez_workflowengine_bundle.workflow_directory%'
+            - 'ez_workflowengine_bundle.workflow_directory'
+            - '@ez_migration_bundle.helper.config.resolver'
 
     ### parsers
 
@@ -92,7 +98,8 @@ services:
         class: '%ez_workflowengine_bundle.storage_handler.database.class%'
         arguments:
             - '@ezpublish.connection'
-            - '%ez_workflowengine_bundle.table_name%'
+            - 'ez_workflowengine_bundle.table_name'
+            - '@ez_migration_bundle.helper.config.resolver'
 
     ### slots
 

WHATSNEW.md

@@ -0,0 +1,19 @@
+Version 1.1
+===========
+
+* New: it is now possible to define the following parameters using siteaccess-aware configuration:
+
+    `ez_workflowengine_bundle.table_name`, `ez_workflowengine_bundle.workflow_directory`
+
+    This is useful when you need to execute different sets of workflows for each site in a multi-site installation.
+
+* Changed: requires Kaliop eZ-Migration Bundle version 4.7 or later.
+
+    NB: recent versions of the eZ-Migration Bundle have introduced support for multiple features useful for
+    workflows. Be sure to check out its WHATSNEW file. 
+
+
+Version 1.0
+===========
+
+Initial release

composer.json

@@ -9,16 +9,11 @@
             "name": "Gaetano Giunta",
             "email": "[email protected]",
             "role": "Lead Developer"
-        },
-        {
-            "name": "Daniel Clements",
-            "email": "[email protected]",
-            "role": "Developer"
         }
     ],
     "require": {
         "php": ">=5.6",
-        "kaliop/ezmigrationbundle": ">=4.0.0-rc4@dev"
+        "kaliop/ezmigrationbundle": "^4.7"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",

ezpublish_legacy/ezworkflowenginebridge/extension.xml

@@ -2,8 +2,8 @@
 <software>
     <metadata>
         <name>Kaliop eZ Workflow Engine Bridge</name>
-        <version>0.1</version>
+        <version>1.1</version>
         <copyright>Copyright (C) 2017-2018 Kaliop UK Ltd</copyright>
         <license>GNU General Public License v2.0</license>
     </metadata>
-</software>
+</software>