Jingga/oms-Workflow
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Workflow.git synced 2026-02-13 12:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

workflow fix

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-09-30 00:37:12 +02:00
parent 74354377ce
commit de8ec268ef
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/main.yml vendored
View File

@ -73,7 +73,7 @@ jobs:
fail-fast: false fail-fast: false
max-parallel: 3 max-parallel: 3
matrix: matrix:
php-versions: ['8.0'] php-versions: ['8.1']
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@main uses: actions/checkout@main
@ -135,7 +135,7 @@ jobs:
fail-fast: false fail-fast: false
max-parallel: 3 max-parallel: 3
matrix: matrix:
php-versions: ['8.0'] php-versions: ['8.1']
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@main uses: actions/checkout@main
@ -184,7 +184,7 @@ jobs:
fail-fast: false fail-fast: false
max-parallel: 3 max-parallel: 3
matrix: matrix:
php-versions: ['8.0'] php-versions: ['8.1']
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@main uses: actions/checkout@main
@ -240,7 +240,7 @@ jobs:
submodules: recursive submodules: recursive
token: ${{ secrets.GH_PAT }} token: ${{ secrets.GH_PAT }}
- name: Lint Code Base - name: Lint Code Base
uses: github/super-linter@v4 uses: github/super-linter/slim@v4
env: env:
VALIDATE_ALL_CODEBASE: false VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: develop DEFAULT_BRANCH: develop

10
Controller/ApiController.php
View File

@ -61,7 +61,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function runWorkflowFromHook(...$data) : void public function runWorkflowFromHook(mixed ...$data) : void
{ {
/** @var WorkflowTemplate[] $workflows */ /** @var WorkflowTemplate[] $workflows */
$workflows = WorkflowTemplateMapper::getAll() $workflows = WorkflowTemplateMapper::getAll()
@ -86,17 +86,17 @@ final class ApiController extends Controller
foreach ($hooks as $hook) { foreach ($hooks as $hook) {
/** @var array{:triggerGroup?:string} $data */ /** @var array{:triggerGroup?:string} $data */
$triggerIsRegex = \stripos($data[':triggerGroup'], '/') === 0; $triggerIsRegex = \stripos($data['@triggerGroup'], '/') === 0;
$matched = false; $matched = false;
if ($triggerIsRegex) { if ($triggerIsRegex) {
$matched = \preg_match($data[':triggerGroup'], $hook) === 1; $matched = \preg_match($data['@triggerGroup'], $hook) === 1;
} else { } else {
$matched = $data[':triggerGroup'] === $hook; $matched = $data['@triggerGroup'] === $hook;
} }
if (!$matched && \stripos($hook, '/') === 0) { if (!$matched && \stripos($hook, '/') === 0) {
$matched = \preg_match($hook, $data[':triggerGroup']) === 1; $matched = \preg_match($hook, $data['@triggerGroup']) === 1;
} }
if ($matched) { if ($matched) {

10
Controller/CliController.php
View File

@ -47,7 +47,7 @@ final class CliController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function runWorkflowFromHook(...$data) : void public function runWorkflowFromHook(mixed ...$data) : void
{ {
/** @var \Modules\Workflow\Models\WorkflowTemplate[] $workflows */ /** @var \Modules\Workflow\Models\WorkflowTemplate[] $workflows */
$workflows = WorkflowTemplateMapper::getAll()->where('status', WorkflowStatus::ACTIVE)->execute(); $workflows = WorkflowTemplateMapper::getAll()->where('status', WorkflowStatus::ACTIVE)->execute();
@ -56,17 +56,17 @@ final class CliController extends Controller
foreach ($hooks as $hook) { foreach ($hooks as $hook) {
/** @var array{\\:triggerGroup?:string} $data */ /** @var array{\\:triggerGroup?:string} $data */
$triggerIsRegex = \stripos($data[':triggerGroup'], '/') === 0; $triggerIsRegex = \stripos($data['@triggerGroup'], '/') === 0;
$matched = false; $matched = false;
if ($triggerIsRegex) { if ($triggerIsRegex) {
$matched = \preg_match($data[':triggerGroup'], $hook) === 1; $matched = \preg_match($data['@triggerGroup'], $hook) === 1;
} else { } else {
$matched = $data[':triggerGroup'] === $hook; $matched = $data['@triggerGroup'] === $hook;
} }
if (!$matched && \stripos($hook, '/') === 0) { if (!$matched && \stripos($hook, '/') === 0) {
$matched = \preg_match($hook, $data[':triggerGroup']) === 1; $matched = \preg_match($hook, $data['@triggerGroup']) === 1;
} }
if ($matched) { if ($matched) {

2
composer.json
View File

@ -12,7 +12,7 @@
"friendsofphp/php-cs-fixer": ">=3.8", "friendsofphp/php-cs-fixer": ">=3.8",
"squizlabs/php_codesniffer": ">=3.6", "squizlabs/php_codesniffer": ">=3.6",
"phpmd/phpmd": ">=2.9", "phpmd/phpmd": ">=2.9",
"phpstan/phpstan": ">=1.5.4", "phpstan/phpstan": ">=1.8.6",
"phan/phan": ">=3.2.6" "phan/phan": ">=3.2.6"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",