From 097dab23b9b6b58440ea39fd4e475612d9d10119 Mon Sep 17 00:00:00 2001 From: Roric van Schalkwijk Date: Tue, 16 Dec 2025 20:31:14 +0100 Subject: [PATCH 1/7] feat: update ElasticSearch Directive to include staging server --- src/Basic.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Basic.php b/src/Basic.php index 395ad27..ca22cec 100644 --- a/src/Basic.php +++ b/src/Basic.php @@ -123,7 +123,8 @@ public function configure() // ElasticSearch ->addDirective(Directive::CONNECT, env('WP_ENV') == 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl') - ->addDirective(Directive::CONNECT, 'https://elasticsearch-yard.app.owc.shockapp.io') + ->addDirective(Directive::CONNECT, + env('WP_ENV') == 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io') // Google Translate ->addDirective(Directive::CONNECT, [ @@ -207,10 +208,10 @@ public function configure() ->addDirective(Directive::SCRIPT, Keyword::UNSAFE_EVAL) // Needed for Vite development server - ->addDirective(Directive::CONNECT, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) - ->addDirective(Directive::SCRIPT, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) - ->addDirective(Directive::IMG, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) - ->addDirective(Directive::STYLE, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']); + ->addDirective(Directive::CONNECT, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) + ->addDirective(Directive::SCRIPT, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) + ->addDirective(Directive::IMG, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) + ->addDirective(Directive::STYLE, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']); if (env('LANDO_REMOTE_ASSETS_URL')) { $this->addDirective(Directive::IMG, env('LANDO_REMOTE_ASSETS_URL')); From ee719ed2e2c6a55e8f1da4e2bac5a818f535ae1b Mon Sep 17 00:00:00 2001 From: Rovasch <166744617+Rovasch@users.noreply.github.com> Date: Tue, 16 Dec 2025 19:32:22 +0000 Subject: [PATCH 2/7] auto: apply php-cs-fixer changes --- src/Basic.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Basic.php b/src/Basic.php index ca22cec..1abef37 100644 --- a/src/Basic.php +++ b/src/Basic.php @@ -123,8 +123,10 @@ public function configure() // ElasticSearch ->addDirective(Directive::CONNECT, env('WP_ENV') == 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl') - ->addDirective(Directive::CONNECT, - env('WP_ENV') == 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io') + ->addDirective( + Directive::CONNECT, + env('WP_ENV') == 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io' + ) // Google Translate ->addDirective(Directive::CONNECT, [ From d0ba614c86981f10339809bd94d5559c93296535 Mon Sep 17 00:00:00 2001 From: Roric van Schalkwijk Date: Wed, 17 Dec 2025 08:42:27 +0100 Subject: [PATCH 3/7] fix: adjust to strict comparison --- src/Basic.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Basic.php b/src/Basic.php index 1abef37..b46b0b4 100644 --- a/src/Basic.php +++ b/src/Basic.php @@ -122,11 +122,8 @@ public function configure() ->addDirective(Directive::STYLE, 'https://*.typekit.net') // ElasticSearch - ->addDirective(Directive::CONNECT, env('WP_ENV') == 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl') - ->addDirective( - Directive::CONNECT, - env('WP_ENV') == 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io' - ) + ->addDirective(Directive::CONNECT, env('WP_ENV') === 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl') + ->addDirective(Directive::CONNECT, env('WP_ENV') === 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io') // Google Translate ->addDirective(Directive::CONNECT, [ From d0981cb445bed30f4e3259ad019a16cf40da3452 Mon Sep 17 00:00:00 2001 From: Roric van Schalkwijk Date: Wed, 17 Dec 2025 13:03:39 +0100 Subject: [PATCH 4/7] feat: adjust workflow for testing signed commit --- .github/workflows/format-php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/format-php.yml b/.github/workflows/format-php.yml index e536275..91687ca 100644 --- a/.github/workflows/format-php.yml +++ b/.github/workflows/format-php.yml @@ -7,5 +7,5 @@ on: jobs: php-cs-fixer: - uses: yardinternet/workflows/.github/workflows/format-php.yml@main + uses: yardinternet/workflows/.github/workflows/format-php.yml@feat/signed-commit secrets: inherit From b7f5ed351d7c20fdce1c265a993fd81399e35d84 Mon Sep 17 00:00:00 2001 From: Roric van Schalkwijk Date: Wed, 17 Dec 2025 13:05:48 +0100 Subject: [PATCH 5/7] chore: trigger formatter --- src/Basic.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Basic.php b/src/Basic.php index b46b0b4..b6fe54e 100644 --- a/src/Basic.php +++ b/src/Basic.php @@ -123,7 +123,8 @@ public function configure() // ElasticSearch ->addDirective(Directive::CONNECT, env('WP_ENV') === 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl') - ->addDirective(Directive::CONNECT, env('WP_ENV') === 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io') + ->addDirective(Directive::CONNECT, + env('WP_ENV') === 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io') // Google Translate ->addDirective(Directive::CONNECT, [ @@ -131,7 +132,9 @@ public function configure() 'https://translate-pa.googleapis.com', ]) ->addDirective(Directive::SCRIPT, [ + 'https://translate.googleapis.com', + 'https://www.google.com', ]) ->addDirective(Directive::STYLE, 'https://www.gstatic.com') @@ -207,10 +210,10 @@ public function configure() ->addDirective(Directive::SCRIPT, Keyword::UNSAFE_EVAL) // Needed for Vite development server - ->addDirective(Directive::CONNECT, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) - ->addDirective(Directive::SCRIPT, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) - ->addDirective(Directive::IMG, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) - ->addDirective(Directive::STYLE, ['http://localhost:*', 'https://localhost:*', 'ws://localhost:*']); + ->addDirective(Directive::CONNECT, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) + ->addDirective(Directive::SCRIPT, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) + ->addDirective(Directive::IMG, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']) + ->addDirective(Directive::STYLE, [ 'http://localhost:*', 'https://localhost:*', 'ws://localhost:*']); if (env('LANDO_REMOTE_ASSETS_URL')) { $this->addDirective(Directive::IMG, env('LANDO_REMOTE_ASSETS_URL')); From b09e9732422227a5373a73547edbc6135e5a3594 Mon Sep 17 00:00:00 2001 From: Yard workflows Date: Wed, 17 Dec 2025 12:48:15 +0000 Subject: [PATCH 6/7] style: apply php-cs-fixer changes --- src/Basic.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Basic.php b/src/Basic.php index b6fe54e..8616dd6 100644 --- a/src/Basic.php +++ b/src/Basic.php @@ -123,8 +123,10 @@ public function configure() // ElasticSearch ->addDirective(Directive::CONNECT, env('WP_ENV') === 'production' ? 'https://es.elk01.yard.nl/' : 'https://es.test01.yard.nl') - ->addDirective(Directive::CONNECT, - env('WP_ENV') === 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io') + ->addDirective( + Directive::CONNECT, + env('WP_ENV') === 'production' ? 'https://elasticsearch-yard.app.owc.shockapp.io' : 'https://elasticsearch-yard-staging.app.owc.shockapp.io' + ) // Google Translate ->addDirective(Directive::CONNECT, [ @@ -132,7 +134,6 @@ public function configure() 'https://translate-pa.googleapis.com', ]) ->addDirective(Directive::SCRIPT, [ - 'https://translate.googleapis.com', 'https://www.google.com', From 59e2bc972522b8d2f3bdadc164f2650dcaac3ebe Mon Sep 17 00:00:00 2001 From: Roric van Schalkwijk Date: Thu, 18 Dec 2025 12:44:58 +0100 Subject: [PATCH 7/7] chore: trigger formatter again --- src/Basic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Basic.php b/src/Basic.php index 8616dd6..ff38914 100644 --- a/src/Basic.php +++ b/src/Basic.php @@ -164,7 +164,8 @@ public function configure() // ReadSpeaker ->addDirective(Directive::CONNECT, ['https://cdn-eu.readspeaker.com', 'https://app-eu.readspeaker.com', 'https://vttts-eu.readspeaker.com']) - ->addDirective(Directive::STYLE, ['https://cdn-eu.readspeaker.com', 'https://app-eu.readspeaker.com']) + ->addDirective(Directive::STYLE, ['https://cdn-eu.readspeaker.com', + 'https://app-eu.readspeaker.com']) ->addDirective(Directive::FORM_ACTION, ['https://app-eu.readspeaker.com']) ->addDirective(Directive::FRAME, ['https://app-eu.readspeaker.com'])