Dev Updated Composer dependencies

LimeSurvey · May 3, 2023 · 4f070c0 · 4f070c0
1 parent 4920978
commit 4f070c0
Show file tree

Hide file tree

Showing 18 changed files with 145 additions and 118 deletions.
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
@@ -42,6 +42,9 @@
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
     /** @var ?string */
     private $vendorDir;
 
@@ -106,6 +109,7 @@ class ClassLoader
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
     }
 
     /**
@@ -425,7 +429,8 @@ public function unregister()
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
@@ -555,18 +560,26 @@ private function findFileWithExtension($class, $ext)
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param  string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
@@ -98,7 +98,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
     {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
             }
         }
 
@@ -119,7 +119,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
      */
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints($constraint);
+        $constraint = $parser->parseConstraints((string) $constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
         return $provided->matches($constraint);
@@ -328,7 +328,9 @@ private static function getInstalled()
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
@@ -340,12 +342,17 @@ private static function getInstalled()
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
             } else {
                 self::$installed = array();
             }
         }
-        $installed[] = self::$installed;
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
 
         return $installed;
     }

diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -37,25 +37,18 @@ public static function getLoader()
 
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitddb1a145e450f862353420acc5153e40::$files;
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireddb1a145e450f862353420acc5153e40($fileIdentifier, $file);
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitddb1a145e450f862353420acc5153e40::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+                require $file;
+            }
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-/**
- * @param string $fileIdentifier
- * @param string $file
- * @return void
- */
-function composerRequireddb1a145e450f862353420acc5153e40($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-
-        require $file;
-    }
-}
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
@@ -7,8 +7,8 @@
 
 return array(
     $vendorDir . '/pear/console_getopt',
-    $vendorDir . '/pear/ole',
-    $vendorDir . '/pear/pear-core-minimal/src',
     $vendorDir . '/pear/pear_exception',
+    $vendorDir . '/pear/pear-core-minimal/src',
+    $vendorDir . '/pear/ole',
     $vendorDir . '/pear/spreadsheet_excel_writer',
 );
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'limesurvey/limesurvey',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'aa37c2f11cb45f9932d4da2cde3d396505337933',
+        'reference' => '4920978b1a27514b0dc3404a15a4bec6a79f2980',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -20,9 +20,9 @@
             'dev_requirement' => false,
         ),
         'khaled.alshamaa/ar-php' => array(
-            'pretty_version' => 'v6.3.0',
-            'version' => '6.3.0.0',
-            'reference' => 'a35d61400a646a0c685a98d3fc7eea8721bc404e',
+            'pretty_version' => 'v6.3.4',
+            'version' => '6.3.4.0',
+            'reference' => '36550a0d805dc50fcede0132cd8b83c80fe1fd6c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../khaled.alshamaa/ar-php',
             'aliases' => array(),
@@ -31,7 +31,7 @@
         'limesurvey/limesurvey' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'aa37c2f11cb45f9932d4da2cde3d396505337933',
+            'reference' => '4920978b1a27514b0dc3404a15a4bec6a79f2980',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -65,9 +65,9 @@
             'dev_requirement' => false,
         ),
         'paragonie/sodium_compat' => array(
-            'pretty_version' => 'v1.19.0',
-            'version' => '1.19.0.0',
-            'reference' => 'cb15e403ecbe6a6cc515f855c310eb6b1872a933',
+            'pretty_version' => 'v1.20.0',
+            'version' => '1.20.0.0',
+            'reference' => 'e592a3e06d1fa0d43988c7c7d9948ca836f644b6',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/sodium_compat',
             'aliases' => array(),
@@ -92,9 +92,9 @@
             'dev_requirement' => false,
         ),
         'pear/pear-core-minimal' => array(
-            'pretty_version' => 'v1.10.11',
-            'version' => '1.10.11.0',
-            'reference' => '68d0d32ada737153b7e93b8d3c710ebe70ac867d',
+            'pretty_version' => 'v1.10.13',
+            'version' => '1.10.13.0',
+            'reference' => 'aed862e95fd286c53cc546734868dc38ff4b5b1d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/pear-core-minimal',
             'aliases' => array(),
@@ -148,7 +148,7 @@
         'rsky/pear-core-min' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => 'v1.10.11',
+                0 => 'v1.10.13',
             ),
         ),
         'symfony/polyfill-ctype' => array(

diff --git a/vendor/khaled.alshamaa/ar-php/ArPHP.phar b/vendor/khaled.alshamaa/ar-php/ArPHP.phar
diff --git a/vendor/khaled.alshamaa/ar-php/CITATION.cff b/vendor/khaled.alshamaa/ar-php/CITATION.cff
@@ -6,9 +6,12 @@ authors:
   - family-names: Al-Shamaa
     given-names: Khaled
     orcid: "https://orcid.org/0000-0002-7668-3798"
-version: 6.3.0
-date-released: "2022-06-17"
+version: 6.3.3
+date-released: "2023-04-01"
 identifiers:
+  - description: Ar-PHP version 6.3.3
+    type: doi
+    value: "10.5281/zenodo.7790300"
   - description: Ar-PHP version 6.3.0
     type: doi
     value: "10.5281/zenodo.6657842"

diff --git a/vendor/khaled.alshamaa/ar-php/examples/ar_summarize.php b/vendor/khaled.alshamaa/ar-php/examples/ar_summarize.php
@@ -180,7 +180,6 @@
 </i>
 </div>
 
-
 <footer><i><a href="https://github.com/khaled-alshamaa/ar-php">Ar-PHP</a>, an open-source library for website developers to process Arabic content</i></footer>
 </body>
 </html>
diff --git a/vendor/khaled.alshamaa/ar-php/examples/qibla.php b/vendor/khaled.alshamaa/ar-php/examples/qibla.php
@@ -2,7 +2,7 @@
 error_reporting(E_STRICT);
 
 if (isset($_GET['d'])) { 
-    $degree = $_GET['d']; 
+    $degree = (float)$_GET['d']; 
 } else { 
     $degree = 0; 
 }

diff --git a/vendor/khaled.alshamaa/ar-php/examples/strtotime.php b/vendor/khaled.alshamaa/ar-php/examples/strtotime.php
@@ -186,11 +186,6 @@
 </i>
 </div>
 
-
-
-
-
-
 <footer><i><a href="https://github.com/khaled-alshamaa/ar-php">Ar-PHP</a>, an open-source library for website developers to process Arabic content</i></footer>
 </body>
 </html>
diff --git a/vendor/khaled.alshamaa/ar-php/src/Arabic.php b/vendor/khaled.alshamaa/ar-php/src/Arabic.php
@@ -51,14 +51,14 @@
  * @copyright 2006-2023 Khaled Al-Shamaa
  *
  * @license   LGPL <http://www.gnu.org/licenses/lgpl.txt>
- * @version   6.3.3 released in Apr 1, 2023
+ * @version   6.3.4 released in Apr 5, 2023
  * @link      http://www.ar-php.org
  */
 
 class Arabic
 {
     /** @var string */
-    public $version = '6.3.3';
+    public $version = '6.3.4';
 
     /** @var array<string> */
     private $arStandardPatterns = array();
@@ -2396,7 +2396,8 @@ private function arGlyphsPreConvert($str)
                     $output .= '&#x' . $this->arGlyphs[$crntChar . $nextChar][0] . ';';
                 }
                 if ($prevChar == 'ل') {
-                    $tmp_form = ($this->arGlyphs[$chars[$i - 2]]['prevLink'] == true) ? 3 : 2;
+                    $tmp_form = (isset($this->arGlyphs[$chars[$i - 2]]['prevLink']) &&
+                                 $this->arGlyphs[$chars[$i - 2]]['prevLink'] == true) ? 3 : 2;
                     $output .= '&#x' . $this->arGlyphs[$prevChar][$tmp_form] . ';';
                     $i--;
                 }

diff --git a/vendor/paragonie/sodium_compat/LICENSE b/vendor/paragonie/sodium_compat/LICENSE
@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2016-2022, Paragon Initiative Enterprises <security at paragonie dot com>
+Copyright (c) 2016-2023, Paragon Initiative Enterprises <security at paragonie dot com>
 Copyright (c) 2013-2019, Frank Denis <j at pureftpd dot org>
 
 Permission to use, copy, modify, and/or distribute this software for any

diff --git a/vendor/paragonie/sodium_compat/lib/php72compat.php b/vendor/paragonie/sodium_compat/lib/php72compat.php
@@ -1360,6 +1360,8 @@ function sodium_memcmp($string1, $string2)
      * @return void
      * @throws SodiumException
      * @throws TypeError
+     *
+     * @psalm-suppress ReferenceConstraintViolation
      */
     function sodium_memzero(&$string)
     {