Merge branch 'release-2.8.2'

oat-sa · Jul 27, 2018 · 4e0fbf3 · 4e0fbf3
2 parents 63ec8cf + dd3b91f
commit 4e0fbf3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 		},
 		"minimum-stability" : "dev",
 		"require": {
-			"oat-sa/oatbox-extension-installer": "dev-master"
+			"oat-sa/oatbox-extension-installer": "~1.1||dev-master"
 		},
 		"autoload" : {
 			"psr-4" : {

diff --git a/manifest.php b/manifest.php
@@ -27,7 +27,7 @@
     'label' => 'extension-tao-mediamanager',
     'description' => 'TAO media manager extension',
     'license' => 'GPL-2.0',
-    'version' => '2.8.1',
+    'version' => '2.8.2',
     'author' => 'Open Assessment Technologies SA',
     'requires' => array(
         'tao' => '>=17.2.0',

diff --git a/model/MediaService.php b/model/MediaService.php
@@ -46,7 +46,7 @@ class MediaService extends \tao_models_classes_ClassService
 
     /**
      * (non-PHPdoc)
-     * @see tao_models_classes_ClassService::getRootClass()
+     * @see \tao_models_classes_ClassService::getRootClass()
      */
     public function getRootClass()
     {
@@ -133,7 +133,7 @@ public function editMediaInstance($fileTmp, $instanceUri, $language)
 
     /**
      * (non-PHPdoc)
-     * @see tao_models_classes_ClassService::deleteResource()
+     * @see \tao_models_classes_ClassService::deleteResource()
      */
     public function deleteResource(\core_kernel_classes_Resource $resource)
     {

diff --git a/model/MediaSource.php b/model/MediaSource.php
@@ -24,34 +24,38 @@
 use oat\tao\model\media\MediaManagement;
 use oat\taoMediaManager\model\fileManagement\FileManager;
 use oat\oatbox\log\LoggerAwareTrait;
+use oat\generis\model\OntologyAwareTrait;
 
 class MediaSource extends Configurable implements MediaManagement
 {
 
     use LoggerAwareTrait;
+    use OntologyAwareTrait;
 
     const SCHEME_NAME = 'taomedia://mediamanager/';
 
-    private $lang;
-
-    private $rootClassUri;
-
     /**
-     * get the lang of the class in case we want to filter the media on language
-     *
-     * @param array $options
+     * Returns the lanuage URI to be used
+     * @return string
      */
-    public function __construct($options = array())
+    protected function getLanguage()
     {
-        parent::__construct($options);
-        \common_ext_ExtensionsManager::singleton()->getExtensionById('taoMediaManager');
-        $this->lang = (isset($options['lang'])) ? $options['lang'] : '';
-        $this->rootClassUri = (isset($options['rootClass'])) ? $options['rootClass'] : MediaService::singleton()->getRootClass();
+        return $this->hasOption('lang')
+            ? $this->getOption('lang')
+            : ''
+        ;
     }
-
+
+    /**
+     * Return the root class of the mediasource
+     * @return \core_kernel_classes_Class
+     */
     public function getRootClass()
     {
-        return new \core_kernel_classes_Class($this->rootClassUri);
+        return $this->getClass($this->hasOption('rootClass')
+            ? $this->getOption('rootClass')
+            : MediaService::ROOT_CLASS_URI
+        );
     }
 
     /**
@@ -68,7 +72,7 @@ public function add($source, $fileName, $parent, $mimetype = null)
         $clazz = $this->getOrCreatePath($parent);
 
         $service = MediaService::singleton();
-        $instanceUri = $service->createMediaInstance($source, $clazz->getUri(), $this->lang, $fileName, $mimetype);
+        $instanceUri = $service->createMediaInstance($source, $clazz->getUri(), $this->getLanguage(), $fileName, $mimetype);
 
         return $this->getFileInfo($instanceUri);
     }
@@ -91,7 +95,7 @@ public function delete($link)
     public function getDirectory($parentLink = '', $acceptableMime = array(), $depth = 1)
     {
         if ($parentLink == '') {
-            $class = new \core_kernel_classes_Class($this->rootClassUri);
+            $class = $this->getRootClass();
         } else {
             $class = new \core_kernel_classes_Class(\tao_helpers_Uri::decode($parentLink));
         }

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -35,6 +35,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', '2.8.1');
+        $this->skip('0.3.0', '2.8.2');
     }
 }