Merge branch 'develop' into trunk

WordPress · Feb 10, 2024 · 73c2904 · 73c2904
2 parents 0d365a2 + a9047dd
commit 73c2904
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -15,7 +15,7 @@ jobs:
 
       - name: Get tag
         id: tag
-        run: echo "::set-output name=tag::${GITHUB_REF#refs/tags/}"
+        run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Build project
         run: git archive -o /tmp/wp-plugin-dependencies-${{ steps.tag.outputs.tag }}.zip --prefix=wp-plugin-dependencies/ ${{ steps.tag.outputs.tag }}

diff --git a/.github/workflows/wp-phpunit.yml b/.github/workflows/wp-phpunit.yml
@@ -43,7 +43,7 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           coverage: none
           extensions: mysql, mysqli
-          tools: composer, wp-cli, phpunit-polyfills:1.0
+          tools: composer, wp-cli, phpunit-polyfills:1.1
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,6 @@
 [unreleased]
+#### 3.0.2 / 2024-02-09
+* update kill switch
 
 #### 3.0.1 / 2023-11-21
 * fix for multisite, too many `%s`

diff --git a/phpunit.xml b/phpunit.xml
@@ -11,6 +11,7 @@
 		<testsuite name="wp-plugin-dependencies">
 			<directory suffix=".php">./tests/</directory>
 			<exclude>./tests/test-sample.php</exclude>
+			<exclude>./tests/invalid</exclude>
 		</testsuite>
 	</testsuites>
 

diff --git a/plugin.php b/plugin.php
@@ -13,7 +13,7 @@
  * Plugin URI:  https://wordpress.org/plugins/wp-plugin-dependencies
  * Description: Parses 'Requires Plugins' header and information about dependencies.
  * Author: Andy Fragen, Colin Stewart, Paul Biron
- * Version: 3.0.1
+ * Version: 3.0.2
  * License: MIT
  * Network: true
  * Requires at least: 6.4
@@ -33,7 +33,9 @@
 }
 
 // TODO: update with correct version.
-if ( version_compare( get_bloginfo( 'version' ), '6.5-beta1', '>=' ) ) {
+if ( version_compare( get_bloginfo( 'version' ), '6.5-beta1', '>=' )
+	|| \class_exists( 'WP_Plugin_Dependencies' )
+) {
 	require_once ABSPATH . 'wp-admin/includes/plugin.php';
 	deactivate_plugins( __FILE__ );
 }

diff --git a/...s/addDependenciesToDependentPluginRow.php → ...d/addDependenciesToDependentPluginRow.php b/...s/addDependenciesToDependentPluginRow.php → ...d/addDependenciesToDependentPluginRow.php
diff --git a/...endencies/addDependencyPluginRowHooks.php → ...s/invalid/addDependencyPluginRowHooks.php b/...endencies/addDependencyPluginRowHooks.php → ...s/invalid/addDependencyPluginRowHooks.php
diff --git a/...pendencies/addDependentPluginRowHooks.php → tests/invalid/addDependentPluginRowHooks.php b/...pendencies/addDependentPluginRowHooks.php → tests/invalid/addDependentPluginRowHooks.php
diff --git a/...es/addDependentsToDependencyPluginRow.php → ...id/addDependentsToDependencyPluginRow.php b/...es/addDependentsToDependencyPluginRow.php → ...id/addDependentsToDependencyPluginRow.php
diff --git a/...n/plugin-dependencies/modifyPluginRow.php → tests/invalid/modifyPluginRow.php b/...n/plugin-dependencies/modifyPluginRow.php → tests/invalid/modifyPluginRow.php
diff --git a/tests/phpunit/tests/admin/plugin-dependencies/base.php b/tests/phpunit/tests/admin/plugin-dependencies/base.php
@@ -23,15 +23,13 @@ abstract class WP_PluginDependencies_UnitTestCase extends WP_UnitTestCase {
 	 * @var array
 	 */
 	protected static $static_properties = array(
-		'plugins'                         => array(),
-		'plugin_dirnames'                 => array(),
-		'plugin_dirnames_cache'           => array(),
-		'dependencies'                    => array(),
-		'dependency_slugs'                => array(),
-		'dependent_slugs'                 => array(),
-		'dependency_api_data'             => array(),
-		'uninstalled_dependency_api_data' => array(),
-		'plugin_card_data'                => array(),
+		'plugins'               => array(),
+		'plugin_dirnames'       => array(),
+		'plugin_dirnames_cache' => array(),
+		'dependencies'          => array(),
+		'dependency_slugs'      => array(),
+		'dependent_slugs'       => array(),
+		'dependency_api_data'   => array(),
 	);
 
 	/**