From 40ff02d6870a759edf83c897e86593843bbdd83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Mon, 14 Apr 2025 23:18:29 +0200
Subject: [PATCH 1/3] # This is a combination of 7 commits. # This is the 1st
 commit message:

Add `NoUselessWriteVisibilityFixer`

# The commit message #2 will be skipped:

# Update

# The commit message #3 will be skipped:

# Update

# The commit message #4 will be skipped:

# Update

# The commit message #5 will be skipped:

# Update

# The commit message #6 will be skipped:

# Test

# The commit message #7 will be skipped:

# Fix linting
---
 CHANGELOG.md                                  |   1 +
 README.md                                     |  15 ++-
 src/Fixer/NoUselessWriteVisibilityFixer.php   | 101 +++++++++++++++++
 .../NoUselessWriteVisibilityFixerTest.php     | 105 ++++++++++++++++++
 4 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 src/Fixer/NoUselessWriteVisibilityFixer.php
 create mode 100644 tests/Fixer/NoUselessWriteVisibilityFixerTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7adc43..9ba5ec12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # CHANGELOG for PHP CS Fixer: custom fixers
 
 ## v3.25.0
+- Add NoUselessWriteVisibilityFixer
 - ReadonlyPromotedPropertiesFixer - support asymmetric visibility
 
 ## v3.24.0
diff --git a/README.md b/README.md
index a3dc44cb..af94733d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3613-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3638-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions/workflows/ci.yaml/badge.svg)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions/workflows/ci.yaml)
@@ -399,6 +399,19 @@ Functions `strlen` and `mb_strlen` must not be compared to 0.
 +$isNotEmpty = $string !== '';
 ```
 
+#### NoUselessWriteVisibilityFixer
+There must be no useless write visibility.
+```diff
+ <?php class Foo {
+-    public public(set) $x;
+-    public(set) $y;
+-    protected protected(set) $z;
++    public $x;
++    public $y;
++    protected $z;
+ }
+```
+
 #### NumericLiteralSeparatorFixer
 Numeric literals must have configured separators.
   DEPRECATED: use `numeric_literal_separator` instead.
diff --git a/src/Fixer/NoUselessWriteVisibilityFixer.php b/src/Fixer/NoUselessWriteVisibilityFixer.php
new file mode 100644
index 00000000..42c47776
--- /dev/null
+++ b/src/Fixer/NoUselessWriteVisibilityFixer.php
@@ -0,0 +1,101 @@
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of PHP CS Fixer: custom fixers.
+ *
+ * (c) 2018 Kuba Werłos
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace PhpCsFixerCustomFixers\Fixer;
+
+use PhpCsFixer\FixerDefinition\CodeSample;
+use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
+use PhpCsFixer\Tokenizer\CT;
+use PhpCsFixer\Tokenizer\Token;
+use PhpCsFixer\Tokenizer\Tokens;
+
+final class NoUselessWriteVisibilityFixer extends AbstractFixer
+{
+    /** @var non-empty-array<int, list<int>> */
+    private array $predecessorKindMap;
+
+    public function __construct()
+    {
+        if (\defined('T_PUBLIC_SET')) {
+            $this->predecessorKindMap = [
+                \T_PUBLIC_SET => [\T_PUBLIC, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC],
+                \T_PROTECTED_SET => [\T_PROTECTED, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED],
+                \T_PRIVATE_SET => [\T_PRIVATE, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE],
+            ];
+        }
+    }
+
+    public function getDefinition(): FixerDefinitionInterface
+    {
+        return new FixerDefinition(
+            'There must be no useless write visibility.',
+            [new CodeSample(
+                <<<'PHP'
+                    <?php class Foo {
+                        public public(set) $x;
+                        public(set) $y;
+                        protected protected(set) $z;
+                    }
+
+                    PHP,
+            )],
+        );
+    }
+
+    public function getPriority(): int
+    {
+        return 0;
+    }
+
+    public function isCandidate(Tokens $tokens): bool
+    {
+        return \defined('T_PUBLIC_SET') && $tokens->isAnyTokenKindsFound(\array_keys($this->predecessorKindMap));
+    }
+
+    public function isRisky(): bool
+    {
+        return false;
+    }
+
+    public function fix(\SplFileInfo $file, Tokens $tokens): void
+    {
+        foreach ($tokens->findGivenKind(\array_keys($this->predecessorKindMap)) as $kind => $elements) {
+            foreach (\array_keys($elements) as $index) {
+                $this->fixVisibility($tokens, $index, $kind, $kind === \T_PUBLIC_SET);
+            }
+        }
+    }
+
+    private function fixVisibility(Tokens $tokens, int $index, int $kind, bool $makePublicIfNone): void
+    {
+        $prevIndex = $tokens->getPrevMeaningfulToken($index);
+        \assert(\is_int($prevIndex));
+        if ($tokens[$prevIndex]->isGivenKind(\T_ABSTRACT)) {
+            $prevIndex = $tokens->getPrevMeaningfulToken($prevIndex);
+            \assert(\is_int($prevIndex));
+        }
+
+        if (!$tokens[$prevIndex]->isGivenKind($this->predecessorKindMap[$kind])) {
+            if ($makePublicIfNone) {
+                $tokens[$index] = new Token([\T_PUBLIC, 'public']);
+            }
+
+            return;
+        }
+
+        $tokens->clearAt($index);
+
+        if ($tokens[$index + 1]->isWhitespace()) {
+            $tokens->clearAt($index + 1);
+        }
+    }
+}
diff --git a/tests/Fixer/NoUselessWriteVisibilityFixerTest.php b/tests/Fixer/NoUselessWriteVisibilityFixerTest.php
new file mode 100644
index 00000000..9df7b6a4
--- /dev/null
+++ b/tests/Fixer/NoUselessWriteVisibilityFixerTest.php
@@ -0,0 +1,105 @@
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of PHP CS Fixer: custom fixers.
+ *
+ * (c) 2018 Kuba Werłos
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Fixer;
+
+/**
+ * @internal
+ *
+ * @covers \PhpCsFixerCustomFixers\Fixer\NoUselessWriteVisibilityFixer
+ *
+ * @requires PHP >= 8.4
+ */
+final class NoUselessWriteVisibilityFixerTest extends AbstractFixerTestCase
+{
+    public function testIsRisky(): void
+    {
+        self::assertRiskiness(false);
+    }
+
+    /**
+     * @dataProvider provideFixCases
+     */
+    public function testFix(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<string, array{0: string, 1?: string}>
+     */
+    public static function provideFixCases(): iterable
+    {
+        yield 'class properties' => [
+            <<<'PHP'
+                <?php class Foo {
+                    public int $x;
+                    protected int $y;
+                    private int $z;
+                }
+                PHP,
+            <<<'PHP'
+                <?php class Foo {
+                    public public(set) int $x;
+                    protected protected(set) int $y;
+                    private private(set) int $z;
+                }
+                PHP,
+        ];
+
+        yield 'only write visibility' => [
+            <<<'PHP'
+                <?php class Foo {
+                    public string $x;
+                }
+                PHP,
+            <<<'PHP'
+                <?php class Foo {
+                    public(set) string $x;
+                }
+                PHP,
+        ];
+
+        yield 'promoted properties' => [
+            <<<'PHP'
+                <?php class Foo {
+                    public function __construct(
+                        public string $x,
+                        protected string $y,
+                        private string $z,
+                    ) {}
+                }
+                PHP,
+            <<<'PHP'
+                <?php class Foo {
+                    public function __construct(
+                        public public(set) string $x,
+                        protected protected(set) string $y,
+                        private private(set) string $z,
+                    ) {}
+                }
+                PHP,
+        ];
+
+        yield 'abstract property' => [
+            <<<'PHP'
+                <?php abstract class Foo {
+                    public abstract int $x { get; }
+                }
+                PHP,
+            <<<'PHP'
+                <?php abstract class Foo {
+                    public abstract public(set) int $x { get; }
+                }
+                PHP,
+        ];
+    }
+}

From 2b358be932508b6ae6ea73c582f77533b46c57ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Wed, 23 Apr 2025 22:24:27 +0200
Subject: [PATCH 2/3] Update

---
 src/Fixer/NoUselessWriteVisibilityFixer.php   |  5 +++-
 .../NoUselessWriteVisibilityFixerTest.php     | 26 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/Fixer/NoUselessWriteVisibilityFixer.php b/src/Fixer/NoUselessWriteVisibilityFixer.php
index 42c47776..a3400f0e 100644
--- a/src/Fixer/NoUselessWriteVisibilityFixer.php
+++ b/src/Fixer/NoUselessWriteVisibilityFixer.php
@@ -86,7 +86,10 @@ private function fixVisibility(Tokens $tokens, int $index, int $kind, bool $make
 
         if (!$tokens[$prevIndex]->isGivenKind($this->predecessorKindMap[$kind])) {
             if ($makePublicIfNone) {
-                $tokens[$index] = new Token([\T_PUBLIC, 'public']);
+                $prevDeciderIndex = $tokens->getPrevTokenOfKind($index, ['(', ';', '{']);
+                \assert(\is_int($prevDeciderIndex));
+                $kind = $tokens[$prevDeciderIndex]->equals('(') ? CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC : \T_PUBLIC;
+                $tokens[$index] = new Token([$kind, 'public']);
             }
 
             return;
diff --git a/tests/Fixer/NoUselessWriteVisibilityFixerTest.php b/tests/Fixer/NoUselessWriteVisibilityFixerTest.php
index 9df7b6a4..4464ef31 100644
--- a/tests/Fixer/NoUselessWriteVisibilityFixerTest.php
+++ b/tests/Fixer/NoUselessWriteVisibilityFixerTest.php
@@ -58,12 +58,34 @@ public static function provideFixCases(): iterable
         yield 'only write visibility' => [
             <<<'PHP'
                 <?php class Foo {
-                    public string $x;
+                    public string $a;
+                    public string $b;
+                    public function __construct(
+                        public string $x,
+                        public string $y,
+                    ) {}
+                    public string $c;
+                    public string $d;
+                }
+                abstract class Bar {
+                    abstract public function __construct();
+                    public string $a;
                 }
                 PHP,
             <<<'PHP'
                 <?php class Foo {
-                    public(set) string $x;
+                    public(set) string $a;
+                    public(set) string $b;
+                    public function __construct(
+                        public(set) string $x,
+                        public(set) string $y,
+                    ) {}
+                    public(set) string $c;
+                    public(set) string $d;
+                }
+                abstract class Bar {
+                    abstract public function __construct();
+                    public(set) string $a;
                 }
                 PHP,
         ];

From bf39baca2d5f1f05800ae0ed2c42c68f1ea30fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Thu, 24 Apr 2025 21:21:49 +0200
Subject: [PATCH 3/3] Update `README.md`

---
 README.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef13ccad..399ada69 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3607-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3632-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions/workflows/ci.yaml/badge.svg)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions/workflows/ci.yaml)
@@ -399,6 +399,19 @@ Functions `strlen` and `mb_strlen` must not be compared to 0.
 +$isNotEmpty = $string !== '';
 ```
 
+#### NoUselessWriteVisibilityFixer
+There must be no useless write visibility.
+```diff
+ <?php class Foo {
+-    public public(set) $x;
+-    public(set) $y;
+-    protected protected(set) $z;
++    public $x;
++    public $y;
++    protected $z;
+ }
+```
+
 #### NumericLiteralSeparatorFixer
 Numeric literals must have configured separators.
   DEPRECATED: use `numeric_literal_separator` instead.