Merge pull request #367 from lloc/version-2-9-2

Upgrade of PHPUnit to version 10

Author: lloc

composer.json

@@ -10,7 +10,7 @@
     "ext-json": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.6",
+    "phpunit/phpunit": "^10",
     "brain/monkey": "^2.6",
     "phpstan/phpstan": "^1.11",
     "szepeviktor/phpstan-wordpress": "^1.3",

phpunit.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">./includes/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <php>
     <const name="MSLS_PLUGIN_PATH" value="multisite-language-switcher/MultisiteLanguageSwitcher.php"/>
     <const name="MSLS_PLUGIN__FILE__" value="/var/www/html/wp-content/plugins/multisite-language-switcher/MultisiteLanguageSwitcher.php"/>
@@ -13,4 +8,9 @@
   <testsuite name="Internal tests">
     <directory prefix="Test" suffix=".php">./tests/phpunit</directory>
   </testsuite>
+  <source>
+    <include>
+      <directory suffix=".php">./includes/</directory>
+    </include>
+  </source>
 </phpunit>

tests/phpunit/ContentImport/TestAttachmentPathFinder.php

@@ -14,7 +14,7 @@ public function setUp(): void {
 		$this->test = new AttachmentPathFinder();
 	}
 
-	public function dataprovider_filter_srcset() {
+	public static function dataprovider_filter_srcset(): array {
 		$image_src     = 'http://example.com/image.jpg';
 		$msls_imported = array(
 			'blog' => 1,

tests/phpunit/ContentImport/TestImportCoordinates.php

@@ -23,7 +23,7 @@ public function setUp(): void {
 		$this->test->dest_lang      = 'it_IT';
 	}
 
-	public function provider_validate(): array {
+	public static function provider_validate(): array {
 		$post = \Mockery::mock( \WP_Post::class );
 		return array(
 			array( null, null, null, null, null, false ),

tests/phpunit/ContentImport/TestImportLogger.php

@@ -16,7 +16,7 @@ public function setUp(): void {
 		$this->test = new ImportLogger( $coordinates );
 	}
 
-	public function provider_get_data(): array {
+	public static function provider_get_data(): array {
 		return array(
 			array( 'info' ),
 			array( 'error' ),

tests/phpunit/TestMslsAdminIcon.php

@@ -177,7 +177,7 @@ public function test_set_icon_type(): void {
 		$this->assertInstanceOf( MslsAdminIcon::class, $obj->set_icon_type( 'flag' ) );
 	}
 
-	public function icon_type_provider(): array {
+	public static function icon_type_provider(): array {
 		return array(
 			array( 'flag', 'de_DE', '<span class="flag-icon flag-icon-de">de_DE</span>' ),
 			array( 'label', 'it_IT', '<span class="language-badge it_IT"><span>it</span><span>IT</span></span>' ),

tests/phpunit/TestMslsBlog.php

@@ -99,7 +99,7 @@ public function test_get_title(): void {
 	 *
 	 * @return array[]
 	 */
-	public function compareProvider() {
+	public static function compareProvider(): array {
 		return array(
 			array( 0, 0, 0 ),
 			array( 0, 1, - 1 ),

tests/phpunit/TestMslsContentFilter.php

@@ -13,7 +13,7 @@
 
 class TestMslsContentFilter extends MslsUnitTestCase {
 
-	protected function provide_content_filter_data(): array {
+	public static function provide_content_filter_data(): array {
 		return array(
 			array( 'Test', 'Test', true, false, false ),
 			array( 'Test', 'Test', false, false, false ),

tests/phpunit/TestMslsMetaBox.php

@@ -94,7 +94,7 @@ public function test_render_options() {
 		$this->assertEquals( '<option value="42" selected="selected">A random title</option>', $this->test->render_options( 'post', 42 ) );
 	}
 
-	public function add_data_provider() {
+	public static function add_data_provider(): array {
 		return array(
 			array( array( 'post', 'page' ), 8, 8, true, true ),
 			array( array( 'book' ), 3, 6, false, false ),
@@ -169,7 +169,7 @@ public function test_render_select_hierarchical() {
 		$this->test->render_select();
 	}
 
-	protected function render_input_provider() {
+	public static function render_input_provider(): array {
 		return array(
 			array( array( 'de_DE' => 42 ), 1, 0, 0, 1, '<ul><li class=""><label for="msls_title_ msls-icon-wrapper flag"><a title="Edit the translation in the de_DE-blog" href="edit-post-link"><span class="flag-icon flag-icon-de">de_DE</span></a>&nbsp;</label><input type="hidden" id="msls_id_" name="msls_input_de_DE" value="42"/><input class="msls_title" id="msls_title_" name="msls_title_" type="text" value="Test"/></li></ul><input type="hidden" name="msls_post_type" id="msls_post_type" value="page"/><input type="hidden" name="msls_action" id="msls_action" value="suggest_posts"/>' ),
 			array( array( 'en_US' => 17 ), 0, 1, 1, 0, '<ul><li class=""><label for="msls_title_ msls-icon-wrapper flag"><a title="Create a new translation in the de_DE-blog" href="admin-url-empty"><span class="flag-icon flag-icon-de">de_DE</span></a>&nbsp;</label><input type="hidden" id="msls_id_" name="msls_input_de_DE" value=""/><input class="msls_title" id="msls_title_" name="msls_title_" type="text" value=""/></li></ul><input type="hidden" name="msls_post_type" id="msls_post_type" value="page"/><input type="hidden" name="msls_action" id="msls_action" value="suggest_posts"/>' ),

tests/phpunit/TestMslsOptions.php

@@ -163,7 +163,7 @@ public function test_get_icon_type_admin_display(): void {
 		$this->assertEquals( MslsAdminIcon::TYPE_LABEL, $obj->get_icon_type() );
 	}
 
-	public function provide_data_for_slug_check(): array {
+	public static function provide_data_for_slug_check(): array {
 		return array(
 			array( '', '', false, false, false, '', false ), // first return
 			array( null, '', false, false, false, '', false ), // first return