From d459dfac74e90c29950d49a82edc19fd913d435e Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 29 Jul 2021 08:25:05 +0000 Subject: update to bootstrap 5.0.2 --- vendor/composer/InstalledVersions.php | 16 ++++++++++++++-- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_real.php | 2 -- vendor/composer/autoload_static.php | 1 + vendor/composer/installed.json | 20 +++++++------------- vendor/composer/installed.php | 12 ++++++------ vendor/composer/platform_check.php | 26 -------------------------- 7 files changed, 29 insertions(+), 49 deletions(-) delete mode 100644 vendor/composer/platform_check.php (limited to 'vendor/composer') diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 2c3bcd1bf..b3a4e1611 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -249,7 +249,13 @@ class InstalledVersions @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); if (null === self::$installed) { - self::$installed = include __DIR__ . '/installed.php'; + // 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 = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } } return self::$installed; @@ -316,7 +322,13 @@ class InstalledVersions } if (null === self::$installed) { - self::$installed = require __DIR__ . '/installed.php'; + // 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'; + } else { + self::$installed = array(); + } } $installed[] = self::$installed; diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index e1970725f..22fed00c2 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -386,6 +386,7 @@ return array( 'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php', 'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php', 'Ramsey\\Collection\\AbstractArray' => $vendorDir . '/ramsey/collection/src/AbstractArray.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index fbfac821c..01be3a52c 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -22,8 +22,6 @@ class ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d return self::$loader; } - require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); spl_autoload_unregister(array('ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d', 'loadClassLoader')); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 76328350d..eb84f6fbb 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -576,6 +576,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php', 'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php', 'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php', + 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php', 'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php', 'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php', 'Ramsey\\Collection\\AbstractArray' => __DIR__ . '/..' . '/ramsey/collection/src/AbstractArray.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 658da1fdd..60bccd1db 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1595,23 +1595,23 @@ }, { "name": "twbs/bootstrap", - "version": "v5.0.1", - "version_normalized": "5.0.1.0", + "version": "v5.0.2", + "version_normalized": "5.0.2.0", "source": { "type": "git", "url": "https://github.com/twbs/bootstrap.git", - "reference": "58b1be927f43c779377e478df2d119f2ddf956ca" + "reference": "688bce4fa695cc360a0d084e34f029b0c192b223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/58b1be927f43c779377e478df2d119f2ddf956ca", - "reference": "58b1be927f43c779377e478df2d119f2ddf956ca", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/688bce4fa695cc360a0d084e34f029b0c192b223", + "reference": "688bce4fa695cc360a0d084e34f029b0c192b223", "shasum": "" }, "replace": { "twitter/bootstrap": "self.version" }, - "time": "2021-05-13T16:22:20+00:00", + "time": "2021-06-22T18:29:16+00:00", "type": "library", "installation-source": "dist", "notification-url": "https://packagist.org/downloads/", @@ -1642,14 +1642,8 @@ ], "support": { "issues": "https://github.com/twbs/bootstrap/issues", - "source": "https://github.com/twbs/bootstrap/tree/v5.0.1" + "source": "https://github.com/twbs/bootstrap/tree/v5.0.2" }, - "funding": [ - { - "url": "https://opencollective.com/bootstrap", - "type": "open_collective" - } - ], "install-path": "../twbs/bootstrap" } ], diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index b1f2402c2..fb055627f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '67322c12643ced03bec0be70667f8b1c45de752f', + 'reference' => 'cec2f0d894b80f3affeb60cff2d4afa49a2019a8', 'name' => 'zotlabs/hubzilla', 'dev' => false, ), @@ -224,18 +224,18 @@ 'dev_requirement' => false, ), 'twbs/bootstrap' => array( - 'pretty_version' => 'v5.0.1', - 'version' => '5.0.1.0', + 'pretty_version' => 'v5.0.2', + 'version' => '5.0.2.0', 'type' => 'library', 'install_path' => __DIR__ . '/../twbs/bootstrap', 'aliases' => array(), - 'reference' => '58b1be927f43c779377e478df2d119f2ddf956ca', + 'reference' => '688bce4fa695cc360a0d084e34f029b0c192b223', 'dev_requirement' => false, ), 'twitter/bootstrap' => array( 'dev_requirement' => false, 'replaced' => array( - 0 => 'v5.0.1', + 0 => 'v5.0.2', ), ), 'zotlabs/hubzilla' => array( @@ -244,7 +244,7 @@ 'type' => 'application', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '67322c12643ced03bec0be70667f8b1c45de752f', + 'reference' => 'cec2f0d894b80f3affeb60cff2d4afa49a2019a8', 'dev_requirement' => false, ), ), diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php deleted file mode 100644 index 92370c5a0..000000000 --- a/vendor/composer/platform_check.php +++ /dev/null @@ -1,26 +0,0 @@ -= 70300)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.3.0". You are running ' . PHP_VERSION . '.'; -} - -if ($issues) { - if (!headers_sent()) { - header('HTTP/1.1 500 Internal Server Error'); - } - if (!ini_get('display_errors')) { - if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { - fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); - } elseif (!headers_sent()) { - echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; - } - } - trigger_error( - 'Composer detected issues in your platform: ' . implode(' ', $issues), - E_USER_ERROR - ); -} -- cgit v1.2.3