Skip to content

Commit 00554a9

Browse files
authored
[CI] Adjusted gh actions and PHPStan (#268)
1 parent e0ecc27 commit 00554a9

File tree

7 files changed

+19
-8
lines changed

7 files changed

+19
-8
lines changed

.github/workflows/browser-tests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ jobs:
1717
test-suite: '--profile=browser --suite=admin-ui --tags=@richtext'
1818
secrets:
1919
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
20+
AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
21+
AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
22+
AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
strategy:
1515
matrix:
1616
php:
17-
- '8.0'
17+
- '8.1'
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v5
2020

2121
- name: Setup PHP Action
2222
uses: shivammathur/setup-php@v2
@@ -45,7 +45,7 @@ jobs:
4545
- '8.1'
4646

4747
steps:
48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v5
4949

5050
- name: Setup PHP Action
5151
uses: shivammathur/setup-php@v2
@@ -95,7 +95,7 @@ jobs:
9595
- '8.1'
9696

9797
steps:
98-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v5
9999

100100
- name: Setup PHP Action
101101
uses: shivammathur/setup-php@v2
@@ -146,7 +146,7 @@ jobs:
146146
- '8.1'
147147

148148
steps:
149-
- uses: actions/checkout@v3
149+
- uses: actions/checkout@v5
150150

151151
- name: Setup PHP Action
152152
uses: shivammathur/setup-php@v2
@@ -183,7 +183,7 @@ jobs:
183183
--health-timeout 5s
184184
--health-retries 10
185185
steps:
186-
- uses: actions/checkout@v3
186+
- uses: actions/checkout@v5
187187
with:
188188
fetch-depth: 0
189189

.github/workflows/frontend-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 5
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v5
1818
- uses: actions/setup-node@v2
1919
with:
2020
node-version: '18'

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
},
3333
"require-dev": {
3434
"dama/doctrine-test-bundle": "^6.7.5",
35+
"friendsofphp/php-cs-fixer": "^3.0",
3536
"ibexa/admin-ui": "~4.6.x-dev",
3637
"ibexa/ci-scripts": "^0.2@dev",
3738
"ibexa/doctrine-schema": "~4.6.x-dev",

phpstan-baseline.neon

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,12 @@ parameters:
408408
count: 1
409409
path: src/lib/Configuration/UI/Mapper/CustomStyle.php
410410

411+
-
412+
message: '#^Method Ibexa\\FieldTypeRichText\\Configuration\\UI\\Mapper\\CustomTag\:\:translateLabels\(\) should return array\<string, array\{label\: string, description\: string, isInline\: bool, icon\?\: string, attributes\?\: array\<string, array\{type\: string, required\: bool, defaultValue\: mixed, label\: string, choices\?\: array\<string\>, choicesLabel\?\: array\<string, string\>\}\>\}\> but returns array\<string, array\{label\: string, description\: string, isInline\: bool, icon\?\: string, attributes\?\: array\<string, array\{label\: string\}\|array\{type\: string, required\: bool, defaultValue\: mixed, label\: string, choices\?\: array\<string\>, choicesLabel\?\: array\<string, string\>\}\>\}\>\.$#'
413+
identifier: return.type
414+
count: 1
415+
path: src/lib/Configuration/UI/Mapper/CustomTag.php
416+
411417
-
412418
message: '#^Method Ibexa\\FieldTypeRichText\\Configuration\\UI\\Mapper\\CustomTemplateConfigMapper\:\:mapConfig\(\) has parameter \$enabledCustomTemplates with no value type specified in iterable type array\.$#'
413419
identifier: missingType.iterableValue

src/bundle/Templating/Twig/Extension/YoutubeIdExtractorExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
final class YoutubeIdExtractorExtension extends AbstractExtension
1818
{
1919
private const YOUTUBE_ID_REGEX = '/(?:https?:)?(?:\/\/)?(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])'
20-
. '(?P<id>[\w-]{11})(?=[^\w-]|$)(?![?=&+%\w.-]*(?:[\'"][^<>]*>|<\/a>))[?=&+%\w.-]*/i';
20+
. '(?P<id>[\w-]{11})(?=[^\w-]|$)(?![?=&+%\w.-]*(?:[\'"][^<>]*>|<\/a>))[?=&+%\w.-]*/i';
2121

2222
public function getFunctions(): array
2323
{

src/lib/Configuration/UI/Mapper/CustomTag.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
namespace Ibexa\FieldTypeRichText\Configuration\UI\Mapper;
1010

1111
use Ibexa\FieldTypeRichText\Configuration\UI\Mapper\CustomTag\AttributeMapper;
12+
use JMS\TranslationBundle\Annotation\Ignore;
1213
use RuntimeException;
1314
use Symfony\Component\Asset\Packages;
1415
use Symfony\Component\Translation\TranslatorBagInterface;

0 commit comments

Comments
 (0)