Skip to content

Commit 1b60b93

Browse files
ziegenbergziegenberg
committed
Fixed bundled dependencies
Re-Installed the following dependencies: - dealerdirect/phpcodesniffer-composer-installer - phpcsstandards/phpcsutils - phpcsstandards/phpcsextra - squizlabs/php_codesniffer Fixes #245 Signed-off-by: Daniel Ziegenberg <[email protected]>
1 parent 38602b5 commit 1b60b93

File tree

662 files changed

+64878
-18
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

662 files changed

+64878
-18
lines changed

‎vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInitf911c1a21380142d6ee33490dc0eee6a::getLoader();
25+
return ComposerAutoloaderInit574d662ebe51df2403d0358535dbfb75::getLoader();

‎vendor/composer/InstalledVersions.php‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ class InstalledVersions
3232
*/
3333
private static $installed;
3434

35+
/**
36+
* @var bool
37+
*/
38+
private static $installedIsLocalDir;
39+
3540
/**
3641
* @var bool|null
3742
*/
@@ -309,6 +314,12 @@ public static function reload($data)
309314
{
310315
self::$installed = $data;
311316
self::$installedByVendor = array();
317+
318+
// when using reload, we disable the duplicate protection to ensure that self::$installed data is
319+
// always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
320+
// so we have to assume it does not, and that may result in duplicate data being returned when listing
321+
// all installed packages for example
322+
self::$installedIsLocalDir = false;
312323
}
313324

314325
/**
@@ -325,19 +336,24 @@ private static function getInstalled()
325336
$copiedLocalDir = false;
326337

327338
if (self::$canGetVendors) {
339+
$selfDir = strtr(__DIR__, '\\', '/');
328340
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341+
$vendorDir = strtr($vendorDir, '\\', '/');
329342
if (isset(self::$installedByVendor[$vendorDir])) {
330343
$installed[] = self::$installedByVendor[$vendorDir];
331344
} elseif (is_file($vendorDir.'/composer/installed.php')) {
332345
/** @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 */
333346
$required = require $vendorDir.'/composer/installed.php';
334347
self::$installedByVendor[$vendorDir] = $required;
335348
$installed[] = $required;
336-
if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
349+
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
337350
self::$installed = $required;
338-
$copiedLocalDir = true;
351+
self::$installedIsLocalDir = true;
339352
}
340353
}
354+
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
355+
$copiedLocalDir = true;
356+
}
341357
}
342358
}
343359

‎vendor/composer/autoload_real.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInitf911c1a21380142d6ee33490dc0eee6a
5+
class ComposerAutoloaderInit574d662ebe51df2403d0358535dbfb75
66
{
77
private static $loader;
88

@@ -24,12 +24,12 @@ public static function getLoader()
2424

2525
require __DIR__ . '/platform_check.php';
2626

27-
spl_autoload_register(array('ComposerAutoloaderInitf911c1a21380142d6ee33490dc0eee6a', 'loadClassLoader'), true, true);
27+
spl_autoload_register(array('ComposerAutoloaderInit574d662ebe51df2403d0358535dbfb75', 'loadClassLoader'), true, true);
2828
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
29-
spl_autoload_unregister(array('ComposerAutoloaderInitf911c1a21380142d6ee33490dc0eee6a', 'loadClassLoader'));
29+
spl_autoload_unregister(array('ComposerAutoloaderInit574d662ebe51df2403d0358535dbfb75', 'loadClassLoader'));
3030

3131
require __DIR__ . '/autoload_static.php';
32-
call_user_func(\Composer\Autoload\ComposerStaticInitf911c1a21380142d6ee33490dc0eee6a::getInitializer($loader));
32+
call_user_func(\Composer\Autoload\ComposerStaticInit574d662ebe51df2403d0358535dbfb75::getInitializer($loader));
3333

3434
$loader->register(true);
3535

‎vendor/composer/autoload_static.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInitf911c1a21380142d6ee33490dc0eee6a
7+
class ComposerStaticInit574d662ebe51df2403d0358535dbfb75
88
{
99
public static $prefixLengthsPsr4 = array (
1010
'P' =>
@@ -85,9 +85,9 @@ class ComposerStaticInitf911c1a21380142d6ee33490dc0eee6a
8585
public static function getInitializer(ClassLoader $loader)
8686
{
8787
return \Closure::bind(function () use ($loader) {
88-
$loader->prefixLengthsPsr4 = ComposerStaticInitf911c1a21380142d6ee33490dc0eee6a::$prefixLengthsPsr4;
89-
$loader->prefixDirsPsr4 = ComposerStaticInitf911c1a21380142d6ee33490dc0eee6a::$prefixDirsPsr4;
90-
$loader->classMap = ComposerStaticInitf911c1a21380142d6ee33490dc0eee6a::$classMap;
88+
$loader->prefixLengthsPsr4 = ComposerStaticInit574d662ebe51df2403d0358535dbfb75::$prefixLengthsPsr4;
89+
$loader->prefixDirsPsr4 = ComposerStaticInit574d662ebe51df2403d0358535dbfb75::$prefixDirsPsr4;
90+
$loader->classMap = ComposerStaticInit574d662ebe51df2403d0358535dbfb75::$classMap;
9191

9292
}, null, ClassLoader::class);
9393
}

‎vendor/composer/installed.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@
189189
},
190190
"require": {
191191
"php": ">=5.4",
192-
"phpcsstandards/phpcsutils": "^1.0.12",
193-
"squizlabs/php_codesniffer": "^3.10.0"
192+
"phpcsstandards/phpcsutils": "^1.1.0",
193+
"squizlabs/php_codesniffer": "^3.13.0"
194194
},
195195
"replace": {
196196
"wimg/php-compatibility": "*"
197197
},
198198
"require-dev": {
199199
"php-parallel-lint/php-console-highlighter": "^1.0.0",
200-
"php-parallel-lint/php-parallel-lint": "^1.3.2",
200+
"php-parallel-lint/php-parallel-lint": "^1.4.0",
201201
"phpcsstandards/phpcsdevcs": "^1.1.3",
202202
"phpcsstandards/phpcsdevtools": "^1.2.0",
203203
"phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4 || ^10.1.0",
@@ -206,7 +206,7 @@
206206
"suggest": {
207207
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
208208
},
209-
"time": "2024-06-07T09:46:11+00:00",
209+
"time": "2025-07-06T15:59:37+00:00",
210210
"default-branch": true,
211211
"type": "phpcodesniffer-standard",
212212
"extra": {
@@ -237,7 +237,7 @@
237237
}
238238
],
239239
"description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
240-
"homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
240+
"homepage": "https://techblog.wimgodden.be/tag/codesniffer/",
241241
"keywords": [
242242
"compatibility",
243243
"phpcs",
@@ -261,6 +261,10 @@
261261
{
262262
"url": "https://opencollective.com/php_codesniffer",
263263
"type": "open_collective"
264+
},
265+
{
266+
"url": "https://thanks.dev/u/gh/phpcompatibility",
267+
"type": "thanks_dev"
264268
}
265269
],
266270
"install-path": "../phpcompatibility/php-compatibility"

‎vendor/composer/installed.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 'moodlehq/local_codechecker',
44
'pretty_version' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => 'b4422b004fe63360eaa73113e537604bd2efd2d6',
6+
'reference' => '38602b55f5fb5b0c05b34de293c0e475e357e93b',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -22,7 +22,7 @@
2222
'moodlehq/local_codechecker' => array(
2323
'pretty_version' => 'dev-main',
2424
'version' => 'dev-main',
25-
'reference' => 'b4422b004fe63360eaa73113e537604bd2efd2d6',
25+
'reference' => '38602b55f5fb5b0c05b34de293c0e475e357e93b',
2626
'type' => 'library',
2727
'install_path' => __DIR__ . '/../../',
2828
'aliases' => array(),

0 commit comments

Comments
 (0)