Skip to content
Draft
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
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,16 @@ 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
with:
path: libraries/vendor
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: |
Expand All @@ -76,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
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/MVC/Factory/MVCFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down
1 change: 1 addition & 0 deletions libraries/src/MVC/View/HtmlView.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 12 additions & 12 deletions libraries/src/Service/Provider/CaptchaRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
}