From dc0069ebd73226e414c076e9abb816eb5b15f592 Mon Sep 17 00:00:00 2001 From: zagovorychev Date: Thu, 7 Mar 2019 10:11:59 +0300 Subject: [PATCH 1/2] non-actions hidden --- actions/MediaImport.php | 5 +++++ actions/MediaManager.php | 6 ++++++ manifest.php | 4 ++-- scripts/update/Updater.php | 9 ++++----- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/actions/MediaImport.php b/actions/MediaImport.php index 0c7b9b14c..de1e2c941 100755 --- a/actions/MediaImport.php +++ b/actions/MediaImport.php @@ -21,6 +21,7 @@ namespace oat\taoMediaManager\actions; +use oat\tao\model\routing\AnnotationReader\security; use oat\taoMediaManager\model\FileImporter; use oat\taoMediaManager\model\MediaService; use oat\taoMediaManager\model\SharedStimulusImporter; @@ -32,6 +33,10 @@ class MediaImport extends \tao_actions_Import { private $importHandlers; + /** + * MediaImport constructor. + * @security("hide") + */ public function __construct() { parent::__construct(); diff --git a/actions/MediaManager.php b/actions/MediaManager.php index f7ce2e3f7..6a5bcd5a0 100755 --- a/actions/MediaManager.php +++ b/actions/MediaManager.php @@ -21,6 +21,7 @@ namespace oat\taoMediaManager\actions; +use oat\tao\model\routing\AnnotationReader\security; use oat\taoMediaManager\model\editInstanceForm; use oat\taoMediaManager\model\MediaService; use oat\taoMediaManager\model\MediaSource; @@ -34,6 +35,11 @@ protected function getClassService() return MediaService::singleton(); } + /** + * MediaManager constructor. + * @throws \common_ext_ExtensionException + * @security("hide") + */ public function __construct() { diff --git a/manifest.php b/manifest.php index 20d1715eb..492186f5d 100755 --- a/manifest.php +++ b/manifest.php @@ -27,10 +27,10 @@ 'label' => 'extension-tao-mediamanager', 'description' => 'TAO media manager extension', 'license' => 'GPL-2.0', - 'version' => '5.0.3', + 'version' => '6.0.0', 'author' => 'Open Assessment Technologies SA', 'requires' => array( - 'tao' => '>=22.6.2', + 'tao' => '>=27.2.0', 'generis' => '>=8.1.3', 'taoItems' => '>=6.0.0' ), diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php index 24675e019..7f9abf5f5 100755 --- a/scripts/update/Updater.php +++ b/scripts/update/Updater.php @@ -23,11 +23,10 @@ class Updater extends \common_ext_ExtensionUpdater { - /** - * - * @param string $initialVersion - * @return string $versionUpdatedTo + * @param $initialVersion + * @return string|void + * @throws \common_exception_NotImplemented */ public function update($initialVersion) { @@ -35,6 +34,6 @@ public function update($initialVersion) throw new \common_exception_NotImplemented('Updates from versions prior to Tao 3.1 are not longer supported, please update to Tao 3.1 first'); } - $this->skip('0.3.0', '5.0.3'); + $this->skip('0.3.0', '6.0.0'); } } From 4359956c918f7167da3d7c0bc69ee676b4f39de7 Mon Sep 17 00:00:00 2001 From: zagovorychev Date: Mon, 11 Mar 2019 11:04:31 +0300 Subject: [PATCH 2/2] added type hint for phpdoc --- scripts/update/Updater.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php index 7f9abf5f5..c9e505410 100755 --- a/scripts/update/Updater.php +++ b/scripts/update/Updater.php @@ -24,7 +24,7 @@ class Updater extends \common_ext_ExtensionUpdater { /** - * @param $initialVersion + * @param string $initialVersion * @return string|void * @throws \common_exception_NotImplemented */