DGR-964: Bump Tested up to version to 6.6 #73

kei178 · 2024-10-02T13:50:04Z

This PR updates the tested WP version up to 6.6. As commented, it also fixes the development and CI setup for PHPCS and corrects PHPCS violations.

I've also conducted manual testing from the UI to make sure everything works as expected.

kei178 · 2024-10-02T13:51:54Z

.github/workflows/ci.yml

-          - php: '7.0'
-            composer: 1
-            wordpress: '5.9'
+            wordpress: '6.2'
          - php: '7.1'
            composer: 1
-            wordpress: '5.9'
-          - php: '7.2'
-            composer: 2
-            wordpress: '5.9'
-          - php: '7.3'
-            composer: 2
-            wordpress: '5.9'
+            wordpress: '6.5'
          - php: '7.4'
            composer: 2
-            wordpress: '5.9'
+            wordpress: '6.6'
+          - php: '8.2'
+            composer: 2
+            wordpress: '6.6'


Updating the CI setup to test the current major WP version 6 with possible PHP versions.

c.f.

https://wordpress.org/documentation/article/supported-versions/

https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/

…ltFound warning

… in function call phpcs errors

kei178 · 2024-10-03T04:06:35Z

.github/workflows/ci.yml

+          git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git vendor/wp-coding-standards/wpcs
+          composer global config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
          composer global require wp-coding-standards/wpcs
          composer global require phpcompatibility/phpcompatibility-paragonie
          composer global require phpcompatibility/phpcompatibility-wp
-          sudo vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs,vendor/phpcompatibility/php-compatibility,vendor/phpcompatibility/phpcompatibility-paragonie,vendor/phpcompatibility/phpcompatibility-wp
+          composer global require phpcsstandards/phpcsutils
+          composer global require phpcsstandards/phpcsextra
+          sudo vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs,vendor/phpcompatibility/php-compatibility,vendor/phpcompatibility/phpcompatibility-paragonie,vendor/phpcompatibility/phpcompatibility-wp,vendor/phpcsstandards/phpcsutils,vendor/phpcsstandards/phpcsextra


To fix the PHPCS setup for CI.

kei178 · 2024-10-03T04:07:11Z

bin/init-wp-dev.sh

+git clone -b main https://github.com/WordPress/WordPress-Coding-Standards.git $wpcs_path
+phpcsutils_path="${PLUGIN_DIR}/vendor/phpcsstandards/phpcsutils"
+phpcompatibility_path="${PLUGIN_DIR}/vendor/phpcompatibility/phpcompatibility-wp"
+phpcs_extra_path="${PLUGIN_DIR}/vendor/phpcsstandards/phpcsextra"
+vendor/bin/phpcs --config-set installed_paths $wpcs_path, $phpcsutils_path, $phpcompatibility_path, $phpcs_extra_path


To fix the PHPCS setup for development.

kei178 · 2024-10-03T04:07:23Z

composer.json

+        "phpcompatibility/phpcompatibility-wp": "*",
+        "phpcsstandards/phpcsutils": "^1.0",
+        "phpcsstandards/phpcsextra": "^1.2.0"


To fix the PHPCS setup for development.

kei178 · 2024-10-03T04:09:57Z

includes/class-accredible-learndash-admin-menu.php

@@ -23,7 +23,7 @@ public static function add() {
 			add_menu_page(
 				'Accredible LearnDash Add-on',
 				'Accredible LearnDash Add-on',
-				'administrator',
+				'manage_options',


To fix the following PHPCS violation.

We need to provide not a role but a capability for the 3rd argument of add_menu_page and add_submenu_page.

c.f.

https://developer.wordpress.org/reference/functions/add_menu_page/

https://wordpress.org/documentation/article/roles-and-capabilities/

kei178 · 2024-10-03T04:11:01Z

includes/helpers/class-accredible-learndash-admin-form-helper.php

@@ -21,7 +21,7 @@ class Accredible_Learndash_Admin_Form_Helper {
 		public static function value_attr( $obj, $key ) {
 			$obj = (array) $obj;
 			if ( ! empty( $obj ) && isset( $obj[ $key ] ) ) {
-				echo sprintf(
+				printf(


Auto-correction by PHPCBF: bbcfe99

kei178 · 2024-10-03T04:11:09Z

includes/helpers/class-accredible-learndash-admin-table-helper.php

@@ -93,7 +93,7 @@ public function build_table_rows( $table_data ) {
 				}
 				$row_cells .= '</tr>';

-				$index ++;
+				++$index;


Auto-correction by PHPCBF: bbcfe99

kei178 · 2024-10-03T04:11:19Z

includes/models/class-accredible-learndash-model.php

@@ -157,10 +157,8 @@ public static function validate( $data, $id = null ) {
 					if ( ! isset( $data[ $field ] ) || '' === trim( $data[ $field ] ) ) {
 						throw new Exception( esc_attr( $field ) . ' is a required field.' );
 					}
-				} else {
-					if ( array_key_exists( $field, $data ) && ( null === $data[ $field ] || '' === trim( $data[ $field ] ) ) ) {
+				} elseif ( array_key_exists( $field, $data ) && ( null === $data[ $field ] || '' === trim( $data[ $field ] ) ) ) {


Auto-correction by PHPCBF: bbcfe99

kei178 · 2024-10-03T04:12:03Z

includes/helpers/class-accredible-learndash-admin-form-helper.php

+		 * @param mixed $default_value default value.
 		 */
-		public static function html( $value, $default = 'N/A' ) {
+		public static function html( $value, $default_value = 'N/A' ) {
 			if ( empty( $value ) ) {
-				$value = $default;
+				$value = $default_value;


To fix the following PHPCS warning:

albertpaulp

My php foo is definitely rusted but changes look reasonable also CI & manual testing gives confidence, off to you go sailer 🚢

abhisheksarka

Love PHP 🫠

Bump Tested up to version to 6.6

7bc37e6

kei178 self-assigned this Oct 2, 2024

kei178 commented Oct 2, 2024

View reviewed changes

kei178 added the wip label Oct 2, 2024

kei178 force-pushed the feature/DGR-964/test-with-latest-wordpress-version branch 9 times, most recently from c046f8b to 97b2e94 Compare October 3, 2024 03:02

Fix phpcs setup issues

3fd33f2

kei178 force-pushed the feature/DGR-964/test-with-latest-wordpress-version branch 2 times, most recently from d40057e to b079544 Compare October 3, 2024 03:46

Fix WP initialization failure in CI

590fd9c

kei178 force-pushed the feature/DGR-964/test-with-latest-wordpress-version branch from b079544 to 590fd9c Compare October 3, 2024 03:48

kei178 added 3 commits October 3, 2024 10:54

Fix auto coding style correction by phpcbf

bbcfe99

Fix Universal.NamingConventions.NoReservedKeywordParameterNames.defau…

8b3a349

…ltFound warning

Fix Capabilities should be used instead of roles. Found administrator…

d0ad45b

… in function call phpcs errors

kei178 commented Oct 3, 2024

View reviewed changes

kei178 removed the wip label Oct 3, 2024

kei178 added the waiting-review label Oct 3, 2024

kei178 requested review from albertpaulp, abhisheksarka, Ndibui and DancingCode October 3, 2024 04:37

albertpaulp approved these changes Oct 3, 2024

View reviewed changes

kei178 added reviewed and removed waiting-review labels Oct 3, 2024

abhisheksarka approved these changes Oct 3, 2024

View reviewed changes

kei178 merged commit df4f21d into develop Oct 3, 2024
4 checks passed

kei178 deleted the feature/DGR-964/test-with-latest-wordpress-version branch October 3, 2024 10:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DGR-964: Bump Tested up to version to 6.6 #73

DGR-964: Bump Tested up to version to 6.6 #73

kei178 commented Oct 2, 2024 •

edited

Loading

kei178 Oct 2, 2024

kei178 Oct 3, 2024

kei178 Oct 3, 2024

kei178 Oct 3, 2024

kei178 Oct 3, 2024

kei178 Oct 3, 2024

kei178 Oct 3, 2024

kei178 Oct 3, 2024

kei178 Oct 3, 2024

albertpaulp left a comment

abhisheksarka left a comment

DGR-964: Bump Tested up to version to 6.6 #73

DGR-964: Bump Tested up to version to 6.6 #73

Conversation

kei178 commented Oct 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

albertpaulp left a comment

Choose a reason for hiding this comment

abhisheksarka left a comment

Choose a reason for hiding this comment

kei178 commented Oct 2, 2024 •

edited

Loading