From b81304570ad692a8fea12ac5fad0d473c32f3f69 Mon Sep 17 00:00:00 2001
From: Christian Heel <66922325+heelc29@users.noreply.github.com>
Date: Sun, 6 Oct 2024 14:36:43 +0200
Subject: [PATCH 1/4] move use statement out of phpcs disable

caused by #43265
---
 .../components/com_content/src/Model/FeaturedModel.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php
index 2f9893f99a4f1..a91926785134c 100644
--- a/administrator/components/com_content/src/Model/FeaturedModel.php
+++ b/administrator/components/com_content/src/Model/FeaturedModel.php
@@ -10,9 +10,9 @@
 
 namespace Joomla\Component\Content\Administrator\Model;
 
-// phpcs:disable PSR1.Files.SideEffects
 use Joomla\Database\QueryInterface;
 
+// phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 

From 7b3039fdc37d1223a6a726e199553986e8d10672 Mon Sep 17 00:00:00 2001
From: Christian Heel <66922325+heelc29@users.noreply.github.com>
Date: Sun, 6 Oct 2024 14:37:16 +0200
Subject: [PATCH 2/4] move use statement out of phpcs disable

caused by #40129
---
 libraries/src/Table/Ucm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Table/Ucm.php b/libraries/src/Table/Ucm.php
index 2018e587d9a58..c6fd09ec75445 100644
--- a/libraries/src/Table/Ucm.php
+++ b/libraries/src/Table/Ucm.php
@@ -9,10 +9,10 @@
 
 namespace Joomla\CMS\Table;
 
-// phpcs:disable PSR1.Files.SideEffects
 use Joomla\Database\DatabaseDriver;
 use Joomla\Event\DispatcherInterface;
 
+// phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 

From ae35c031a5810665d66ea4ab6aea3a89ede88f6d Mon Sep 17 00:00:00 2001
From: Christian Heel <66922325+heelc29@users.noreply.github.com>
Date: Sun, 6 Oct 2024 14:38:30 +0200
Subject: [PATCH 3/4] remove blank line in phpcs disable

---
 libraries/src/Event/Application/BeforeCompileHeadEvent.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/src/Event/Application/BeforeCompileHeadEvent.php b/libraries/src/Event/Application/BeforeCompileHeadEvent.php
index 87a019dfaa1a9..b9e5a211353f3 100644
--- a/libraries/src/Event/Application/BeforeCompileHeadEvent.php
+++ b/libraries/src/Event/Application/BeforeCompileHeadEvent.php
@@ -10,7 +10,6 @@
 namespace Joomla\CMS\Event\Application;
 
 // phpcs:disable PSR1.Files.SideEffects
-
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 

From 0c6ea05587b3ac4a058dbcb48c69f4693ae7fd55 Mon Sep 17 00:00:00 2001
From: Christian Heel <66922325+heelc29@users.noreply.github.com>
Date: Sun, 6 Oct 2024 14:40:19 +0200
Subject: [PATCH 4/4] fix phpcs enable rule

caused by #40343
---
 libraries/src/Extension/Service/Provider/MVCFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Extension/Service/Provider/MVCFactory.php b/libraries/src/Extension/Service/Provider/MVCFactory.php
index 7eb07ef7b8f03..171cb665c3790 100644
--- a/libraries/src/Extension/Service/Provider/MVCFactory.php
+++ b/libraries/src/Extension/Service/Provider/MVCFactory.php
@@ -23,7 +23,7 @@
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
-// phpcs:e_JEXECes.SideEffects
+// phpcs:enable PSR1.Files.SideEffects
 
 /**
  * Service provider for the service MVC factory.