Merge branch 'main' into try/322-refresh

Author: swissspidy

.github/workflows/copilot-setup-steps.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3
+        uses: ramsey/composer-install@a35c6ebd3d08125aaf8852dff361e686a1a67947 # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

features/scaffold.feature

@@ -9,6 +9,10 @@ Feature: WordPress code scaffolding
     When I run `wp scaffold child-theme zombieland --parent_theme=umbrella --theme_name=Zombieland --author=Tallahassee --author_uri=https://wp-cli.org --theme_uri=http://www.zombieland.com`
     Then the {THEME_DIR}/zombieland/style.css file should exist
     And the {THEME_DIR}/zombieland/functions.php file should exist
+    And the {THEME_DIR}/zombieland/functions.php file should contain:
+      """
+      wp_style_add_data( 'zombieland-style', 'rtl', 'add' );
+      """
     And STDOUT should be:
       """
       Success: Created '{THEME_DIR}/zombieland'.
@@ -58,6 +62,44 @@ Feature: WordPress code scaffolding
       Success: Network enabled the 'Zombieland' theme.
       """
 
+  Scenario: Scaffold a child theme and activate it with different slug and name
+    Given a WP install
+
+    When I run `wp theme install twentytwentyone --force`
+    Then STDOUT should not be empty
+
+    And I run `wp theme path`
+    And save STDOUT as {THEME_DIR}
+
+    When I run `wp scaffold child-theme first-run --parent_theme=twentytwentyone --theme_name="First Run Name" --activate`
+    Then STDOUT should contain:
+      """
+      Success: Created '{THEME_DIR}/first-run'.
+      """
+    And STDOUT should contain:
+      """
+      Success: Switched to 'First Run Name' theme.
+      """
+
+    When I run `wp theme list --fields=name,status --format=csv`
+    Then STDOUT should contain:
+      """
+      first-run,active
+      """
+
+    # Now delete the theme and create it again to test the fix for the caching issue
+    When I run `rm -rf {THEME_DIR}/first-run`
+    And I run `wp theme activate twentytwentyone`
+    And I run `wp scaffold child-theme first-run --parent_theme=twentytwentyone --theme_name="First Run Name" --activate`
+    Then STDOUT should contain:
+      """
+      Success: Created '{THEME_DIR}/first-run'.
+      """
+    And STDOUT should contain:
+      """
+      Success: Switched to 'First Run Name' theme.
+      """
+
   Scenario: Scaffold a child theme with invalid slug
     Given a WP install
     When I try `wp scaffold child-theme . --parent_theme=simple-life`

src/Scaffold_Command.php

@@ -539,8 +539,10 @@ public function child_theme( $args, $assoc_args ) {
 		$this->log_whether_files_written( $files_written, $skip_message, $success_message );
 
 		if ( Utils\get_flag_value( $assoc_args, 'activate' ) ) {
+			wp_get_theme( $theme_slug )->cache_delete();
 			WP_CLI::run_command( [ 'theme', 'activate', $theme_slug ] );
 		} elseif ( Utils\get_flag_value( $assoc_args, 'enable-network' ) ) {
+			wp_get_theme( $theme_slug )->cache_delete();
 			WP_CLI::run_command( [ 'theme', 'enable', $theme_slug ], [ 'network' => true ] );
 		}
 	}

templates/child_theme_functions.mustache

@@ -20,4 +20,5 @@ function {{prefix_safe}}_parent_theme_enqueue_styles() {
 		array( '{{parent_theme}}-style' ),
 		'0.1.0'
 	);
+	wp_style_add_data( '{{slug}}-style', 'rtl', 'add' );
 }