From ee9d66b71e19d8c605b933a9b06ea4da20313462 Mon Sep 17 00:00:00 2001 From: Christian Heel <66922325+heelc29@users.noreply.github.com> Date: Tue, 29 Jul 2025 19:51:29 +0200 Subject: [PATCH 1/5] test --- libraries/src/MVC/Factory/MVCFactory.php | 2 +- libraries/src/MVC/View/HtmlView.php | 1 + .../src/Service/Provider/CaptchaRegistry.php | 24 +++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libraries/src/MVC/Factory/MVCFactory.php b/libraries/src/MVC/Factory/MVCFactory.php index b21b3a1021f54..be1fe28deb2e2 100644 --- a/libraries/src/MVC/Factory/MVCFactory.php +++ b/libraries/src/MVC/Factory/MVCFactory.php @@ -79,7 +79,7 @@ class MVCFactory implements MVCFactoryInterface, FormFactoryAwareInterface, Site public function __construct($namespace, ?LoggerInterface $logger = null) { $this->namespace = $namespace; - $this->logger = $logger; + $this->logger = $logger; } /** diff --git a/libraries/src/MVC/View/HtmlView.php b/libraries/src/MVC/View/HtmlView.php index aa82b04dae6aa..1aa5cda393415 100644 --- a/libraries/src/MVC/View/HtmlView.php +++ b/libraries/src/MVC/View/HtmlView.php @@ -14,6 +14,7 @@ use Joomla\CMS\Event\View\DisplayEvent; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\SiteRouterAwareTrait; use Joomla\CMS\Uri\Uri; use Joomla\CMS\User\CurrentUserInterface; use Joomla\CMS\User\CurrentUserTrait; diff --git a/libraries/src/Service/Provider/CaptchaRegistry.php b/libraries/src/Service/Provider/CaptchaRegistry.php index 59585a04f1abe..061060eae750e 100644 --- a/libraries/src/Service/Provider/CaptchaRegistry.php +++ b/libraries/src/Service/Provider/CaptchaRegistry.php @@ -38,19 +38,19 @@ class CaptchaRegistry implements ServiceProviderInterface public function register(Container $container) { $container->alias('captcharegistry', Registry::class) - ->share( - Registry::class, - function (Container $container) { - $dispatcher = $container->get(DispatcherInterface::class); - $registry = new Registry(); - $registry->setDispatcher($dispatcher); + ->share( + Registry::class, + function (Container $container) { + $dispatcher = $container->get(DispatcherInterface::class); + $registry = new Registry(); + $registry->setDispatcher($dispatcher); - PluginHelper::importPlugin('captcha', null, true, $dispatcher); - $registry->initRegistry(); + PluginHelper::importPlugin('captcha', null, true, $dispatcher); + $registry->initRegistry(); - return $registry; - }, - true - ); + return $registry; + }, + true + ); } } From f4bd9b1f87a19d099cc2754c3262def8b206699c Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 8 Aug 2025 12:29:04 +0200 Subject: [PATCH 2/5] Change --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c655bf951700b..6b7442516d2c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,12 +68,14 @@ jobs: path: libraries/vendor key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }} - name: Check PHP code style + id: check-codestyle env: PHP_CS_FIXER_IGNORE_ENV: true run: | git config --global --add safe.directory $GITHUB_WORKSPACE ./libraries/vendor/bin/${{ matrix.command }} - uses: parkerbxyz/suggest-changes@v2 + if: failure() && steps.check-codestyle.outcome == 'failure' with: comment: 'Your code does not comply with our codestyle. Please commit the suggested changes.' From 480fb35a2112485038fe12c34eb13e14c7ef9cae Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 8 Aug 2025 12:33:22 +0200 Subject: [PATCH 3/5] More changes --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b7442516d2c6..df228d0138c40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,7 @@ jobs: key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }} - name: Check PHP code style id: check-codestyle + continue-on-error: true env: PHP_CS_FIXER_IGNORE_ENV: true run: | From cd381735e05b3a51d4d25f2d8d6795bc62af884c Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 8 Aug 2025 12:43:40 +0200 Subject: [PATCH 4/5] More changes 2 --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df228d0138c40..368b4542b43dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: needs: [composer] strategy: matrix: - command: ['php-cs-fixer fix -vvv --dry-run --diff', 'phpcs --extensions=php -p --standard=ruleset.xml .'] + command: ['php-cs-fixer fix -vvv', 'phpcs --extensions=php -p --standard=ruleset.xml .'] steps: - uses: actions/checkout@v4 - uses: actions/cache/restore@v4 @@ -76,7 +76,6 @@ jobs: git config --global --add safe.directory $GITHUB_WORKSPACE ./libraries/vendor/bin/${{ matrix.command }} - uses: parkerbxyz/suggest-changes@v2 - if: failure() && steps.check-codestyle.outcome == 'failure' with: comment: 'Your code does not comply with our codestyle. Please commit the suggested changes.' From 53ceadee45ffd5e745a73999c21684a01e2a21bf Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 8 Aug 2025 13:15:41 +0200 Subject: [PATCH 5/5] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 368b4542b43dd..1337e7d05b3c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,6 +78,7 @@ jobs: - uses: parkerbxyz/suggest-changes@v2 with: comment: 'Your code does not comply with our codestyle. Please commit the suggested changes.' + event: 'REQUEST_CHANGES' code-style-js-css: name: Check Javascript & CSS code style