Version 2.0.6

Composer Fail DICTrait
surlabs · Sep 18, 2023 · 40f41d8 · 40f41d8
1 parent 9372cc2
commit 40f41d8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/classes/Recommender/RecommenderCurl.php b/classes/Recommender/RecommenderCurl.php
@@ -1,6 +1,7 @@
 <?php
 
-use srag\DIC\DhbwTraining\DICTrait;
+//#SUR# composer fail
+//use srag\DIC\DhbwTraining\DICTrait;
 use srag\Plugins\DhbwTraining\Config\Config;
 
 
@@ -12,8 +13,8 @@
  */
 class RecommenderCurl
 {
-
-    use DICTrait;
+    //#SUR# composer fail
+    //use DICTrait;
 
     const PLUGIN_CLASS_NAME = ilDhbwTrainingPlugin::class;
     const KEY_RESPONSE_TIME_START = ilDhbwTrainingPlugin::PLUGIN_PREFIX . "_response_time_start";
@@ -73,11 +74,11 @@ public function start()/*:void*/
      */
     protected function getAnonymizedUserHash() : string
     {
-	    $alg = 'sha256'; // put new desired hashing algo here
-	    if (array_search($alg,hash_algos()) === false) {
-		    $alg = 'md5'; // Fallback to md5 if $alg not included in php
-	    }
-	    return hash($alg,Config::getField(Config::KEY_SALT) . self::dic()->user()->getId());
+        $alg = 'sha256'; // put new desired hashing algo here
+        if (array_search($alg,hash_algos()) === false) {
+            $alg = 'md5'; // Fallback to md5 if $alg not included in php
+        }
+        return hash($alg,Config::getField(Config::KEY_SALT) . self::dic()->user()->getId());
     }
 
 
@@ -216,7 +217,7 @@ protected function doRequest(string $rest_url, array $headers, array $post_data
                 $this->response->setProgressmeters((array) $progress_meter_list);
             } else {
                 if(strlen(ilSession::get(self::KEY_RESPONSE_PROGRESS_METER)) > 0) {
-                   $this->response->setProgressmeters((array) unserialize(ilSession::get(self::KEY_RESPONSE_PROGRESS_METER)));
+                    $this->response->setProgressmeters((array) unserialize(ilSession::get(self::KEY_RESPONSE_PROGRESS_METER)));
                 }
             }
 
@@ -345,4 +346,4 @@ public function sendRating(string $recomander_id, int $rating)/*:void*/
 
         $this->doRequest("/v1/rating", $headers, $data);
     }
-}
+}
diff --git a/classes/Recommender/RecommenderResponse.php b/classes/Recommender/RecommenderResponse.php
@@ -1,6 +1,7 @@
 <?php
 
-use srag\DIC\DhbwTraining\DICTrait;
+//#SUR# composer fail
+//use srag\DIC\DhbwTraining\DICTrait;
 use srag\Plugins\DhbwTraining\RecommenderSystem\Common\Domain\Aggregate\Model\Guid;
 use srag\Plugins\DhbwTraining\RecommenderSystem\RcSGateway;
 
@@ -12,8 +13,8 @@
  */
 class RecommenderResponse
 {
-
-    use DICTrait;
+    //#SUR# composer fail
+    //use DICTrait;
 
     const PLUGIN_CLASS_NAME = ilDhbwTrainingPlugin::class;
     const STATUS_SUCCESS = "success";

diff --git a/plugin.php b/plugin.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . "/vendor/srag/dic/src/PHPVersionChecker.php";
 
 $id = "xdht";
-$version = "2.0.5";
+$version = "2.0.6";
 $ilias_min_version = "6.0";
 $ilias_max_version = "7.999";
 $responsible = "fluxlabs ag";