feat: use WordPress plugin dependency feature (#73)

* feat: use WordPress plugin dependency feature * ci: attempt to fix test failures * ci: attempt to fix test failures * Update standards-and-tests.yml --------- Co-authored-by: Ricardo Aragon <[email protected]>
pressbooks · Apr 8, 2024 · 474a389 · 474a389
1 parent e939396
commit 474a389
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/.github/workflows/standards-and-tests.yml b/.github/workflows/standards-and-tests.yml
@@ -17,12 +17,12 @@ jobs:
       matrix:
         php: [ 8.1, 8.2 ]
         os: [ubuntu-20.04]
-        wordpress: [6.2, latest]
+        wordpress: ['6.5', latest]
         include:
           - experimental: true
           - experimental: false
             php: 8.1
-            wordpress: 6.2
+            wordpress: '6.5'
     name: Tests - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}
 
     steps:

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
   "require-dev": {
     "phpcompatibility/php-compatibility": "^9.3",
     "pressbooks/coding-standards": "^1.1",
-    "yoast/phpunit-polyfills": "^1.0.1"
+    "yoast/phpunit-polyfills": "^1.1"
   },
   "scripts": {
     "test": [

diff --git a/composer.lock b/composer.lock
diff --git a/excalibur.php b/excalibur.php
@@ -4,6 +4,8 @@
 Plugin URI: https://github.com/pressbooks/excalibur/
 GitHub Plugin URI: pressbooks/excalibur
 Release Asset: true
+Requires at least: 6.5
+Requires Plugins: pressbooks
 Description: Excalibur is a SWORD protocol client for Pressbooks.
 Version: 0.7.0
 Author: Pressbooks (Book Oven Inc.)
@@ -14,19 +16,6 @@
 Network: True
 */
 
-// -------------------------------------------------------------------------------------------------------------------
-// Check minimum requirements
-// -------------------------------------------------------------------------------------------------------------------
-
-if ( ! function_exists( 'pb_meets_minimum_requirements' ) && ! @include_once( WP_PLUGIN_DIR . '/pressbooks/compatibility.php' ) ) { // @codingStandardsIgnoreLine
-	add_action('admin_notices', function () {
-		echo '<div id="message" role="alert" class="error fade"><p>' . __( 'Cannot find Pressbooks install.', 'excalibur' ) . '</p></div>';
-	});
-	return;
-} elseif ( ! pb_meets_minimum_requirements() ) {
-	return;
-}
-
 // -------------------------------------------------------------------------------------------------------------------
 // Class autoloader
 // -------------------------------------------------------------------------------------------------------------------

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -12,7 +12,10 @@
  * Manually load the plugin being tested.
  */
 function _manually_load_plugin() {
+	require_once( __DIR__ . '/../../pressbooks/hm-autoloader.php' );
 	require_once( __DIR__ . '/../../pressbooks/pressbooks.php' );
+	require_once( __DIR__ . '/../../pressbooks/requires.php' );
+	require_once( __DIR__ . '/../../pressbooks/requires-admin.php' );
 	require_once( __DIR__ . '/../excalibur.php' );
 }