Skip to content

Commit d8d0e12

Browse files
onlionli
committed
Remove hard PHP 8.0 requirement
This way, s9y still works with PHP 7.4, which makes the upgrade path easier.
1 parent 10975a6 commit d8d0e12

11 files changed

+45
-51
lines changed

‎bundled-libs/composer/autoload_classmap.php

-2
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@
119119
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
120120
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
121121
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
122-
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
123122
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
124-
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
125123
'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
126124
'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
127125
'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',

‎bundled-libs/composer/autoload_real.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static function getLoader()
3535
require __DIR__ . '/autoload_static.php';
3636
call_user_func(\Composer\Autoload\ComposerStaticInitcbda25b16bb8365467298ce193f0f30c::getInitializer($loader));
3737

38-
$loader->setApcuPrefix('Z/MU3fsy9VaX7GThuDWyc');
38+
$loader->setApcuPrefix('pZXHgfsNRpI3/XO56IexP');
3939
$loader->register(true);
4040

4141
$filesToLoad = \Composer\Autoload\ComposerStaticInitcbda25b16bb8365467298ce193f0f30c::$files;

‎bundled-libs/composer/autoload_static.php

-2
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,7 @@ class ComposerStaticInitcbda25b16bb8365467298ce193f0f30c
176176
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
177177
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
178178
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
179-
'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
180179
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
181-
'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
182180
'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
183181
'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
184182
'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',

‎bundled-libs/composer/installed.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -408,27 +408,27 @@
408408
},
409409
{
410410
"name": "psr/simple-cache",
411-
"version": "2.0.0",
412-
"version_normalized": "2.0.0.0",
411+
"version": "1.0.1",
412+
"version_normalized": "1.0.1.0",
413413
"source": {
414414
"type": "git",
415415
"url": "https://github.com/php-fig/simple-cache.git",
416-
"reference": "8707bf3cea6f710bf6ef05491234e3ab06f6432a"
416+
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
417417
},
418418
"dist": {
419419
"type": "zip",
420-
"url": "https://api.github.com/repos/php-fig/simple-cache/zipball/8707bf3cea6f710bf6ef05491234e3ab06f6432a",
421-
"reference": "8707bf3cea6f710bf6ef05491234e3ab06f6432a",
420+
"url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
421+
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
422422
"shasum": ""
423423
},
424424
"require": {
425-
"php": ">=8.0.0"
425+
"php": ">=5.3.0"
426426
},
427-
"time": "2021-10-29T13:22:09+00:00",
427+
"time": "2017-10-23T01:57:42+00:00",
428428
"type": "library",
429429
"extra": {
430430
"branch-alias": {
431-
"dev-master": "2.0.x-dev"
431+
"dev-master": "1.0.x-dev"
432432
}
433433
},
434434
"installation-source": "dist",
@@ -444,7 +444,7 @@
444444
"authors": [
445445
{
446446
"name": "PHP-FIG",
447-
"homepage": "https://www.php-fig.org/"
447+
"homepage": "http://www.php-fig.org/"
448448
}
449449
],
450450
"description": "Common interfaces for simple caching",
@@ -456,7 +456,7 @@
456456
"simple-cache"
457457
],
458458
"support": {
459-
"source": "https://github.com/php-fig/simple-cache/tree/2.0.0"
459+
"source": "https://github.com/php-fig/simple-cache/tree/master"
460460
},
461461
"install-path": "../psr/simple-cache"
462462
},

‎bundled-libs/composer/installed.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 's9y/serendipity',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => 'ad77cf9432dbef23b9bc6c91797dc3bfb14f9c95',
6+
'reference' => '10975a6127469bfdcb209dfae278f36e129c36e2',
77
'type' => 's9y-core',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -74,9 +74,9 @@
7474
'dev_requirement' => false,
7575
),
7676
'psr/simple-cache' => array(
77-
'pretty_version' => '2.0.0',
78-
'version' => '2.0.0.0',
79-
'reference' => '8707bf3cea6f710bf6ef05491234e3ab06f6432a',
77+
'pretty_version' => '1.0.1',
78+
'version' => '1.0.1.0',
79+
'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b',
8080
'type' => 'library',
8181
'install_path' => __DIR__ . '/../psr/simple-cache',
8282
'aliases' => array(),
@@ -91,7 +91,7 @@
9191
's9y/serendipity' => array(
9292
'pretty_version' => 'dev-master',
9393
'version' => 'dev-master',
94-
'reference' => 'ad77cf9432dbef23b9bc6c91797dc3bfb14f9c95',
94+
'reference' => '10975a6127469bfdcb209dfae278f36e129c36e2',
9595
'type' => 's9y-core',
9696
'install_path' => __DIR__ . '/../../',
9797
'aliases' => array(),

‎bundled-libs/composer/platform_check.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
$issues = array();
66

7-
if (!(PHP_VERSION_ID >= 80000)) {
8-
$issues[] = 'Your Composer dependencies require a PHP version ">= 8.0.0". You are running ' . PHP_VERSION . '.';
7+
if (!(PHP_VERSION_ID >= 70100)) {
8+
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.0". You are running ' . PHP_VERSION . '.';
99
}
1010

1111
if ($issues) {

‎bundled-libs/psr/simple-cache/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"authors": [
77
{
88
"name": "PHP-FIG",
9-
"homepage": "https://www.php-fig.org/"
9+
"homepage": "http://www.php-fig.org/"
1010
}
1111
],
1212
"require": {
13-
"php": ">=8.0.0"
13+
"php": ">=5.3.0"
1414
},
1515
"autoload": {
1616
"psr-4": {
@@ -19,7 +19,7 @@
1919
},
2020
"extra": {
2121
"branch-alias": {
22-
"dev-master": "2.0.x-dev"
22+
"dev-master": "1.0.x-dev"
2323
}
2424
}
2525
}

‎bundled-libs/psr/simple-cache/src/CacheException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
/**
66
* Interface used for all types of exceptions thrown by the implementing library.
77
*/
8-
interface CacheException extends \Throwable
8+
interface CacheException
99
{
1010
}

‎bundled-libs/psr/simple-cache/src/CacheInterface.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface CacheInterface
1515
* @throws \Psr\SimpleCache\InvalidArgumentException
1616
* MUST be thrown if the $key string is not a legal value.
1717
*/
18-
public function get(string $key, mixed $default = null);
18+
public function get($key, $default = null);
1919

2020
/**
2121
* Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
@@ -31,7 +31,7 @@ public function get(string $key, mixed $default = null);
3131
* @throws \Psr\SimpleCache\InvalidArgumentException
3232
* MUST be thrown if the $key string is not a legal value.
3333
*/
34-
public function set(string $key, mixed $value, null|int|\DateInterval $ttl = null);
34+
public function set($key, $value, $ttl = null);
3535

3636
/**
3737
* Delete an item from the cache by its unique key.
@@ -43,7 +43,7 @@ public function set(string $key, mixed $value, null|int|\DateInterval $ttl = nul
4343
* @throws \Psr\SimpleCache\InvalidArgumentException
4444
* MUST be thrown if the $key string is not a legal value.
4545
*/
46-
public function delete(string $key);
46+
public function delete($key);
4747

4848
/**
4949
* Wipes clean the entire cache's keys.
@@ -55,16 +55,16 @@ public function clear();
5555
/**
5656
* Obtains multiple cache items by their unique keys.
5757
*
58-
* @param iterable<string> $keys A list of keys that can be obtained in a single operation.
59-
* @param mixed $default Default value to return for keys that do not exist.
58+
* @param iterable $keys A list of keys that can obtained in a single operation.
59+
* @param mixed $default Default value to return for keys that do not exist.
6060
*
61-
* @return iterable<string, mixed> A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
61+
* @return iterable A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
6262
*
6363
* @throws \Psr\SimpleCache\InvalidArgumentException
6464
* MUST be thrown if $keys is neither an array nor a Traversable,
6565
* or if any of the $keys are not a legal value.
6666
*/
67-
public function getMultiple(iterable $keys, mixed $default = null);
67+
public function getMultiple($keys, $default = null);
6868

6969
/**
7070
* Persists a set of key => value pairs in the cache, with an optional TTL.
@@ -80,20 +80,20 @@ public function getMultiple(iterable $keys, mixed $default = null);
8080
* MUST be thrown if $values is neither an array nor a Traversable,
8181
* or if any of the $values are not a legal value.
8282
*/
83-
public function setMultiple(iterable $values, null|int|\DateInterval $ttl = null);
83+
public function setMultiple($values, $ttl = null);
8484

8585
/**
8686
* Deletes multiple cache items in a single operation.
8787
*
88-
* @param iterable<string> $keys A list of string-based keys to be deleted.
88+
* @param iterable $keys A list of string-based keys to be deleted.
8989
*
9090
* @return bool True if the items were successfully removed. False if there was an error.
9191
*
9292
* @throws \Psr\SimpleCache\InvalidArgumentException
9393
* MUST be thrown if $keys is neither an array nor a Traversable,
9494
* or if any of the $keys are not a legal value.
9595
*/
96-
public function deleteMultiple(iterable $keys);
96+
public function deleteMultiple($keys);
9797

9898
/**
9999
* Determines whether an item is present in the cache.
@@ -110,5 +110,5 @@ public function deleteMultiple(iterable $keys);
110110
* @throws \Psr\SimpleCache\InvalidArgumentException
111111
* MUST be thrown if the $key string is not a legal value.
112112
*/
113-
public function has(string $key);
113+
public function has($key);
114114
}

‎composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
}
2525
],
2626
"require": {
27-
"php": "^8.0",
2827
"ext-intl": "*",
2928
"ext-json": "*",
3029
"ext-libxml": "*",
@@ -50,7 +49,7 @@
5049
"http"
5150
],
5251
"platform": {
53-
"php": "8.0.0"
52+
"php": "7.4"
5453
},
5554
"sort-packages": true,
5655
"vendor-dir": "bundled-libs",

‎composer.lock

+11-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)