Merge pull request #314 from creative-commoners/pulls/5.0/fix-tests-a…

…nd-travis

API Implement namespaces, PSR-2 linting, update Travis and fix tests

.travis.yml

@@ -1,25 +1,30 @@
-# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
-
 language: php
 
-php:
-  - 5.5
-
 env:
-  matrix:
-    - DB=MYSQL CORE_RELEASE=4
+  global:
+    - COMPOSER_ROOT_VERSION="5.0.x-dev"
 
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=4
+      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
+    - php: 7.0
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.1
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
 
 before_script:
-  - composer self-update || true
   - phpenv rehash
-  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
-  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
-  - cd ~/builds/ss
+  - phpenv config-rm xdebug.ini
+
+  - composer install --prefer-dist
+  - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.0.x-dev symbiote/silverstripe-queuedjobs:4.x-dev
+  - composer update
 
 script:
-  - vendor/bin/phpunit advancedworkflow/tests/
+  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=framework/phpcs.xml.dist code/ tests/ ; fi
+
+after_success:
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi

.upgrade.yml

@@ -0,0 +1,39 @@
+mappings:
+  AssignUsersToWorkflowAction: Symbiote\AdvancedWorkflow\Actions\AssignUsersToWorkflowAction
+  CancelWorkflowAction: Symbiote\AdvancedWorkflow\Actions\CancelWorkflowAction
+  NotifyUsersWorkflowAction: Symbiote\AdvancedWorkflow\Actions\NotifyUsersWorkflowAction
+  PublishItemWorkflowAction: Symbiote\AdvancedWorkflow\Actions\PublishItemWorkflowAction
+  SetPropertyWorkflowAction: Symbiote\AdvancedWorkflow\Actions\SetPropertyWorkflowAction
+  SimpleApprovalWorkflowAction: Symbiote\AdvancedWorkflow\Actions\SimpleApprovalWorkflowAction
+  UnpublishItemWorkflowAction: Symbiote\AdvancedWorkflow\Actions\UnpublishItemWorkflowAction
+  AdvancedWorkflowAdmin: Symbiote\AdvancedWorkflow\Admin\AdvancedWorkflowAdmin
+  WorkflowDefinitionItemRequestClass: Symbiote\AdvancedWorkflow\Admin\WorkflowDefinitionItemRequestClass
+  WorkflowDefinitionExporter: Symbiote\AdvancedWorkflow\Admin\WorkflowDefinitionExporter
+  WorkflowDefinitionImporter: Symbiote\AdvancedWorkflow\Admin\WorkflowDefinitionImporter
+  AdvancedWorkflowActionController: Symbiote\AdvancedWorkflow\Controllers\AdvancedWorkflowActionController
+  FrontEndWorkflowController: Symbiote\AdvancedWorkflow\Controllers\FrontEndWorkflowController
+  ImportedWorkflowTemplate: Symbiote\AdvancedWorkflow\DataObjects\ImportedWorkflowTemplate
+  WorkflowAction: Symbiote\AdvancedWorkflow\DataObjects\WorkflowAction
+  WorkflowActionInstance: Symbiote\AdvancedWorkflow\DataObjects\WorkflowActionInstance
+  WorkflowDefinition: Symbiote\AdvancedWorkflow\DataObjects\WorkflowDefinition
+  WorkflowInstance: Symbiote\AdvancedWorkflow\DataObjects\WorkflowInstance
+  WorkflowTransition: Symbiote\AdvancedWorkflow\DataObjects\WorkflowTransition
+  WorkflowBulkLoader: Symbiote\AdvancedWorkflow\Dev\WorkflowBulkLoader
+  AdvancedWorkflowExtension: Symbiote\AdvancedWorkflow\Extensions\AdvancedWorkflowExtension
+  FileWorkflowApplicable: Symbiote\AdvancedWorkflow\Extensions\FileWorkflowApplicable
+  WorkflowApplicable: Symbiote\AdvancedWorkflow\Extensions\WorkflowApplicable
+  WorkflowEmbargoExpiryExtension: Symbiote\AdvancedWorkflow\Extensions\WorkflowEmbargoExpiryExtension
+  WorkflowField: Symbiote\AdvancedWorkflow\FormFields\WorkflowField
+  WorkflowFieldActionController: Symbiote\AdvancedWorkflow\FormFields\WorkflowFieldActionController
+  WorkflowFieldItemController: Symbiote\AdvancedWorkflow\FormFields\WorkflowFieldItemController
+  WorkflowFieldTransitionController: Symbiote\AdvancedWorkflow\FormFields\WorkflowFieldTransitionController
+  AWRequiredFields: Symbiote\AdvancedWorkflow\Forms\AWRequiredFields
+  FrontendWorkflowForm: Symbiote\AdvancedWorkflow\Forms\FrontendWorkflowForm
+  WorkflowPublishTargetJob: Symbiote\AdvancedWorkflow\Jobs\WorkflowPublishTargetJob
+  WorkflowReminderJob: Symbiote\AdvancedWorkflow\Jobs\WorkflowReminderJob
+  WorkflowService: Symbiote\AdvancedWorkflow\Services\WorkflowService
+  ExistingWorkflowException: Symbiote\AdvancedWorkflow\Services\ExistingWorkflowException
+  WorkflowReminderTask: Symbiote\AdvancedWorkflow\Tasks\WorkflowReminderTask
+  WorkflowTemplate: Symbiote\AdvancedWorkflow\Templates\WorkflowTemplate
+  GridFieldExportAction: Symbiote\AdvancedWorkflow\Forms\GridField\GridFieldExportAction
+  GridFieldWorkflowRestrictedEditButton: Symbiote\AdvancedWorkflow\Forms\GridField\GridFieldWorkflowRestrictedEditButton

_config.php

@@ -3,11 +3,3 @@
  * @license BSD License (http://silverstripe.org/bsd-license/)
  * @package advancedworkflow
  */
-define('ADVANCED_WORKFLOW_DIR', basename(dirname(__FILE__)));
-
-if(ADVANCED_WORKFLOW_DIR != 'advancedworkflow') {
-	throw new Exception(
-		"The advanced workflow module must be in a directory named 'advancedworkflow', not " . ADVANCED_WORKFLOW_DIR
-	);
-}
-

_config/workflowconfig.yml

@@ -1,28 +1,15 @@
 ---
 Name: workflowconfig
-After:
-  - 'framework/*'
-  - 'cms/*'
 ---
-SiteTree:
+SilverStripe\CMS\Model\SiteTree:
   extensions:
-    - WorkflowApplicable
-CMSPageEditController:
+    - Symbiote\AdvancedWorkflow\Extensions\WorkflowApplicable
+SilverStripe\CMS\Controllers\CMSPageEditController:
   extensions:
-    - AdvancedWorkflowExtension
-GridFieldDetailForm_ItemRequest:
+    - Symbiote\AdvancedWorkflow\Extensions\AdvancedWorkflowExtension
+SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest:
   extensions:
-    - AdvancedWorkflowExtension
-LeftAndMain:
+    - Symbiote\AdvancedWorkflow\Extensions\AdvancedWorkflowExtension
+SilverStripe\Admin\LeftAndMain:
   extra_requirements_css:
     - advancedworkflow/css/AdvancedWorkflowAdmin.css
-
----
-Name: workflow_jobs
-Only:
-  moduleexists: queuedjobs
----
-Injector:
-  WorkflowReminderJob:
-    properties:
-      queuedJobService: %$QueuedJobService

_config/workflowjobs.yml

@@ -0,0 +1,9 @@
+---
+Name: workflow_jobs
+Only:
+  moduleexists: queuedjobs
+---
+SilverStripe\Core\Injector\Injector:
+  Symbiote\AdvancedWorkflow\Jobs\WorkflowReminderJob:
+    properties:
+      queuedJobService: %$Symbiote\QueuedJobs\Services\QueuedJobService

_config/workflows.yml

@@ -1,49 +1,49 @@
 ---
 Name: defaultworkflows
 ---
-Injector:
+SilverStripe\Core\Injector\Injector:
   SimpleReviewApprove:
-    class: WorkflowTemplate
+    class: Symbiote\AdvancedWorkflow\Templates\WorkflowTemplate
     constructor:
-      - Review and Approve
-      - Single step review and approve. Make sure to update the Apply for approval and Notify users steps!
+      - 'Review and Approve'
+      - 'Single step review and approve. Make sure to update the Apply for approval and Notify users steps!'
       - 0.2
     properties:
       structure:
-        Apply for approval:
-          type: AssignUsersToWorkflowAction
-          transitions: 
-            notify: Notify users
-        Notify users:
-          type: NotifyUsersWorkflowAction
+        'Apply for approval':
+          type: Symbiote\AdvancedWorkflow\Actions\AssignUsersToWorkflowAction
+          transitions:
+            notify: 'Notify users'
+        'Notify users':
+          type: Symbiote\AdvancedWorkflow\Actions\NotifyUsersWorkflowAction
           transitions:
             approval: Approval
         Approval:
-          type: SimpleApprovalWorkflowAction
+          type: Symbiote\AdvancedWorkflow\Actions\SimpleApprovalWorkflowAction
           transitions:
             Approve: Publish
-            Reject: Reject changes
+            Reject: 'Reject changes'
         Publish:
-          type: PublishItemWorkflowAction
-          transitions: 
-            assign: Assign Initiator Publish
-        Assign Initiator Publish:
-          type: AssignUsersToWorkflowAction
-          transitions: 
-            notify: Notify Initiator Publish
-        Notify Initiator Publish:
-          type: NotifyUsersWorkflowAction
-        Reject changes:
-          type: CancelWorkflowAction
-          transitions: 
-            assign: Assign Initiator Cancel
-        Assign Initiator Cancel:
-          type: AssignUsersToWorkflowAction
-          transitions: 
-            notify: Notify Initiator Cancel
-        Notify Initiator Cancel:
-          type: NotifyUsersWorkflowAction
-  WorkflowService:
+          type: Symbiote\AdvancedWorkflow\Actions\PublishItemWorkflowAction
+          transitions:
+            assign: 'Assign Initiator Publish'
+        'Assign Initiator Publish':
+          type: Symbiote\AdvancedWorkflow\Actions\AssignUsersToWorkflowAction
+          transitions:
+            notify: 'Notify Initiator Publish'
+        'Notify Initiator Publish':
+          type: Symbiote\AdvancedWorkflow\Actions\NotifyUsersWorkflowAction
+        'Reject changes':
+          type: Symbiote\AdvancedWorkflow\Actions\CancelWorkflowAction
+          transitions:
+            assign: 'Assign Initiator Cancel'
+        'Assign Initiator Cancel':
+          type: Symbiote\AdvancedWorkflow\Actions\AssignUsersToWorkflowAction
+          transitions:
+            notify: 'Notify Initiator Cancel'
+        'Notify Initiator Cancel':
+          type: Symbiote\AdvancedWorkflow\Actions\NotifyUsersWorkflowAction
+  Symbiote\AdvancedWorkflow\Services\WorkflowService:
     properties:
       templates:
-        - %$SimpleReviewApprove
+        - '%$SimpleReviewApprove'