Merge branch 'release_5-4' of https://github.com/ILIAS-eLearning/ILIAS …

…into release_5-4

Modules/TestQuestionPool/classes/class.assFormulaQuestion.php

@@ -1262,7 +1262,12 @@ public function getBestSolution($solutions)
                     $unit_factor = assFormulaQuestionUnit::lookupUnitFactor($user_solution[$result_name]['unit']);
                 }
 
-                $user_solution[$result->getResult()]["value"] = ilMath::_div($resVal, $unit_factor, 55);
+                try {
+                    $user_solution[$result->getResult()]["value"] = ilMath::_div($resVal, $unit_factor, 55);
+                } catch (ilMathDivisionByZeroException $ex) {
+                    $user_solution[$result->getResult()]["value"] = 0;
+                    ilUtil::sendFailure( $ex->getMessage(), true );
+                }
             }
             if ($result->getResultType() == assFormulaQuestionResult::RESULT_CO_FRAC
                 || $result->getResultType() == assFormulaQuestionResult::RESULT_FRAC) {

Modules/TestQuestionPool/classes/class.assFormulaQuestionResult.php

@@ -324,7 +324,12 @@ public function isCorrect($variables, $results, $value, $unit = null)
                         $check_fraction = false;
                     }
                 } else {
-                    $frac_value = ilMath::_div($exp_val[0], $exp_val[1], $this->getPrecision());
+                    try {
+                        $frac_value = ilMath::_div($exp_val[0], $exp_val[1], $this->getPrecision());
+                    } catch (ilMathDivisionByZeroException $ex) {
+                        $frac_value = 0;
+                        ilUtil::sendFailure($ex->getMessage(), true);
+                    }
                     $frac_value = str_replace(',', '.', $frac_value);
 
                     if (ilMath::_equals($frac_value, $resultWithRespectedUnit, $this->getPrecision())) {

libs/composer/composer.json

@@ -26,7 +26,7 @@
 		"league/flysystem": "^1.0",
 		"james-heinrich/getid3": "^1.9",
 		"phpoffice/phpspreadsheet": "1.8.2",
-		"jumbojett/openid-connect-php": "^0.7.0",
+		"jumbojett/openid-connect-php": "^0.9.2",
 		"sabre/dav": "~3.2.2",
 		"slim/slim": "^3.11",
 		"enshrined/svg-sanitize": "^0.13.0"
@@ -291,10 +291,10 @@
 		},
 		"jumbojett/openid-connect-php" : {
 			"source": "https://github.com/jumbojett/OpenID-Connect-PHP",
-			"used_version": "v0.7.0",
+			"used_version": "v0.9.2",
 			"added_by": "Stefan Meyer <[email protected]>",
 			"wrapped_by": null,
-			"last_update": "2018-10-20",
+			"last_update": "2021-05-10",
 			"last_update_by": "Stefan Meyer <[email protected]",
 			"approved_by": "Jour Fixe",
 			"approved-date": "2018-02-26"

libs/composer/vendor/composer/ClassLoader.php

@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
         return array();

libs/composer/vendor/composer/LICENSE

@@ -1,21 +1,56 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Composer
+Upstream-Contact: Jordi Boggiano <[email protected]>
+Source: https://github.com/composer/composer
 
-Copyright (c) Nils Adermann, Jordi Boggiano
+Files: *
+Copyright: 2016, Nils Adermann <[email protected]>
+           2016, Jordi Boggiano <[email protected]>
+License: Expat
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
+Files: src/Composer/Util/TlsHelper.php
+Copyright: 2016, Nils Adermann <[email protected]>
+           2016, Jordi Boggiano <[email protected]>
+           2013, Evan Coury <[email protected]>
+License: Expat and BSD-2-Clause
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+ .
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is furnished
+ to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.