From e0499aed61cc236b5836bf89b44df568314d28a3 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 14 Aug 2025 11:36:55 +0700
Subject: [PATCH 1/2] [Scoped] Remove no longer needed vendor patch for
 VisibilityRequiredFixer

---
 composer.json                                      |  5 +----
 ...classnotation-visibilityrequiredfixer-php.patch | 14 --------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 patches/friendsofphp-php-cs-fixer-src-fixer-classnotation-visibilityrequiredfixer-php.patch

diff --git a/composer.json b/composer.json
index 90cee95a26..15d5719498 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "phpstan/phpstan-phpunit": "^2.0.7",
         "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^11.5.27",
-        "rector/rector": "^2.1.2",
+        "rector/rector": "^2.1.3",
         "rector/type-perfect": "^2.1.0",
         "symplify/phpstan-extensions": "^12.0.1",
         "symplify/vendor-patches": "^11.5",
@@ -89,9 +89,6 @@
     },
     "extra": {
         "patches": {
-            "friendsofphp/php-cs-fixer": [
-                "patches/friendsofphp-php-cs-fixer-src-fixer-classnotation-visibilityrequiredfixer-php.patch"
-            ],
             "illuminate/container": [
                 "patches/illuminate-container-container-php.patch"
             ],
diff --git a/patches/friendsofphp-php-cs-fixer-src-fixer-classnotation-visibilityrequiredfixer-php.patch b/patches/friendsofphp-php-cs-fixer-src-fixer-classnotation-visibilityrequiredfixer-php.patch
deleted file mode 100644
index b0553941f3..0000000000
--- a/patches/friendsofphp-php-cs-fixer-src-fixer-classnotation-visibilityrequiredfixer-php.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- /dev/null
-+++ ../src/Fixer/ClassNotation/VisibilityRequiredFixer.php
-@@ -53,7 +53,10 @@
- 
-     private const PROPERTY_TYPE_DECLARATION_KINDS = [\T_STRING, \T_NS_SEPARATOR, CT::T_NULLABLE_TYPE, CT::T_ARRAY_TYPEHINT, CT::T_TYPE_ALTERNATION, CT::T_TYPE_INTERSECTION, CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_OPEN, CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_CLOSE];
-     private const EXPECTED_KINDS_GENERIC = [\T_ABSTRACT, \T_FINAL, \T_PRIVATE, \T_PROTECTED, \T_PUBLIC, \T_STATIC, \T_VAR, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE, FCT::T_READONLY, FCT::T_PRIVATE_SET, FCT::T_PROTECTED_SET, FCT::T_PUBLIC_SET];
--    private const EXPECTED_KINDS_PROPERTY_KINDS = [...self::EXPECTED_KINDS_GENERIC, ...self::PROPERTY_TYPE_DECLARATION_KINDS];
-+    private const EXPECTED_KINDS_PROPERTY_KINDS = [
-+        \T_ABSTRACT, \T_FINAL, \T_PRIVATE, \T_PROTECTED, \T_PUBLIC, \T_STATIC, \T_VAR, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE, FCT::T_READONLY, FCT::T_PRIVATE_SET, FCT::T_PROTECTED_SET, FCT::T_PUBLIC_SET,
-+        \T_STRING, \T_NS_SEPARATOR, CT::T_NULLABLE_TYPE, CT::T_ARRAY_TYPEHINT, CT::T_TYPE_ALTERNATION, CT::T_TYPE_INTERSECTION, CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_OPEN, CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_CLOSE
-+    ];
- 
-     /**
-      * @var list<'const'|'method'|'promoted_property'|'property'>

From 7a215f7cc06224dc7f092abb7dd01a88bfb7cf2d Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 14 Aug 2025 11:40:52 +0700
Subject: [PATCH 2/2] re-run rector

---
 src/Console/Output/GitlabOutputFormatter.php | 6 +++---
 src/Utils/PrivatesAccessorHelper.php         | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Console/Output/GitlabOutputFormatter.php b/src/Console/Output/GitlabOutputFormatter.php
index d001811e17..d8fa34fb59 100644
--- a/src/Console/Output/GitlabOutputFormatter.php
+++ b/src/Console/Output/GitlabOutputFormatter.php
@@ -65,9 +65,9 @@
 final readonly class GitlabOutputFormatter implements OutputFormatterInterface
 {
     public function __construct(
-        private readonly EasyCodingStandardStyle $easyCodingStandardStyle,
-        private readonly ExitCodeResolver $exitCodeResolver,
-        private readonly DiffParser $diffParser,
+        private EasyCodingStandardStyle $easyCodingStandardStyle,
+        private ExitCodeResolver $exitCodeResolver,
+        private DiffParser $diffParser,
     ) {
     }
 
diff --git a/src/Utils/PrivatesAccessorHelper.php b/src/Utils/PrivatesAccessorHelper.php
index 604d8e61ed..ca79e623ba 100644
--- a/src/Utils/PrivatesAccessorHelper.php
+++ b/src/Utils/PrivatesAccessorHelper.php
@@ -11,8 +11,6 @@ final class PrivatesAccessorHelper
     public static function getPropertyValue(object $object, string $propertyName): mixed
     {
         $reflectionProperty = new ReflectionProperty($object, $propertyName);
-        // this is needed for PHP 7.2 downgrade code
-        $reflectionProperty->setAccessible(true);
 
         return $reflectionProperty->getValue($object);
     }
@@ -20,8 +18,6 @@ public static function getPropertyValue(object $object, string $propertyName): m
     public static function setPropertyValue(object $object, string $propertyName, mixed $value): void
     {
         $reflectionProperty = new ReflectionProperty($object, $propertyName);
-        // this is needed for PHP 7.2 downgrade code
-        $reflectionProperty->setAccessible(true);
 
         $reflectionProperty->setValue($object, $value);
     }