Merge branch 'trunk' into dependabot/composer/slevomat/coding-standard-8.19.1

davidperezgar · web-flow · commit 95d1ab715f86 · 2025-06-18T17:37:01.000+02:00
diff --git a/includes/Traits/License_Utils.php b/includes/Traits/License_Utils.php
@@ -83,7 +83,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|Apache2|MPL20|ISC/im', $license );
+		$match = preg_match( '/GPL|GNU|MIT|FreeBSD|New BSD|BSD-3-Clause|BSD 3 Clause|OpenLDAP|Expat|Apache2|MPL20|ISC|CC0/im', $license );
 
 		return ( false === $match || 0 === $match ) ? false : true;
 	}
diff --git a/tests/phpunit/tests/Traits/License_Utils_Tests.php b/tests/phpunit/tests/Traits/License_Utils_Tests.php
@@ -112,6 +112,9 @@ public function data_license_gpl_compatibility() {
 			array( 'OpenLDAP', true ),
 			array( 'Expat', true ),
 			array( 'ISC', true ),
+			array( 'CC0', true ),
+			array( 'CC0-1.0', true ),
+			array( 'CC0 1.0 Universal', true ),
 
 			array( 'EPL', false ),
 			array( 'EUPL', false ),

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ protected function is_license_valid_identifier( $license ) {`
`83`	`83`	`* @return bool true if the license is GPL compatible, otherwise false.`
`84`	`84`	`*/`
`85`	`85`	`protected function is_license_gpl_compatible( $license ) {`
`86`		`- $match = preg_match( '/GPL\|GNU\|MIT\|FreeBSD\|New BSD\|BSD-3-Clause\|BSD 3 Clause\|OpenLDAP\|Expat\|Apache2\|MPL20\|ISC/im', $license );`
	`86`	`+ $match = preg_match( '/GPL\|GNU\|MIT\|FreeBSD\|New BSD\|BSD-3-Clause\|BSD 3 Clause\|OpenLDAP\|Expat\|Apache2\|MPL20\|ISC\|CC0/im', $license );`
`87`	`87`
`88`	`88`	`return ( false === $match \|\| 0 === $match ) ? false : true;`
`89`	`89`	`}`