Merge pull request #3 from renatonascalves/feature/misc-updates

renatonascalves · web-flow · commit bfe7a756ef00 · 2024-05-24T21:53:42.000-03:00
Misc updates
diff --git a/.deployignore b/.deployignore
@@ -19,7 +19,6 @@ package-lock.json
 phpunit.xml
 phpunit.xml.dist
 .phpunit.result.cache
-multisite.xml
 multisite.xml.dist
 .phpcs.xml
 phpcs.xml
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -10,7 +10,7 @@ jobs:
   composer-phpcs-phpstan:
     uses: alleyinteractive/.github/.github/workflows/php-composer-command.yml@main
     with:
-      php: 8.2
+      php: 8.3
       command: |
         phpcs
         phpstan
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false # do not fail fast, let all the failing tests fail.
       matrix:
-        php: [8.2]
+        php: [8.3]
         es_version: [7.17.5]
         multisite: [0, 1]
         wp_version: ["latest"]
@@ -51,7 +51,7 @@ jobs:
           security-enabled: false
 
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
diff --git a/.phpcs.xml b/.phpcs.xml
@@ -28,10 +28,10 @@
 	<exclude-pattern>*/**/tests/</exclude-pattern>
 
 	<!-- Configure the PHP version -->
-	<config name="testVersion" value="8.2-" />
+	<config name="testVersion" value="8.3-" />
 
 	<!-- Check against minimum WP version. -->
-	<config name="minimum_supported_wp_version" value="6.3" />
+	<config name="minimum_supported_wp_version" value="6.1" />
 
 	<!-- Set the text domain for i18n. -->
 	<rule ref="WordPress.WP.I18n">
diff --git a/composer.json b/composer.json
@@ -44,40 +44,46 @@
     }
   ],
   "require": {
-    "php": "^8.2",
+    "php": "^8.3",
     "spatie/elasticsearch-query-builder": "^1.0"
   },
   "require-dev": {
-    "alleyinteractive/alley-coding-standards": "^2.0.1",
-    "alleyinteractive/pest-plugin-wordpress": "^0.1.0",
+    "alleyinteractive/alley-coding-standards": "^2.0",
+    "alleyinteractive/pest-plugin-wordpress": "^0.5",
     "buddypress/buddypress": "dev-master",
-    "mantle-framework/testkit": "^0.12",
+    "mantle-framework/testkit": "^1.0",
     "phpstan/extension-installer": "^1.1",
     "phpstan/phpstan": "^1.10",
-    "szepeviktor/phpstan-wordpress": "^1.1.6",
-    "wp-phpunit/wp-phpunit": "^6.3",
-    "wpackagist-plugin/elasticpress": "^4.6.1"
+    "szepeviktor/phpstan-wordpress": "^1.3",
+    "wpackagist-plugin/elasticpress": "^4.6"
   },
   "scripts": {
     "phpcs": "phpcs . --basepath=.",
     "phpcbf": "phpcbf . --basepath=.",
     "phpstan": [
       "phpstan analyze --ansi --memory-limit=1G"
     ],
-    "phpunit": "pest"
+    "phpunit": "pest",
+    "test_multi": "WP_MULTISITE=1 pest"
   },
   "config": {
     "platform": {
-      "php": "8.2"
+      "php": "8.3"
     },
     "optimize-autoloader": true,
     "sort-packages": true,
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "phpstan/extension-installer": true,
-      "composer/installers": true,
       "alleyinteractive/composer-wordpress-autoloader": true,
-      "pestphp/pest-plugin": true
+      "pestphp/pest-plugin": true,
+      "composer/installers": true
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Elasticsearch\\BuddyPress\\": "src/",
+      "Elasticsearch\\BuddyPress\\Tests\\": "tests"
     }
   },
   "extra": {
diff --git a/elasticsearch-buddypress.php b/elasticsearch-buddypress.php
@@ -16,20 +16,49 @@
  * Author:            Renato Alves
  * Author URI:        https://ralv.es
  * Text Domain:       elasticsearch-buddypress
- * Domain Path:       /languages/
- * Requires PHP:      8.2
- * Requires WP:       5.9
- * Tested up to:      6.3
+ * Requires PHP:      8.3
+ * Requires WP:       6.1
+ * Tested up to:      6.5.2
+ * Requires Plugins:  buddypress
  * License:           GPL-3.0-or-later
  * License URI:       https://www.gnu.org/licenses/gpl-3.0.html
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress;
 
-// Plugin autoloader.
-require_once __DIR__ . '/vendor/wordpress-autoload.php';
+/* Start Composer Loader */
+
+// Check if Composer is installed.
+if ( ! file_exists( __DIR__ . '/vendor/wordpress-autoload.php' ) ) {
+	if ( ! class_exists( \Composer\InstalledVersions::class ) ) {
+		\add_action(
+			'admin_notices',
+			function () {
+				?>
+				<div class="notice notice-error">
+					<p>
+						<?php
+						esc_html_e(
+							'ElasticSearch BuddyPress appears to have been installed without its dependencies. It will not work properly until dependencies are installed. This likely means you have cloned it from Github and need to run the command `composer install`.',
+							'elasticsearch-buddypress'
+						);
+						?>
+					</p>
+				</div>
+				<?php
+			}
+		);
+
+		return;
+	}
+} else {
+	// Load Composer dependencies.
+	require_once __DIR__ . '/vendor/wordpress-autoload.php';
+}
+
+/* End Composer Loader */
 
 /**
  * Getting the instance of the controller class.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,5 @@
 parameters:
-	level: 8
+	level: 1
 	paths:
 		- elasticsearch-buddypress.php
 		- src/
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,22 +1,18 @@
+<?xml version="1.0"?>
 <phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	bootstrap="tests/bootstrap.php"
 	backupGlobals="false"
 	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	>
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+	displayDetailsOnTestsThatTriggerDeprecations="true"
+	displayDetailsOnTestsThatTriggerWarnings="true"
+	failOnNotice="true"
+	failOnDeprecation="true"
+>
 	<testsuites>
-		<testsuite>
-			<directory suffix=".php">./tests/</directory>
+		<testsuite name="elasticsearch-buddypress">
+			<directory suffix="Test.php">./tests/</directory>
 		</testsuite>
 	</testsuites>
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">./</directory>
-			<exclude>
-				<directory suffix=".php">./tests/</directory>
-			</exclude>
-		</whitelist>
-	</filter>
 </phpunit>
diff --git a/readme.txt b/readme.txt
@@ -3,9 +3,9 @@ Contributors:      espellcaste
 Tags:              buddypress, elasticsearch, elasticpress
 License:           GPL-3.0-or-later
 License URI:       https://www.gnu.org/licenses/gpl-3.0.html
-Requires PHP:      8.2
-Requires at least: 5.9
-Tested up to:      6.3
+Requires PHP:      8.3
+Requires at least: 6.1
+Tested up to:      6.5.2
 Stable tag:        0.1.0-alpha
 
 == Description ==
diff --git a/src/Adapters/Adapter.php b/src/Adapters/Adapter.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters;
 
diff --git a/src/Adapters/ElasticPress/ElasticPress.php b/src/Adapters/ElasticPress/ElasticPress.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters\ElasticPress;
 
diff --git a/src/Adapters/ElasticPress/Features/Groups/Group.php b/src/Adapters/ElasticPress/Features/Groups/Group.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters\ElasticPress\Features\Groups;
 
diff --git a/src/Adapters/ElasticPress/Features/Groups/GroupFormatArgs.php b/src/Adapters/ElasticPress/Features/Groups/GroupFormatArgs.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters\ElasticPress\Features\Groups;
 
diff --git a/src/Adapters/ElasticPress/Features/Groups/Indexable.php b/src/Adapters/ElasticPress/Features/Groups/Indexable.php
@@ -5,13 +5,14 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters\ElasticPress\Features\Groups;
 
 use WP_Term;
 use WP_User;
 use WP_Taxonomy;
+use WP_Error;
 use ElasticPress\Indexable as EP_Indexable;
 
 /**
@@ -166,7 +167,7 @@ public function prepapre_terms( int $group_id ): array {
 		foreach ( $selected_taxonomies as $taxonomy ) {
 			$object_terms = bp_get_object_terms( $group_id, $taxonomy->name );
 
-			if ( ! $object_terms || is_wp_error( $object_terms ) ) {
+			if ( ! $object_terms || $object_terms instanceof WP_Error ) {
 				continue;
 			}
 
diff --git a/src/Adapters/ElasticPress/Features/Groups/QueryIntegration.php b/src/Adapters/ElasticPress/Features/Groups/QueryIntegration.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters\ElasticPress\Features\Groups;
 
diff --git a/src/Adapters/ElasticPress/Features/Groups/SyncManager.php b/src/Adapters/ElasticPress/Features/Groups/SyncManager.php
@@ -7,7 +7,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters\ElasticPress\Features\Groups;
 
diff --git a/src/Adapters/ElasticPress/Features/Groups/mapping.php b/src/Adapters/ElasticPress/Features/Groups/mapping.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 return [
 	'settings' => [
diff --git a/src/Adapters/FormatArgs.php b/src/Adapters/FormatArgs.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Adapters;
 
diff --git a/src/Controller.php b/src/Controller.php
@@ -5,13 +5,13 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress;
 
+use Elasticsearch\BuddyPress\Interfaces\Hookable;
 use Elasticsearch\BuddyPress\Adapters\Adapter;
 use Elasticsearch\BuddyPress\Adapters\ElasticPress\ElasticPress;
-use Elasticsearch\BuddyPress\Interfaces\Hookable;
 
 /**
  * The controller class, which is responsible for loading adapters and
@@ -28,8 +28,6 @@ class Controller implements Hookable {
 
 	/**
 	 * A callback for the init action hook.
-	 *
-	 * @todo Confirm if this is still needed.
 	 */
 	public function action__init(): void {
 		/**
@@ -90,7 +88,7 @@ public function missing_notice(): void {
 		<div class="notice notice-error">
 			<p>
 				<strong><?php esc_html_e( 'Elasticsearch BuddyPress', 'elasticsearch-buddypress' ); ?></strong>
-				<?php esc_html_e( 'depends on the lastest version of Buddypress to work!', 'elasticsearch-buddypress' ); ?>
+				<?php esc_html_e( 'depends on the latest version of Buddypress to work!', 'elasticsearch-buddypress' ); ?>
 			</p>
 		</div>
 		<?php
diff --git a/src/Factory.php b/src/Factory.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress;
 
diff --git a/src/Interfaces/Formatter.php b/src/Interfaces/Formatter.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Interfaces;
 
diff --git a/src/Interfaces/Hookable.php b/src/Interfaces/Hookable.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Interfaces;
 
diff --git a/src/Registry.php b/src/Registry.php
@@ -5,7 +5,7 @@
  * @package Elasticsearch\BuddyPress
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress;
 
diff --git a/tests/Adapters/ElasticPress/ApiTest.php b/tests/Adapters/ElasticPress/ApiTest.php
@@ -6,7 +6,7 @@
  * @package Elasticsearch\BuddyPress\Tests
  */
 
-declare(strict_types=1);
+declare( strict_types=1 );
 
 namespace Elasticsearch\BuddyPress\Tests;
 
diff --git a/tests/Adapters/ElasticPress/GroupTest.php b/tests/Adapters/ElasticPress/GroupTest.php
diff --git a/tests/Includes/bootstrap-functions.php b/tests/Includes/bootstrap-functions.php
diff --git a/tests/Includes/define-constants.php b/tests/Includes/define-constants.php
diff --git a/tests/TestCases/AdapterUnitTestCase.php b/tests/TestCases/AdapterUnitTestCase.php
diff --git a/tests/TestCases/ElasticPressTestCase.php b/tests/TestCases/ElasticPressTestCase.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/tests/multisite.xml b/tests/multisite.xml
diff --git a/tests/testcases/AdapterUnitTestCase.php b/tests/testcases/AdapterUnitTestCase.php
