From ce604ed05a1a21273a34608f7b26b8c397a2138a Mon Sep 17 00:00:00 2001 From: "o.pinke" Date: Mon, 6 Dec 2021 15:20:11 +0100 Subject: [PATCH] updates composer --- composer.json | 7 +- composer.lock | 2 +- conlite/external/composer/ClassLoader.php | 113 ++++++++++++++++-- .../external/composer/InstalledVersions.php | 25 +++- conlite/external/composer/installed.json | 14 +-- conlite/external/composer/installed.php | 14 +-- conlite/plugins/.gitignore | 8 -- 7 files changed, 140 insertions(+), 43 deletions(-) delete mode 100644 conlite/plugins/.gitignore diff --git a/composer.json b/composer.json index f101da8..6308829 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { - "name": "vendor/con-lite21", - "description": "Description of project ConLite21.", + "name": "vendor/conlite", + "description": "ConLite vendor libs", + "license": "GPL-3.0-or-later", "authors": [ { "name": "oldperl", @@ -12,7 +13,7 @@ }, "require": { "phpmailer/phpmailer": "v6.5.*", - "endroid/qr-code": "4.2.2" + "endroid/qr-code": "4.2.*" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index e092f5c..525e104 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "556a72471464e0cc12ffb0eb1572afb5", + "content-hash": "4058ddfb2c39b3e213b283a4d0e5226f", "packages": [ { "name": "bacon/bacon-qr-code", diff --git a/conlite/external/composer/ClassLoader.php b/conlite/external/composer/ClassLoader.php index 6d0c3f2..0cd6055 100644 --- a/conlite/external/composer/ClassLoader.php +++ b/conlite/external/composer/ClassLoader.php @@ -42,30 +42,75 @@ namespace Composer\Autoload; */ class ClassLoader { + /** @var ?string */ private $vendorDir; // PSR-4 + /** + * @var array[] + * @psalm-var array> + */ private $prefixLengthsPsr4 = array(); + /** + * @var array[] + * @psalm-var array> + */ private $prefixDirsPsr4 = array(); + /** + * @var array[] + * @psalm-var array + */ private $fallbackDirsPsr4 = array(); // PSR-0 + /** + * @var array[] + * @psalm-var array> + */ private $prefixesPsr0 = array(); + /** + * @var array[] + * @psalm-var array + */ private $fallbackDirsPsr0 = array(); + /** @var bool */ private $useIncludePath = false; + + /** + * @var string[] + * @psalm-var array + */ private $classMap = array(); + + /** @var bool */ private $classMapAuthoritative = false; + + /** + * @var bool[] + * @psalm-var array + */ private $missingClasses = array(); + + /** @var ?string */ private $apcuPrefix; + /** + * @var self[] + */ private static $registeredLoaders = array(); + /** + * @param ?string $vendorDir + */ public function __construct($vendorDir = null) { $this->vendorDir = $vendorDir; } + /** + * @return string[] + */ public function getPrefixes() { if (!empty($this->prefixesPsr0)) { @@ -75,28 +120,47 @@ class ClassLoader return array(); } + /** + * @return array[] + * @psalm-return array> + */ public function getPrefixesPsr4() { return $this->prefixDirsPsr4; } + /** + * @return array[] + * @psalm-return array + */ public function getFallbackDirs() { return $this->fallbackDirsPsr0; } + /** + * @return array[] + * @psalm-return array + */ public function getFallbackDirsPsr4() { return $this->fallbackDirsPsr4; } + /** + * @return string[] Array of classname => path + * @psalm-var array + */ public function getClassMap() { return $this->classMap; } /** - * @param array $classMap Class to filename map + * @param string[] $classMap Class to filename map + * @psalm-param array $classMap + * + * @return void */ public function addClassMap(array $classMap) { @@ -111,9 +175,11 @@ class ClassLoader * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param array|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix + * @param string[]|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + * + * @return void */ public function add($prefix, $paths, $prepend = false) { @@ -156,11 +222,13 @@ class ClassLoader * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param string[]|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException + * + * @return void */ public function addPsr4($prefix, $paths, $prepend = false) { @@ -204,8 +272,10 @@ class ClassLoader * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param array|string $paths The PSR-0 base directories + * @param string $prefix The prefix + * @param string[]|string $paths The PSR-0 base directories + * + * @return void */ public function set($prefix, $paths) { @@ -220,10 +290,12 @@ class ClassLoader * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param string[]|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException + * + * @return void */ public function setPsr4($prefix, $paths) { @@ -243,6 +315,8 @@ class ClassLoader * Turns on searching the include path for class files. * * @param bool $useIncludePath + * + * @return void */ public function setUseIncludePath($useIncludePath) { @@ -265,6 +339,8 @@ class ClassLoader * that have not been registered with the class map. * * @param bool $classMapAuthoritative + * + * @return void */ public function setClassMapAuthoritative($classMapAuthoritative) { @@ -285,6 +361,8 @@ class ClassLoader * APCu prefix to use to cache found/not-found classes, if the extension is enabled. * * @param string|null $apcuPrefix + * + * @return void */ public function setApcuPrefix($apcuPrefix) { @@ -305,6 +383,8 @@ class ClassLoader * Registers this instance as an autoloader. * * @param bool $prepend Whether to prepend the autoloader or not + * + * @return void */ public function register($prepend = false) { @@ -324,6 +404,8 @@ class ClassLoader /** * Unregisters this instance as an autoloader. + * + * @return void */ public function unregister() { @@ -403,6 +485,11 @@ class ClassLoader return self::$registeredLoaders; } + /** + * @param string $class + * @param string $ext + * @return string|false + */ private function findFileWithExtension($class, $ext) { // PSR-4 lookup @@ -474,6 +561,10 @@ class ClassLoader * Scope isolated include. * * Prevents access to $this/self from included files. + * + * @param string $file + * @return void + * @private */ function includeFile($file) { diff --git a/conlite/external/composer/InstalledVersions.php b/conlite/external/composer/InstalledVersions.php index b3a4e16..d50e0c9 100644 --- a/conlite/external/composer/InstalledVersions.php +++ b/conlite/external/composer/InstalledVersions.php @@ -20,12 +20,25 @@ use Composer\Semver\VersionParser; * * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * - * To require it's presence, you can require `composer-runtime-api ^2.0` + * To require its presence, you can require `composer-runtime-api ^2.0` */ class InstalledVersions { + /** + * @var mixed[]|null + * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}|array{}|null + */ private static $installed; + + /** + * @var bool|null + */ private static $canGetVendors; + + /** + * @var array[] + * @psalm-var array}> + */ private static $installedByVendor = array(); /** @@ -228,7 +241,7 @@ class InstalledVersions /** * @return array - * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string} + * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string} */ public static function getRootPackage() { @@ -242,7 +255,7 @@ class InstalledVersions * * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. * @return array[] - * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} + * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} */ public static function getRawData() { @@ -265,7 +278,7 @@ class InstalledVersions * Returns the raw data of all installed.php which are currently loaded for custom implementations * * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ public static function getAllRawData() { @@ -288,7 +301,7 @@ class InstalledVersions * @param array[] $data A vendor/composer/installed.php data set * @return void * - * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array} $data + * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} $data */ public static function reload($data) { @@ -298,7 +311,7 @@ class InstalledVersions /** * @return array[] - * @psalm-return list}> + * @psalm-return list}> */ private static function getInstalled() { diff --git a/conlite/external/composer/installed.json b/conlite/external/composer/installed.json index 6dd4454..2e14a64 100644 --- a/conlite/external/composer/installed.json +++ b/conlite/external/composer/installed.json @@ -183,17 +183,17 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.5.1", - "version_normalized": "6.5.1.0", + "version": "v6.5.3", + "version_normalized": "6.5.3.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355" + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/dd803df5ad7492e1b40637f7ebd258fee5ca7355", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", "shasum": "" }, "require": { @@ -220,7 +220,7 @@ "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" }, - "time": "2021-08-18T09:14:16+00:00", + "time": "2021-11-25T16:34:11+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -252,7 +252,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" }, "funding": [ { diff --git a/conlite/external/composer/installed.php b/conlite/external/composer/installed.php index d4efcec..a1a4054 100644 --- a/conlite/external/composer/installed.php +++ b/conlite/external/composer/installed.php @@ -5,8 +5,8 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '5c9e15e23ca5e451ba14f78858dfa23dd81d498b', - 'name' => 'vendor/con-lite21', + 'reference' => '85a5027880a8624c6a59db08fd8e2acdf6089484', + 'name' => 'vendor/conlite', 'dev' => false, ), 'versions' => array( @@ -38,21 +38,21 @@ 'dev_requirement' => false, ), 'phpmailer/phpmailer' => array( - 'pretty_version' => 'v6.5.1', - 'version' => '6.5.1.0', + 'pretty_version' => 'v6.5.3', + 'version' => '6.5.3.0', 'type' => 'library', 'install_path' => __DIR__ . '/../phpmailer/phpmailer', 'aliases' => array(), - 'reference' => 'dd803df5ad7492e1b40637f7ebd258fee5ca7355', + 'reference' => 'baeb7cde6b60b1286912690ab0693c7789a31e71', 'dev_requirement' => false, ), - 'vendor/con-lite21' => array( + 'vendor/conlite' => array( 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '5c9e15e23ca5e451ba14f78858dfa23dd81d498b', + 'reference' => '85a5027880a8624c6a59db08fd8e2acdf6089484', 'dev_requirement' => false, ), ), diff --git a/conlite/plugins/.gitignore b/conlite/plugins/.gitignore deleted file mode 100644 index 8b1d314..0000000 --- a/conlite/plugins/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/cl-linkchecker -/cl-mod-rewrite -/cl-newsletter -/cl-workflow -/cl-content-allocation -/org.conlite.twig -/smarty -/phpbo.cookie_consent