Merge branch 'release/4.0.0' into 'master'

Release 4.0.0

See merge request fluxns/learnplaces!17

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.0.0] - 16.09.2021
+### Added
+- ILIAS 7 Support
+### Removed
+- ILIAS 5.4 is no longer supported
+
+### BREAKING CHANGES
+- ILIAS 5.4 is no longer supported
+
 ## [3.0.0] - 04.02.2021
 ### Added
 - Link action for ILIAS object

README.md

@@ -3,15 +3,16 @@ Learnplaces 2 is a ground up rewritten drop in replacement of
 the old learnplaces plugin.
 
 ## Requirements
-* Version: ILIAS 5.4 or 6
-* PHP 7.0 - 7.4
+* Version: ILIAS 6 or 7
+* PHP 7.2 - 7.4
 
 ### Compatibility Table
 |Plugin Version   | ILIAS Versions | PHP Versions  |
 |---|---|---|
 | v1.X  | 5.2 - 5.3 | 7.0 |
 | v2.X | 5.3 - 5.4 | 7.0 - 7.2 |
 | v3.X | 5.4 - 6 | 7.0 - 7.4 |
+| v4.X | 6 - 7 | 7.2 - 7.4 |
 
 ## Installation
 
@@ -105,10 +106,10 @@ This project is licensed under the GNU GPLv3 License - see the LICENSE.md file f
 
 ## Contact
 
-studer + raimann ag  
-Farbweg 9  
+fluxlabs AG
+Scheunenstrasse 19
 3400 Burgdorf  
 Switzerland
 
-[info@studer-raimann.ch](mailto:info@studer-raimann.ch)  
-<https://www.studer-raimann.ch>
+[connect@fluxlabs.ch](mailto:connect@fluxlabs.ch)  
+<https://fluxlabs.ch>

classes/class.ilObjLearnplacesGUI.php

@@ -195,7 +195,7 @@ protected function performCommand(string $command) {
      *
      */
     protected function setSubtabs() {
-        if (ilObjUdfEditorAccess::hasWriteAccess()) {
+        if ($this->accessGuard->hasWritePermission()) {
             $this->learnplaceTabs->addSubTab(self::SUBTAB_CONTENT, $this->lng->txt(self::SUBTAB_CONTENT), $this->ctrl->getLinkTarget($this));
 
             if($this->accessGuard->hasWritePermission() && !$this->hasMap())

classes/gui/block/AccordionBlock/AccordionBlockEditFormView.php

@@ -37,7 +37,7 @@ protected function hasBlockSpecificParts(): bool {
 	/**
 	 * @inheritDoc
 	 */
-	protected function initBlockSpecificForm() {
+	protected function initBlockSpecificForm(): void {
 		$title = new ilTextInputGUI($this->plugin->txt('accordion_block_title'), self::POST_TITLE);
 		$title->setMaxLength(256);
 		$title->setRequired(true);

classes/gui/block/AccordionBlock/AccordionBlockPresentationView.php

@@ -69,7 +69,7 @@ public function __construct(ilLearnplacesPlugin $plugin, ilCtrl $controlFlow, Co
 		$this->template = new ilTemplate('./Customizing/global/plugins/Services/Repository/RepositoryObject/Learnplaces/templates/default/block/tpl.accordion.html', true, true);
 	}
 
-	private function initView() {
+	private function initView(): void {
 		$this->contentView->setBlocks($this->model->getBlocks());
 		$this->contentView->setAccordionId($this->model->getId());
 		$this->contentView->setReadonly($this->isReadonly());
@@ -80,14 +80,14 @@ private function initView() {
 		$this->template->setVariable('EXPANDED', $this->model->isExpand() ? 'in' : '');
 	}
 
-	public function setModel(AccordionBlockModel $model) {
+	public function setModel(AccordionBlockModel $model): void {
 		$this->model = $model;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function getHtml() {
+	public function getHtml(): string {
 		if(is_null($this->model))
 			throw new LogicException('The accordion block view requires a model to render its content.');
 

classes/gui/block/AccordionBlock/class.xsrlAccordionBlockGUI.php

@@ -97,7 +97,7 @@ public function __construct(ilTabsGUI $tabs, $template, ilCtrl $controlFlow, ilL
     }
 
 
-    public function executeCommand()
+    public function executeCommand(): bool
     {
 
         if (version_compare(ILIAS_VERSION_NUMERIC, "6.0", "<")) {
@@ -131,7 +131,7 @@ public function executeCommand()
         return false;
     }
 
-    private function add()
+    private function add(): void
     {
         $this->controlFlow->saveParameter($this, PlusView::POSITION_QUERY_PARAM);
 
@@ -144,7 +144,7 @@ private function add()
         $this->template->setContent($form->getHTML());
     }
 
-    private function create()
+    private function create(): void
     {
         $form = new AccordionBlockEditFormView(new AccordionBlockModel());
         try {
@@ -179,15 +179,15 @@ private function create()
         }
     }
 
-    private function edit()
+    private function edit(): void
     {
         $block = $this->accordionService->find($this->getBlockId());
         $form = new AccordionBlockEditFormView($block);
         $form->fillForm();
         $this->template->setContent($form->getHTML());
     }
 
-    private function update()
+    private function update(): void
     {
         $form = new AccordionBlockEditFormView(new AccordionBlockModel());
         try {
@@ -212,7 +212,7 @@ private function update()
         }
     }
 
-    private function delete()
+    private function delete(): void
     {
         $queries = $this->request->getQueryParams();
         $blockId = intval($queries[self::BLOCK_ID_QUERY_KEY]);
@@ -223,7 +223,7 @@ private function delete()
         $this->controlFlow->redirectByClass(xsrlContentGUI::class, CommonControllerAction::CMD_INDEX);
     }
 
-    private function confirm()
+    private function confirm(): void
     {
         $queries = $this->request->getQueryParams();
 
@@ -241,7 +241,7 @@ private function confirm()
         $this->template->setContent($confirm->getHTML());
     }
 
-    private function cancel()
+    private function cancel(): void
     {
         $this->controlFlow->redirectByClass(xsrlContentGUI::class, CommonControllerAction::CMD_INDEX);
     }
@@ -252,7 +252,7 @@ private function getBlockId(): int
         return intval($queries[self::BLOCK_ID_QUERY_KEY]);
     }
 
-    private function regenerateSequence()
+    private function regenerateSequence(): void
     {
         $learnplace = $this->learnplaceService->findByObjectId(ilObject::_lookupObjectId($this->getCurrentRefId()));
         $this->learnplaceService->store($learnplace);

classes/gui/block/IliasLinkBlock/IliasLinkBlockPresentationView.php

@@ -64,7 +64,7 @@ public function __construct(ilLearnplacesPlugin $plugin, ilCtrl $controlFlow) {
 		$this->template = new ilTemplate('./Customizing/global/plugins/Services/Repository/RepositoryObject/Learnplaces/templates/default/block/tpl.ilias_link.html', true, true);
 	}
 
-	private function initView() {
+	private function initView(): void {
 
 		$objectId = ilObject::_lookupObjectId($this->model->getRefId());
 
@@ -73,7 +73,7 @@ private function initView() {
 		$this->template->setVariable('DESCRIPTION', ilObject::_lookupDescription($objectId));
 	}
 
-	public function setModel(ILIASLinkBlockModel $model) {
+	public function setModel(ILIASLinkBlockModel $model): void {
 		$this->model = $model;
 		$this->initView();
 	}
@@ -82,7 +82,7 @@ public function setModel(ILIASLinkBlockModel $model) {
 	/**
 	 * @inheritDoc
 	 */
-	public function getHtml() {
+	public function getHtml(): string {
 		if(is_null($this->model))
 			throw new LogicException('The picture block view requires a model to render its content.');
 

classes/gui/block/IliasLinkBlock/class.xsrlIliasLinkBlockEditFormViewGUI.php

@@ -31,7 +31,7 @@ protected function hasBlockSpecificParts(): bool {
 	/**
 	 * @inheritDoc
 	 */
-	protected function initBlockSpecificForm() {
+	protected function initBlockSpecificForm(): void {
 		$link = new ilLinkInputGUI($this->plugin->txt('ilias_link_block_select_target'), self::POST_REFID);
 		$link->setInternalLinkFilterTypes(['RepositoryItem']);
 		$link->setRequired(true);
@@ -64,11 +64,12 @@ protected function getFormActionUrl(): string {
 	/**
 	 * @inheritDoc
 	 */
-	protected function getObject() {
+	protected function getObject(): void {
 		//raw value looks like "xsrl|74"
 		$rawValue = $this->getInput(self::POST_REFID);
 		$delimiter = '|';
-		$lastElement = end(explode($delimiter, $rawValue));
+        $values = explode($delimiter, $rawValue);
+		$lastElement = end($values);
 		$this->block->setRefId(intval($lastElement));
 	}
 

classes/gui/block/IliasLinkBlock/class.xsrlIliasLinkBlockGUI.php

@@ -109,12 +109,9 @@ public function __construct(ilTabsGUI $tabs, $template, ilCtrl $controlFlow, ilL
     }
 
 
-    public function executeCommand()
+    public function executeCommand(): bool
     {
         $next_class = $this->controlFlow->getNextClass();
-        if (version_compare(ILIAS_VERSION_NUMERIC, "6.0", "<")) {
-            $this->template->getStandardTemplate();
-        }
         $cmd = $this->controlFlow->getCmd(CommonControllerAction::CMD_INDEX);
         $this->tabs->activateTab(self::TAB_ID);
 
@@ -147,7 +144,7 @@ public function executeCommand()
         return false;
     }
 
-    private function add()
+    private function add(): void
     {
         $this->controlFlow->saveParameter($this, PlusView::POSITION_QUERY_PARAM);
         $this->controlFlow->saveParameter($this, PlusView::ACCORDION_QUERY_PARAM);
@@ -162,7 +159,7 @@ private function add()
         $this->template->setContent($form->getHTML());
     }
 
-    private function create()
+    private function create(): void
     {
         $form = new xsrlIliasLinkBlockEditFormViewGUI(new ILIASLinkBlockModel());
         try {
@@ -209,7 +206,7 @@ private function create()
         }
     }
 
-    private function edit()
+    private function edit(): void
     {
         $blockId = $this->getBlockId();
         $block = $this->iliasLinkService->find($blockId);
@@ -218,7 +215,7 @@ private function edit()
         $this->template->setContent($form->getHTML());
     }
 
-    private function update()
+    private function update(): void
     {
         $form = new xsrlIliasLinkBlockEditFormViewGUI(new ILIASLinkBlockModel());
         try {
@@ -242,7 +239,7 @@ private function update()
         }
     }
 
-    private function delete()
+    private function delete(): void
     {
         $queries = $this->request->getQueryParams();
         $blockId = intval($queries[self::BLOCK_ID_QUERY_KEY]);
@@ -254,7 +251,7 @@ private function delete()
         $this->controlFlow->redirectByClass(xsrlContentGUI::class, CommonControllerAction::CMD_INDEX);
     }
 
-    private function confirm()
+    private function confirm(): void
     {
         $queries = $this->request->getQueryParams();
         $confirm = new ilConfirmationGUI();
@@ -271,7 +268,7 @@ private function confirm()
         $this->template->setContent($confirm->getHTML());
     }
 
-    private function cancel()
+    private function cancel(): void
     {
         $this->controlFlow->redirectByClass(xsrlContentGUI::class, CommonControllerAction::CMD_INDEX);
     }
@@ -282,7 +279,7 @@ private function getBlockId(): int
         return intval($queries[self::BLOCK_ID_QUERY_KEY]);
     }
 
-    private function regenerateSequence()
+    private function regenerateSequence(): void
     {
         $learnplace = $this->learnplaceService->findByObjectId(ilObject::_lookupObjectId($this->getCurrentRefId()));
         $this->learnplaceService->store($learnplace);

classes/gui/block/MapBlock/MapBlockPresentationView.php

@@ -110,7 +110,7 @@ public function setModels(MapBlockModel $model, LocationModel $location, Configu
 	/**
 	 * @inheritDoc
 	 */
-	public function getHtml() {
+	public function getHtml(): string {
 		if(is_null($this->model))
 			throw new LogicException('The picture block view requires a model to render its content.');