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
15 changes: 14 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ APP_DEBUG=FALSE
APP_NAME="ProcessMaker"
APP_ENV=production
APP_KEY=
BROADCAST_DRIVER=redis
BROADCAST_CONNECTION=redis
BROADCASTER_HOST=https://processmaker.local.processmaker.com:6001
BROADCASTER_KEY=
LARAVEL_ECHO_SERVER_AUTH_HOST=https://processmaker.local.processmaker.com
Expand All @@ -29,6 +29,13 @@ DATA_DB_DATABASE=processmaker
DATA_DB_USERNAME=homestead
DATA_DB_PASSWORD=secret
APP_URL=https://processmaker.local.processmaker.com

APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US
APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database
BCRYPT_ROUNDS=12
TELESCOPE_ENABLED=false
REDIS_CLIENT=predis
REDIS_PREFIX=
Expand All @@ -51,3 +58,9 @@ CUSTOM_EXECUTORS=false
CACHE_SETTING_DRIVER=cache_settings
CACHE_SETTING_PREFIX=settings:
AI_ENABLE_RAG_COLLECTIONS=false

LOG_STACK=single

SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null
2 changes: 1 addition & 1 deletion ProcessMaker/Console/Commands/ChangeKeyEncryptedData.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Exception;
use Illuminate\Console\Command;
use ProcessMaker\Facades\EncryptedData;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Facades\EncryptedData;

class ChangeKeyEncryptedData extends Command
{
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Console/Commands/CreateSamlCertificate.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CreateSamlCertificate extends CreateCertificate
{--keyname=key.pem : Full name of the certificate key file}
{--certname=cert.pem : Full name to the certificate file}
{--subject= : Set subject of request or cert '
. '(e.g. /C=US/ST=New York/L=New York City/O=Example Inc/CN=example.com)}';
. '(e.g. /C=US/ST=New York/L=New York City/O=Example Inc/CN=example.com)}';

/**
* The console command description.
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Console/Commands/Install.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function handle()
'APP_ENV' => 'production',
'APP_KEY' => $this->key,
'APP_URL' => $this->option('url'),
'BROADCAST_DRIVER' => $this->option('broadcast-driver'),
'BROADCAST_CONNECTION' => $this->option('broadcast-driver'),
'BROADCASTER_HOST' => null,
'BROADCASTER_KEY' => $this->option('broadcast-key') ? $this->option('broadcast-key') : '21a795019957dde6bcd96142e05d4b10',
'LARAVEL_ECHO_SERVER_AUTH_HOST' => null,
Expand Down
3 changes: 2 additions & 1 deletion ProcessMaker/Console/Commands/UpdateSettingsGroupId.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public function handle()
{
// Update the setting.group_id with the corresponding category created in settings_menus
Setting::updateAllSettingsGroupId();
return $this->info("Settings group_id updated successfully");

return $this->info('Settings group_id updated successfully');
}
}
2 changes: 1 addition & 1 deletion ProcessMaker/Events/ActivityAssigned.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function broadcastOn()
/**
* Return the process request.
*
* @return \ProcessMaker\Models\ProcessRequestToken
* @return ProcessRequestToken
*/
public function getProcessRequestToken()
{
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Events/ActivityCompleted.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function broadcastOn()
/**
* Return the process request.
*
* @return \ProcessMaker\Models\ProcessRequestToken
* @return ProcessRequestToken
*/
public function getProcessRequestToken()
{
Expand Down
6 changes: 3 additions & 3 deletions ProcessMaker/Events/CustomizeUiUpdated.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CustomizeUiUpdated implements SecurityLogEventInterface
private function defaultVariables(): string
{
$defaults = config('app.default_colors');

$objects = [];
foreach ($defaults as $name => $value) {
$objects[] = [
Expand All @@ -40,10 +40,10 @@ private function defaultVariables(): string
'title' => ucfirst($name),
];
}

return json_encode($objects);
}

/**
* Create a new event instance.
*
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Events/ProcessCompleted.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function broadcastOn()
/**
* Return the process request.
*
* @return \ProcessMaker\Models\ProcessRequest
* @return ProcessRequest
*/
public function getProcessRequest()
{
Expand Down
5 changes: 3 additions & 2 deletions ProcessMaker/Events/RedirectToEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,17 @@ public function broadcastOn(): array
{
$channels = [
// Current request
new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $this->processRequest->getKey())
new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $this->processRequest->getKey()),
];
// include child requests if any
foreach($this->processRequest->childRequests()->pluck('id') as $childRequestId) {
foreach ($this->processRequest->childRequests()->pluck('id') as $childRequestId) {
$channels[] = new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $childRequestId);
}
// include parent request if any
if ($this->processRequest->parent_request_id) {
$channels[] = new PrivateChannel('ProcessMaker.Models.ProcessRequest.' . $this->processRequest->parent_request_id);
}

return $channels;
}
}
2 changes: 1 addition & 1 deletion ProcessMaker/Events/SessionStarted.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(User $user)
/**
* Get the channels the event should broadcast on.
*
* @return \Illuminate\Broadcasting\Channel|array
* @return Channel|array
*/
public function broadcastOn()
{
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Facades/Docker.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use ProcessMaker\Managers\DockerManager;

/**
* @see \ProcessMaker\Managers\DockerManager
* @see DockerManager
*
* @method bool hasRemoteDocker()
* @method string getDockerHost()
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Facades/MatchingTasks.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ class MatchingTasks extends Facade
*/
protected static function getFacadeAccessor()
{
return MatchingTasks::class;
return self::class;
}
}
2 changes: 1 addition & 1 deletion ProcessMaker/Facades/RequestDevice.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use ProcessMaker\Models\RequestDevice as RequestDeviceModel;

/**
* @see \ProcessMaker\Models\RequestDevice
* @see RequestDeviceModel
*
* @method static string getVariableName()
* @method static string getId()
Expand Down
4 changes: 2 additions & 2 deletions ProcessMaker/Http/Controllers/Api/GroupMemberController.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public function destroy(GroupMember $group_member)
/**
* Display a listing of groups available
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return ApiCollection
*
* @OA\Get(
Expand Down Expand Up @@ -338,7 +338,7 @@ public function groupsAvailable(Request $request)
/**
* Display a listing of users available
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return ApiCollection
*
* @OA\Get(
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Controllers/Api/SignalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SignalController extends Controller
*
* @param Request $request
*
* @return \Illuminate\Http\Response
* @return Response
*
* @OA\Get(
* path="/signals",
Expand Down
10 changes: 5 additions & 5 deletions ProcessMaker/Http/Controllers/Auth/ClientController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ClientController extends PassportClientController
/**
* List auth clients
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return array
*/
public function index(Request $request)
Expand All @@ -27,7 +27,7 @@ public function index(Request $request)
/**
* Get an individual auth client
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @param string $clientId
* @return array
*/
Expand All @@ -42,7 +42,7 @@ public function show(Request $request, $clientId)
/**
* Store a new client.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return \Laravel\Passport\Client
*/
public function store(Request $request)
Expand Down Expand Up @@ -70,7 +70,7 @@ public function store(Request $request)
/**
* Update the given client.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @param string $clientId
* @return \Illuminate\Http\Response|\Laravel\Passport\Client
*/
Expand Down Expand Up @@ -108,7 +108,7 @@ public function update(Request $request, $clientId)
/**
* Delete the given client.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @param string $clientId
* @return null
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function testSettings(Request $request)
if (count($enabled) === 0) {
$message = [
'status' => 'error',
'message' => __('The two-step method must be selected.')
'message' => __('The two-step method must be selected.'),
];
$status = 500;
}
Expand Down Expand Up @@ -237,6 +237,7 @@ public static function check2faByGroups()
{
try {
$user = Auth::user();

return $user->in2FAGroupOrIndependent();
} catch (Exception $e) {
session()->put(self::TFA_ERROR, $e->getMessage());
Expand Down
12 changes: 6 additions & 6 deletions ProcessMaker/Http/Controllers/Process/ScreenController.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function edit(Screen $screen)
{
$addons = $this->getPluginAddons('edit', compact(['screen']));
$assignedProjects = json_decode($screen->projects, true);

$lastDraftOrPublishedVersion = $screen->getDraftOrPublishedLatestVersion();

$isDraft = 0;
Expand All @@ -92,11 +92,11 @@ public function edit(Screen $screen)
}

return view('processes.screens.edit', compact(
'screen',
'addons',
'assignedProjects',
'isDraft'
)
'screen',
'addons',
'assignedProjects',
'isDraft'
)
);
}

Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Controllers/Process/SignalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function index(Request $request)
/**
* Get a specific signal
*
* @return \Illuminate\View\View|\Illuminate\Contracts\View
* @return View|\Illuminate\Contracts\View
*/
public function edit($id)
{
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/AuthenticateSession.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class AuthenticateSession extends BaseAuthenticateSession
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param Closure $next
*
* @return mixed
* @throws \Illuminate\Auth\AuthenticationException
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/BrowserCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class BrowserCache
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/EncryptCookies.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ class EncryptCookies extends BaseEncrypter
*/
'device_id',
'fromTriggerStartEvent',
'language'
'language',
];
}
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/HideServerHeaders.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class HideServerHeaders
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
* @param Closure(Request): (Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/IgnoreMapFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class IgnoreMapFiles
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/IsAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class IsAdmin
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
* @param Closure(Request): (Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/IsManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class IsManager
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
* @param Closure(Request): (Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Middleware/NoCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class NoCache
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
* @param Closure(Request): (Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
Expand Down
Loading
Loading