diff --git a/components/ILIAS/AdministrativeNotification/classes/Setup/class.ilADNAgent.php b/components/ILIAS/AdministrativeNotification/classes/Setup/class.ilADNAgent.php index c93017e6ba13..8af5a614437c 100755 --- a/components/ILIAS/AdministrativeNotification/classes/Setup/class.ilADNAgent.php +++ b/components/ILIAS/AdministrativeNotification/classes/Setup/class.ilADNAgent.php @@ -68,7 +68,7 @@ public function getUpdateObjective(Config $config = null): Setup\Objective } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Authentication/classes/Setup/class.ilAuthenticationSetupAgent.php b/components/ILIAS/Authentication/classes/Setup/class.ilAuthenticationSetupAgent.php index ca511fcef31e..ecc18b8429c2 100755 --- a/components/ILIAS/Authentication/classes/Setup/class.ilAuthenticationSetupAgent.php +++ b/components/ILIAS/Authentication/classes/Setup/class.ilAuthenticationSetupAgent.php @@ -47,7 +47,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupAgent.php b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupAgent.php index ba9299b35451..2953229e2615 100755 --- a/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupAgent.php +++ b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupAgent.php @@ -76,7 +76,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Bibliographic/classes/Setup/class.ilBibliographicSetupAgent.php b/components/ILIAS/Bibliographic/classes/Setup/class.ilBibliographicSetupAgent.php index cfd73f3af3c1..1ece01e6ef64 100755 --- a/components/ILIAS/Bibliographic/classes/Setup/class.ilBibliographicSetupAgent.php +++ b/components/ILIAS/Bibliographic/classes/Setup/class.ilBibliographicSetupAgent.php @@ -74,7 +74,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Certificate/classes/Setup/class.ilCertificatSetupAgent.php b/components/ILIAS/Certificate/classes/Setup/class.ilCertificatSetupAgent.php index 7b5047880610..81fc251d0d68 100755 --- a/components/ILIAS/Certificate/classes/Setup/class.ilCertificatSetupAgent.php +++ b/components/ILIAS/Certificate/classes/Setup/class.ilCertificatSetupAgent.php @@ -47,7 +47,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Chatroom/classes/Setup/class.ilChatroomSetupAgent.php b/components/ILIAS/Chatroom/classes/Setup/class.ilChatroomSetupAgent.php index 0bdb64239aa0..cfb9d6f9f65c 100755 --- a/components/ILIAS/Chatroom/classes/Setup/class.ilChatroomSetupAgent.php +++ b/components/ILIAS/Chatroom/classes/Setup/class.ilChatroomSetupAgent.php @@ -233,7 +233,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective return new ObjectiveCollection('Update chatroom database and server config', false, ...$objectives); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/CmiXapi/classes/Setup/class.ilCmiXapiSetupAgent.php b/components/ILIAS/CmiXapi/classes/Setup/class.ilCmiXapiSetupAgent.php index bc0ff2a8b9de..a755039ce618 100755 --- a/components/ILIAS/CmiXapi/classes/Setup/class.ilCmiXapiSetupAgent.php +++ b/components/ILIAS/CmiXapi/classes/Setup/class.ilCmiXapiSetupAgent.php @@ -48,7 +48,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Component/classes/Setup/class.ilComponentsSetupAgent.php b/components/ILIAS/Component/classes/Setup/class.ilComponentsSetupAgent.php index f18d919ecab0..6d91aa36877c 100755 --- a/components/ILIAS/Component/classes/Setup/class.ilComponentsSetupAgent.php +++ b/components/ILIAS/Component/classes/Setup/class.ilComponentsSetupAgent.php @@ -68,7 +68,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\ObjectiveCollection( "Artifacts for Services/Component", diff --git a/components/ILIAS/Component/classes/Setup/class.ilPluginDefaultAgent.php b/components/ILIAS/Component/classes/Setup/class.ilPluginDefaultAgent.php index cf1d36760b75..cf3413a0f373 100755 --- a/components/ILIAS/Component/classes/Setup/class.ilPluginDefaultAgent.php +++ b/components/ILIAS/Component/classes/Setup/class.ilPluginDefaultAgent.php @@ -79,7 +79,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/ContentPage/classes/Setup/class.ilContentPageSetupAgent.php b/components/ILIAS/ContentPage/classes/Setup/class.ilContentPageSetupAgent.php index b0db11058532..8fbf9c64526e 100755 --- a/components/ILIAS/ContentPage/classes/Setup/class.ilContentPageSetupAgent.php +++ b/components/ILIAS/ContentPage/classes/Setup/class.ilContentPageSetupAgent.php @@ -49,7 +49,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective return new ilDatabaseUpdateStepsExecutedObjective(new ilContentPageUpdateSteps()); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Course/classes/Objectives/Setup/ilCourseObjectiveSetupAgent.php b/components/ILIAS/Course/classes/Objectives/Setup/ilCourseObjectiveSetupAgent.php index 037bce54366a..9ddaba2d2c9c 100644 --- a/components/ILIAS/Course/classes/Objectives/Setup/ilCourseObjectiveSetupAgent.php +++ b/components/ILIAS/Course/classes/Objectives/Setup/ilCourseObjectiveSetupAgent.php @@ -49,7 +49,7 @@ public function getInstallObjective(Config $config = null): Objective return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/DataProtection/classes/Setup/Agent.php b/components/ILIAS/DataProtection/classes/Setup/Agent.php index 6c1ee40b09de..1f345840ede3 100755 --- a/components/ILIAS/DataProtection/classes/Setup/Agent.php +++ b/components/ILIAS/DataProtection/classes/Setup/Agent.php @@ -55,7 +55,7 @@ public function getUpdateObjective(Config $config = null): Objective return new ilTreeAdminNodeAddedObjective('dpro', 'DataProtection'); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new NullObjective(); } diff --git a/components/ILIAS/Database/classes/Setup/class.ilDatabaseSetupAgent.php b/components/ILIAS/Database/classes/Setup/class.ilDatabaseSetupAgent.php index 81f24d86fa45..b5c57c34ef50 100755 --- a/components/ILIAS/Database/classes/Setup/class.ilDatabaseSetupAgent.php +++ b/components/ILIAS/Database/classes/Setup/class.ilDatabaseSetupAgent.php @@ -99,7 +99,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdocs */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/EmployeeTalk/classes/Setup/class.ilEmployeeTalkSetupAgent.php b/components/ILIAS/EmployeeTalk/classes/Setup/class.ilEmployeeTalkSetupAgent.php index 4cd2909c3ec8..d0c351e23bd2 100755 --- a/components/ILIAS/EmployeeTalk/classes/Setup/class.ilEmployeeTalkSetupAgent.php +++ b/components/ILIAS/EmployeeTalk/classes/Setup/class.ilEmployeeTalkSetupAgent.php @@ -51,7 +51,7 @@ public function getInstallObjective(Config $config = null): Objective return new \ilTreeAdminNodeAddedObjective('tala', '__TalkTemplateAdministration'); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new Objective\NullObjective(); } diff --git a/components/ILIAS/EventHandling/classes/Setup/class.ilEventHandlingSetupAgent.php b/components/ILIAS/EventHandling/classes/Setup/class.ilEventHandlingSetupAgent.php index 8484ea794eb5..c3d2f9833e05 100755 --- a/components/ILIAS/EventHandling/classes/Setup/class.ilEventHandlingSetupAgent.php +++ b/components/ILIAS/EventHandling/classes/Setup/class.ilEventHandlingSetupAgent.php @@ -65,7 +65,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritDoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\ObjectiveCollection( "Artifacts for Services/EventHandling", diff --git a/components/ILIAS/File/classes/Setup/class.ilFileObjectAgent.php b/components/ILIAS/File/classes/Setup/class.ilFileObjectAgent.php index f8bb2ce57b3a..0c1870f28607 100755 --- a/components/ILIAS/File/classes/Setup/class.ilFileObjectAgent.php +++ b/components/ILIAS/File/classes/Setup/class.ilFileObjectAgent.php @@ -69,7 +69,7 @@ public function getUpdateObjective(Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/FileDelivery/src/Setup/Agent.php b/components/ILIAS/FileDelivery/src/Setup/Agent.php index a204cb2a41d4..1b1cccaf89d5 100755 --- a/components/ILIAS/FileDelivery/src/Setup/Agent.php +++ b/components/ILIAS/FileDelivery/src/Setup/Agent.php @@ -31,7 +31,7 @@ */ class Agent implements Setup\Agent { - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new Setup\ObjectiveCollection( 'File StreamDelivery Artifacts', diff --git a/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemSetupAgent.php b/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemSetupAgent.php index b0e337ea379b..cc3db228b838 100755 --- a/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemSetupAgent.php +++ b/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemSetupAgent.php @@ -46,7 +46,7 @@ public function hasConfig(): bool */ public function getArrayToConfigTransformation(): Refinery\Transformation { - return $this->refinery->custom()->transformation(fn ($data): \ilFileSystemSetupConfig => new \ilFileSystemSetupConfig( + return $this->refinery->custom()->transformation(fn($data): \ilFileSystemSetupConfig => new \ilFileSystemSetupConfig( $data["data_dir"] )); } @@ -75,7 +75,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Forum/classes/Setup/class.ilForumSetupAgent.php b/components/ILIAS/Forum/classes/Setup/class.ilForumSetupAgent.php index 5d171b99fbb9..ed4de13296e3 100755 --- a/components/ILIAS/Forum/classes/Setup/class.ilForumSetupAgent.php +++ b/components/ILIAS/Forum/classes/Setup/class.ilForumSetupAgent.php @@ -57,7 +57,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/GlobalCache/tests/Setup/ilGlobalCacheSetupAgentTest.php b/components/ILIAS/GlobalCache/tests/Setup/ilGlobalCacheSetupAgentTest.php index 0934fa832084..c5315e2556c5 100755 --- a/components/ILIAS/GlobalCache/tests/Setup/ilGlobalCacheSetupAgentTest.php +++ b/components/ILIAS/GlobalCache/tests/Setup/ilGlobalCacheSetupAgentTest.php @@ -268,7 +268,7 @@ public function testGetUpdateObjectiveWithoutConfig(): void public function testGetBuildArtifactObjective(): void { - $objective_collection = $this->obj->getBuildArtifactObjective(); + $objective_collection = $this->obj->getBuildObjective(); $this->assertInstanceOf(NullObjective::class, $objective_collection); } diff --git a/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheSetupAgent.php b/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheSetupAgent.php index b585043bebbe..0566bed1161e 100755 --- a/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheSetupAgent.php +++ b/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheSetupAgent.php @@ -132,7 +132,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/GlobalScreen/README.md b/components/ILIAS/GlobalScreen/README.md index 355f735f8187..7b5beaf9603d 100755 --- a/components/ILIAS/GlobalScreen/README.md +++ b/components/ILIAS/GlobalScreen/README.md @@ -86,7 +86,7 @@ All vendors for all scopes are collected when you perform a `composer install` o Furthermore, the collection of providers in the system can also be done by ILIAS-CLI: ``` -php ./cli/setup.php build-artifacts +php ./cli/setup.php build ``` How a specific provider must look like is described in the respective README.md files of the scopes. diff --git a/components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenSetupAgent.php b/components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenSetupAgent.php index ba9595b7dd4c..bc68a8a82181 100755 --- a/components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenSetupAgent.php +++ b/components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenSetupAgent.php @@ -65,7 +65,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdocs */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new ilGlobalScreenBuildProviderMapObjective(); } diff --git a/components/ILIAS/Glossary/classes/Setup/class.ilGlossarySetupAgent.php b/components/ILIAS/Glossary/classes/Setup/class.ilGlossarySetupAgent.php index d13605400227..7b30c6cb35ce 100755 --- a/components/ILIAS/Glossary/classes/Setup/class.ilGlossarySetupAgent.php +++ b/components/ILIAS/Glossary/classes/Setup/class.ilGlossarySetupAgent.php @@ -49,7 +49,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective return new ilDatabaseUpdateStepsExecutedObjective(new ilGlossaryDBUpdateSteps()); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Http_/classes/Setup/class.ilHttpSetupAgent.php b/components/ILIAS/Http_/classes/Setup/class.ilHttpSetupAgent.php index 9705e5e42eab..21f8fe23c744 100755 --- a/components/ILIAS/Http_/classes/Setup/class.ilHttpSetupAgent.php +++ b/components/ILIAS/Http_/classes/Setup/class.ilHttpSetupAgent.php @@ -98,7 +98,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/ILIASObject/classes/Setup/class.ilObjectSetupAgent.php b/components/ILIAS/ILIASObject/classes/Setup/class.ilObjectSetupAgent.php index ced10fcd5e3a..b5826e7e6177 100755 --- a/components/ILIAS/ILIASObject/classes/Setup/class.ilObjectSetupAgent.php +++ b/components/ILIAS/ILIASObject/classes/Setup/class.ilObjectSetupAgent.php @@ -64,7 +64,7 @@ public function getMigrations(): array ]; } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new ilObjectTypeSpecificPropertiesArtifactObjective(); } diff --git a/components/ILIAS/Imprint/classes/Setup/ImprintUpdateAgent.php b/components/ILIAS/Imprint/classes/Setup/ImprintUpdateAgent.php index c2dc791f3d43..29d27a6a2379 100755 --- a/components/ILIAS/Imprint/classes/Setup/ImprintUpdateAgent.php +++ b/components/ILIAS/Imprint/classes/Setup/ImprintUpdateAgent.php @@ -52,7 +52,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective )); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentMigrationAgent.php b/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentMigrationAgent.php index 933053583653..8687dffbf59b 100644 --- a/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentMigrationAgent.php +++ b/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentMigrationAgent.php @@ -51,7 +51,7 @@ public function getUpdateObjective(\ILIAS\Setup\Config $config = null): Setup\Ob return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentSetupAgent.php b/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentSetupAgent.php index 42d626ef729d..8b36c6894ddf 100755 --- a/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentSetupAgent.php +++ b/components/ILIAS/IndividualAssessment/classes/Setup/class.ilIndividualAssessmentSetupAgent.php @@ -62,7 +62,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/LTI/classes/Setup/class.ilLTISetupAgent.php b/components/ILIAS/LTI/classes/Setup/class.ilLTISetupAgent.php index 6ccb750a2c14..fe0eeb39bc06 100755 --- a/components/ILIAS/LTI/classes/Setup/class.ilLTISetupAgent.php +++ b/components/ILIAS/LTI/classes/Setup/class.ilLTISetupAgent.php @@ -48,7 +48,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/LTIConsumer/classes/Setup/class.ilLTIConsumerSetupAgent.php b/components/ILIAS/LTIConsumer/classes/Setup/class.ilLTIConsumerSetupAgent.php index 1d0f7b062124..562fddf7f109 100755 --- a/components/ILIAS/LTIConsumer/classes/Setup/class.ilLTIConsumerSetupAgent.php +++ b/components/ILIAS/LTIConsumer/classes/Setup/class.ilLTIConsumerSetupAgent.php @@ -48,7 +48,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Language/classes/Setup/class.ilLanguageSetupAgent.php b/components/ILIAS/Language/classes/Setup/class.ilLanguageSetupAgent.php index b7b13b82f0e4..bdf4a1a00589 100755 --- a/components/ILIAS/Language/classes/Setup/class.ilLanguageSetupAgent.php +++ b/components/ILIAS/Language/classes/Setup/class.ilLanguageSetupAgent.php @@ -82,7 +82,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Language/tests/ilLanguageSetupAgentTest.php b/components/ILIAS/Language/tests/ilLanguageSetupAgentTest.php index b7655d0d0208..391c870b1fe0 100755 --- a/components/ILIAS/Language/tests/ilLanguageSetupAgentTest.php +++ b/components/ILIAS/Language/tests/ilLanguageSetupAgentTest.php @@ -37,7 +37,7 @@ protected function setUp(): void $refinery = new Refinery($this->createMock(DataFactory::class), $this->createMock(\ilLanguage::class)); $setup_language = $this->createMock(ilSetupLanguage::class); - $this->obj = new \ilLanguageSetupAgent($refinery, null, $setup_language); + $this->obj = new \ilLanguageSetupAgent($refinery, $setup_language); } public function testCreate(): void @@ -77,7 +77,7 @@ public function testGetUpdateObjective(): void public function testGetBuildArtifactObjective(): void { - $result = $this->obj->getBuildArtifactObjective(); + $result = $this->obj->getBuildObjective(); $this->assertInstanceOf(NullObjective::class, $result); } diff --git a/components/ILIAS/LearningModule/classes/Setup/class.ilLearningModuleSetupAgent.php b/components/ILIAS/LearningModule/classes/Setup/class.ilLearningModuleSetupAgent.php index 32274089426e..2d206458770d 100755 --- a/components/ILIAS/LearningModule/classes/Setup/class.ilLearningModuleSetupAgent.php +++ b/components/ILIAS/LearningModule/classes/Setup/class.ilLearningModuleSetupAgent.php @@ -65,7 +65,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceMigrationAgent.php b/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceMigrationAgent.php index 36365e8fd1f6..b3c362534eea 100644 --- a/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceMigrationAgent.php +++ b/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceMigrationAgent.php @@ -51,7 +51,7 @@ public function getUpdateObjective(\ILIAS\Setup\Config $config = null): Setup\Ob return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceSetupAgent.php b/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceSetupAgent.php index 61ae28303b3e..e966b1dab309 100755 --- a/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceSetupAgent.php +++ b/components/ILIAS/LearningSequence/classes/Setup/class.ilLearningSequenceSetupAgent.php @@ -72,7 +72,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/LegalDocuments/classes/Setup/Agent.php b/components/ILIAS/LegalDocuments/classes/Setup/Agent.php index 250a18981233..044a9baaa251 100755 --- a/components/ILIAS/LegalDocuments/classes/Setup/Agent.php +++ b/components/ILIAS/LegalDocuments/classes/Setup/Agent.php @@ -55,7 +55,7 @@ public function getUpdateObjective(Config $config = null): Objective return new ilDatabaseUpdateStepsExecutedObjective(new UpdateSteps()); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new ConsumerObjective(); } diff --git a/components/ILIAS/LegalDocuments/tests/Setup/AgentTest.php b/components/ILIAS/LegalDocuments/tests/Setup/AgentTest.php index 8fe703809d71..8efa3b303483 100755 --- a/components/ILIAS/LegalDocuments/tests/Setup/AgentTest.php +++ b/components/ILIAS/LegalDocuments/tests/Setup/AgentTest.php @@ -64,7 +64,7 @@ public function testGetUpdateObjective(): void public function testGetBuildArtifactObjective(): void { - $this->assertInstanceOf(ConsumerObjective::class, (new Agent($this->mock(Refinery::class)))->getBuildArtifactObjective()); + $this->assertInstanceOf(ConsumerObjective::class, (new Agent($this->mock(Refinery::class)))->getBuildObjective()); } public function testGetStatusObjective(): void diff --git a/components/ILIAS/Logging/classes/Setup/class.ilLoggingSetupAgent.php b/components/ILIAS/Logging/classes/Setup/class.ilLoggingSetupAgent.php index 11bc8dfd6547..57ceaad44d9c 100755 --- a/components/ILIAS/Logging/classes/Setup/class.ilLoggingSetupAgent.php +++ b/components/ILIAS/Logging/classes/Setup/class.ilLoggingSetupAgent.php @@ -89,7 +89,7 @@ public function getUpdateObjective(Config $config = null): Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Mail/classes/Setup/class.ilMailSetupAgent.php b/components/ILIAS/Mail/classes/Setup/class.ilMailSetupAgent.php index 3a3487ef74f4..3f3296af3c41 100755 --- a/components/ILIAS/Mail/classes/Setup/class.ilMailSetupAgent.php +++ b/components/ILIAS/Mail/classes/Setup/class.ilMailSetupAgent.php @@ -50,7 +50,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/MathJax/classes/Setup/class.ilMathJaxSetupAgent.php b/components/ILIAS/MathJax/classes/Setup/class.ilMathJaxSetupAgent.php index aa8abc89211b..a4ad4ed3fbc4 100755 --- a/components/ILIAS/MathJax/classes/Setup/class.ilMathJaxSetupAgent.php +++ b/components/ILIAS/MathJax/classes/Setup/class.ilMathJaxSetupAgent.php @@ -79,7 +79,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/MediaObjects/classes/Setup/class.ilMediaObjectSetupAgent.php b/components/ILIAS/MediaObjects/classes/Setup/class.ilMediaObjectSetupAgent.php index 999f6ca0c851..bd4924cc896e 100755 --- a/components/ILIAS/MediaObjects/classes/Setup/class.ilMediaObjectSetupAgent.php +++ b/components/ILIAS/MediaObjects/classes/Setup/class.ilMediaObjectSetupAgent.php @@ -73,7 +73,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Notifications/classes/Setup/ilNotificationUpdateAgent.php b/components/ILIAS/Notifications/classes/Setup/ilNotificationUpdateAgent.php index ef9a35172b4c..43d3b406d2e1 100755 --- a/components/ILIAS/Notifications/classes/Setup/ilNotificationUpdateAgent.php +++ b/components/ILIAS/Notifications/classes/Setup/ilNotificationUpdateAgent.php @@ -56,7 +56,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/OrgUnit/classes/Setup/class.ilOrgUnitSetupAgent.php b/components/ILIAS/OrgUnit/classes/Setup/class.ilOrgUnitSetupAgent.php index 28b67359563e..d1409cc2f9bd 100644 --- a/components/ILIAS/OrgUnit/classes/Setup/class.ilOrgUnitSetupAgent.php +++ b/components/ILIAS/OrgUnit/classes/Setup/class.ilOrgUnitSetupAgent.php @@ -51,7 +51,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/PDFGeneration/Setup/class.ilPDFGenerationSetupAgent.php b/components/ILIAS/PDFGeneration/Setup/class.ilPDFGenerationSetupAgent.php index a1996e7def6f..b7da135a9a07 100755 --- a/components/ILIAS/PDFGeneration/Setup/class.ilPDFGenerationSetupAgent.php +++ b/components/ILIAS/PDFGeneration/Setup/class.ilPDFGenerationSetupAgent.php @@ -54,7 +54,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/PrivacySecurity/classes/Setup/class.ilPrivacySecuritySetupAgent.php b/components/ILIAS/PrivacySecurity/classes/Setup/class.ilPrivacySecuritySetupAgent.php index 2651fe942f06..c6943158473e 100755 --- a/components/ILIAS/PrivacySecurity/classes/Setup/class.ilPrivacySecuritySetupAgent.php +++ b/components/ILIAS/PrivacySecurity/classes/Setup/class.ilPrivacySecuritySetupAgent.php @@ -93,7 +93,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageSetupAgent.php b/components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageSetupAgent.php index bed045a56364..801d86f89e1b 100755 --- a/components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageSetupAgent.php +++ b/components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageSetupAgent.php @@ -70,7 +70,7 @@ public function getUpdateObjective(Config $config = null): Objective ); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new ilResourceStorageFlavourArtifact(); } diff --git a/components/ILIAS/Setup/README.md b/components/ILIAS/Setup/README.md index c771f3e7bdec..644be06682ff 100755 --- a/components/ILIAS/Setup/README.md +++ b/components/ILIAS/Setup/README.md @@ -133,7 +133,7 @@ is required or storing that information in the database. Thanks to op-code-cachi the information will practically be in-memory. This approach has one major downside: When adding or changing code that is included in some artifact, the change does not come in effect immediately, because the corresponding artifact has not been -updated. This is done via `php cli/setup.php build-artifacts` or when updating +updated. This is done via `php cli/setup.php build` or when updating the composer class-map. You can use your artifact with the following method which resolves to the diff --git a/components/ILIAS/Setup/Setup.php b/components/ILIAS/Setup/Setup.php index ee87286b0e94..33d2c295ff4c 100644 --- a/components/ILIAS/Setup/Setup.php +++ b/components/ILIAS/Setup/Setup.php @@ -38,7 +38,7 @@ public function init( new \ILIAS\Setup\CLI\App( $internal["command.install"], $internal["command.update"], - $internal["command.build-artifacts"], + $internal["command.build"], $internal["command.achieve"], $internal["command.status"], $internal["command.migrate"] @@ -62,8 +62,8 @@ public function init( $internal["config_reader"], $internal["common_preconditions"] ); - $internal["command.build-artifacts"] = fn() => - new \ILIAS\Setup\CLI\BuildArtifactsCommand( + $internal["command.build"] = fn() => + new \ILIAS\Setup\CLI\BuildCommand( $internal["agent_finder"] ); $internal["command.achieve"] = fn() => diff --git a/components/ILIAS/Setup/src/Agent.php b/components/ILIAS/Setup/src/Agent.php index 15cd46801ec2..24b14962d55d 100755 --- a/components/ILIAS/Setup/src/Agent.php +++ b/components/ILIAS/Setup/src/Agent.php @@ -74,7 +74,7 @@ public function getUpdateObjective(Config $config = null): Objective; * * @throw InvalidArgumentException if Config does not match the Agent. */ - public function getBuildArtifactObjective(): Objective; + public function getBuildObjective(): Objective; /** * Get the objective to be achieved when status is requested. diff --git a/components/ILIAS/Setup/src/Agent/NullAgent.php b/components/ILIAS/Setup/src/Agent/NullAgent.php index 0f53b2079b97..1ed9856ea3a3 100755 --- a/components/ILIAS/Setup/src/Agent/NullAgent.php +++ b/components/ILIAS/Setup/src/Agent/NullAgent.php @@ -78,7 +78,7 @@ public function getUpdateObjective(Config $config = null): Objective /** * @inheritdocs */ - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new NullObjective(); } diff --git a/components/ILIAS/Setup/src/AgentCollection.php b/components/ILIAS/Setup/src/AgentCollection.php index 7df37f52ad47..08e8eb9cb530 100755 --- a/components/ILIAS/Setup/src/AgentCollection.php +++ b/components/ILIAS/Setup/src/AgentCollection.php @@ -97,7 +97,7 @@ public function getArrayToConfigTransformation(): Transformation } return $out; }), - $this->refinery->custom()->transformation(fn ($v): array => [$v]), + $this->refinery->custom()->transformation(fn($v): array => [$v]), $this->refinery->to()->toNew(ConfigCollection::class) ]); } @@ -156,13 +156,13 @@ function (string $k, Agent $v) use ($config): \ILIAS\Setup\Objective { /** * @inheritdocs */ - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new ObjectiveCollection( "Collected Build Artifact Objectives", false, ...array_values(array_map( - fn (Agent $v): \ILIAS\Setup\Objective => $v->getBuildArtifactObjective(), + fn(Agent $v): \ILIAS\Setup\Objective => $v->getBuildObjective(), $this->agents )) ); @@ -177,7 +177,7 @@ public function getStatusObjective(Metrics\Storage $storage): Objective "Collected Status Objectives", false, ...array_values(array_map( - fn (string $k, Agent $v): \ILIAS\Setup\Objective => $v->getStatusObjective( + fn(string $k, Agent $v): \ILIAS\Setup\Objective => $v->getStatusObjective( new Metrics\StorageOnPathWrapper($k, $storage) ), array_keys($this->agents), diff --git a/components/ILIAS/Setup/src/CLI/BuildArtifactsCommand.php b/components/ILIAS/Setup/src/CLI/BuildCommand.php similarity index 93% rename from components/ILIAS/Setup/src/CLI/BuildArtifactsCommand.php rename to components/ILIAS/Setup/src/CLI/BuildCommand.php index 269510518bd5..0c2aa277a3e1 100755 --- a/components/ILIAS/Setup/src/CLI/BuildArtifactsCommand.php +++ b/components/ILIAS/Setup/src/CLI/BuildCommand.php @@ -33,12 +33,12 @@ /** * Installation command. */ -class BuildArtifactsCommand extends Command +class BuildCommand extends Command { use HasAgent; use ObjectiveHelper; - protected static $defaultName = "build-artifacts"; + protected static $defaultName = "build"; public function __construct(AgentFinder $agent_finder) { @@ -61,7 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $agent = $this->getRelevantAgent($input); - $objective = $agent->getBuildArtifactObjective(); + $objective = $agent->getBuildObjective(); $environment = new ArrayEnvironment([ Environment::RESOURCE_ADMIN_INTERACTION => $io diff --git a/components/ILIAS/Setup/tests/Agent/NullAgentTest.php b/components/ILIAS/Setup/tests/Agent/NullAgentTest.php index bc76d74070f1..e4c7470d94c7 100755 --- a/components/ILIAS/Setup/tests/Agent/NullAgentTest.php +++ b/components/ILIAS/Setup/tests/Agent/NullAgentTest.php @@ -44,7 +44,7 @@ public function testIsNull(): void $this->assertFalse($this->agent->hasConfig()); $this->assertEquals($null, $this->agent->getInstallObjective()); $this->assertEquals($null, $this->agent->getUpdateObjective()); - $this->assertEquals($null, $this->agent->getBuildArtifactObjective()); + $this->assertEquals($null, $this->agent->getBuildObjective()); $this->assertEquals($null, $this->agent->getStatusObjective($this->storage)); $this->assertEquals([], $this->agent->getMigrations()); } diff --git a/components/ILIAS/Setup/tests/CLI/BuildArtifactsCommandTest.php b/components/ILIAS/Setup/tests/CLI/BuildCommandTest.php similarity index 91% rename from components/ILIAS/Setup/tests/CLI/BuildArtifactsCommandTest.php rename to components/ILIAS/Setup/tests/CLI/BuildCommandTest.php index a39df75a1caa..88ab95bf91fb 100755 --- a/components/ILIAS/Setup/tests/CLI/BuildArtifactsCommandTest.php +++ b/components/ILIAS/Setup/tests/CLI/BuildCommandTest.php @@ -24,7 +24,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Tester\CommandTester; -class BuildArtifactsCommandTest extends TestCase +class BuildCommandTest extends TestCase { public function testBasicFunctionality(): void { @@ -40,7 +40,7 @@ public function testBasicFunctionality(): void $objective = $this->createMock(Setup\Objective::class); $agent ->expects($this->once()) - ->method("getBuildArtifactObjective") + ->method("getBuildObjective") ->with() ->willReturn($objective); @@ -61,7 +61,7 @@ public function testBasicFunctionality(): void ->method("isApplicable") ->willReturn(true); - $command = new Setup\CLI\BuildArtifactsCommand($agent_finder); + $command = new Setup\CLI\BuildCommand($agent_finder); $tester = new CommandTester($command); $tester->execute([]); } diff --git a/components/ILIAS/Setup/tests/CLI/InstallCommandTest.php b/components/ILIAS/Setup/tests/CLI/InstallCommandTest.php index 9e233d87d387..531602e1b27c 100755 --- a/components/ILIAS/Setup/tests/CLI/InstallCommandTest.php +++ b/components/ILIAS/Setup/tests/CLI/InstallCommandTest.php @@ -106,7 +106,7 @@ public function getClientId(): string $agent ->expects($this->never()) - ->method("getBuildArtifactObjective") + ->method("getBuildObjective") ->with() ->willReturn(new Setup\Objective\NullObjective()); diff --git a/components/ILIAS/Setup/tests/CLI/UpdateCommandTest.php b/components/ILIAS/Setup/tests/CLI/UpdateCommandTest.php index d5593a1a8f1c..2cb8341c6135 100755 --- a/components/ILIAS/Setup/tests/CLI/UpdateCommandTest.php +++ b/components/ILIAS/Setup/tests/CLI/UpdateCommandTest.php @@ -89,7 +89,7 @@ public function basicFunctionality(bool $is_applicable): void $agent ->expects($this->never()) - ->method("getBuildArtifactObjective") + ->method("getBuildObjective") ->with() ->willReturn(new Setup\Objective\NullObjective()); diff --git a/components/ILIAS/Setup/tests/Helper.php b/components/ILIAS/Setup/tests/Helper.php index 5629fcb3ea98..b64f89dc12be 100755 --- a/components/ILIAS/Setup/tests/Helper.php +++ b/components/ILIAS/Setup/tests/Helper.php @@ -31,7 +31,7 @@ protected function newAgent(): Setup\Agent $consumer = $this ->getMockBuilder(Setup\Agent::class) - ->onlyMethods(["hasConfig", "getArrayToConfigTransformation", "getInstallObjective", "getUpdateObjective", "getBuildArtifactObjective", "getStatusObjective", "getMigrations", "getNamedObjectives"]) + ->onlyMethods(["hasConfig", "getArrayToConfigTransformation", "getInstallObjective", "getUpdateObjective", "getBuildObjective", "getStatusObjective", "getMigrations", "getNamedObjectives"]) ->setMockClassName("Mock_AgentNo" . ($no++)) ->getMock(); diff --git a/components/ILIAS/StaticURL/src/SetupAgent.php b/components/ILIAS/StaticURL/src/SetupAgent.php index b9173045837c..d6208bbab6a2 100755 --- a/components/ILIAS/StaticURL/src/SetupAgent.php +++ b/components/ILIAS/StaticURL/src/SetupAgent.php @@ -28,7 +28,7 @@ */ class SetupAgent extends Agent\NullAgent implements Agent { - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new ArtifactObjective(); } diff --git a/components/ILIAS/StudyProgramme/classes/Setup/class.ilStudyProgrammeMigrationAgent.php b/components/ILIAS/StudyProgramme/classes/Setup/class.ilStudyProgrammeMigrationAgent.php index b7815cadeb03..81d647d04c8b 100755 --- a/components/ILIAS/StudyProgramme/classes/Setup/class.ilStudyProgrammeMigrationAgent.php +++ b/components/ILIAS/StudyProgramme/classes/Setup/class.ilStudyProgrammeMigrationAgent.php @@ -51,7 +51,7 @@ public function getUpdateObjective(\ILIAS\Setup\Config $config = null): Setup\Ob return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Style/classes/Setup/class.ilStyleSetupAgent.php b/components/ILIAS/Style/classes/Setup/class.ilStyleSetupAgent.php index 1b4fd75e4ceb..17ec3ffcc01e 100755 --- a/components/ILIAS/Style/classes/Setup/class.ilStyleSetupAgent.php +++ b/components/ILIAS/Style/classes/Setup/class.ilStyleSetupAgent.php @@ -65,7 +65,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new ilKitchenSinkDataCollectedObjective(); } diff --git a/components/ILIAS/SystemFolder/classes/Setup/class.ilSystemFolderSetupAgent.php b/components/ILIAS/SystemFolder/classes/Setup/class.ilSystemFolderSetupAgent.php index bca80331c352..e95f4978bd88 100755 --- a/components/ILIAS/SystemFolder/classes/Setup/class.ilSystemFolderSetupAgent.php +++ b/components/ILIAS/SystemFolder/classes/Setup/class.ilSystemFolderSetupAgent.php @@ -77,7 +77,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Test/classes/Setup/class.ilTestSetupAgent.php b/components/ILIAS/Test/classes/Setup/class.ilTestSetupAgent.php index f391da07f5f0..e964aa3bc425 100755 --- a/components/ILIAS/Test/classes/Setup/class.ilTestSetupAgent.php +++ b/components/ILIAS/Test/classes/Setup/class.ilTestSetupAgent.php @@ -76,7 +76,7 @@ public function getInstallObjective(Config $config = null): Objective return new NullObjective(); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new NullObjective(); } diff --git a/components/ILIAS/Test/tests/Setup/ilTestSetupAgentTest.php b/components/ILIAS/Test/tests/Setup/ilTestSetupAgentTest.php index d6f3e6b4b582..f11fc77ab034 100644 --- a/components/ILIAS/Test/tests/Setup/ilTestSetupAgentTest.php +++ b/components/ILIAS/Test/tests/Setup/ilTestSetupAgentTest.php @@ -56,7 +56,7 @@ public function testGetInstallObjective(): void public function testGetBuildArtifactObjective(): void { $ilTestSetupAgentTest = new ilTestSetupAgent($this->createMock(Refinery::class)); - $this->assertInstanceOf(NullObjective::class, $ilTestSetupAgentTest->getBuildArtifactObjective()); + $this->assertInstanceOf(NullObjective::class, $ilTestSetupAgentTest->getBuildObjective()); } public function testGetMigrations(): void diff --git a/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php b/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php index b04cdbcc9baa..250d374641a1 100755 --- a/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php +++ b/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php @@ -59,7 +59,7 @@ public function getUpdateObjective(Config $config = null): Objective return new ilDatabaseUpdateStepsExecutedObjective(new ilTreeDBUpdateSteps8()); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new Objective\NullObjective(); } diff --git a/components/ILIAS/UICore/classes/Setup/class.ilUICoreSetupAgent.php b/components/ILIAS/UICore/classes/Setup/class.ilUICoreSetupAgent.php index 15b481d36093..42eb6492e918 100755 --- a/components/ILIAS/UICore/classes/Setup/class.ilUICoreSetupAgent.php +++ b/components/ILIAS/UICore/classes/Setup/class.ilUICoreSetupAgent.php @@ -57,7 +57,7 @@ public function getUpdateObjective(Config $config = null): Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new ObjectiveCollection( 'buildIlCtrlArtifacts', @@ -93,7 +93,7 @@ public function getNamedObjectives(?Config $config = null): array 'buildIlCtrlArtifacts' => new ObjectiveConstructor( 'builds all necessary ilCtrl artifacts.', function () { - return $this->getBuildArtifactObjective(); + return $this->getBuildObjective(); } ), diff --git a/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php b/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php index 7f3fb33f84e9..b74abccc97a8 100755 --- a/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php +++ b/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php @@ -65,7 +65,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective ); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/Utilities/classes/Setup/class.ilUtilitiesSetupAgent.php b/components/ILIAS/Utilities/classes/Setup/class.ilUtilitiesSetupAgent.php index 2b05f84830d2..ab5daa415902 100755 --- a/components/ILIAS/Utilities/classes/Setup/class.ilUtilitiesSetupAgent.php +++ b/components/ILIAS/Utilities/classes/Setup/class.ilUtilitiesSetupAgent.php @@ -78,7 +78,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupAgent.php b/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupAgent.php index 5b031bc9c08a..2a1f65d625de 100755 --- a/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupAgent.php +++ b/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupAgent.php @@ -41,7 +41,7 @@ public function hasConfig(): bool public function getArrayToConfigTransformation(): Refinery\Transformation { - return $this->refinery->custom()->transformation(fn ($data): ilVirusScannerSetupConfig => new ilVirusScannerSetupConfig( + return $this->refinery->custom()->transformation(fn($data): ilVirusScannerSetupConfig => new ilVirusScannerSetupConfig( $data["virusscanner"] ?? ilVirusScannerSetupConfig::VIRUS_SCANNER_NONE, $data["path_to_scan"] ?? null, $data["path_to_clean"] ?? null, @@ -65,7 +65,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/WOPI/classes/Setup/class.ilWOPISetupAgent.php b/components/ILIAS/WOPI/classes/Setup/class.ilWOPISetupAgent.php index 82330d7e04db..f0aa2cf9b125 100755 --- a/components/ILIAS/WOPI/classes/Setup/class.ilWOPISetupAgent.php +++ b/components/ILIAS/WOPI/classes/Setup/class.ilWOPISetupAgent.php @@ -49,7 +49,7 @@ public function getUpdateObjective(Config $config = null): Objective return new \ilDatabaseUpdateStepsExecutedObjective(new ilWOPIDB90()); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new Objective\NullObjective(); } diff --git a/components/ILIAS/WebServices/classes/Setup/class.ilWebServicesSetupAgent.php b/components/ILIAS/WebServices/classes/Setup/class.ilWebServicesSetupAgent.php index a3b3ca9abd69..ba825a71494a 100755 --- a/components/ILIAS/WebServices/classes/Setup/class.ilWebServicesSetupAgent.php +++ b/components/ILIAS/WebServices/classes/Setup/class.ilWebServicesSetupAgent.php @@ -99,7 +99,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/WorkflowEngine/Setup/class.ilWorkflowEngineSetupAgent.php b/components/ILIAS/WorkflowEngine/Setup/class.ilWorkflowEngineSetupAgent.php index 29d6a69bf32e..b9db92832b1a 100755 --- a/components/ILIAS/WorkflowEngine/Setup/class.ilWorkflowEngineSetupAgent.php +++ b/components/ILIAS/WorkflowEngine/Setup/class.ilWorkflowEngineSetupAgent.php @@ -55,7 +55,7 @@ public function getInstallObjective(Config $config = null): Objective return new Setup\Objective\NullObjective(); } - public function getBuildArtifactObjective(): Objective + public function getBuildObjective(): Objective { return new Setup\Objective\NullObjective(); } diff --git a/components/ILIAS/setup_/README.md b/components/ILIAS/setup_/README.md index be4eb8cd543e..1ece4390cc63 100755 --- a/components/ILIAS/setup_/README.md +++ b/components/ILIAS/setup_/README.md @@ -6,7 +6,7 @@ main commands to manage ILIAS installations: * `install` will [set an installation up](#install-ilias) * `update` will [update an installation](#update-ilias) * `status` will [report status of an installation](#report-status-of-ilias) -* `build-artifacts` [recreates static assets](#build-ilias-artifacts) of an installation +* `build` [recreates static assets](#build-static-assets) of an installation * `achieve` [a named objective](#achieve-a-named-objective) of an agent * `migrate` will run [needed migrations](#migrations) @@ -106,10 +106,15 @@ Like for `install` and `update`, plugins are included here, but can be controlle via options. -## Build ILIAS Artifacts +## Build Static Assets -Artifacts are source code files that are created based on the ILIAS source tree. -You can refresh them by calling `php cli/setup.php build-artifacts` from your +There are two types of assets that ILIAS needs to function: + +* **Artifacts** are source code files that are created based on the ILIAS source tree. +* The **Public Folder** is filled with resources from the ILIAS components to be + served on the web. + +You can refresh them by calling `php cli/setup.php build` from your installation. Make sure you run the command with the webserver user or adjust filesystem permissions later on, because the webserver will need to access the generated files. Please do not invoke this function unless it is explicitly stated diff --git a/components/ILIAS/setup_/classes/class.ilCommonSetupAgent.php b/components/ILIAS/setup_/classes/class.ilCommonSetupAgent.php index f8cdf48422ea..9d9b61ca927f 100755 --- a/components/ILIAS/setup_/classes/class.ilCommonSetupAgent.php +++ b/components/ILIAS/setup_/classes/class.ilCommonSetupAgent.php @@ -138,7 +138,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective /** * @inheritdoc */ - public function getBuildArtifactObjective(): Setup\Objective + public function getBuildObjective(): Setup\Objective { return new Setup\Objective\NullObjective(); } diff --git a/composer.json b/composer.json index c295b520b87c..2550f958f1fa 100755 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "scripts": { "post-autoload-dump": [ "@php cli/build_bootstrap.php components/ILIAS/Setup/resources/dependency_resolution.php setup", - "@php cli/setup.php build-artifacts --yes" + "@php cli/setup.php build --yes" ], "post-install-cmd": [ "@php vendor/composer/rmdirs.php"