test(snapshots) refresh scaffold snapshots for 4.7 output

init scaffold now emits the dev:rebuild command and the tests/_wordpress,
tests/_data and Support/Data .gitignore files (4.7.0); regenerate the 3.5
scaffold snapshots to match.

Author: lucatume

config/rector-35.php

@@ -10,6 +10,7 @@
 use lucatume\Rector\SerializableThrowableCompatibilityRector;
 use Rector\Config\RectorConfig;
 use Rector\DowngradePhp72\Rector\ClassMethod\DowngradeParameterTypeWideningRector;
+use Rector\DowngradePhp80\Rector\Expression\DowngradeMatchToSwitchRector;
 use Rector\DowngradePhp81\Rector\FuncCall\DowngradeHashAlgorithmXxHashRector;
 use Rector\DowngradePhp81\Rector\StmtsAwareInterface\DowngradeSetAccessibleReflectionPropertyRector;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
@@ -66,10 +67,15 @@
     // after every `new ReflectionProperty`. The master source already guards each call with
     // `PHP_VERSION_ID < 80100 && $prop->setAccessible(true)`, so the injected copies are redundant
     // and, in one spot, land before the variable is assigned (fatal). Skip it; master's guards stand.
+    //
+    // DowngradeMatchToSwitchRector drops the left side of `$x = $a ?? match(...)`; skip it for
+    // MachineInformation (its only matches use that pattern) so DowngradeCoalesceMatchAssignRector
+    // can downgrade them without losing the constructor-argument fallback.
     $rectorConfig->skip([
         DowngradeParameterTypeWideningRector::class,
         DowngradeHashAlgorithmXxHashRector::class,
         DowngradeSetAccessibleReflectionPropertyRector::class,
+        DowngradeMatchToSwitchRector::class => [dirname(__DIR__) . '/src/Utils/MachineInformation.php'],
     ]);
 
     // Downgrade PHP_OS_FAMILY (PHP 7.2+) to PHP_OS for PHP 7.1 compatibility

config/rector/src/DowngradeCoalesceMatchAssignRector.php

@@ -8,33 +8,38 @@
 use PhpParser\Node\Expr\BinaryOp\NotIdentical;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\Match_;
+use PhpParser\Node\MatchArm;
 use PhpParser\Node\Name;
+use PhpParser\Node\Stmt\Break_;
+use PhpParser\Node\Stmt\Case_;
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
+use PhpParser\Node\Stmt\Switch_;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * Split `$x = $a ?? match (...) { ... };` into an if/else before the match is downgraded.
+ * Downgrade `$x = $a ?? match (...) { ... };` to an if/else for PHP < 8.0.
  *
- * Rector's DowngradeMatchToSwitchRector turns the nested match into a switch that assigns $x
- * directly but drops the `$a ??` fallback, so the provided value is ignored (e.g.
+ * Rector's built-in DowngradeMatchToSwitchRector turns the nested match into a switch that
+ * assigns $x directly but drops the `$a ??` fallback, so the provided value is ignored (e.g.
  * MachineInformation ignoring its constructor arguments and always auto-detecting the host).
- * Rewriting the coalesce into an explicit if/else keeps the match in a plain `$x = match(...)`
- * position the downgrade handles correctly, and preserves the `$a ??` semantics.
+ * The built-in is skipped for the affected file in rector-35.php and this rule does the whole
+ * downgrade: `if ($a !== null) { $x = $a; } else { switch (subject) { ... } }`, preserving the
+ * `$a ??` semantics.
  */
 class DowngradeCoalesceMatchAssignRector extends AbstractRector
 {
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
-            'Split an assignment of "value ?? match(...)" into if/else so the coalesce survives the match downgrade',
+            'Downgrade an assignment of "value ?? match(...)" to if/else, preserving the coalesce',
             [
                 new CodeSample(
                     '$this->os = $os ?? match ($d) { "l" => "linux", default => "?" };',
-                    "if (\$os !== null) {\n    \$this->os = \$os;\n} else {\n    \$this->os = match (\$d) { \"l\" => \"linux\", default => \"?\" };\n}"
+                    "if (\$os !== null) {\n    \$this->os = \$os;\n} else {\n    switch (\$d) {\n        case \"l\":\n            \$this->os = \"linux\";\n            break;\n        default:\n            \$this->os = \"?\";\n            break;\n    }\n}"
                 ),
             ]
         );
@@ -61,14 +66,43 @@ public function refactor(Node $node): ?Node
         }
 
         $target = $assign->var;
-        $fallbackValue = $coalesce->left;
 
         return new If_(
-            new NotIdentical($fallbackValue, new ConstFetch(new Name('null'))),
+            new NotIdentical($coalesce->left, new ConstFetch(new Name('null'))),
             [
-                'stmts' => [new Expression(new Assign($target, $fallbackValue))],
-                'else' => new Else_([new Expression(new Assign($target, $coalesce->right))]),
+                'stmts' => [new Expression(new Assign($target, $coalesce->left))],
+                'else' => new Else_([$this->matchToSwitch($coalesce->right, $target)]),
             ]
         );
     }
+
+    private function matchToSwitch(Match_ $match, Node $target): Switch_
+    {
+        $cases = [];
+        foreach ($match->arms as $arm) {
+            $cases = array_merge($cases, $this->armToCases($arm, $target));
+        }
+        return new Switch_($match->cond, $cases);
+    }
+
+    /**
+     * @return Case_[]
+     */
+    private function armToCases(MatchArm $arm, Node $target): array
+    {
+        $body = [new Expression(new Assign($target, $arm->body)), new Break_()];
+
+        // Default arm: conds is null.
+        if ($arm->conds === null) {
+            return [new Case_(null, $body)];
+        }
+
+        // One arm can list several conditions (`'a', 'b' => ...`): fall through to the last.
+        $cases = [];
+        $last = count($arm->conds) - 1;
+        foreach ($arm->conds as $i => $cond) {
+            $cases[] = new Case_($cond, $i === $last ? $body : []);
+        }
+        return $cases;
+    }
 }

tests/unit/Codeception/Template/__snapshots__/WpbrowserTest__3.5__should_scaffold_for_child_theme_correctly__0.snapshot

@@ -12,9 +12,9 @@ add_action('after_setup_theme', 'theme_23_some_function');
 <<< /index.php <<<
 
 >>> /tests/EndToEnd.suite.yml >>>
-# Integration suite configuration
+# EndToEnd suite configuration
 #
-# Run integration and "WordPress unit" tests.
+# Run end-to-end tests.
 
 actor: EndToEndTester
 bootstrap: _bootstrap.php
@@ -290,8 +290,8 @@ TEST_TABLE_PREFIX=test_
 WORDPRESS_TABLE_PREFIX=wp_
 
 # The URL and domain of the WordPress site used in end-to-end tests.
-WORDPRESS_URL=http://localhost:33117
-WORDPRESS_DOMAIN=localhost:33117
+WORDPRESS_URL=http://localhost:45628
+WORDPRESS_DOMAIN=localhost:45628
 WORDPRESS_ADMIN_PATH=/wp-admin
 
 # The username and password of the administrator user of the WordPress site used in end-to-end tests.
@@ -300,20 +300,24 @@ WORDPRESS_ADMIN_PASSWORD=password
 
 # The host and port of the ChromeDriver server that will be used in end-to-end tests.
 CHROMEDRIVER_HOST=localhost
-CHROMEDRIVER_PORT=45469
+CHROMEDRIVER_PORT=13862
 
 # The port on which the PHP built-in server will serve the WordPress installation.
-BUILTIN_SERVER_PORT=33117
+BUILTIN_SERVER_PORT=45628
+# The WordPress version installed by `init`, reused by the `dev:rebuild` command.
+WORDPRESS_VERSION=6.8.1
+
 
 <<< /tests/.env <<<
 
 >>> /tests/_output/.gitkeep >>>
 
 <<< /tests/_output/.gitkeep <<<
 
->>> /tests/_data/.gitkeep >>>
+>>> /tests/_data/.gitignore >>>
+!dump.sql
 
-<<< /tests/_data/.gitkeep <<<
+<<< /tests/_data/.gitignore <<<
 
 >>> /codeception.yml >>>
 support_namespace: Support
@@ -360,6 +364,7 @@ extensions:
         - lucatume\WPBrowser\Command\DevStop
         - lucatume\WPBrowser\Command\DevInfo
         - lucatume\WPBrowser\Command\DevRestart
+        - lucatume\WPBrowser\Command\DevRebuild
         - lucatume\WPBrowser\Command\ChromedriverUpdate
 
 <<< /codeception.yml <<<

tests/unit/Codeception/Template/__snapshots__/WpbrowserTest__3.5__should_scaffold_for_plugin_with_non_plugin_php_file__0.snapshot

@@ -1,7 +1,7 @@
 >>> /tests/EndToEnd.suite.yml >>>
-# Integration suite configuration
+# EndToEnd suite configuration
 #
-# Run integration and "WordPress unit" tests.
+# Run end-to-end tests.
 
 actor: EndToEndTester
 bootstrap: _bootstrap.php
@@ -285,8 +285,8 @@ TEST_TABLE_PREFIX=test_
 WORDPRESS_TABLE_PREFIX=wp_
 
 # The URL and domain of the WordPress site used in end-to-end tests.
-WORDPRESS_URL=http://localhost:46881
-WORDPRESS_DOMAIN=localhost:46881
+WORDPRESS_URL=http://localhost:9261
+WORDPRESS_DOMAIN=localhost:9261
 WORDPRESS_ADMIN_PATH=/wp-admin
 
 # The username and password of the administrator user of the WordPress site used in end-to-end tests.
@@ -295,20 +295,24 @@ WORDPRESS_ADMIN_PASSWORD=password
 
 # The host and port of the ChromeDriver server that will be used in end-to-end tests.
 CHROMEDRIVER_HOST=localhost
-CHROMEDRIVER_PORT=7413
+CHROMEDRIVER_PORT=64577
 
 # The port on which the PHP built-in server will serve the WordPress installation.
-BUILTIN_SERVER_PORT=46881
+BUILTIN_SERVER_PORT=9261
+# The WordPress version installed by `init`, reused by the `dev:rebuild` command.
+WORDPRESS_VERSION=6.8.1
+
 
 <<< /tests/.env <<<
 
 >>> /tests/_output/.gitkeep >>>
 
 <<< /tests/_output/.gitkeep <<<
 
->>> /tests/_data/.gitkeep >>>
+>>> /tests/_data/.gitignore >>>
+!dump.sql
 
-<<< /tests/_data/.gitkeep <<<
+<<< /tests/_data/.gitignore <<<
 
 >>> /codeception.yml >>>
 support_namespace: Support
@@ -355,6 +359,7 @@ extensions:
         - lucatume\WPBrowser\Command\DevStop
         - lucatume\WPBrowser\Command\DevInfo
         - lucatume\WPBrowser\Command\DevRestart
+        - lucatume\WPBrowser\Command\DevRebuild
         - lucatume\WPBrowser\Command\ChromedriverUpdate
 
 <<< /codeception.yml <<<