kaliop-uk / ezworkflowenginebundle

Core/StorageHandler/Database/Workflow.php

Spacing +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
     protected function getWorkflowName($workflowDefinitionName)
     {
         $mtime = explode(' ', microtime());
-        $time = date('YmdHis', $mtime[1]). substr($mtime[0], 2, 3);
+        $time = date('YmdHis', $mtime[1]) . substr($mtime[0], 2, 3);
         return $time . '/' . getmypid() . '/' . $workflowDefinitionName;
     }
 }

Core/WorkflowServiceFacade.php

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
         if (count($workflowDefinitions)) {
 
             $workflowParameters = array();
-            foreach($signalParameters as $parameter => $value) {
+            foreach ($signalParameters as $parameter => $value) {
                 $convertedParameter = $this->convertSignalMember($signalName, $parameter);
                 $workflowParameters['signal:' . $convertedParameter] = $value;
             }
@@ -118,7 +118,7 @@ 
     {
         $defs = array();
 
-        foreach($this->innerService->getMigrationsDefinitions() as $key => $definition) {
+        foreach ($this->innerService->getMigrationsDefinitions() as $key => $definition) {
             if ($definition->status == MigrationDefinition::STATUS_TO_PARSE) {
                 $definition = $this->innerService->parseMigrationDefinition($definition);
             }
@@ -147,7 +147,7 @@ 
         $defs = array();
         $resources = array();
 
-        foreach($this->getWorkflowsDefinitions($paths) as $key => $definition) {
+        foreach ($this->getWorkflowsDefinitions($paths) as $key => $definition) {
             /// @todo add safety check that we got back in fact a WorkflowDefinition
             if ($definition->signalName === $signalName && $definition->status == MigrationDefinition::STATUS_PARSED) {
                 $defs[$key] = $definition;
@@ -157,7 +157,7 @@ 
 
         $collection = new MigrationDefinitionCollection($defs);
 
-        $code = '<?php return '.var_export($collection, true).';';
+        $code = '<?php return ' . var_export($collection, true) . ';';
         $cache->write($code, $resources);
 
         return $collection;

Braces +9 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
     {
         $workflowDefinitions = $this->getValidWorkflowsDefinitionsForSignal($signalName);
 
-        if ($this->logger) $this->logger->debug("Found " . count($workflowDefinitions) . " workflow definitions for signal '$signalName'");
+        if ($this->logger) {
+            $this->logger->debug("Found " . count($workflowDefinitions) . " workflow definitions for signal '$signalName'");
+        }
 
         if (count($workflowDefinitions)) {
 
@@ -57,7 +59,9 @@ 
             foreach ($workflowDefinitions as $workflowDefinition) {
 
                 if (self::$workflowExecuting > 0 && $workflowDefinition->avoidRecursion) {
-                    if ($this->logger) $this->logger->debug("Skipping workflow '{$workflowDefinition->name}' to avoid recursion (workflow already executing)");
+                    if ($this->logger) {
+                        $this->logger->debug("Skipping workflow '{$workflowDefinition->name}' to avoid recursion (workflow already executing)");
+                    }
                     return;
                 }
 
@@ -81,7 +85,9 @@ 
                 self::$workflowExecuting += 1;
                 try {
 
-                    if ($this->logger) $this->logger->debug("Executing workflow '{$workflowDefinition->name}' with parameters: " . preg_replace("/\n+/s", ' ', preg_replace('/^(Array| +|\(|\))/m', '', print_r($workflowParameters, true))));
+                    if ($this->logger) {
+                        $this->logger->debug("Executing workflow '{$workflowDefinition->name}' with parameters: " . preg_replace("/\n+/s", ' ', preg_replace('/^(Array| +|\(|\))/m', '', print_r($workflowParameters, true))));
+                    }
 
                     /// @todo allow setting of default lang, user and userGroup content types ?
                     $this->innerService->executeMigration($wfd, array(

Core/DefinitionParser/AbstractDefinitionParser.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
                     $avoidRecursion = $dsl[WorkflowDefinition::MANIFEST_AVOIDRECURSION_ELEMENT];
                 }
 
-            } while(false);
+            } while (false);
         }
 
         return new WorkflowDefinition(

ezpublish_legacy/ezworkflowenginebridge/eventtypes/event/ezworkflowenginehook/ezworkflowenginehooktype.php

Spacing +79 added lines, -79 removed lines

@@ -5,25 +5,25 @@ 
     const WORKFLOW_TYPE_STRING = 'ezworkflowenginehook';
 
     static $signalMapping = array(
-        'content_addlocation' => array( 'pre' => false, 'post' => 'LocationService\CreateLocationSignal' ),
+        'content_addlocation' => array('pre' => false, 'post' => 'LocationService\CreateLocationSignal'),
         // this legacy operation does not allow us to retrieve in all scenarios the object_id, needed for the corresponding signal
         //'content_delete' =>  array( 'pre' => false, 'post' => 'ContentService\DeleteContentSignal' ),
-        'content_hide' => array( 'pre' => false, 'post' => 'LocationService\HideLocationSignal' ),
-        'content_move' => array( 'pre' => false, 'post' => 'LocationService\MoveSubtreeSignal' ),
-        'content_publish' => array( 'pre' => false, 'post' => 'ContentService\PublishVersionSignal' ),
+        'content_hide' => array('pre' => false, 'post' => 'LocationService\HideLocationSignal'),
+        'content_move' => array('pre' => false, 'post' => 'LocationService\MoveSubtreeSignal'),
+        'content_publish' => array('pre' => false, 'post' => 'ContentService\PublishVersionSignal'),
         // this legacy operation does not allow us to retrieve in all scenarios the object_id, needed for the corresponding signal
         //'content_removelocation' => array( 'pre' => false, 'post' => 'LocationService\DeleteLocationSignal' ),
         // this legacy operation does not seem to have any corresponding eZ5 signal...
         //'content_removetranslation' => '',
-        'content_sort' => array( 'pre' => false, 'post' => 'LocationService\UpdateLocationSignal' ),
-        'content_swap' => array( 'pre' => false, 'post' => 'LocationService\SwapLocationSignal' ),
-        'content_updatealwaysavailable' => array( 'pre' => false, 'post' => 'ContentService\UpdateContentMetadataSignal' ),
-        'content_updateinitiallanguage' => array( 'pre' => false, 'post' => 'ContentService\UpdateContentMetadataSignal' ),
-        'content_updatemainassignment' => array( 'pre' => false, 'post' => 'ContentService\UpdateContentMetadataSignal' ),
+        'content_sort' => array('pre' => false, 'post' => 'LocationService\UpdateLocationSignal'),
+        'content_swap' => array('pre' => false, 'post' => 'LocationService\SwapLocationSignal'),
+        'content_updatealwaysavailable' => array('pre' => false, 'post' => 'ContentService\UpdateContentMetadataSignal'),
+        'content_updateinitiallanguage' => array('pre' => false, 'post' => 'ContentService\UpdateContentMetadataSignal'),
+        'content_updatemainassignment' => array('pre' => false, 'post' => 'ContentService\UpdateContentMetadataSignal'),
         // this legacy operation needs hackish workarounds to retrieve the modified state(s), needed for the corresponding signal
         //'content_updateobjectstate' => 'ObjectStateService\SetContentStateSignal' ),
-        'content_updatepriority' => array( 'pre' => false, 'post' => 'LocationService\UpdateLocationSignal' ),
-        'content_updatesection' => array( 'pre' => false, 'post' => 'SectionService\AssignSectionSignal' ),
+        'content_updatepriority' => array('pre' => false, 'post' => 'LocationService\UpdateLocationSignal'),
+        'content_updatesection' => array('pre' => false, 'post' => 'SectionService\AssignSectionSignal'),
     );
 
     /**
@@ -31,38 +31,38 @@ 
      */
     public function __construct()
     {
-        $this->eZWorkflowEventType( self::WORKFLOW_TYPE_STRING, ezpI18n::tr( 'ezworkflowengine/eventtypes', 'Run WorkFlowEngineBundle workflows' ) );
-        $this->setTriggerTypes( array( '*' => true ) );
+        $this->eZWorkflowEventType(self::WORKFLOW_TYPE_STRING, ezpI18n::tr('ezworkflowengine/eventtypes', 'Run WorkFlowEngineBundle workflows'));
+        $this->setTriggerTypes(array('*' => true));
     }
 
-    public function execute( $process, $event )
+    public function execute($process, $event)
     {
-        $parameters = $process->attribute( 'parameter_list' );
-        $tmp = explode( '_', $parameters['trigger_name'], 2 );
-        $triggerName = reset( $tmp );
+        $parameters = $process->attribute('parameter_list');
+        $tmp = explode('_', $parameters['trigger_name'], 2);
+        $triggerName = reset($tmp);
         $operationName = $parameters['module_name'] . '_' . $parameters['module_function'];
 
-        $signalName = $this->getsignalName( $triggerName, $operationName );
-        if ( !$signalName )
+        $signalName = $this->getsignalName($triggerName, $operationName);
+        if (!$signalName)
         {
-            eZDebug::writeError( "Trigger '$triggerName $operationName' can not be mapped to eZ5 workflow signal. Aborting eZ4 workflow" );
+            eZDebug::writeError("Trigger '$triggerName $operationName' can not be mapped to eZ5 workflow signal. Aborting eZ4 workflow");
             return eZWorkflowType::STATUS_REJECTED;
         }
 
-        $signalsParameters = $this->convertParameters( $triggerName, $operationName, $parameters );
+        $signalsParameters = $this->convertParameters($triggerName, $operationName, $parameters);
 
-        if ( !$signalsParameters )
+        if (!$signalsParameters)
         {
-            eZDebug::writeNotice( "Parameters for trigger '$triggerName $operationName' do not map to an eZ5 workflow. Continuing the eZ4 workflow" );
+            eZDebug::writeNotice("Parameters for trigger '$triggerName $operationName' do not map to an eZ5 workflow. Continuing the eZ4 workflow");
             // this is a way to gracefully avoid triggering eZ5 workflows without failing the ez4 one
             return eZWorkflowType::STATUS_ACCEPTED;
         }
 
         foreach ($signalsParameters as $signalParameters)
         {
-            if ( !is_array( $signalParameters ) || ! count( $signalParameters ) )
+            if (!is_array($signalParameters) || !count($signalParameters))
             {
-                eZDebug::writeError( "Parameters for trigger '$triggerName $operationName' can not be mapped to eZ5 workflow parameters. Aborting eZ4 workflow" );
+                eZDebug::writeError("Parameters for trigger '$triggerName $operationName' can not be mapped to eZ5 workflow parameters. Aborting eZ4 workflow");
                 return eZWorkflowType::STATUS_REJECTED;
             }
 
@@ -70,18 +70,18 @@ 
             $signalParameters['legacyOperation'] = $operationName;
 
             $serviceContainer = ezpKernel::instance()->getServiceContainer();
-            $workflowService = $serviceContainer->get( 'ez_workflowengine_bundle.workflow_service' );
+            $workflowService = $serviceContainer->get('ez_workflowengine_bundle.workflow_service');
 
             try
             {
-                eZDebug::writeDebug( "Triggering any eZ5 workflows available for signal '$signalName' with parameters:" .
-                    preg_replace( "/\n+/s", ' ', preg_replace('/^(Array| +|\(|\))/m', '', print_r( $signalParameters, true ) ) ),
+                eZDebug::writeDebug("Triggering any eZ5 workflows available for signal '$signalName' with parameters:" .
+                    preg_replace("/\n+/s", ' ', preg_replace('/^(Array| +|\(|\))/m', '', print_r($signalParameters, true))),
                     __METHOD__
                 );
-                $workflowService->triggerWorkflow( $signalName, $signalParameters );
-            } catch ( \Exception $e )
+                $workflowService->triggerWorkflow($signalName, $signalParameters);
+            } catch (\Exception $e)
             {
-                eZDebug::writeError( $e->getMessage(), __METHOD__ );
+                eZDebug::writeError($e->getMessage(), __METHOD__);
                 return eZWorkflowType::STATUS_REJECTED;
             }
         }
@@ -95,9 +95,9 @@ 
      * @param string $operationName
      * @return string mixed
      */
-    protected function getsignalName( $triggerName, $operationName )
+    protected function getsignalName($triggerName, $operationName)
     {
-        if ( !isset( self::$signalMapping[$operationName][$triggerName] ) )
+        if (!isset(self::$signalMapping[$operationName][$triggerName]))
         {
             return $triggerName . '_' . $operationName;
         }
@@ -112,26 +112,26 @@ 
      * @return array[] Each element is an array of parameters, used to trigger an ez5 workflow. Return array( false )
      *                 for error conditions and array() to ignore ez5 workflows but continue the ez4 one
      */
-    protected function convertParameters( $triggerName, $operationName, array $parameters )
+    protected function convertParameters($triggerName, $operationName, array $parameters)
     {
         /// @see https://doc.ez.no/display/EZP/Signals+reference
-        switch( $operationName )
+        switch ($operationName)
         {
             case 'content_addlocation':
                 $out = array();
                 // loop over all locations of content and find the ones which are children of the parents from the trigger
                 // NB: will break if eZ allows to create 2 locations in the same place for a single content...
                 $locations = eZContentObjectTreeNode::fetchByContentObjectID($parameters['object_id']);
-                foreach( $parameters['select_node_id_array'] as $parentNodeId )
+                foreach ($parameters['select_node_id_array'] as $parentNodeId)
                 {
-                    foreach( $locations as $contentLocation )
+                    foreach ($locations as $contentLocation)
                     {
-                        if ( $contentLocation->attribute( 'parent_node_id' ) == $parentNodeId )
+                        if ($contentLocation->attribute('parent_node_id') == $parentNodeId)
                         {
                             $out[] = array(
                                 'contentId' => $parameters['object_id'],
                                 /// @todo grab location id of created node
-                                'locationId' => $contentLocation->attribute( 'node_id' ),
+                                'locationId' => $contentLocation->attribute('node_id'),
                             );
                             break;
                         }
@@ -148,26 +148,26 @@ 
 
             case 'content_hide':
                 $objectId = $this->objectIdFromNodeId($parameters['node_id']);
-                if ( !$objectId )
+                if (!$objectId)
                 {
-                    return array( false );
+                    return array(false);
                 }
-                return array( array(
+                return array(array(
                     'locationId' => $parameters['node_id'],
                     'contentId' => $objectId,
-                ) );
+                ));
 
             case 'content_move':
-                return array( array(
+                return array(array(
                     'subtreeId' => $parameters['node_id'],
                     'newParentLocationId' => $parameters['new_parent_node_id'],
-                ) );
+                ));
 
             case 'content_publish':
-                return array( array(
+                return array(array(
                     'contentId' => $parameters['object_id'],
                     'versionNo' => $parameters['version'],
-                ) );
+                ));
 
             /*case 'content_removelocation':
                 $out = array();
@@ -203,66 +203,66 @@ 
             //case 'content_removetranslation':
 
             case 'content_sort':
-                $objectId = $this->objectIdFromNodeId( $parameters['node_id'] );
-                if ( !$objectId )
+                $objectId = $this->objectIdFromNodeId($parameters['node_id']);
+                if (!$objectId)
                 {
-                    return array( false );
+                    return array(false);
                 }
-                return array( array(
+                return array(array(
                     'contentId' => $objectId,
                     'locationId' => $parameters['node_id'],
-                ) );
+                ));
 
             case 'content_swap':
-                $objectId1 = $this->objectIdFromNodeId( $parameters['node_id'] );
-                $objectId2 = $this->objectIdFromNodeId( $parameters['selected_node_id'] );
-                if ( !$objectId1 || !$objectId2 )
+                $objectId1 = $this->objectIdFromNodeId($parameters['node_id']);
+                $objectId2 = $this->objectIdFromNodeId($parameters['selected_node_id']);
+                if (!$objectId1 || !$objectId2)
                 {
-                    return array( false );
+                    return array(false);
                 }
-                return array( array(
+                return array(array(
                     'content1Id' => $objectId1,
                     'location1Id' => $parameters['node_id'],
                     'content2Id' => $objectId2,
                     'location2Id' => $parameters['selected_node_id'],
-                ) );
+                ));
 
             case 'content_updatemainassignment':
-                return array( array(
+                return array(array(
                     'contentId' => $parameters['object_id'],
-                ) );
+                ));
 
             case 'content_updatepriority':
                 $objectId = $this->objectIdFromNodeId($parameters['node_id']);
-                if ( !$objectId )
+                if (!$objectId)
                 {
-                    return array( false );
+                    return array(false);
                 }
-                return array( array(
+                return array(array(
                     'contentId' => '',
                     'locationId' => $parameters['node_id'],
-                ) );
+                ));
 
             case 'content_updatesection':
                 $objectId = $this->objectIdFromNodeId($parameters['node_id']);
-                if ( !$objectId )
+                if (!$objectId)
                 {
-                    return array( false );
+                    return array(false);
                 }
-                return array( array(
+                return array(array(
                     'contentId' => $objectId,
                     'sectionId' => $parameters['selected_section_id'],
-                ) );
+                ));
 
             case 'content_updateinitiallanguage':
-                return array( array(
+                return array(array(
                     'contentId' => $parameters['object_id'],
-                ) );
+                ));
 
             case 'content_updatealwaysavailable':
-                return array( array(
+                return array(array(
                     'contentId' => $parameters['object_id'],
-                ) );
+                ));
 
             /*case 'content_updateobjectstate':
                 /// @todo we get an array of all states, but the eZ5 event needs to know which one changed
@@ -275,21 +275,21 @@ 
             // in case of an unmapped legacy operation, we let through all parameters unmodified - except a few known ones
             // (is it really a good idea to remove the known params?)
             default:
-                return array( array_diff_key( $parameters, array( 'workflow_id', 'trigger_name', 'module_name', 'module_function', 'user_id' ) ) );
+                return array(array_diff_key($parameters, array('workflow_id', 'trigger_name', 'module_name', 'module_function', 'user_id')));
         }
     }
 
-    protected function objectIdFromNodeId( $nodeID )
+    protected function objectIdFromNodeId($nodeID)
     {
-        $node = eZContentObjectTreeNode::fetch( $nodeID );
-        if ( !is_object( $node ) )
+        $node = eZContentObjectTreeNode::fetch($nodeID);
+        if (!is_object($node))
         {
-            eZDebug::writeError( 'Unable to fetch node ' . $nodeID, __METHOD__ );
+            eZDebug::writeError('Unable to fetch node ' . $nodeID, __METHOD__);
             return null;
         }
 
-        return $node->attribute( 'contentobject_id' );
+        return $node->attribute('contentobject_id');
     }
 }
 
-eZWorkflowEventType::registerEventType( eZWorkflowEngineHookType::WORKFLOW_TYPE_STRING, 'eZWorkflowEngineHookType' );
+eZWorkflowEventType::registerEventType(eZWorkflowEngineHookType::WORKFLOW_TYPE_STRING, 'eZWorkflowEngineHookType');

API/Value/WorkflowDefinition.php

Spacing +5 added lines, -5 removed lines

@@ -12,11 +12,11 @@
  */
 class WorkflowDefinition extends MigrationDefinition
 {
-    const MANIFEST_STEP_TYPE= 'workflow';
-    const MANIFEST_SIGNAL_ELEMENT= 'signal';
-    const MANIFEST_RUNAS_ELEMENT= 'run_as';
-    const MANIFEST_USETRANSACTION_ELEMENT= 'transaction';
-    const MANIFEST_AVOIDRECURSION_ELEMENT= 'avoid_recursion';
+    const MANIFEST_STEP_TYPE = 'workflow';
+    const MANIFEST_SIGNAL_ELEMENT = 'signal';
+    const MANIFEST_RUNAS_ELEMENT = 'run_as';
+    const MANIFEST_USETRANSACTION_ELEMENT = 'transaction';
+    const MANIFEST_AVOIDRECURSION_ELEMENT = 'avoid_recursion';
 
     protected $signalName;
     // unlike migrations, workflows default to run as current user

Command/ResumeCommand.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
         $executed = 0;
         $failed = 0;
 
-        foreach($suspendedWorkflows as $suspendedWorkflow) {
+        foreach ($suspendedWorkflows as $suspendedWorkflow) {
             $output->writeln("<info>Resuming {$suspendedWorkflow->name}</info>");
 
             try {
@@ -106,7 +106,7 @@ 
 
         $time = microtime(true) - $start;
         $output->writeln("Resumed $executed workflows, failed $failed");
-        $output->writeln("Time taken: ".sprintf('%.2f', $time)." secs, memory: ".sprintf('%.2f', (memory_get_peak_usage(true) / 1000000)). ' MB');
+        $output->writeln("Time taken: " . sprintf('%.2f', $time) . " secs, memory: " . sprintf('%.2f', (memory_get_peak_usage(true) / 1000000)) . ' MB');
 
         if ($failed) {
             return 2;

Command/WorkflowCommand.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
             $output->writeln('<info>Workflow: ' . $workflow->name . '</info>');
             $output->writeln('Status: ' . $status);
-            $output->writeln('Executed on: <info>' . ($workflow->executionDate != null ? date("Y-m-d H:i:s", $workflow->executionDate) : '--'). '</info>');
+            $output->writeln('Executed on: <info>' . ($workflow->executionDate != null ? date("Y-m-d H:i:s", $workflow->executionDate) : '--') . '</info>');
             $output->writeln('Execution notes: <info>' . $workflow->executionError . '</info>');
             $output->writeln('Signal: <info>' . $workflow->signalName . '</info>');
 

Command/CleanupCommand.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     {
         $this->setName('kaliop:workflows:cleanup')
             ->addOption('older-than', 'o', InputOption::VALUE_REQUIRED, "Only remove workflows which have finished since N minutes", 86400)
-            ->addOption('failed', 'f',  InputOption::VALUE_NONE, "Remove failed instead of finished workflows")
+            ->addOption('failed', 'f', InputOption::VALUE_NONE, "Remove failed instead of finished workflows")
             ->addOption('dry-run', 'd', InputOption::VALUE_NONE, "Only list workflows to remove, without actually doing it")
             ->setDescription('Removes old workflows from the list of executed ones')
         ;
@@ -48,7 +48,7 @@ 
                 break;
             }
 
-            foreach($workflows as $workflow) {
+            foreach ($workflows as $workflow) {
                 if ($workflow->executionDate < $maxAge) {
                     $toRemove[] = $workflow;
                 }
@@ -56,7 +56,7 @@ 
 
             $total += count($workflows);
             $offset += $limit;
-        } while(true);
+        } while (true);
 
         if ($input->getOption('dry-run')) {
             $action = "To remove: ";