Skip to content

Commit 072dccf

Browse files
chore: remove files that belong in other PRs
- Revert lib/poller.php and lib/rrd.php arg-array changes (belong in PR Cacti#6855) - Remove ArgArrayHardeningTest.php (belongs in PR Cacti#6855) - Revert vendor/composer updates (should be a separate PR) Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
1 parent 182f13e commit 072dccf

File tree

14 files changed

+8942
-10885
lines changed

14 files changed

+8942
-10885
lines changed

composer.lock

Lines changed: 7751 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

include/vendor/composer/InstalledVersions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public static function getRawData()
277277
if (null === self::$installed) {
278278
// only require the installed.php file if this file is loaded from its dumped location,
279279
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
280-
if (substr(__DIR__, -8, 1) !== 'C') {
280+
if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
281281
self::$installed = include __DIR__ . '/installed.php';
282282
} else {
283283
self::$installed = array();
@@ -378,7 +378,7 @@ private static function getInstalled()
378378
if (null === self::$installed) {
379379
// only require the installed.php file if this file is loaded from its dumped location,
380380
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
381-
if (substr(__DIR__, -8, 1) !== 'C') {
381+
if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
382382
/** @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 */
383383
$required = require __DIR__ . '/installed.php';
384384
self::$installed = $required;

include/vendor/composer/LICENSE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Copyright (c) Nils Adermann, Jordi Boggiano
32

43
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1817
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1918
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2019
THE SOFTWARE.
21-

include/vendor/composer/autoload_classmap.php

Lines changed: 1 addition & 1187 deletions
Large diffs are not rendered by default.

include/vendor/composer/autoload_files.php

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,9 @@
66
$baseDir = dirname(dirname($vendorDir));
77

88
return array(
9-
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
10-
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
11-
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
12-
'8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
13-
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
14-
'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
15-
'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
16-
'ec07570ca5a812141189b1fa81503674' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert/Functions.php',
179
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
18-
'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php',
19-
'35a6ad97d21e794e7e22a17d806652e4' => $vendorDir . '/nunomaduro/termwind/src/Functions.php',
10+
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
2011
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
21-
'a1cfe24d14977df6878b9bf804af2d1c' => $vendorDir . '/nunomaduro/collision/src/Adapters/Phpunit/Autoload.php',
22-
'aadac1114cab8dc19489a7f6dc24c003' => $vendorDir . '/pestphp/pest-plugin-arch/src/Autoload.php',
2312
'253c157292f75eb38082b5acb06f3f01' => $vendorDir . '/nikic/fast-route/src/functions.php',
24-
'f83ed111c2f97a0449abf067f157f418' => $vendorDir . '/pestphp/pest/src/Functions.php',
25-
'7d2876738dc0328edeb8a103c76cd8e7' => $vendorDir . '/pestphp/pest/src/Pest.php',
26-
'9b38cf48e83f5d8f60375221cd213eee' => $vendorDir . '/phpstan/phpstan/bootstrap.php',
27-
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
28-
'23c18046f52bef3eea034657bafda50f' => $vendorDir . '/symfony/polyfill-php81/bootstrap.php',
29-
'9d2b9fc6db0f153a0a149fefb182415e' => $vendorDir . '/symfony/polyfill-php84/bootstrap.php',
3013
'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
31-
'38143a9afc50997d55e4815db8489d1c' => $vendorDir . '/rector/rector/bootstrap.php',
3214
);

include/vendor/composer/autoload_psr4.php

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,78 +7,24 @@
77

88
return array(
99
'phpseclib3\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
10-
'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src', $vendorDir . '/phpdocumentor/reflection-common/src'),
11-
'Whoops\\' => array($vendorDir . '/filp/whoops/src/Whoops'),
12-
'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
13-
'Termwind\\' => array($vendorDir . '/nunomaduro/termwind/src'),
14-
'Symfony\\Polyfill\\Php84\\' => array($vendorDir . '/symfony/polyfill-php84'),
15-
'Symfony\\Polyfill\\Php81\\' => array($vendorDir . '/symfony/polyfill-php81'),
16-
'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
17-
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
18-
'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
19-
'Symfony\\Polyfill\\Intl\\Grapheme\\' => array($vendorDir . '/symfony/polyfill-intl-grapheme'),
20-
'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
21-
'Symfony\\Contracts\\Service\\' => array($vendorDir . '/symfony/service-contracts'),
22-
'Symfony\\Contracts\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher-contracts'),
23-
'Symfony\\Contracts\\Cache\\' => array($vendorDir . '/symfony/cache-contracts'),
24-
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
25-
'Symfony\\Component\\VarExporter\\' => array($vendorDir . '/symfony/var-exporter'),
26-
'Symfony\\Component\\String\\' => array($vendorDir . '/symfony/string'),
27-
'Symfony\\Component\\Stopwatch\\' => array($vendorDir . '/symfony/stopwatch'),
28-
'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
29-
'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
30-
'Symfony\\Component\\Finder\\' => array($vendorDir . '/symfony/finder'),
31-
'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
32-
'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
33-
'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
34-
'Symfony\\Component\\Cache\\' => array($vendorDir . '/symfony/cache'),
3510
'Stevenmaguire\\OAuth2\\Client\\' => array($vendorDir . '/stevenmaguire/oauth2-microsoft/src', $vendorDir . '/stevenmaguire/oauth2-keycloak/src'),
3611
'Slim\\' => array($vendorDir . '/slim/slim/Slim'),
37-
'React\\Stream\\' => array($vendorDir . '/react/stream/src'),
38-
'React\\Socket\\' => array($vendorDir . '/react/socket/src'),
39-
'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
40-
'React\\EventLoop\\' => array($vendorDir . '/react/event-loop/src'),
41-
'React\\Dns\\' => array($vendorDir . '/react/dns/src'),
42-
'React\\ChildProcess\\' => array($vendorDir . '/react/child-process/src'),
43-
'React\\Cache\\' => array($vendorDir . '/react/cache/src'),
4412
'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
4513
'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-middleware/src', $vendorDir . '/psr/http-server-handler/src'),
4614
'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
4715
'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
48-
'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
4916
'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
50-
'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
51-
'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
5217
'PhpMqtt\\Client\\' => array($vendorDir . '/php-mqtt/client/src'),
53-
'PhpCsFixer\\' => array($vendorDir . '/friendsofphp/php-cs-fixer/src'),
54-
'Pest\\Plugin\\' => array($vendorDir . '/pestphp/pest-plugin/src'),
55-
'Pest\\Drift\\' => array($vendorDir . '/pestphp/pest-plugin-drift/src'),
56-
'Pest\\Arch\\' => array($vendorDir . '/pestphp/pest-plugin-arch/src'),
57-
'Pest\\' => array($vendorDir . '/pestphp/pest/src'),
5818
'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
59-
'ParaTest\\' => array($vendorDir . '/brianium/paratest/src'),
60-
'PHPUnit\\Architecture\\' => array($vendorDir . '/ta-tikoma/phpunit-architecture-test/src'),
61-
'PHPStan\\PhpDocParser\\' => array($vendorDir . '/phpstan/phpdoc-parser/src'),
6219
'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'),
63-
'Overtrue\\PHPLint\\' => array($vendorDir . '/overtrue/phplint/src'),
64-
'NunoMaduro\\Collision\\' => array($vendorDir . '/nunomaduro/collision/src'),
6520
'NetDNS2\\' => array($vendorDir . '/mikepultz/netdns2/src/NetDNS2'),
6621
'MyCLabs\\Enum\\' => array($vendorDir . '/myclabs/php-enum/src'),
6722
'League\\OAuth2\\Client\\' => array($vendorDir . '/league/oauth2-google/src', $vendorDir . '/league/oauth2-client/src'),
68-
'Jean85\\' => array($vendorDir . '/jean85/pretty-package-versions/src'),
6923
'Hayageek\\OAuth2\\Client\\' => array($vendorDir . '/hayageek/oauth2-yahoo/src'),
7024
'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
7125
'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
7226
'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
7327
'Greew\\OAuth2\\Client\\Provider\\' => array($vendorDir . '/greew/oauth2-azure-provider/src/Provider'),
7428
'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'),
75-
'Fidry\\CpuCoreCounter\\' => array($vendorDir . '/fidry/cpu-core-counter/src'),
7629
'FastRoute\\' => array($vendorDir . '/nikic/fast-route/src'),
77-
'Evenement\\' => array($vendorDir . '/evenement/evenement/src'),
78-
'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/src'),
79-
'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
80-
'Composer\\XdebugHandler\\' => array($vendorDir . '/composer/xdebug-handler/src'),
81-
'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
82-
'Composer\\Pcre\\' => array($vendorDir . '/composer/pcre/src'),
83-
'Clue\\React\\NDJson\\' => array($vendorDir . '/clue/ndjson-react/src'),
8430
);

include/vendor/composer/autoload_real.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25+
require __DIR__ . '/platform_check.php';
26+
2527
spl_autoload_register(array('ComposerAutoloaderInit4457df976b6743d4cf060b8bfc645118', 'loadClassLoader'), true, true);
2628
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
2729
spl_autoload_unregister(array('ComposerAutoloaderInit4457df976b6743d4cf060b8bfc645118', 'loadClassLoader'));

0 commit comments

Comments
 (0)