Merge branch 'master' into 4.x

Author: jrfnl

src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.1.inc

@@ -140,11 +140,11 @@ function moreParamSecond(LogicException $bar, Exception $foo) {
 // phpcs:set Generic.CodeAnalysis.UnusedFunctionParameter ignoreTypeHints[]
 
 class ConstructorPropertyPromotionNoContentInMethod {
-    public function __construct(protected int $id) {}
+    public function __construct(protected int $id, private(set) $foo) {}
 }
 
 class ConstructorPropertyPromotionWithContentInMethod {
-    public function __construct(protected int $id, $toggle = true) {
+    public function __construct(protected int $id, private(set) $foo, $toggle = true) {
         if ($toggle === true) {
             doSomething();
         }

src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.1.inc

@@ -75,7 +75,7 @@ class TypedProperties
 }
 
 class ConstructorPropertyPromotionWithTypes {
-    public function __construct(protected Float|Int $x, public ?STRING &$y = 'test', private mixed $z) {}
+    public function __construct(protected Float|Int $x, public(set) ?STRING &$y = 'test', private mixed $z) {}
 }
 
 class ConstructorPropertyPromotionAndNormalParams {

src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.1.inc.fixed

@@ -75,7 +75,7 @@ class TypedProperties
 }
 
 class ConstructorPropertyPromotionWithTypes {
-    public function __construct(protected float|int $x, public ?string &$y = 'test', private mixed $z) {}
+    public function __construct(protected float|int $x, public(set) ?string &$y = 'test', private mixed $z) {}
 }
 
 class ConstructorPropertyPromotionAndNormalParams {

src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc

@@ -109,3 +109,11 @@ class SkipOverPHP84FinalProperties {
 $a = \null;
 $a = \falSe;
 $a = \True;
+
+// PHP 8.4 asymmetric visibility
+class WithAsym {
+    private(set) null|true $asym1 = TRUE;
+    public private(set) ?bool $asym2 = false;
+    protected(set) false|string|null $asym3 = null;
+    public protected(set) Type|null|bool $asym4 = true;
+}

src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc.fixed

@@ -109,3 +109,11 @@ class SkipOverPHP84FinalProperties {
 $a = \NULL;
 $a = \FALSE;
 $a = \TRUE;
+
+// PHP 8.4 asymmetric visibility
+class WithAsym {
+    private(set) null|true $asym1 = TRUE;
+    public private(set) ?bool $asym2 = FALSE;
+    protected(set) false|string|null $asym3 = NULL;
+    public protected(set) Type|null|bool $asym4 = TRUE;
+}

src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php

@@ -55,6 +55,9 @@ public function getErrorList()
             109 => 1,
             110 => 1,
             111 => 1,
+            116 => 1,
+            117 => 1,
+            118 => 1,
         ];
 
     }//end getErrorList()

src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.1.inc

@@ -109,7 +109,7 @@ class OnlyConstructorPropertyPromotion {
 
 class ConstructorPropertyPromotionMixedWithNormalParams {
     public function __construct(
-        public string $name = '',
+        public(set) string $name = '',
         ?int $optionalParam = 0,
         mixed $requiredParam,
     ) {}

src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.1.inc

@@ -160,3 +160,17 @@ interface PHP84HookedProperty {
     public $thisisfine { get; }
     public $_underscore { get; }
 }
+
+class AsymVisibility {
+    // The read scope is public, but not specified. Enforce the naming conventions anyway.
+    private(set) $asymPublicImplied  = 'hello';
+    private(set) $_asymPublicImplied = 'hello';
+
+    // The read scope is private, so these properties should be handled as private properties.
+    private private(set) $asymPrivate  = 'hello';
+    private(set) private $_asymPrivate = 'hello';
+
+    // The read scope is public/protected, so these properties should be handled as public properties.
+    public private(set) $asymPublicPrivate  = 'hello';
+    private(set) protected $_asymPrivateProtected = 'hello';
+}

src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php

@@ -73,6 +73,9 @@ public function getErrorList($testFile='')
                 152 => 1,
                 155 => 1,
                 161 => 1,
+                167 => 1,
+                170 => 1,
+                175 => 1,
             ];
 
         default:

src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.1.inc

@@ -134,3 +134,17 @@ interface PHP84HookedProperty {
     public $thisisfine { get; }
     public $_underscore { get; }
 }
+
+class AsymVisibility {
+    // The read scope is public, but not specified. Enforce the naming conventions anyway.
+    private(set) $asymPublicImplied  = 'hello';
+    private(set) $_asymPublicImplied = 'hello';
+
+    // The read scope is private, so these properties should be handled as private properties.
+    private private(set) $asymPrivate  = 'hello';
+    private(set) private $_asymPrivate = 'hello';
+
+    // The read scope is public/protected, so these properties should be handled as public properties.
+    protected private(set) $asymProtectedPrivate  = 'hello';
+    private(set) public $_asymPrivatePublic = 'hello';
+}