Upgrade to Laravel 7.x

.gitignore

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

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/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/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/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

@@ -70,4 +70,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,
+    ];
 }

ProcessMaker/Media.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Facades\Storage;
 use Spatie\MediaLibrary\FileManipulator;
 use Spatie\MediaLibrary\Filesystem\Filesystem;
-use Spatie\MediaLibrary\Models\Media as BaseMedia;
+use Spatie\MediaLibrary\MediaCollections\Models\Media as BaseMedia;
 
 class Media extends BaseMedia
 {

ProcessMaker/Models/Media.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Validation\ValidationException;
 use ProcessMaker\Models\ProcessRequest;
-use Spatie\MediaLibrary\Models\Media as Model;
+use Spatie\MediaLibrary\MediaCollections\Models\Media as Model;
 
 /**
  * Represents media files stored in the database

ProcessMaker/Models/MediaPathGenerator.php

@@ -8,8 +8,8 @@
 
 namespace ProcessMaker\Models;
 
-use Spatie\MediaLibrary\Models\Media;
-use Spatie\MediaLibrary\PathGenerator\PathGenerator;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
+use Spatie\MediaLibrary\Support\PathGenerator\PathGenerator;
 
 class MediaPathGenerator implements PathGenerator
 {

ProcessMaker/Models/Process.php

@@ -41,8 +41,8 @@
 use ProcessMaker\Traits\ProcessTimerEventsTrait;
 use ProcessMaker\Traits\ProcessTrait;
 use ProcessMaker\Traits\SerializeToIso8601;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 use Throwable;
 
 /**
@@ -136,7 +136,7 @@
  */
 class Process extends Model implements HasMedia, ProcessModelInterface
 {
-    use HasMediaTrait;
+    use InteractsWithMedia;
     use SerializeToIso8601;
     use SoftDeletes;
     use ProcessTaskAssignmentsTrait;

ProcessMaker/Models/ProcessRequest.php

@@ -24,8 +24,8 @@
 use ProcessMaker\Traits\HideSystemResources;
 use ProcessMaker\Traits\SerializeToIso8601;
 use ProcessMaker\Traits\SqlsrvSupportTrait;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 use Throwable;
 
 /**
@@ -82,7 +82,7 @@ class ProcessRequest extends Model implements ExecutionInstanceInterface, HasMed
 {
     use ExecutionInstanceTrait;
     use SerializeToIso8601;
-    use HasMediaTrait;
+    use InteractsWithMedia;
     use ExtendedPMQL;
     use SqlsrvSupportTrait;
     use HideSystemResources;

ProcessMaker/Models/SecurityLog.php

@@ -5,41 +5,41 @@
 use Illuminate\Database\Eloquent\Model;
 use ProcessMaker\Traits\ExtendedPMQL;
 
+/**
+ * Class SecurityLog
+ *
+ *
+ * @property Carbon $updated_at
+ * @property Carbon $created_at
+ *
+ * @OA\Schema(
+ *   schema="securityLog",
+ *   @OA\Property(property="id", type="integer"),
+ *   @OA\Property(property="event", type="string"),
+ *   @OA\Property(property="ip", type="string"),
+ *   @OA\Property(property="meta", type="array",
+ *      @OA\Items(type="object",
+ *         @OA\Property(property="os", type="array",
+ *              @OA\Items(type="object",
+ *                  @OA\Property(property="name", type="string"),
+ *                  @OA\Property(property="version", type="string"),
+ *              ),
+ *         ),
+ *         @OA\Property(property="browser", type="array",
+ *              @OA\Items(type="object",
+ *                  @OA\Property(property="name", type="string"),
+ *                  @OA\Property(property="version", type="string"),
+ *              ),
+ *         ),
+ *         @OA\Property(property="user_agent", type="string"),
+ *      ),
+ *    ),
+ *   @OA\Property(property="user_id", type="integer"),
+ *   @OA\Property(property="occured_at", type="string"),
+ * ),
+ */
 class SecurityLog extends Model
 {
-    /**
-     * Class SecurityLog
-     *
-     *
-     * @property Carbon $updated_at
-     * @property Carbon $created_at
-     *
-     * @OA\Schema(
-     *   schema="securityLog",
-     *   @OA\Property(property="id", type="integer"),
-     *   @OA\Property(property="event", type="string"),
-     *   @OA\Property(property="ip", type="string"),
-     *   @OA\Property(property="meta", type="array",
-     *      @OA\Items(type="object",
-     *         @OA\Property(property="os", type="array",
-     *              @OA\Items(type="object",
-     *                  @OA\Property(property="name", type="string"),
-     *                  @OA\Property(property="version", type="string"),
-     *              ),
-     *         ),
-     *         @OA\Property(property="browser", type="array",
-     *              @OA\Items(type="object",
-     *                  @OA\Property(property="name", type="string"),
-     *                  @OA\Property(property="version", type="string"),
-     *              ),
-     *         ),
-     *         @OA\Property(property="user_agent", type="string"),
-     *      ),
-     *    ),
-     *   @OA\Property(property="user_id", type="integer"),
-     *   @OA\Property(property="occured_at", type="string"),
-     * ),
-     */
     use ExtendedPMQL;
 
     const CREATED_AT = 'occurred_at';

ProcessMaker/Models/Setting.php

@@ -9,8 +9,8 @@
 use Illuminate\Validation\Rule;
 use ProcessMaker\Traits\ExtendedPMQL;
 use ProcessMaker\Traits\SerializeToIso8601;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 
 /**
  * Class Settings
@@ -50,7 +50,7 @@
 class Setting extends Model implements HasMedia
 {
     use ExtendedPMQL;
-    use HasMediaTrait;
+    use InteractsWithMedia;
     use SerializeToIso8601;
 
     protected $connection = 'processmaker';

ProcessMaker/Models/TokenClient.php

@@ -4,21 +4,21 @@
 
 use Laravel\Passport\Client;
 
+/**
+ * @OA\Schema(
+ *   schema="TokenClient",
+ *   @OA\Property(property="id", type="integer"),
+ *   @OA\Property(property="user_id", type="integer"),
+ *   @OA\Property(property="name", type="string"),
+ *   @OA\Property(property="provider", type="string"),
+ *   @OA\Property(property="redirect", type="string"),
+ *   @OA\Property(property="personal_access_client", type="boolean"),
+ *   @OA\Property(property="password_client", type="boolean"),
+ *   @OA\Property(property="revoked", type="boolean"),
+ *   @OA\Property(property="created_at", type="string", format="date-time"),
+ *   @OA\Property(property="updated_at", type="string", format="date-time"),
+ * )
+ */
 class TokenClient extends Client
 {
-    /**
-     * @OA\Schema(
-     *   schema="TokenClient",
-     *   @OA\Property(property="id", type="integer"),
-     *   @OA\Property(property="user_id", type="integer"),
-     *   @OA\Property(property="name", type="string"),
-     *   @OA\Property(property="provider", type="string"),
-     *   @OA\Property(property="redirect", type="string"),
-     *   @OA\Property(property="personal_access_client", type="boolean"),
-     *   @OA\Property(property="password_client", type="boolean"),
-     *   @OA\Property(property="revoked", type="boolean"),
-     *   @OA\Property(property="created_at", type="string", format="date-time"),
-     *   @OA\Property(property="updated_at", type="string", format="date-time"),
-     * )
-     */
 }

ProcessMaker/Models/User.php

@@ -16,15 +16,15 @@
 use ProcessMaker\Traits\HasAuthorization;
 use ProcessMaker\Traits\HideSystemResources;
 use ProcessMaker\Traits\SerializeToIso8601;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 
 class User extends Authenticatable implements HasMedia
 {
     use PMQL;
     use HasApiTokens;
     use Notifiable;
-    use HasMediaTrait;
+    use InteractsWithMedia;
     use HasAuthorization;
     use SerializeToIso8601;
     use SoftDeletes;

ProcessMaker/Models/UserToken.php

@@ -4,21 +4,21 @@
 
 use Laravel\Passport\Token;
 
+/**
+ * @OA\Schema(
+ *   schema="UserToken",
+ *   @OA\Property(property="id", type="string"),
+ *   @OA\Property(property="user_id", type="integer"),
+ *   @OA\Property(property="client_id", type="integer"),
+ *   @OA\Property(property="name", type="string"),
+ *   @OA\Property(property="scopes", type="object"),
+ *   @OA\Property(property="revoked", type="boolean"),
+ *   @OA\Property(property="client", type="object", ref="#/components/schemas/TokenClient"),
+ *   @OA\Property(property="created_at", type="string", format="date-time"),
+ *   @OA\Property(property="updated_at", type="string", format="date-time"),
+ *   @OA\Property(property="expires_at", type="string", format="date-time"),
+ * )
+ */
 class UserToken extends Token
 {
-    /**
-     * @OA\Schema(
-     *   schema="UserToken",
-     *   @OA\Property(property="id", type="string"),
-     *   @OA\Property(property="user_id", type="integer"),
-     *   @OA\Property(property="client_id", type="integer"),
-     *   @OA\Property(property="name", type="string"),
-     *   @OA\Property(property="scopes", type="object"),
-     *   @OA\Property(property="revoked", type="boolean"),
-     *   @OA\Property(property="client", type="object", ref="#/components/schemas/TokenClient"),
-     *   @OA\Property(property="created_at", type="string", format="date-time"),
-     *   @OA\Property(property="updated_at", type="string", format="date-time"),
-     *   @OA\Property(property="expires_at", type="string", format="date-time"),
-     * )
-     */
 }