Merge remote-tracking branch 'origin/develop' into Hammer-SVC-False-Positive-Build

glo71317 · glo71317 · commit ff147ecdd22b · 2024-06-25T16:23:29.000+05:30
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "ext-dom": "*",
-        "phpunit/phpunit": "~9.5.8",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "~3.6.0"
     },
     "autoload": {
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/Unit/ClassHierarchy/EntityTest.php b/dev/tests/Unit/ClassHierarchy/EntityTest.php
@@ -503,7 +503,7 @@ public function testIsEnum(string $type, bool $expected)
      *
      * @return array
      */
-    public function dataProviderIsClass()
+    public static function dataProviderIsClass()
     {
         return [
             'entity-is-class-returns-true'      => [
@@ -530,7 +530,7 @@ public function dataProviderIsClass()
      *
      * @return array
      */
-    public function dataProviderIsInterface()
+    public static function dataProviderIsInterface()
     {
         return [
             'entity-is-class-returns-false'     => [
@@ -557,7 +557,7 @@ public function dataProviderIsInterface()
      *
      * @return array
      */
-    public function dataProviderIsTrait()
+    public static function dataProviderIsTrait()
     {
         return [
             'entity-is-class-returns-false'     => [
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandApiClassesTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandApiClassesTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-class';
         return [
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandApiInterfacesTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandApiInterfacesTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-interface';
         return [
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandApiTraitsTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandApiTraitsTest.php
@@ -44,7 +44,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-trait';
 
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandDatabaseSchemasTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandDatabaseSchemasTest.php
@@ -48,7 +48,7 @@ public function testExecute(
     /**
      * @return array
      */
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/db_schema';
         return [
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandDiXmlTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandDiXmlTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/di_xml';
 
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandLayoutTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandLayoutTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/layout_xml';
         getcwd();
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandLessTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandLessTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/less';
 
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandMftfTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandMftfTest.php
@@ -80,7 +80,7 @@ protected function executeCommand($pathToSourceCodeBefore, $pathToSourceCodeAfte
         return $commandTester;
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/mftf';
         return [
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandNonApiClassesTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandNonApiClassesTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/non-api-class';
         return [
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandNonApiInterfacesTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandNonApiInterfacesTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/non-api-interface';
         return [
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandNonApiTraitsTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandNonApiTraitsTest.php
@@ -44,7 +44,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/non-api-trait';
 
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandSystemXmlTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandSystemXmlTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/system_xml';
 
diff --git a/dev/tests/Unit/Console/Command/CompareSourceCommandXsdSchemasTest.php b/dev/tests/Unit/Console/Command/CompareSourceCommandXsdSchemasTest.php
@@ -42,7 +42,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/xsd-schema';
 
diff --git a/dev/tests/Unit/Console/Command/HierarchyTest.php b/dev/tests/Unit/Console/Command/HierarchyTest.php
@@ -39,7 +39,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/HierarchyTest/_files';
         return [
diff --git a/dev/tests/Unit/Console/Command/HtmlTest.php b/dev/tests/Unit/Console/Command/HtmlTest.php
@@ -63,7 +63,7 @@ public function testExecute(
         );
     }
 
-    public function changesDataProvider()
+    public static function changesDataProvider()
     {
         $pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/all';
 
diff --git a/dev/tests/Unit/Filter/AllowedChangeFilter/ComposerVersionFilterTest.php b/dev/tests/Unit/Filter/AllowedChangeFilter/ComposerVersionFilterTest.php
@@ -51,7 +51,7 @@ public function testFilter($dataFolder, $filteredSection, $expectsRemaining)
      *
      * @return array
      */
-    public function filterDataProvider()
+    public static function filterDataProvider()
     {
         return [
             ['package_version_name_matches', 'version', false],
diff --git a/dev/tests/Unit/Filter/AllowedChangeFilter/PhpCommentFormattingFilterTest.php b/dev/tests/Unit/Filter/AllowedChangeFilter/PhpCommentFormattingFilterTest.php
@@ -50,7 +50,7 @@ public function testFilter($dataFolder, $expectsRemaining)
      *
      * @return array
      */
-    public function filterDataProvider()
+    public static function filterDataProvider()
     {
         return [
             ['condensed_comments_match', false],
diff --git a/dev/tests/Unit/Filter/AllowedChangeFilter/PhpIgnoredTagFilterTest.php b/dev/tests/Unit/Filter/AllowedChangeFilter/PhpIgnoredTagFilterTest.php
@@ -53,7 +53,7 @@ public function testFilter($dataFolder, $ignoredTags, $ignoredTagValues, $caseSe
      *
      * @return array
      */
-    public function filterDataProvider()
+    public static function filterDataProvider()
     {
         return [
             ['add_ignored_tag_only_comment', ['ignored'], [], true, false],
diff --git a/dev/tests/Unit/Filter/AllowedChangeFilter/PhpWhitespaceFilterTest.php b/dev/tests/Unit/Filter/AllowedChangeFilter/PhpWhitespaceFilterTest.php
@@ -50,7 +50,7 @@ public function testFilter($dataFolder, $expectsRemaining)
      *
      * @return array
      */
-    public function filterDataProvider()
+    public static function filterDataProvider()
     {
         return [
             ['filtered_changes_remain', true],
diff --git a/dev/tests/Unit/Reporter/HtmlTargetDecoratorTest.php b/dev/tests/Unit/Reporter/HtmlTargetDecoratorTest.php
@@ -23,7 +23,7 @@ public function testUrl(bool $hasOption, string $target, string $context, string
         $this->assertEquals($expected, $result);
     }
 
-    public function dataProviderTestUrl()
+    public static function dataProviderTestUrl()
     {
         return [
             'target-context-class' => [

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ public function testIsEnum(string $type, bool $expected)`
`503`	`503`	`*`
`504`	`504`	`* @return array`
`505`	`505`	`*/`
`506`		`- public function dataProviderIsClass()`
	`506`	`+ public static function dataProviderIsClass()`
`507`	`507`	`{`
`508`	`508`	`return [`
`509`	`509`	`'entity-is-class-returns-true' => [`
`@@ -530,7 +530,7 @@ public function dataProviderIsClass()`
`530`	`530`	`*`
`531`	`531`	`* @return array`
`532`	`532`	`*/`
`533`		`- public function dataProviderIsInterface()`
	`533`	`+ public static function dataProviderIsInterface()`
`534`	`534`	`{`
`535`	`535`	`return [`
`536`	`536`	`'entity-is-class-returns-false' => [`
`@@ -557,7 +557,7 @@ public function dataProviderIsInterface()`
`557`	`557`	`*`
`558`	`558`	`* @return array`
`559`	`559`	`*/`
`560`		`- public function dataProviderIsTrait()`
	`560`	`+ public static function dataProviderIsTrait()`
`561`	`561`	`{`
`562`	`562`	`return [`
`563`	`563`	`'entity-is-class-returns-false' => [`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testExecute(`
`42`	`42`	`);`
`43`	`43`	`}`
`44`	`44`
`45`		`- public function changesDataProvider()`
	`45`	`+ public static function changesDataProvider()`
`46`	`46`	`{`
`47`	`47`	`$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-class';`
`48`	`48`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function testExecute(`
`44`	`44`	`);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function changesDataProvider()`
	`47`	`+ public static function changesDataProvider()`
`48`	`48`	`{`
`49`	`49`	`$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/api-trait';`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function testExecute(`
`48`	`48`	`/**`
`49`	`49`	`* @return array`
`50`	`50`	`*/`
`51`		`- public function changesDataProvider()`
	`51`	`+ public static function changesDataProvider()`
`52`	`52`	`{`
`53`	`53`	`$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/db_schema';`
`54`	`54`	`return [`