Laravel 8.x Shift

.gitignore

@@ -37,5 +37,6 @@ coverage
 cypress/screenshots
 cypress/videos
 cypress/downloads
+.phpunit.result.cache
 .php-cs-fixer.cache
 .phpunit.result.cache

ProcessMaker/Console/Commands/Install.php

@@ -2,17 +2,17 @@
 
 namespace ProcessMaker\Console\Commands;
 
+use Database\Seeders\UserSeeder;
 use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Database\Query\Grammars\SqlServerGrammar;
 use Illuminate\Encryption\Encrypter;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use ProcessMaker\Traits\SupportsNonInteraction;
 use Symfony\Component\Console\Helper\Table;
-use UserSeeder;
 use Validator;
 
 /**
@@ -317,7 +317,7 @@ public function handle()
             $this->info(__('Installer completed. Consult ProcessMaker documentation on how to configure email, jobs and notifications.'));
         }
 
-        return true;
+        return 0;
     }
 
     /**

ProcessMaker/Console/Commands/InstallPreCommitHooks.php

@@ -73,10 +73,13 @@ private function addHook($hookDir)
             unlink($hookPath);
         }
 
-        symlink(
-            base_path('.pre-commit'),
-            $hookPath
-        );
+        try {
+            symlink(
+                base_path('.pre-commit'),
+                $hookPath
+            );
+        } catch(\ErrorException $e) {
+        }
     }
 
     private function addConfig($configDir)
@@ -85,9 +88,13 @@ private function addConfig($configDir)
         if (file_exists($configPath)) {
             unlink($configPath);
         }
-        symlink(
-            base_path('.php-cs-fixer.php'),
-            $configPath
-        );
+
+        try {
+            symlink(
+                base_path('.php-cs-fixer.php'),
+                $configPath
+            );
+        } catch(\ErrorException $e) {
+        }
     }
 }

ProcessMaker/Contracts/ProcessAssetsInterface.php

@@ -2,8 +2,6 @@
 
 namespace ProcessMaker\Contracts;
 
-use Illuminate\Database\Eloquent\Model;
-
 interface ProcessAssetsInterface
 {
     /**

ProcessMaker/Exception/Handler.php

@@ -2,7 +2,6 @@
 
 namespace ProcessMaker\Exception;
 
-use Exception;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
@@ -12,6 +11,7 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Route as RouteFacade;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;
 
 /**
  * Our general exception handler
@@ -34,10 +34,12 @@ class Handler extends ExceptionHandler
 
     /**
      * Report our exception. If in testing with verbosity, it will also dump exception information to the console
-     * @param Exception $exception
-     * @throws Exception
+     *
+     * @param  Throwable  $exception
+     *
+     * @throws Throwable
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         if (App::environment() == 'testing' && env('TESTING_VERBOSE')) {
             // If we're verbose, we should print ALL Exceptions to the screen
@@ -52,10 +54,10 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         $prefix = '';
         $route = $request->route();
@@ -118,10 +120,10 @@ protected function unauthenticated($request, AuthenticationException $exception)
      * Convert the given exception to an array.
      * @note This is overridding Laravel's default exception handler in order to handle binary data in message
      *
-     * @param  \Exception  $e
+     * @param  \Throwable  $e
      * @return array
      */
-    protected function convertExceptionToArray(Exception $e)
+    protected function convertExceptionToArray(Throwable $e)
     {
         return config('app.debug') ? [
             'message' => utf8_encode($e->getMessage()),

ProcessMaker/Exception/ReferentialIntegrityException.php

@@ -3,11 +3,11 @@
 namespace ProcessMaker\Exception;
 
 use Exception;
-use Illuminate\Database\Eloquent\Model;
+use ProcessMaker\Models\ProcessMakerModel;
 
 class ReferentialIntegrityException extends Exception
 {
-    public function __construct(Model $source, Model $parent)
+    public function __construct(Model $source, ProcessMakerModel $parent)
     {
         $source = class_basename($source) . ':' . $source->getKey();
         $parent = class_basename($parent) . ':' . $parent->getKey();

ProcessMaker/Http/Controllers/AdminController.php

@@ -16,7 +16,7 @@ class AdminController extends Controller
 {
     public function index()
     {
-        switch (\Auth::user()->canAny('view-users|view-groups|view-auth_clients|manage-public-files|view-settings')) {
+        switch (\Auth::user()->canAnyFirst('view-users|view-groups|view-auth_clients|manage-public-files|view-settings')) {
             case 'view-users':
                 return redirect()->route('users.index');
             case 'view-groups':

ProcessMaker/Http/Controllers/Api/swagger-v3.php → ProcessMaker/Http/Controllers/Api/OpenApiSpec.php

@@ -1,4 +1,7 @@
 <?php
+
+namespace ProcessMaker\Http\Controllers\Api;
+
 /**
  * @OA\OpenApi(
  *     @OA\Info(
@@ -89,10 +92,8 @@
  *           )
  *         ),
  *     ),
- *     security={
- *         {"pm_api_auth_code": {}},
- *         {"pm_api_bearer": {}},
- *         {"pm_api_key": {}}
- *     },
  * )
  */
+class OpenApiSpec
+{
+}

ProcessMaker/Http/Controllers/Api/ProcessController.php

@@ -25,9 +25,9 @@
 use ProcessMaker\Nayra\Exceptions\ElementNotFoundException;
 use ProcessMaker\Nayra\Storage\BpmnDocument;
 use ProcessMaker\Nayra\Storage\BpmnElement;
-use ProcessMaker\Rules\BPMNValidation;
-use ProcessMaker\Providers\WorkflowServiceProvider;
 use ProcessMaker\Package\WebEntry\Models\WebentryRoute;
+use ProcessMaker\Providers\WorkflowServiceProvider;
+use ProcessMaker\Rules\BPMNValidation;
 use Throwable;
 
 class ProcessController extends Controller
@@ -1176,21 +1176,21 @@ private function validateImportedFile($content)
         return $isDecoded && $validType && $validVersion;
     }
 
-    private function checkForExistingRoute($processId, $route) 
-    {   
-        $existingRoute = WebentryRoute::where('first_segment', $route)->where('process_id','!=', $processId)->first();
+    private function checkForExistingRoute($processId, $route)
+    {
+        $existingRoute = WebentryRoute::where('first_segment', $route)->where('process_id', '!=', $processId)->first();
         if ($existingRoute) {
             throw new \Exception('Segment should be unique. Used in process ' . $existingRoute->process_id . 'node ID: "' . $existingRoute->node_id . '"');
         }
     }
 
-    private function updateRoute($node, $route) 
+    private function updateRoute($node, $route)
     {
         $config = json_decode($node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'config'), true);
         if ($config['web_entry']['webentryRouteConfig']['firstUrlSegment'] !== $route) {
             // update firstUrlSegment to new route
             $config['web_entry']['webentryRouteConfig']['firstUrlSegment'] = $route;
-            
+
             // update entryUrl to new route
             $path = parse_url($config['web_entry']['webentryRouteConfig']['entryUrl'], PHP_URL_PATH);
             $newEntryUrl = str_replace($config['web_entry']['webentryRouteConfig']['firstUrlSegment'], $route, $path);

ProcessMaker/Http/Controllers/Api/ProcessRequestFileController.php

@@ -19,8 +19,6 @@
 use ProcessMaker\Http\Resources\ApiResource;
 use ProcessMaker\Models\Media;
 use ProcessMaker\Models\ProcessRequest;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
 
 class ProcessRequestFileController extends Controller
 {
@@ -36,8 +34,6 @@ class ProcessRequestFileController extends Controller
         'responsive_images',
     ];
 
-    use HasMediaTrait;
-
     /**
      * Display a listing of the resource.
      *

ProcessMaker/Http/Controllers/Process/ModelerController.php

@@ -17,9 +17,9 @@ class ModelerController extends Controller
     /**
      * Invokes the Process Modeler for rendering.
      */
-    public function __invoke(ModelerManager $manager, Process $process, Request $request)
+    public function show(ModelerManager $manager, Process $process, Request $request)
     {
-        /**
+        /*
          * Emit the ModelerStarting event, passing in our ModelerManager instance. This will
          * allow packages to add additional javascript for modeler initialization which
          * can customize the modeler controls list.

ProcessMaker/Http/Controllers/ProcessController.php

@@ -243,7 +243,7 @@ public function triggerStartEventApi(Process $process, Request $request)
     private function checkAuth()
     {
         $perm = 'view-processes|view-process-categories|view-scripts|view-screens|view-environment_variables';
-        switch (\Auth::user()->canAny($perm)) {
+        switch (\Auth::user()->canAnyFirst($perm)) {
             case 'view-processes':
                 return false; // already on index, continue with it
             case 'view-process-categories':

ProcessMaker/Http/Controllers/RequestController.php

@@ -18,13 +18,10 @@
 use ProcessMaker\Package\PackageComments\PackageServiceProvider;
 use ProcessMaker\Traits\HasControllerAddons;
 use ProcessMaker\Traits\SearchAutocompleteTrait;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
-use Spatie\MediaLibrary\Models\Media;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class RequestController extends Controller
 {
-    use HasMediaTrait;
     use SearchAutocompleteTrait;
     use HasControllerAddons;
 

ProcessMaker/Http/Kernel.php

@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \ProcessMaker\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
@@ -69,4 +69,19 @@ class Kernel extends HttpKernel
         'external.connection' => \ProcessMaker\Http\Middleware\ValidateExternalConnection::class,
         'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
     ];
+
+    /**
+     * The auth:anon middleware must run after a session is set up to
+     * check if there is a user logged in before implying the user is
+     * anonymous.
+     *
+     * The auth:anon middleware is only used for the laravel echo
+     * server route: broadcasting/auth
+     *
+     * @var array
+     */
+    protected $middlewarePriority = [
+        \Illuminate\Session\Middleware\AuthenticateSession::class,
+        \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
+    ];
 }