Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-pm4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ on:
jobs:
run:
name: Run PM4-workflow
uses: processmaker/.github/.github/workflows/deploy-pm4.yml@main
uses: processmaker/.github/.github/workflows/deploy-pm4.yml@testbench
secrets: inherit
5 changes: 2 additions & 3 deletions ProcessMaker/Console/Commands/IndexedSearchEnable.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,8 @@ private function setConfig($driver, $url = null, $prefix = null)
$env .= "\n\nSCOUT_DRIVER={$driver}";
$env .= "\nELASTIC_HOST={$url}";
break;
case 'sqlite':
$driver = 'tntsearch';
$env .= "\n\nSCOUT_DRIVER={$driver}";
default:
throw new \Exception('Only Elasticsearch is supported for indexed search.');
break;
}

Expand Down
20 changes: 0 additions & 20 deletions ProcessMaker/Http/Middleware/VerifyCsrfToken.php

This file was deleted.

4 changes: 1 addition & 3 deletions ProcessMaker/Models/GroupMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,8 @@ public function group()
/**
* Boot the model and register observers
*/
protected static function boot()
protected static function booted()
{
parent::boot();

static::observe(GroupMemberObserver::class);
}
}
25 changes: 15 additions & 10 deletions ProcessMaker/Providers/ProcessMakerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@

namespace ProcessMaker\Providers;

use Illuminate\Console\Events\CommandStarting;
use Illuminate\Database\Console\Migrations\MigrateCommand;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Foundation\PackageManifest;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use Illuminate\Notifications\Events\BroadcastNotificationCreated;
use Illuminate\Notifications\Events\NotificationSent;
use Illuminate\Queue\Events\JobAttempted;
use Illuminate\Queue\Events\JobProcessing;
use Illuminate\Queue\Events\JobRetryRequested;
use Illuminate\Queue\Listener;
use Illuminate\Support\Arr;
use Illuminate\Support\Env;
Expand All @@ -22,11 +20,13 @@
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\URL;
use Laravel\Dusk\DuskServiceProvider;
use Laravel\Horizon\Horizon;
use Laravel\Horizon\SystemProcessCounter;
use Laravel\Horizon\WorkerCommandString;
use Lavary\Menu\Menu;
use OpenApi\Analysers\AttributeAnnotationFactory;
use OpenApi\Analysers\DocBlockAnnotationFactory;
use OpenApi\Analysers\ReflectionAnalyser;
use ProcessMaker\Cache\Settings\SettingCacheManager;
use ProcessMaker\Console\Commands\HorizonListen;
use ProcessMaker\Console\Migration\ExtendedMigrateCommand;
Expand Down Expand Up @@ -118,12 +118,6 @@ public function register(): void
});
}

// Dusk, if env is appropriate
// TODO Remove Dusk references and remove from composer dependencies
if (!$this->app->environment('production')) {
$this->app->register(DuskServiceProvider::class);
}

// Register our permission services
$this->app->register(PermissionServiceProvider::class);

Expand Down Expand Up @@ -331,6 +325,17 @@ protected static function registerEvents(): void
throw new MultitenancyNoTenantFound();
}
});

Facades\Event::listen(function (CommandStarting $event) {
if ($event->command === 'l5-swagger:generate') {
// Set the analyser to use the legacy DocBlockAnnotationFactory. This must
// be set here because this config value is not serializable and cannot be cached.
config(['l5-swagger.defaults.scanOptions.analyser' => new ReflectionAnalyser([
new AttributeAnnotationFactory(),
new DocBlockAnnotationFactory(),
])]);
}
});
}

/**
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
$middleware->append(ProcessMakerMiddleware\HideServerHeaders::class);

// Remove CSRF middleware from web group (was disabled in original Kernel.php)
$middleware->removeFromGroup('web', Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class);
$middleware->removeFromGroup('web', Illuminate\Foundation\Http\Middleware\PreventRequestForgery::class);

// Replace Laravel default middleware in web group
$middleware->replaceInGroup('web',
Expand Down
49 changes: 28 additions & 21 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,48 @@
"php": "^8.4",
"babenkoivan/elastic-scout-driver": "^4.0",
"bacon/bacon-qr-code": "^2.0",
"codegreencreative/laravel-samlidp": "^5.2",
"codegreencreative/laravel-samlidp": "^5.4",
"composer/semver": "^3.4",
"darkaonline/l5-swagger": "^9.0.1",
"darkaonline/l5-swagger": "^11.0",
"doctrine/annotations": "^2.0",
"doctrine/dbal": "^4.2",
"fakerphp/faker": "^1.24",
"google/apiclient": "^2.18",
"google/protobuf": "^4.33.6",
"guzzlehttp/guzzle": "^7.9",
"igaster/laravel-theme": "^2.0",
"jenssegers/agent": "^2.6",
"laravel/framework": "^12.47",
"laravel/horizon": "^5.30",
"laravel/framework": "^13.0",
"laravel/horizon": "^5.45",
"laravel/pail": "^1.2",
"laravel/passport": "^13.4",
"laravel/scout": "^10.11",
"laravel/telescope": "^5.2",
"laravel/tinker": "^2.10",
"laravel/passport": "^13.7",
"laravel/scout": "^11.1",
"laravel/telescope": "^5.19",
"laravel/tinker": "^3.0",
"laravel/ui": "^4.6",
"lavary/laravel-menu": "^1.8",
"lcobucci/jwt": "^5.6",
"league/commonmark": "^2.8.1",
"mateusjunges/laravel-kafka": "^2.10",
"mateusjunges/laravel-kafka": "^2.11",
"mittwald/vault-php": "^2.1",
"mustache/mustache": "^2.14",
"open-telemetry/api": "^1.8",
"open-telemetry/exporter-otlp": "^1.3",
"open-telemetry/opentelemetry-auto-laravel": "^1.4",
"open-telemetry/opentelemetry-auto-laravel": "dev-main",
"open-telemetry/transport-grpc": "^1.1",
"openai-php/client": "^0.18.0",
"openai-php/laravel": "^0.18.0",
"openai-php/laravel": "^0.19.1",
"paragonie/sodium_compat": "^2.5",
"php-amqplib/php-amqplib": "^3.7",
"php-http/promise": "~1.2.0",
"phpseclib/phpseclib": "^3.0.50",
"pion/laravel-chunk-upload": "^1.5",
"pion/laravel-chunk-upload": "dev-master",
"predis/predis": "^2.3",
"processmaker/docker-executor-lua": "^1.0",
"processmaker/docker-executor-node": "1.1.0",
"processmaker/docker-executor-php": "1.4.1",
"processmaker/laravel-i18next": "dev-master",
"processmaker/nayra": "1.12.4",
"processmaker/pmql": "1.13.2",
"processmaker/pmql": "1.13.3",
"promphp/prometheus_client_php": "^2.12",
"psr/http-message": "^2.0",
"psr/log": "^3.0",
Expand All @@ -64,24 +64,23 @@
"ralouphie/getallheaders": "^3.0",
"robrichards/xmlseclibs": "^3.1.5",
"simplesoftwareio/simple-qrcode": "*",
"spatie/laravel-fractal": "^6.3",
"spatie/laravel-html": "^3.11",
"spatie/laravel-medialibrary": "^11.11",
"spatie/laravel-multitenancy": "^4.0",
"spatie/laravel-fractal": "^6.4",
"spatie/laravel-html": "^3.13",
"spatie/laravel-ignition": "^2.12",
"spatie/laravel-medialibrary": "^11.21",
"spatie/laravel-multitenancy": "^4.0.9",
"spomky-labs/otphp": "^11.3",
"symfony/expression-language": "^7.2",
"symfony/http-foundation": "^7.3",
"teamtnt/laravel-scout-tntsearch-driver": "^15.0",
"twilio/sdk": "^8.3",
"typo3/class-alias-loader": "^1.2",
"whichbrowser/parser": "^2.1"
},
"require-dev": {
"filp/whoops": "^2.16",
"laravel/dusk": "^8.2",
"laravel/boost": "^2.4",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^12.5.8",
"spatie/laravel-ignition": "^2.9",
"squizlabs/php_codesniffer": "^3.11",
"symfony/dom-crawler": "^7.2"
},
Expand Down Expand Up @@ -220,6 +219,14 @@
]
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/ProcessMaker/laravel-chunk-upload.git"
},
{
"type": "vcs",
"url": "https://github.com/ProcessMaker/contrib-auto-laravel.git"
},
{
"type": "vcs",
"url": "https://github.com/ProcessMaker/SocialiteProviders"
Expand Down
Loading
Loading