more changes

joomla · Apr 4, 2023 · ea3670e · ea3670e
1 parent 7ea8d1e
commit ea3670e
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 18 deletions.
diff --git a/plugins/system/logout/src/Extension/Logout.php b/plugins/system/logout/src/Extension/Logout.php
@@ -42,7 +42,7 @@ final class Logout extends CMSPlugin
      *
      * @since   1.6
      */
-    public function __construct(DispatcherInterface $dispatcher, $config, CMSApplicationInterface $app)
+    public function __construct(DispatcherInterface $dispatcher, array $config, CMSApplicationInterface $app)
     {
         parent::__construct($dispatcher, $config);
 

diff --git a/plugins/system/logrotation/logrotation.xml b/plugins/system/logrotation/logrotation.xml
@@ -9,7 +9,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.9.0</version>
 	<description>PLG_SYSTEM_LOGROTATION_XML_DESCRIPTION</description>
-	<namespace path="src">Joomla\Plugin\System\Logrotation</namespace>
+	<namespace path="src">Joomla\Plugin\System\LogRotation</namespace>
 	<files>
 		<folder plugin="logrotation">services</folder>
 		<folder>src</folder>

diff --git a/plugins/system/logrotation/services/provider.php b/plugins/system/logrotation/services/provider.php
@@ -17,7 +17,7 @@
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\System\Logrotation\Extension\Logrotation;
+use Joomla\Plugin\System\LogRotation\Extension\LogRotation;
 
 return new class () implements ServiceProviderInterface {
     /**
@@ -35,7 +35,7 @@ public function register(Container $container): void
             PluginInterface::class,
             function (Container $container) {
                 $dispatcher = $container->get(DispatcherInterface::class);
-                $plugin     = new Logrotation(
+                $plugin     = new LogRotation(
                     $dispatcher,
                     (array) PluginHelper::getPlugin('system', 'logrotation')
                 );

diff --git a/...logrotation/src/Extension/Logrotation.php → ...logrotation/src/Extension/LogRotation.php b/...logrotation/src/Extension/Logrotation.php → ...logrotation/src/Extension/LogRotation.php
@@ -8,7 +8,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\Plugin\System\Logrotation\Extension;
+namespace Joomla\Plugin\System\LogRotation\Extension;
 
 use Exception;
 use Joomla\CMS\Cache\Cache;
@@ -29,7 +29,7 @@
  *
  * @since  3.9.0
  */
-final class Logrotation extends CMSPlugin
+final class LogRotation extends CMSPlugin
 {
     use DatabaseAwareTrait;
 

diff --git a/plugins/system/schedulerunner/schedulerunner.xml b/plugins/system/schedulerunner/schedulerunner.xml
@@ -9,7 +9,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.1</version>
 	<description>PLG_SYSTEM_SCHEDULERUNNER_XML_DESCRIPTION</description>
-	<namespace path="src">Joomla\Plugin\System\Schedulerunner</namespace>
+	<namespace path="src">Joomla\Plugin\System\ScheduleRunner</namespace>
 	<media destination="plg_system_schedulerunner" folder="media">
 		<folder>js</folder>
 		<filename>joomla.asset.json</filename>

diff --git a/plugins/system/schedulerunner/services/provider.php b/plugins/system/schedulerunner/services/provider.php
@@ -16,7 +16,7 @@
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\System\Schedulerunner\Extension\Schedulerunner;
+use Joomla\Plugin\System\ScheduleRunner\Extension\ScheduleRunner;
 
 return new class () implements ServiceProviderInterface {
     /**
@@ -34,7 +34,7 @@ public function register(Container $container): void
             PluginInterface::class,
             function (Container $container) {
                 $dispatcher = $container->get(DispatcherInterface::class);
-                $plugin     = new Schedulerunner(
+                $plugin     = new ScheduleRunner(
                     $dispatcher,
                     (array) PluginHelper::getPlugin('system', 'schedulerunner')
                 );

diff --git a/...lerunner/src/Extension/Schedulerunner.php → ...lerunner/src/Extension/ScheduleRunner.php b/...lerunner/src/Extension/Schedulerunner.php → ...lerunner/src/Extension/ScheduleRunner.php
@@ -8,7 +8,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\Plugin\System\Schedulerunner\Extension;
+namespace Joomla\Plugin\System\ScheduleRunner\Extension;
 
 use Exception;
 use Joomla\CMS\Component\ComponentHelper;
@@ -34,15 +34,15 @@
 /**
  * This plugin implements listeners to support a visitor-triggered lazy-scheduling pattern.
  * If `com_scheduler` is installed/enabled and its configuration allows unprotected lazy scheduling, this plugin
- * injects into each response with an HTML context a JS file {@see PlgSystemSchedulerunner::injectScheduleRunner()} that
- * sets up an AJAX callback to trigger the scheduler {@see PlgSystemSchedulerunner::runScheduler()}. This is achieved
+ * injects into each response with an HTML context a JS file {@see PlgSystemScheduleRunner::injectScheduleRunner()} that
+ * sets up an AJAX callback to trigger the scheduler {@see PlgSystemScheduleRunner::runScheduler()}. This is achieved
  * through a call to the `com_ajax` component.
  * Also supports the scheduler component configuration form through auto-generation of the webcron key and injection
  * of JS of usability enhancement.
  *
  * @since 4.1.0
  */
-final class Schedulerunner extends CMSPlugin implements SubscriberInterface
+final class ScheduleRunner extends CMSPlugin implements SubscriberInterface
 {
     /**
      * Length of auto-generated webcron key.

diff --git a/plugins/system/skipto/src/Extension/Skipto.php b/plugins/system/skipto/src/Extension/Skipto.php
@@ -95,7 +95,7 @@ public function onAfterDispatch()
             ]
         );
 
-        /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+        /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
         $wa = $document->getWebAssetManager();
         $wa->useScript('skipto');
     }

diff --git a/plugins/system/stats/src/Extension/Stats.php b/plugins/system/stats/src/Extension/Stats.php
@@ -13,7 +13,6 @@
 use Exception;
 use Joomla\CMS\Cache\Cache;
 use Joomla\CMS\Http\HttpFactory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;

diff --git a/plugins/system/webauthn/src/Authentication.php b/plugins/system/webauthn/src/Authentication.php
@@ -321,7 +321,7 @@ public function validateAttestationResponse(string $data): PublicKeyCredentialSo
 
         // Retrieve the stored user ID and make sure it's the same one in the request.
         $storedUserId = $this->session->get('plg_system_webauthn.registration_user_id', 0);
-        $myUser       = $this->getApplication()->getIdentity() ?? new User();
+        $myUser       = $this->app->getIdentity() ?? new User();
         $myUserId     = $myUser->id;
 
         if (($myUser->guest) || ($myUserId != $storedUserId)) {
@@ -392,7 +392,7 @@ private function getSiteIcon(): ?string
                 '/images/',
                 '/media/',
                 '/templates/',
-                '/templates/' . $this->getApplication()->getTemplate(),
+                '/templates/' . $this->app->getTemplate(),
             ];
         } catch (Exception $e) {
             return null;
@@ -526,7 +526,7 @@ private function getPKCredentialRequestOptions(): PublicKeyCredentialRequestOpti
      */
     private function getWebauthnServer(): \Webauthn\Server
     {
-        $siteName = $this->getApplication()->get('sitename');
+        $siteName = $this->app->get('sitename');
 
         // Credentials repository
         $repository = $this->credentialsRepository;