Skip to content

Commit 8e29e81

Browse files
authored
Merge pull request #32145 from nextcloud/fix/phpcolors
Fix mexitek/phpcolors
2 parents 8bcba22 + 5d25da9 commit 8e29e81

29 files changed

Lines changed: 13 additions & 1787 deletions

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"ext-pdo": "*",
2626
"ext-simplexml": "*",
2727
"ext-xmlreader": "*",
28-
"ext-zip": "*",
29-
"mexitek/phpcolors": "^1.0"
28+
"ext-zip": "*"
3029
},
3130
"require-dev": {
3231
"bamarni/composer-bin-plugin": "^1.4"

composer.lock

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

lib/composer/autoload.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
// autoload.php @generated by Composer
44

5+
if (PHP_VERSION_ID < 50600) {
6+
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;
7+
exit(1);
8+
}
9+
510
require_once __DIR__ . '/composer/autoload_real.php';
611

712
return ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c::getLoader();

lib/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
return array(
99
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
10-
'Mexitek\\PHPColors\\Color' => $vendorDir . '/mexitek/phpcolors/src/Mexitek/PHPColors/Color.php',
1110
'OCP\\Accounts\\IAccount' => $baseDir . '/lib/public/Accounts/IAccount.php',
1211
'OCP\\Accounts\\IAccountManager' => $baseDir . '/lib/public/Accounts/IAccountManager.php',
1312
'OCP\\Accounts\\IAccountProperty' => $baseDir . '/lib/public/Accounts/IAccountProperty.php',

lib/composer/composer/autoload_real.php

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

25-
require __DIR__ . '/platform_check.php';
26-
2725
spl_autoload_register(array('ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c', 'loadClassLoader'), true, true);
2826
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
2927
spl_autoload_unregister(array('ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c', 'loadClassLoader'));

lib/composer/composer/autoload_static.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
3636

3737
public static $classMap = array (
3838
'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
39-
'Mexitek\\PHPColors\\Color' => __DIR__ . '/..' . '/mexitek/phpcolors/src/Mexitek/PHPColors/Color.php',
4039
'OCP\\Accounts\\IAccount' => __DIR__ . '/../../..' . '/lib/public/Accounts/IAccount.php',
4140
'OCP\\Accounts\\IAccountManager' => __DIR__ . '/../../..' . '/lib/public/Accounts/IAccountManager.php',
4241
'OCP\\Accounts\\IAccountProperty' => __DIR__ . '/../../..' . '/lib/public/Accounts/IAccountProperty.php',
Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,5 @@
11
{
2-
"packages": [
3-
{
4-
"name": "mexitek/phpcolors",
5-
"version": "v1.0.4",
6-
"version_normalized": "1.0.4.0",
7-
"source": {
8-
"type": "git",
9-
"url": "https://github.com/mexitek/phpColors.git",
10-
"reference": "4043974240ca7dc3c2bec3c158588148b605b206"
11-
},
12-
"dist": {
13-
"type": "zip",
14-
"url": "https://api.github.com/repos/mexitek/phpColors/zipball/4043974240ca7dc3c2bec3c158588148b605b206",
15-
"reference": "4043974240ca7dc3c2bec3c158588148b605b206",
16-
"shasum": ""
17-
},
18-
"require": {
19-
"php": "^7.2|^8.0"
20-
},
21-
"require-dev": {
22-
"nette/tester": "^2.3",
23-
"squizlabs/php_codesniffer": "^3.5"
24-
},
25-
"time": "2021-11-26T13:19:08+00:00",
26-
"type": "library",
27-
"installation-source": "dist",
28-
"autoload": {
29-
"classmap": [
30-
"src"
31-
]
32-
},
33-
"notification-url": "https://packagist.org/downloads/",
34-
"license": [
35-
"MIT"
36-
],
37-
"authors": [
38-
{
39-
"name": "Arlo Carreon",
40-
"homepage": "http://arlocarreon.com",
41-
"role": "creator"
42-
}
43-
],
44-
"description": "A series of methods that let you manipulate colors. Just incase you ever need different shades of one color on the fly.",
45-
"homepage": "http://mexitek.github.com/phpColors/",
46-
"keywords": [
47-
"color",
48-
"css",
49-
"design",
50-
"frontend",
51-
"ui"
52-
],
53-
"support": {
54-
"issues": "https://github.com/mexitek/phpColors/issues",
55-
"source": "https://github.com/mexitek/phpColors"
56-
},
57-
"install-path": "../mexitek/phpcolors"
58-
}
59-
],
2+
"packages": [],
603
"dev": false,
614
"dev-package-names": []
625
}

lib/composer/composer/installed.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'type' => 'library',
66
'install_path' => __DIR__ . '/../../../',
77
'aliases' => array(),
8-
'reference' => '3e28052303a61b134b454fdc31e72d371c03b793',
8+
'reference' => '4f4f8cea83a31519e55b6305c6d9471896de42be',
99
'name' => '__root__',
1010
'dev' => false,
1111
),
@@ -16,16 +16,7 @@
1616
'type' => 'library',
1717
'install_path' => __DIR__ . '/../../../',
1818
'aliases' => array(),
19-
'reference' => '3e28052303a61b134b454fdc31e72d371c03b793',
20-
'dev_requirement' => false,
21-
),
22-
'mexitek/phpcolors' => array(
23-
'pretty_version' => 'v1.0.4',
24-
'version' => '1.0.4.0',
25-
'type' => 'library',
26-
'install_path' => __DIR__ . '/../mexitek/phpcolors',
27-
'aliases' => array(),
28-
'reference' => '4043974240ca7dc3c2bec3c158588148b605b206',
19+
'reference' => '4f4f8cea83a31519e55b6305c6d9471896de42be',
2920
'dev_requirement' => false,
3021
),
3122
),

lib/composer/composer/platform_check.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)