Fix codestyle

Author: Hackwar

ruleset.xml

@@ -27,6 +27,10 @@
 		<exclude-pattern type="relative">src/administrator/manifests/packages/**/script\.php</exclude-pattern>
 	</rule>
 
+	<rule ref="PSR1.Classes.ClassDeclaration">
+		<exclude-pattern type="relative">src/administrator/components/**/script\.php</exclude-pattern>
+	</rule>
+
 	<rule ref="Squiz.Classes.ValidClassName">
 		<exclude-pattern type="relative">src/administrator/components/**/script\.php</exclude-pattern>
 		<exclude-pattern type="relative">src/administrator/manifests/packages/**/script\.php</exclude-pattern>

src/administrator/components/com_patchtester/services/provider.php

@@ -7,7 +7,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
@@ -41,7 +41,7 @@ public function register(Container $container)
         $container->set(
             ComponentInterface::class,
             function (Container $container) {
-                require_once dirname(__DIR__) . '/vendor/autoload.php';
+                require_once \dirname(__DIR__) . '/vendor/autoload.php';
 
                 $component = new PatchtesterComponent($container->get(ComponentDispatcherFactoryInterface::class));
 

src/administrator/components/com_patchtester/src/Controller/ApplyController.php

@@ -39,7 +39,7 @@ public function execute($task): void
         try {
             /** @var PullModel $model */
             $model = Factory::getApplication()->bootComponent('com_patchtester')->getMVCFactory()->createModel('Pull', 'Administrator', ['ignore_request' => true]);
-            $msg = Text::_('COM_PATCHTESTER_NO_FILES_TO_PATCH');
+            $msg   = Text::_('COM_PATCHTESTER_NO_FILES_TO_PATCH');
 
             if ($model->apply($this->input->getUint('pull_id'))) {
                 $msg = Text::_('COM_PATCHTESTER_APPLY_OK');

src/administrator/components/com_patchtester/src/Controller/FetchController.php

@@ -9,7 +9,6 @@
 
 namespace Joomla\Component\Patchtester\Administrator\Controller;
 
-use Exception;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
@@ -32,7 +31,7 @@ class FetchController extends BaseController
      *
      * @return  void  Redirects the application
      *
-     * @throws  Exception
+     * @throws  \Exception
      * @since   2.0
      */
     public function execute($task)
@@ -50,7 +49,7 @@ public function execute($task)
             $model = $this->app->bootComponent('com_patchtester')->getMVCFactory()->createModel('Pulls', 'Administrator');
 
             $status = $model->requestFromGithub($page);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $response = new JsonResponse($e);
             $this->app->sendHeaders();
             echo json_encode($response);
@@ -64,7 +63,7 @@ public function execute($task)
         if ($status['complete'] || $page === $session->get('com_patchtester_fetcher_last_page', false)) {
             $status['complete'] = true;
             $status['header']   = Text::_('COM_PATCHTESTER_FETCH_SUCCESSFUL', true);
-            $message = Text::_('COM_PATCHTESTER_FETCH_COMPLETE_CLOSE_WINDOW', true);
+            $message            = Text::_('COM_PATCHTESTER_FETCH_COMPLETE_CLOSE_WINDOW', true);
         } elseif (isset($status['page'])) {
             $session->set('com_patchtester_fetcher_page', $status['page']);
             $message = Text::sprintf('COM_PATCHTESTER_FETCH_PAGE_NUMBER', $status['page']);

src/administrator/components/com_patchtester/src/Controller/ResetController.php

@@ -43,7 +43,7 @@ public function execute($task): void
         try {
             $hasErrors     = false;
             $revertErrored = false;
-            $mvcFactory = Factory::getApplication()->bootComponent('com_patchtester')->getMVCFactory();
+            $mvcFactory    = Factory::getApplication()->bootComponent('com_patchtester')->getMVCFactory();
             /** @var PullModel $pullModel */
             $pullModel  = $mvcFactory->createModel('Pull', 'Administrator', ['ignore_request' => true]);
             /** @var PullsModel $pullModel */
@@ -53,7 +53,7 @@ public function execute($task): void
 
             // Check the applied patches in the database first
             $appliedPatches = $testsModel->getAppliedPatches();
-            $params = ComponentHelper::getParams('com_patchtester');
+            $params         = ComponentHelper::getParams('com_patchtester');
             // Decide based on repository settings whether patch will be applied through Github or CIServer
             if ((bool) $params->get('ci_switch', 1)) {
                 // Let's try to cleanly revert all applied patches with ci
@@ -65,7 +65,7 @@ public function execute($task): void
                     }
                 }
             } else {
-            // Let's try to cleanly revert all applied patches
+                // Let's try to cleanly revert all applied patches
                 foreach ($appliedPatches as $patch) {
                     try {
                         $pullModel->revertWithGitHub($patch->id);
@@ -104,7 +104,7 @@ public function execute($task): void
             // Check the backups directory to see if any .txt files remain; clear them if so
             $backups = Folder::files(JPATH_COMPONENT . '/backups', '.txt');
 
-            if (count($backups)) {
+            if (\count($backups)) {
                 foreach ($backups as $file) {
                     if (!File::delete(JPATH_COMPONENT . '/backups/' . $file)) {
                         $this->app->enqueueMessage(

src/administrator/components/com_patchtester/src/Controller/StartfetchController.php

@@ -71,7 +71,7 @@ public function execute($task): void
         $testsModel = Factory::getApplication()->bootComponent('com_patchtester')->getMVCFactory()->createModel('Tests', 'Administrator', ['ignore_request' => true]);
         try {
             // Sanity check, ensure there aren't any applied patches
-            if (count($testsModel->getAppliedPatches()) >= 1) {
+            if (\count($testsModel->getAppliedPatches()) >= 1) {
                 $response = new JsonResponse(new \Exception(Text::_('COM_PATCHTESTER_ERROR_APPLIED_PATCHES'), 500));
                 $this->app->sendHeaders();
                 echo json_encode($response);
@@ -89,7 +89,7 @@ public function execute($task): void
         $response = new JsonResponse(
             [
                 'complete' => false,
-                'header' => Text::_('COM_PATCHTESTER_FETCH_PROCESSING', true)
+                'header'   => Text::_('COM_PATCHTESTER_FETCH_PROCESSING', true),
             ],
             Text::sprintf('COM_PATCHTESTER_FETCH_PAGE_NUMBER', 1),
             false,

src/administrator/components/com_patchtester/src/Exception/UnexpectedResponse.php

@@ -9,16 +9,14 @@
 
 namespace Joomla\Component\Patchtester\Administrator\Exception;
 
-use DomainException;
-use Exception;
 use Joomla\Http\Response;
 
 /**
  * Exception representing an unexpected response
  *
  * @since  3.0.0
  */
-class UnexpectedResponse extends DomainException
+class UnexpectedResponse extends \DomainException
 {
     /**
      * The Response object.
@@ -34,15 +32,15 @@ class UnexpectedResponse extends DomainException
      * @param   Response        $response  The Response object.
      * @param   string          $message   The Exception message to throw.
      * @param   int             $code      The Exception code.
-     * @param   Exception|null  $previous  The previous exception used for the exception chaining.
+     * @param   \Exception|null  $previous  The previous exception used for the exception chaining.
      *
      * @since   3.0.0
      */
     public function __construct(
         Response $response,
         $message = '',
         $code = 0,
-        Exception $previous = null
+        ?\Exception $previous = null
     ) {
         parent::__construct($message, $code, $previous);
         $this->response = $response;

src/administrator/components/com_patchtester/src/Field/BranchField.php

@@ -41,7 +41,7 @@ class BranchField extends ListField
      */
     public function getOptions(): array
     {
-        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db    = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true);
         $query->select(
             'DISTINCT(' . $db->quoteName('branch') . ') AS ' . $db->quoteName(

src/administrator/components/com_patchtester/src/Field/LabelField.php

@@ -41,7 +41,7 @@ class LabelField extends ListField
      */
     public function getOptions(): array
     {
-        $db = Factory::getContainer()->get('DatabaseDriver');
+        $db    = Factory::getContainer()->get('DatabaseDriver');
         $query = $db->getQuery(true);
         $query->select(
             'DISTINCT(' . $db->quoteName('name') . ') AS ' . $db->quoteName(

src/administrator/components/com_patchtester/src/GitHub/GitHub.php

@@ -46,7 +46,7 @@ class GitHub
      *
      * @since   3.0.0
      */
-    public function __construct(Registry $options = null, Http $client = null)
+    public function __construct(?Registry $options = null, ?Http $client = null)
     {
         $this->options = $options ?: new Registry();
         $this->client  = $client ?: HttpFactory::getHttp($options);