PMC-809-A

phpunit.xml

@@ -36,6 +36,10 @@
     </filter>
 
     <php>
+        <!--Main environment-->
+        <env name="MAIN_SYS_SYS" value="workflow" />
+        <env name="MAIN_TIME_ZONE" value="America/New_York" />
+        <env name="MAIN_SYSTEM_UTC_TIME_ZONE" value="1" />
         <!--Connection to database-->
         <env name="DB_HOST" value="127.0.0.1" />
         <env name="DB_DATABASE" value="test" />

tests/bootstrap.php

@@ -14,26 +14,46 @@ use Illuminate\Support\Facades\Schema;
 /**
  * @todo Migrate to configuration parameters
  */
-
 define('PATH_TRUNK', dirname(__DIR__));
-define('PATH_CORE', PATH_TRUNK.'/workflow/engine/');
+define('PATH_CORE', PATH_TRUNK . '/workflow/engine/');
 define('PATH_CONFIG', PATH_CORE . 'config/');
-define('PATH_RBAC_CORE',dirname(__DIR__).'/rbac/engine/');
-define('PATH_DB', dirname(__DIR__).'/shared/sites/');
-define('PATH_DATA', dirname(__DIR__).'/shared/rbac/');
+$pathData = PATH_CONFIG . 'paths_installed.php';
+if (file_exists($pathData)) {
+    require_once $pathData;
+} else {
+    define('PATH_DATA', dirname(__DIR__) . '/shared/rbac/');
+}
+define('PATH_RBAC_CORE', dirname(__DIR__) . '/rbac/engine/');
+define('PATH_DB', dirname(__DIR__) . '/shared/sites/');
 define('PATH_SEP', '/');
-define('PATH_METHODS', dirname(__DIR__).'/workflow/engine/methods/');
+define('PATH_METHODS', dirname(__DIR__) . '/workflow/engine/methods/');
 define('SYS_LANG', 'en');
 define('DB_ADAPTER', 'mysql');
 define('SYS_SKIN', 'neoclassic');
-define('SYS_SYS', 'workflow');
-define('PATH_WORKSPACE',PATH_TRUNK.'/shared/sites/' . SYS_SYS . '/');
-define('PMTABLE_KEY','pmtable');
+define('SYS_SYS', env('MAIN_SYS_SYS', 'workflow'));
+define('PATH_WORKSPACE', PATH_TRUNK . '/shared/sites/' . SYS_SYS . '/');
+define('PMTABLE_KEY', 'pmtable');
+define('PATH_WORKFLOW_MYSQL_DATA', PATH_TRUNK . '/workflow/engine/data/mysql/');
+define('PATH_RBAC_MYSQL_DATA', PATH_TRUNK . '/rbac/engine/data/mysql/');
+define('PATH_LANGUAGECONT', PATH_DATA . '/META-INF/');
+
+//timezone
+$_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int) (env('MAIN_SYSTEM_UTC_TIME_ZONE', 'workflow')) == 1;
+
+//Set Time Zone
+ini_set('date.timezone', $_SESSION['__SYSTEM_UTC_TIME_ZONE__'] ? 'UTC' : env('MAIN_TIME_ZONE', 'America/New_York'));
+define('TIME_ZONE', ini_get('date.timezone'));
 
 // Setup basic app services
 $app = require __DIR__ . '/../bootstrap/app.php';
 $app->make(Kernel::class)->bootstrap();
 
+//Overwrite with the Processmaker env.ini configuration used in production environments
+//@todo: move env.ini configuration to .env
+ini_set('date.timezone', TIME_ZONE); //Set Time Zone
+date_default_timezone_set(TIME_ZONE);
+config(['app.timezone' => TIME_ZONE]);
+
 // Setup our testexternal database
 config(['database.connections.testexternal' => [
         'driver' => 'mysql',
@@ -49,6 +69,11 @@ config(['database.connections.testexternal' => [
         'engine' => null
 ]]);
 
+//configuration values
+config([
+    "system.workspace" => SYS_SYS
+]);
+
 // Now, drop all test tables and repopulate with schema
 Schema::connection('testexternal')->dropIfExists('test');
 

workflow/engine/src/ProcessMaker/Model/ListUnassigned.php

@@ -35,6 +35,14 @@ class ListUnassigned extends Model
         return $this->belongsTo(Process::class, 'PRO_ID', 'PRO_ID');
     }
 
+    /**
+     * Return the user this belongs to
+     */
+    public function previousUser()
+    {
+        return $this->belongsTo(User::class, 'DEL_PREVIOUS_USR_UID', 'USR_UID');
+    }
+
     /**
      * Scope a query to only include specific tasks
      *
@@ -93,7 +101,7 @@ class ListUnassigned extends Model
      * @param array $filters
      *
      * @return array
-    */
+     */
     public static function doCount($userUid, $filters = [])
     {
         $list = new PropelListUnassigned();
@@ -155,4 +163,3 @@ class ListUnassigned extends Model
         return $result;
     }
 }
-

workflow/engine/src/ProcessMaker/Services/Api/Light.php

@@ -652,10 +652,11 @@ class Light extends Api
             if (preg_match($this->regexNull, $newerThan)) {
                 return [];
             }
+            $paged = ($start === 0 && $limit === 0) ? false : true;
 
             $dataList['userId'] = $this->getUserId();
             $dataList['action'] = 'unassigned';
-            $dataList['paged'] = false;
+            $dataList['paged'] = $paged;
 
             $dataList['start'] = $start;
             $dataList['limit'] = $limit;
@@ -682,6 +683,9 @@ class Light extends Api
                 /*----------------------------------********---------------------------------*/
             }
             /*----------------------------------********---------------------------------*/
+            if ($paged === true) {
+                $response = $response['data'];
+            }
             $result = $this->parserDataUnassigned($response);
 
             return DateTime::convertUtcToIso8601($result, $this->arrayFieldIso8601);