From 81788e7b48d0ba46cc29ae5cc76f8014f3f5f86f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 8 Sep 2025 16:35:14 +0700
Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Revert=20"=20Re-skip=20Over?=
 =?UTF-8?q?ride=20and=20SensitiveParameter=20=20(#320)"=20(#3=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1cf15fe1173f46b80c184da29cc43addf279bfd3.
---
 .../override_and_sensitive_parameters.php.inc | 45 -------------------
 ..._override_and_sensitive_parameters.php.inc | 22 ---------
 .../DowngradeAttributeToAnnotationRector.php  | 18 +-------
 3 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc
 delete mode 100644 rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc

diff --git a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc b/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc
deleted file mode 100644
index 9636c1b7..00000000
--- a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Rector\Tests\DowngradePhp80\Rector\Class_\DowngradeAttributeToAnnotationRector\Fixture;
-
-final class OverrideAndSensitiveParameter extends Foo
-{
-    #[\Override]
-    public function run(#[\SensitiveParameter] bool $param) {
-        if ($this->isTrue($param)) {
-            return 5;
-        }
-
-        return '10';
-    }
-
-    private function isTrue($value) {
-        return $value === true;
-    }
-}
-
-?>
------
-<?php
-
-namespace Rector\Tests\DowngradePhp80\Rector\Class_\DowngradeAttributeToAnnotationRector\Fixture;
-
-final class OverrideAndSensitiveParameter extends Foo
-{
-    #[\Override]
-    public function run(
-#[\SensitiveParameter]
- bool $param) {
-        if ($this->isTrue($param)) {
-            return 5;
-        }
-
-        return '10';
-    }
-
-    private function isTrue($value) {
-        return $value === true;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc b/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc
deleted file mode 100644
index f54849e4..00000000
--- a/rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Rector\Tests\DowngradePhp80\Rector\Class_\DowngradeAttributeToAnnotationRector\Fixture;
-
-final class SkipAlreadyNewlinedOverrideAndSensitiveParameters extends Foo
-{
-    #[\Override]
-    public function run(
-        #[\SensitiveParameter]
-        bool $param
-    ) {
-        if ($this->isTrue($param)) {
-            return 5;
-        }
-
-        return '10';
-    }
-
-    private function isTrue($value) {
-        return $value === true;
-    }
-}
diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php
index a6f1a527..c20e2f00 100644
--- a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php
+++ b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php
@@ -34,13 +34,7 @@ final class DowngradeAttributeToAnnotationRector extends AbstractRector implemen
     /**
      * @var string[]
      */
-    private const SKIPPED_ATTRIBUTES = [
-        'Attribute',
-        'ReturnTypeWillChange',
-        'AllowDynamicProperties',
-        'Override',
-        'SensitiveParameter',
-    ];
+    private const SKIPPED_ATTRIBUTES = ['Attribute', 'ReturnTypeWillChange', 'AllowDynamicProperties'];
 
     /**
      * @var DowngradeAttributeToAnnotation[]
@@ -120,15 +114,7 @@ public function refactor(Node $node): ?Node
                         (string) $oldTokens[$attrGroup->getEndTokenPos() + 1],
                         "\n"
                     )) {
-                        if ($node instanceof Param && (isset($oldTokens[$attrGroup->getStartTokenPos() - 1]) && ! str_contains(
-                            (string) $oldTokens[$attrGroup->getStartTokenPos() - 1],
-                            "\n"
-                        ))) {
-                            // add new line before
-                            $oldTokens[$attrGroup->getStartTokenPos() - 1]->text .= "\n";
-                        }
-
-                        // add new line after
+                        // add new line
                         $oldTokens[$attrGroup->getEndTokenPos() + 1]->text = "\n" . $oldTokens[$attrGroup->getEndTokenPos() + 1]->text;
                         $this->isDowngraded = true;
                     }