Add all accepted ILIAS 12 composer dependency PRs into composer.json

components/ILIAS/Authentication/tests/LocalUserPasswordTest.php

@@ -142,7 +142,7 @@ public function testPasswordManagerEncodesRawPasswordWithSalt(): void
         $encoder = $this->getMockBuilder(ilBasePasswordEncoder::class)->disableOriginalConstructor()->getMock();
         $factory_mock = $this->getMockBuilder(LocalUserPasswordEncoderFactory::class)->disableOriginalConstructor()->getMock();
 
-        $user_mock->expects($this->once())->method('setPasswordSalt')->with($this->isType('string'));
+        $user_mock->expects($this->once())->method('setPasswordSalt')->with($this->isString());
         $user_mock->expects($this->once())->method('getPasswordSalt')->willReturn('asuperrandomsalt');
         $user_mock->expects($this->once())->method('setPasswordEncodingType')->with($this->equalTo('mockencoder'));
         $user_mock->expects($this->once())->method('setPasswd')->with(
@@ -155,7 +155,7 @@ public function testPasswordManagerEncodesRawPasswordWithSalt(): void
         $encoder->expects($this->once())->method('encodePassword')
             ->with(
                 $this->equalTo(self::PASSWORD),
-                $this->isType('string')
+                $this->isString()
             )->willReturn(self::ENCODED_PASSWORD)
         ;
 
@@ -225,7 +225,7 @@ public function testPasswordManagerVerifiesPassword(): void
         $encoder->expects($this->once())->method('isPasswordValid')->with(
             $this->equalTo(self::ENCODED_PASSWORD),
             $this->equalTo(self::PASSWORD),
-            $this->isType('string')
+            $this->isString()
         )->willReturn(true);
         $encoder->expects($this->once())->method('requiresReencoding')
             ->with($this->equalTo(self::ENCODED_PASSWORD))
@@ -264,7 +264,7 @@ public function testPasswordManagerMigratesPasswordOnVerificationWithVariantEnco
         $encoder->expects($this->once())->method('isPasswordValid')->with(
             $this->equalTo(self::ENCODED_PASSWORD),
             $this->equalTo(self::PASSWORD),
-            $this->isType('string')
+            $this->isString()
         )->willReturn(true);
         $encoder->expects($this->never())->method('requiresReencoding')
             ->with($this->equalTo(self::ENCODED_PASSWORD))
@@ -303,7 +303,7 @@ public function testPasswordManagerReencodesPasswordIfReencodingIsNecessary(): v
         $encoder->expects($this->once())->method('isPasswordValid')->with(
             $this->equalTo(self::ENCODED_PASSWORD),
             $this->equalTo(self::PASSWORD),
-            $this->isType('string')
+            $this->isString()
         )->willReturn(true);
         $encoder->expects($this->once())->method('requiresReencoding')
             ->with($this->equalTo(self::ENCODED_PASSWORD))
@@ -342,7 +342,7 @@ public function testPasswordManagerNeverMigratesPasswordOnFailedVerificationWith
             ->with(
                 $this->equalTo(self::ENCODED_PASSWORD),
                 $this->equalTo(self::PASSWORD),
-                $this->isType('string')
+                $this->isString()
             )->willReturn(false)
         ;
 

components/ILIAS/Authentication/tests/ilSessionTest.php

@@ -207,7 +207,7 @@ function ($arg) {
         );
 
         $cron_manager = $this->createMock(\ILIAS\Cron\Job\JobManager::class);
-        $cron_manager->method('isJobActive')->with($this->isType('string'))->willReturn(true);
+        $cron_manager->method('isJobActive')->with($this->isString())->willReturn(true);
         $this->setGlobalVariable(
             'cron.manager',
             $cron_manager

components/ILIAS/Badge/tests/BadgeParentTest.php

@@ -123,7 +123,6 @@ public function testShowWithoutParentReadRight(): void
         $legacy = $this->getMockBuilder(Legacy\Content::class)->disableOriginalConstructor()->getMock();
         $legacy_factory = $this->getMockBuilder(Legacy\Factory::class)->disableOriginalConstructor()->getMock();
         $listing = $this->getMockBuilder(Listing::class)->disableOriginalConstructor()->getMock();
-        $parent_link = $this->getMockBuilder(Content::class)->disableOriginalConstructor()->getMock();
         $renderer = $this->getMockBuilder(Renderer::class)->disableOriginalConstructor()->getMock();
         $ui = $this->getMockBuilder(UIServices::class)->disableOriginalConstructor()->getMock();
 

components/ILIAS/Component/src/Dependencies/Reader.php

@@ -360,8 +360,6 @@ public function dummy()
         return $mock_builder
             ->disableOriginalConstructor()
             ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
             ->getMock();
     }
 }

components/ILIAS/Data/tests/Description/DListTest.php

@@ -28,6 +28,7 @@
 use ILIAS\Data\Description\DValue;
 use ILIAS\Data\Description\DList;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class DListTest extends TestCase
 {
@@ -43,9 +44,7 @@ public function setUp(): void
         );
     }
 
-    /**
-     * @dataProvider obviousNoMatchProvider
-     */
+    #[DataProvider('obviousNoMatchProvider')]
     public function testObviouslyNotMatching($data): void
     {
         $res = $this->l->getPrimitiveRepresentation($data);
@@ -113,7 +112,7 @@ public function testRenumbersEntrys(): void
 
         $this->v
             ->method("getPrimitiveRepresentation")
-            ->will($this->returnCallback(fn($v) => $v));
+            ->willReturnCallback(fn($v) => $v);
 
         $res = $this->l->getPrimitiveRepresentation($data);
 

components/ILIAS/Data/tests/Description/DMapTest.php

@@ -28,6 +28,7 @@
 use ILIAS\Data\Description\DValue;
 use ILIAS\Data\Description\DMap;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class DMapTest extends TestCase
 {
@@ -46,9 +47,7 @@ public function setUp(): void
         );
     }
 
-    /**
-     * @dataProvider obviousNoMatchProvider
-     */
+    #[DataProvider('obviousNoMatchProvider')]
     public function testObviouslyNotMatching($data): void
     {
         $res = $this->m->getPrimitiveRepresentation($data);

components/ILIAS/Data/tests/Description/DObjectTest.php

@@ -30,12 +30,11 @@
 use ILIAS\Data\Description\DObject;
 use ILIAS\Data\Description\Field;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class DObjectTest extends TestCase
 {
-    /**
-     * @dataProvider simpleObjectsProvider
-     */
+    #[DataProvider('simpleObjectsProvider')]
     public function testSimpleObject(string $field, $object, $expected): void
     {
         $md = $this->createMock(\ILIAS\Data\Text\SimpleDocumentMarkdown::class);
@@ -103,9 +102,7 @@ public function getSomeValue(): int
         ];
     }
 
-    /**
-     * @dataProvider fieldNamesProvider
-     */
+    #[DataProvider('fieldNamesProvider')]
     public function testAllowedFieldNames(string $name, bool $is_allowed): void
     {
         if (!$is_allowed) {
@@ -128,9 +125,7 @@ public static function fieldNamesProvider(): array
         ];
     }
 
-    /**
-     * @dataProvider obviousNoMatchProvider
-     */
+    #[DataProvider('obviousNoMatchProvider')]
     public function testObviouslyNotMatching($data): void
     {
         $desc = new DObject(

components/ILIAS/Data/tests/Description/DValueTest.php

@@ -27,12 +27,11 @@
 use ILIAS\Data\Description\DValue;
 use ILIAS\Data\Description\ValueType;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class DDValueTest extends TestCase
 {
-    /**
-     * @dataProvider casesProvider
-     */
+    #[DataProvider('casesProvider')]
     public function testIntRepresentation(ValueType $type, $value, $is_match): void
     {
         $desc = new DValue(

components/ILIAS/EventHandling/tests/EventTest.php

@@ -45,14 +45,12 @@ protected function setUp(): void
 
         $db_mock = $this->createMock(ilDBInterface::class);
         $db_mock->method("fetchAssoc")
-            ->will(
-                $this->onConsecutiveCalls(
-                    [
-                     "component" => "components/ILIAS/EventHandling",
-                     "id" => "MyTestComponent"
-                 ],
-                    null
-                )
+            ->willReturnOnConsecutiveCalls(
+                [
+                    "component" => "components/ILIAS/EventHandling",
+                    "id" => "MyTestComponent"
+                ],
+                null
             );
 
 

components/ILIAS/Forum/tests/ilForumTopicTest.php

@@ -21,7 +21,7 @@
 use ILIAS\DI\Container;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
+use PHPUnit\Framework\MockObject\InvocationMocker;
 
 class ilForumTopicTest extends TestCase
 {

components/ILIAS/GlobalScreen/tests/ilServicesGlobalScreenTest.php

@@ -117,7 +117,7 @@ public function testRepoAccessTrueNotLoggedInPublicSection(): void
 
         $access_mock->expects($this->once())
                     ->method('checkAccessOfUser')
-                    ->with($this->isType('integer'), 'read', '', $this->ROOT_FOLDER_ID)
+                    ->with($this->isInt(), 'read', '', $this->ROOT_FOLDER_ID)
                     ->willReturn(true);
 
         $this->assertTrue($class->isRepositoryReadable()());

components/ILIAS/LearningSequence/tests/IliasMocks.php

@@ -36,7 +36,7 @@ protected function mockUIFactory(): UIFactory
     {
         $ui_reflection = new ReflectionClass(UIFactory::class);
         $methods = array_map(
-            fn ($m) => $m->getName(),
+            fn($m) => $m->getName(),
             $ui_reflection->getMethods()
         );
 
@@ -50,11 +50,9 @@ protected function mockUIFactory(): UIFactory
         $ui_factory->method('viewControl')
             ->willReturn(new CImpl\ViewControl\Factory($signal_generator));
         $ui_factory->method('breadcrumbs')
-            ->will(
-                $this->returnCallback(function ($crumbs) {
-                    return new CImpl\Breadcrumbs\Breadcrumbs($crumbs);
-                })
-            );
+            ->willReturnCallback(function ($crumbs) {
+                return new CImpl\Breadcrumbs\Breadcrumbs($crumbs);
+            });
         $ui_factory->method('link')
             ->willReturn(new CImpl\Link\Factory());
         $ui_factory->method('symbol')

components/ILIAS/LegalDocuments/tests/WiringTest.php

@@ -204,7 +204,7 @@ public function testHasPublicPage(): void
 
         $instance = new Wiring(
             $this->mockTree(SlotConstructor::class, ['id' => 'foo']),
-            $this->mockMethod(Map::class, 'set', ['public-page', 'foo', $public_page], $map)
+            $this->mockMethod(Map::class, 'set', ['public-page', 'foo'], $map)
         );
 
         $this->assertSame($map, $instance->hasPublicPage($public_page)->map());
@@ -218,7 +218,7 @@ public function testHasPublicPageWithGotoLink(): void
 
         $instance = new Wiring(
             $this->mockTree(SlotConstructor::class, ['id' => 'foo']),
-            $this->mockMethod(Map::class, 'set', ['public-page', 'foo', $public_page], $map)
+            $this->mockMethod(Map::class, 'set', ['public-page', 'foo'], $map)
         );
 
         $this->assertSame($m, $instance->hasPublicPage($public_page, 'foo')->map());

components/ILIAS/Mail/tests/RecipientTest.php

@@ -82,7 +82,7 @@ public function testCheckProperties(): void
         $this->assertFalse($recipient->onlyToExternalMailAddress());
         $this->assertIsArray($recipient->getExternalMailAddress());
         $this->assertCount(2, $recipient->getExternalMailAddress());
-        $this->assertContainsOnly('string', $recipient->getExternalMailAddress());
+        array_map($this->assertIsString(...), $recipient->getExternalMailAddress());
     }
 
     public function testPropertiesPart2(): void
@@ -125,6 +125,6 @@ public function testPropertiesPart2(): void
         $this->assertFalse($recipient->onlyToExternalMailAddress());
         $this->assertIsArray($recipient->getExternalMailAddress());
         $this->assertCount(2, $recipient->getExternalMailAddress());
-        $this->assertContainsOnly('string', $recipient->getExternalMailAddress());
+        array_map($this->assertIsString(...), $recipient->getExternalMailAddress());
     }
 }

components/ILIAS/OnScreenChat/tests/SubscriberRepositoryTest.php

@@ -37,8 +37,8 @@ public function testSubscribersCanBeRetrieved(): void
                     $this->assertStringContainsString(array_shift($consecutive), $value);
                     return true;
                 }),
-                $this->isType('array'),
-                $this->isType('array')
+                $this->isArray(),
+                $this->isArray()
             )
             ->willReturn($resultMock);
 

components/ILIAS/Refinery/tests/String/Encoding/EncodingTest.php

@@ -43,7 +43,7 @@ public static function latin1StringProvider(): array
             for ($j = 0; $j < $length; $j++) {
                 $string .= chr(random_int(0, 255));
             }
-            $strings[] = [$string, @utf8_encode($string)]; //  we must suppress the deprecation warning here
+            $strings[] = [$string, mb_convert_encoding($string, 'UTF-8', 'ISO-8859-1')];
         }
         return $strings;
     }

components/ILIAS/ResourceStorage/tests/Flavours/FlavourMachineTest.php

@@ -105,7 +105,7 @@ public static function definitionsToMachines(): \Iterator
 
 
     #[DataProvider('definitionsToMachines')]
-    public function testDefaultMachines(FlavourDefinition $d, string $machine): void
+    public function testDefaultMachines(FlavourDefinition $d, string $machine, string $engine): void
     {
         $factory = new Factory($this->engine_factory_mock);
         $this->engine_factory_mock->expects($this->once())

components/ILIAS/Setup/Setup.php

@@ -106,14 +106,9 @@ public function init(
             );
 
         $internal["config_reader"] = static fn() =>
-            new \ILIAS\Setup\CLI\ConfigReader(
-                $internal["json.parser"]
-            );
+            new \ILIAS\Setup\CLI\ConfigReader();
 
         $internal["interface_finder"] = static fn() =>
             new \ILIAS\Setup\ImplementationOfInterfaceFinder();
-
-        $internal["json.parser"] = static fn() =>
-            new \Seld\JsonLint\JsonParser();
     }
 }

components/ILIAS/Setup/src/CLI/ConfigReader.php

@@ -27,19 +27,16 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Seld\JsonLint\JsonParser;
 
 /**
  * Read a json-formatted config from a file and overwrite some fields.
  */
 class ConfigReader
 {
-    protected JsonParser $json_parser;
     protected string $base_dir;
 
-    public function __construct(JsonParser $json_parser, ?string $base_dir = null)
+    public function __construct(?string $base_dir = null)
     {
-        $this->json_parser = $json_parser;
         $this->base_dir = $base_dir ?? getcwd();
     }
 
@@ -60,9 +57,11 @@ public function readConfigFile(string $name, array $overwrites = []): array
                 "Config-file '$name' does not exist or is not readable."
             );
         }
-        $json = $this->json_parser->parse(
+        $json = json_decode(
             file_get_contents($name),
-            JsonParser::PARSE_TO_ASSOC | JsonParser::DETECT_KEY_CONFLICTS
+            true,
+            512,
+            JSON_THROW_ON_ERROR
         );
 
         if (!is_array($json)) {

components/ILIAS/Setup/tests/AgentCollectionTest.php

@@ -473,10 +473,10 @@ public function testGetNamedObjectivePassesCorrectConfig()
         $seen_config = null;
         $agent
             ->method("getNamedObjectives")
-            ->will($this->returnCallback(function ($config) use (&$seen_config) {
+            ->willReturnCallback(function ($config) use (&$seen_config) {
                 $seen_config = $config;
                 return [];
-            }));
+            });
 
         $collection = new Setup\AgentCollection(
             $refinery,

components/ILIAS/Setup/tests/CLI/AchieveCommandTest.php

@@ -223,7 +223,7 @@ public function testAchieveObjective(): void
         $agent
             ->expects($this->once())
             ->method("getNamedObjectives")
-            ->will($this->returnCallback(function ($config) use (&$seen_config, $objective) {
+            ->willReturnCallback(function ($config) use (&$seen_config, $objective) {
                 $seen_config = $config;
                 return [
                     "my.objective" => new Setup\ObjectiveConstructor(
@@ -233,7 +233,7 @@ static function () use ($objective): Setup\Objective {
                         }
                     )
                 ];
-            }));
+            });
 
         $objective
             ->expects($this->once())

components/ILIAS/Setup/tests/CLI/BuildCommandTest.php

@@ -52,9 +52,9 @@ public function testBasicFunctionality(): void
         $objective
             ->expects($this->once())
             ->method("achieve")
-            ->will($this->returnCallback(function (Setup\Environment $e) {
+            ->willReturnCallback(function (Setup\Environment $e) {
                 return $e;
-            }));
+            });
 
         $objective
             ->expects($this->once())