Revert "Revert " Re-skip Override and SensitiveParameter (#320)" (#321)" (#322)

This reverts commit 4bebf17.

Author: samsonasik

rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/override_and_sensitive_parameters.php.inc

@@ -0,0 +1,45 @@
+<?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;
+    }
+}
+
+?>

rules-tests/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector/Fixture/skip_already_newlined_override_and_sensitive_parameters.php.inc

@@ -0,0 +1,22 @@
+<?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;
+    }
+}

rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php

@@ -34,7 +34,13 @@ final class DowngradeAttributeToAnnotationRector extends AbstractRector implemen
     /**
      * @var string[]
      */
-    private const SKIPPED_ATTRIBUTES = ['Attribute', 'ReturnTypeWillChange', 'AllowDynamicProperties'];
+    private const SKIPPED_ATTRIBUTES = [
+        'Attribute',
+        'ReturnTypeWillChange',
+        'AllowDynamicProperties',
+        'Override',
+        'SensitiveParameter',
+    ];
 
     /**
      * @var DowngradeAttributeToAnnotation[]
@@ -114,7 +120,15 @@ public function refactor(Node $node): ?Node
                         (string) $oldTokens[$attrGroup->getEndTokenPos() + 1],
                         "\n"
                     )) {
-                        // add new line
+                        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
                         $oldTokens[$attrGroup->getEndTokenPos() + 1]->text = "\n" . $oldTokens[$attrGroup->getEndTokenPos() + 1]->text;
                         $this->isDowngraded = true;
                     }