Skip to content

Commit 3dd936a

Browse files
afboraafbora
committed
v1.3.0
- Drop support for PHP 7.2 with Kirby 3.5 - Updated dependencies
1 parent c720ec2 commit 3dd936a

Some content is hidden

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

49 files changed

+2345
-529
lines changed

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"kirby3-plugin",
99
"kirby-plugin"
1010
],
11-
"version": "1.2.0",
11+
"version": "1.3.0",
1212
"type": "kirby-plugin",
1313
"license": "MIT",
1414
"authors": [
@@ -18,9 +18,9 @@
1818
}
1919
],
2020
"require": {
21-
"php": "^7.1.3",
22-
"getkirby/composer-installer": "^1.1.4",
23-
"voku/html-min": "^4.0"
21+
"php": "^7.3",
22+
"getkirby/composer-installer": "^1.2",
23+
"voku/html-min": "^4.4"
2424
},
2525
"config": {
2626
"optimize-autoloader": true,

‎vendor/composer/ClassLoader.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
*
3838
* @author Fabien Potencier <[email protected]>
3939
* @author Jordi Boggiano <[email protected]>
40-
* @see http://www.php-fig.org/psr/psr-0/
41-
* @see http://www.php-fig.org/psr/psr-4/
40+
* @see https://www.php-fig.org/psr/psr-0/
41+
* @see https://www.php-fig.org/psr/psr-4/
4242
*/
4343
class ClassLoader
4444
{
@@ -60,7 +60,7 @@ class ClassLoader
6060
public function getPrefixes()
6161
{
6262
if (!empty($this->prefixesPsr0)) {
63-
return call_user_func_array('array_merge', $this->prefixesPsr0);
63+
return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
6464
}
6565

6666
return array();

‎vendor/composer/InstalledVersions.php‎

Lines changed: 255 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,255 @@
1+
<?php
2+
3+
4+
5+
6+
7+
8+
9+
10+
11+
12+
13+
namespace Composer;
14+
15+
use Composer\Semver\VersionParser;
16+
17+
18+
19+
20+
21+
22+
class InstalledVersions
23+
{
24+
private static $installed = array (
25+
'root' =>
26+
array (
27+
'pretty_version' => '1.3.0',
28+
'version' => '1.3.0.0',
29+
'aliases' =>
30+
array (
31+
),
32+
'reference' => NULL,
33+
'name' => 'afbora/kirby-minify-html',
34+
),
35+
'versions' =>
36+
array (
37+
'afbora/kirby-minify-html' =>
38+
array (
39+
'pretty_version' => '1.3.0',
40+
'version' => '1.3.0.0',
41+
'aliases' =>
42+
array (
43+
),
44+
'reference' => NULL,
45+
),
46+
'getkirby/composer-installer' =>
47+
array (
48+
'pretty_version' => '1.2.1',
49+
'version' => '1.2.1.0',
50+
'aliases' =>
51+
array (
52+
),
53+
'reference' => 'c98ece30bfba45be7ce457e1102d1b169d922f3d',
54+
),
55+
'symfony/css-selector' =>
56+
array (
57+
'pretty_version' => 'v5.2.2',
58+
'version' => '5.2.2.0',
59+
'aliases' =>
60+
array (
61+
),
62+
'reference' => 'f65f217b3314504a1ec99c2d6ef69016bb13490f',
63+
),
64+
'voku/html-min' =>
65+
array (
66+
'pretty_version' => '4.4.8',
67+
'version' => '4.4.8.0',
68+
'aliases' =>
69+
array (
70+
),
71+
'reference' => '4f700584abd70b308b7d06b8e4cfcc31711faaf9',
72+
),
73+
'voku/simple_html_dom' =>
74+
array (
75+
'pretty_version' => '4.7.28',
76+
'version' => '4.7.28.0',
77+
'aliases' =>
78+
array (
79+
),
80+
'reference' => '78d5894c7f0facfb4fb6369af15b1a87baea958c',
81+
),
82+
),
83+
);
84+
85+
86+
87+
88+
89+
90+
91+
public static function getInstalledPackages()
92+
{
93+
return array_keys(self::$installed['versions']);
94+
}
95+
96+
97+
98+
99+
100+
101+
102+
103+
104+
public static function isInstalled($packageName)
105+
{
106+
return isset(self::$installed['versions'][$packageName]);
107+
}
108+
109+
110+
111+
112+
113+
114+
115+
116+
117+
118+
119+
120+
121+
122+
public static function satisfies(VersionParser $parser, $packageName, $constraint)
123+
{
124+
$constraint = $parser->parseConstraints($constraint);
125+
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
126+
127+
return $provided->matches($constraint);
128+
}
129+
130+
131+
132+
133+
134+
135+
136+
137+
138+
139+
public static function getVersionRanges($packageName)
140+
{
141+
if (!isset(self::$installed['versions'][$packageName])) {
142+
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
143+
}
144+
145+
$ranges = array();
146+
if (isset(self::$installed['versions'][$packageName]['pretty_version'])) {
147+
$ranges[] = self::$installed['versions'][$packageName]['pretty_version'];
148+
}
149+
if (array_key_exists('aliases', self::$installed['versions'][$packageName])) {
150+
$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']);
151+
}
152+
if (array_key_exists('replaced', self::$installed['versions'][$packageName])) {
153+
$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']);
154+
}
155+
if (array_key_exists('provided', self::$installed['versions'][$packageName])) {
156+
$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']);
157+
}
158+
159+
return implode(' || ', $ranges);
160+
}
161+
162+
163+
164+
165+
166+
public static function getVersion($packageName)
167+
{
168+
if (!isset(self::$installed['versions'][$packageName])) {
169+
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
170+
}
171+
172+
if (!isset(self::$installed['versions'][$packageName]['version'])) {
173+
return null;
174+
}
175+
176+
return self::$installed['versions'][$packageName]['version'];
177+
}
178+
179+
180+
181+
182+
183+
public static function getPrettyVersion($packageName)
184+
{
185+
if (!isset(self::$installed['versions'][$packageName])) {
186+
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
187+
}
188+
189+
if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) {
190+
return null;
191+
}
192+
193+
return self::$installed['versions'][$packageName]['pretty_version'];
194+
}
195+
196+
197+
198+
199+
200+
public static function getReference($packageName)
201+
{
202+
if (!isset(self::$installed['versions'][$packageName])) {
203+
throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
204+
}
205+
206+
if (!isset(self::$installed['versions'][$packageName]['reference'])) {
207+
return null;
208+
}
209+
210+
return self::$installed['versions'][$packageName]['reference'];
211+
}
212+
213+
214+
215+
216+
217+
public static function getRootPackage()
218+
{
219+
return self::$installed['root'];
220+
}
221+
222+
223+
224+
225+
226+
227+
228+
public static function getRawData()
229+
{
230+
return self::$installed;
231+
}
232+
233+
234+
235+
236+
237+
238+
239+
240+
241+
242+
243+
244+
245+
246+
247+
248+
249+
250+
251+
public static function reload($data)
252+
{
253+
self::$installed = $data;
254+
}
255+
}

‎vendor/composer/autoload_classmap.php‎

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

88
return array(
9+
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
910
'Kirby\\ComposerInstaller\\CmsInstaller' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php',
1011
'Kirby\\ComposerInstaller\\Installer' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php',
1112
'Kirby\\ComposerInstaller\\Plugin' => $vendorDir . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php',

‎vendor/composer/autoload_real.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

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

2931
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
3032
if ($useStaticLoader) {
31-
require_once __DIR__ . '/autoload_static.php';
33+
require __DIR__ . '/autoload_static.php';
3234

3335
call_user_func(\Composer\Autoload\ComposerStaticInitb347d04a24e66ed035d9a7739784b824::getInitializer($loader));
3436
} else {

‎vendor/composer/autoload_static.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class ComposerStaticInitb347d04a24e66ed035d9a7739784b824
4242
);
4343

4444
public static $classMap = array (
45+
'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
4546
'Kirby\\ComposerInstaller\\CmsInstaller' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php',
4647
'Kirby\\ComposerInstaller\\Installer' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Installer.php',
4748
'Kirby\\ComposerInstaller\\Plugin' => __DIR__ . '/..' . '/getkirby/composer-installer/src/ComposerInstaller/Plugin.php',

0 commit comments

Comments
 (0)