From e0e57ac86d772dee7c123a001341bc8f367acfa5 Mon Sep 17 00:00:00 2001 From: Nilambar Sharma Date: Mon, 27 Jan 2025 11:05:00 +0545 Subject: [PATCH 1/2] Allow ISC license --- includes/Traits/License_Utils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Traits/License_Utils.php b/includes/Traits/License_Utils.php index 4a3db8d21..8ccbf3c14 100644 --- a/includes/Traits/License_Utils.php +++ b/includes/Traits/License_Utils.php @@ -82,7 +82,7 @@ protected function is_license_valid_identifier( $license ) { * @return bool true if the license is GPL compatible, otherwise false. */ protected function is_license_gpl_compatible( $license ) { - $match = preg_match( '/GPL|GNU|MIT|FreeBSD|New BSD|BSD-3-Clause|BSD 3 Clause|OpenLDAP|Expat|Apache|MPL20/im', $license ); + $match = preg_match( '/GPL|GNU|MIT|FreeBSD|New BSD|BSD-3-Clause|BSD 3 Clause|OpenLDAP|Expat|Apache|MPL20|ISC/im', $license ); return ( false === $match || 0 === $match ) ? false : true; } From f2e26a5f76186f703b28756ef7f697ee86097d77 Mon Sep 17 00:00:00 2001 From: Nilambar Sharma Date: Mon, 27 Jan 2025 11:06:49 +0545 Subject: [PATCH 2/2] Update test for the license --- tests/phpunit/tests/Traits/License_Utils_Tests.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/phpunit/tests/Traits/License_Utils_Tests.php b/tests/phpunit/tests/Traits/License_Utils_Tests.php index 1fb256639..3a01809d6 100644 --- a/tests/phpunit/tests/Traits/License_Utils_Tests.php +++ b/tests/phpunit/tests/Traits/License_Utils_Tests.php @@ -104,6 +104,7 @@ public function data_license_gpl_compatibility() { array( 'BSD 3 Clause', true ), array( 'OpenLDAP', true ), array( 'Expat', true ), + array( 'ISC', true ), array( 'EPL', false ), array( 'EUPL', false ),