Merge branch 'main' into update/cpt-scaffold

swissspidy · web-flow · commit f1d7f042818b · 2025-03-31T10:18:54.000+02:00
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -1,6 +1,7 @@
 name: Testing
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:
diff --git a/README.md b/README.md
@@ -238,6 +238,7 @@ The following files are also included unless the `--skip-tests` is used:
 		options:
 		  - circle
 		  - gitlab
+		  - bitbucket
 		  - github
 		---
 
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "wp-cli/wp-cli": "^2.5"
+        "wp-cli/wp-cli": "^2.12"
     },
     "require-dev": {
         "wp-cli/extension-command": "^1.2 || ^2",
@@ -24,7 +24,8 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "johnpbloch/wordpress-core-installer": true
-        }
+        },
+        "lock": false
     },
     "extra": {
         "branch-alias": {
diff --git a/features/scaffold-plugin-tests.feature b/features/scaffold-plugin-tests.feature
@@ -172,42 +172,29 @@ Feature: Scaffold plugin unit tests
     And the {PLUGIN_DIR}/bitbucket-pipelines.yml file should contain:
       """
           - step:
-              image: php:5.6
-              name: "PHP 5.6"
+              image: php:7.4
+              name: "PHP 7.4"
               script:
                 # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
+                - apt-get update && apt-get install -y subversion git zip libzip-dev --no-install-recommends
       """
     And the {PLUGIN_DIR}/bitbucket-pipelines.yml file should contain:
       """
           - step:
-              image: php:7.0
-              name: "PHP 7.0"
+              image: php:8.0
+              name: "PHP 8.0"
               script:
                 # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
+                - apt-get update && apt-get install -y subversion git zip libzip-dev --no-install-recommends
       """
     And the {PLUGIN_DIR}/bitbucket-pipelines.yml file should contain:
       """
           - step:
-              image: php:7.1
-              name: "PHP 7.1"
+              image: php:8.2
+              name: "PHP 8.2"
               script:
                 # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
-      """
-    And the {PLUGIN_DIR}/bitbucket-pipelines.yml file should contain:
-      """
-          - step:
-              image: php:7.2
-              name: "PHP 7.2"
-              script:
-                # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
+                - apt-get update && apt-get install -y subversion git zip libzip-dev --no-install-recommends
       """
     And the {PLUGIN_DIR}/bitbucket-pipelines.yml file should contain:
       """
@@ -309,3 +296,16 @@ Feature: Scaffold plugin unit tests
       """
       require dirname( dirname( __FILE__ ) ) . '/bar.php';
       """
+
+  Scenario: Accept bitbucket as valid CI in plugin scaffold
+    Given a WP install
+    When I run `wp plugin path`
+    Then save STDOUT as {PLUGIN_DIR}
+
+    When I run `wp scaffold plugin hello-world --ci=bitbucket`
+    Then STDOUT should not be empty
+    And the {PLUGIN_DIR}/hello-world/.editorconfig file should exist
+    And the {PLUGIN_DIR}/hello-world/hello-world.php file should exist
+    And the {PLUGIN_DIR}/hello-world/readme.txt file should exist
+    And the {PLUGIN_DIR}/hello-world/bitbucket-pipelines.yml file should exist
+    And the {PLUGIN_DIR}/hello-world/tests directory should exist
diff --git a/features/scaffold-theme-tests.feature b/features/scaffold-theme-tests.feature
@@ -168,42 +168,29 @@ Feature: Scaffold theme unit tests
     And the {THEME_DIR}/t12child/bitbucket-pipelines.yml file should contain:
       """
           - step:
-              image: php:5.6
-              name: "PHP 5.6"
+              image: php:7.4
+              name: "PHP 7.4"
               script:
                 # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
+                - apt-get update && apt-get install -y subversion git zip libzip-dev --no-install-recommends
       """
     And the {THEME_DIR}/t12child/bitbucket-pipelines.yml file should contain:
       """
           - step:
-              image: php:7.0
-              name: "PHP 7.0"
+              image: php:8.0
+              name: "PHP 8.0"
               script:
                 # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
+                - apt-get update && apt-get install -y subversion git zip libzip-dev --no-install-recommends
       """
     And the {THEME_DIR}/t12child/bitbucket-pipelines.yml file should contain:
       """
           - step:
-              image: php:7.1
-              name: "PHP 7.1"
+              image: php:8.2
+              name: "PHP 8.2"
               script:
                 # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
-      """
-    And the {THEME_DIR}/t12child/bitbucket-pipelines.yml file should contain:
-      """
-          - step:
-              image: php:7.2
-              name: "PHP 7.2"
-              script:
-                # Install Dependencies
-                - docker-php-ext-install mysqli
-                - apt-get update && apt-get install -y subversion --no-install-recommends
+                - apt-get update && apt-get install -y subversion git zip libzip-dev --no-install-recommends
       """
     And the {THEME_DIR}/t12child/bitbucket-pipelines.yml file should contain:
       """
diff --git a/features/scaffold.feature b/features/scaffold.feature
@@ -209,8 +209,7 @@ Feature: WordPress code scaffolding
     And the {PLUGIN_DIR}/hello-world/.editorconfig file should exist
     And the {PLUGIN_DIR}/hello-world/hello-world.php file should exist
     And the {PLUGIN_DIR}/hello-world/readme.txt file should exist
-    And the {PLUGIN_DIR}/hello-world/package.json file should exist
-    And the {PLUGIN_DIR}/hello-world/Gruntfile.js file should exist
+    And the {PLUGIN_DIR}/hello-world/composer.json file should exist
     And the {PLUGIN_DIR}/hello-world/.gitignore file should contain:
       """
       .DS_Store
@@ -219,6 +218,7 @@ Feature: WordPress code scaffolding
       Thumbs.db
       wp-cli.local.yml
       node_modules/
+      vendor/
       """
     And the {PLUGIN_DIR}/hello-world/.distignore file should contain:
       """
@@ -254,14 +254,10 @@ Feature: WordPress code scaffolding
       Tested up to: {WP_VERSION}
       """
 
-    When I run `cat {PLUGIN_DIR}/hello-world/package.json`
-    Then STDOUT should be JSON containing:
-      """
-      {"author":"Hello World Author"}
-      """
-    And STDOUT should be JSON containing:
+    When I run `cat {PLUGIN_DIR}/hello-world/composer.json`
+    Then STDOUT should contain:
       """
-      {"version":"0.1.0"}
+      wp-cli/i18n-command
       """
 
   Scenario: Scaffold a plugin by prompting
diff --git a/src/Scaffold_Command.php b/src/Scaffold_Command.php
@@ -508,10 +508,10 @@ public function child_theme( $args, $assoc_args ) {
 			'theme_uri'  => '',
 		];
 
-		$data                               = wp_parse_args( $assoc_args, $defaults );
-		$data['slug']                       = $theme_slug;
-		$data['parent_theme_function_safe'] = str_replace( [ ' ', '-' ], '_', $data['parent_theme'] );
-		$data['description']                = ucfirst( $data['parent_theme'] ) . ' child theme.';
+		$data                = wp_parse_args( $assoc_args, $defaults );
+		$data['slug']        = $theme_slug;
+		$data['prefix_safe'] = str_replace( [ ' ', '-' ], '_', $theme_slug );
+		$data['description'] = ucfirst( $data['parent_theme'] ) . ' child theme.';
 
 		$theme_dir = WP_CONTENT_DIR . "/themes/{$theme_slug}";
 
@@ -624,6 +624,7 @@ private function get_output_path( $assoc_args, $subdir ) {
 	 * options:
 	 *   - circle
 	 *   - gitlab
+	 *   - bitbucket
 	 *   - github
 	 * ---
 	 *
@@ -686,8 +687,7 @@ public function plugin( $args, $assoc_args ) {
 		$files_to_create = [
 			$plugin_path                  => self::mustache_render( 'plugin.mustache', $data ),
 			$plugin_readme_path           => self::mustache_render( 'plugin-readme.mustache', $data ),
-			"{$plugin_dir}/package.json"  => self::mustache_render( 'plugin-packages.mustache', $data ),
-			"{$plugin_dir}/Gruntfile.js"  => self::mustache_render( 'plugin-gruntfile.mustache', $data ),
+			"{$plugin_dir}/composer.json" => self::mustache_render( 'plugin-composer.mustache', $data ),
 			"{$plugin_dir}/.gitignore"    => self::mustache_render( 'plugin-gitignore.mustache', $data ),
 			"{$plugin_dir}/.distignore"   => self::mustache_render( 'plugin-distignore.mustache', $data ),
 			"{$plugin_dir}/.editorconfig" => file_get_contents( self::get_template_path( '.editorconfig' ) ),
diff --git a/templates/child_theme_functions.mustache b/templates/child_theme_functions.mustache
@@ -7,15 +7,17 @@
  * @package {{slug}}
  */
 
-add_action( 'wp_enqueue_scripts', '{{parent_theme_function_safe}}_parent_theme_enqueue_styles' );
+add_action( 'wp_enqueue_scripts', '{{prefix_safe}}_parent_theme_enqueue_styles' );
 
 /**
  * Enqueue scripts and styles.
  */
-function {{parent_theme_function_safe}}_parent_theme_enqueue_styles() {
-	wp_enqueue_style( '{{parent_theme}}-style', get_template_directory_uri() . '/style.css' );
-	wp_enqueue_style( '{{slug}}-style',
+function {{prefix_safe}}_parent_theme_enqueue_styles() {
+	wp_enqueue_style( '{{parent_theme}}-style', get_template_directory_uri() . '/style.css', array(), '0.1.0' );
+	wp_enqueue_style(
+		'{{slug}}-style',
 		get_stylesheet_directory_uri() . '/style.css',
-		[ '{{parent_theme}}-style' ]
+		array( '{{parent_theme}}-style' ),
+		'0.1.0'
 	);
 }
diff --git a/templates/install-wp-tests.sh b/templates/install-wp-tests.sh
@@ -22,6 +22,17 @@ download() {
         curl -s "$1" > "$2";
     elif [ `which wget` ]; then
         wget -nv -O "$2" "$1"
+    else
+        echo "Error: Neither curl nor wget is installed."
+        exit 1
+    fi
+}
+
+# Check if svn is installed
+check_svn_installed() {
+    if ! command -v svn > /dev/null; then
+        echo "Error: svn is not installed. Please install svn and try again."
+        exit 1
     fi
 }
 
@@ -64,6 +75,7 @@ install_wp() {
 	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
 		mkdir -p $TMPDIR/wordpress-trunk
 		rm -rf $TMPDIR/wordpress-trunk/*
+        check_svn_installed
 		svn export --quiet https://core.svn.wordpress.org/trunk $TMPDIR/wordpress-trunk/wordpress
 		mv $TMPDIR/wordpress-trunk/wordpress/* $WP_CORE_DIR
 	else
@@ -108,6 +120,7 @@ install_test_suite() {
 		# set up testing suite
 		mkdir -p $WP_TESTS_DIR
 		rm -rf $WP_TESTS_DIR/{includes,data}
+        check_svn_installed
 		svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
 		svn export --quiet --ignore-externals https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
 	fi
diff --git a/templates/phpunit.xml.dist b/templates/phpunit.xml.dist
@@ -4,8 +4,9 @@
 	backupGlobals="false"
 	colors="true"
 	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
 	convertWarningsToExceptions="true"
+	convertNoticesToExceptions="true"
+	convertDeprecationsToExceptions="true"
 	>
 	<testsuites>
 		<testsuite name="testing">
diff --git a/templates/plugin-bitbucket.mustache b/templates/plugin-bitbucket.mustache
diff --git a/templates/plugin-composer.mustache b/templates/plugin-composer.mustache
diff --git a/templates/plugin-gitignore.mustache b/templates/plugin-gitignore.mustache
diff --git a/templates/plugin-gruntfile.mustache b/templates/plugin-gruntfile.mustache
diff --git a/templates/plugin-packages.mustache b/templates/plugin-packages.mustache
