Skip to content

Commit 414f526

Browse files
bastianallgeierbastianallgeier
committed
Upgrade to 3.7.1
1 parent 452afc5 commit 414f526

File tree

377 files changed

+67703
-67546
lines changed

Some content is hidden

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

377 files changed

+67703
-67546
lines changed

‎kirby/.editorconfig‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@
66

77
root = true
88

9-
[*.php]
9+
[*]
1010
charset = utf-8
1111
end_of_line = lf
12-
insert_final_newline = true
12+
indent_style = tab
13+
indent_size = 2
1314
trim_trailing_whitespace = true
15+
16+
[*.php]
17+
indent_size = 4
18+
insert_final_newline = true
19+
20+
[*.yml]
1421
indent_style = space
15-
indent_size = 4
22+
23+
[*.md]
24+
trim_trailing_whitespace = false

‎kirby/bootstrap.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
* stop at older or too recent versions
66
*/
77
if (
8-
version_compare(PHP_VERSION, '7.4.0', '>=') === false ||
9-
version_compare(PHP_VERSION, '8.2.0', '<') === false
8+
version_compare(PHP_VERSION, '7.4.0', '>=') === false ||
9+
version_compare(PHP_VERSION, '8.2.0', '<') === false
1010
) {
11-
die(include __DIR__ . '/views/php.php');
11+
die(include __DIR__ . '/views/php.php');
1212
}
1313

1414
if (is_file($autoloader = dirname(__DIR__) . '/vendor/autoload.php')) {
1515

16-
/**
17-
* Always prefer a site-wide Composer autoloader
18-
* if it exists, it means that the user has probably
19-
* installed additional packages
20-
*/
21-
include $autoloader;
16+
/**
17+
* Always prefer a site-wide Composer autoloader
18+
* if it exists, it means that the user has probably
19+
* installed additional packages
20+
*/
21+
include $autoloader;
2222
} elseif (is_file($autoloader = __DIR__ . '/vendor/autoload.php')) {
2323

24-
/**
25-
* Fall back to the local autoloader if that exists
26-
*/
27-
include $autoloader;
24+
/**
25+
* Fall back to the local autoloader if that exists
26+
*/
27+
include $autoloader;
2828
} else {
2929

30-
/**
31-
* If neither one exists, don't bother searching;
32-
* it's a custom directory setup and the users need to
33-
* load the autoloader themselves
34-
*/
30+
/**
31+
* If neither one exists, don't bother searching;
32+
* it's a custom directory setup and the users need to
33+
* load the autoloader themselves
34+
*/
3535
}

‎kirby/composer.json‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
11
{
2-
"name": "getkirby/cms",
3-
"description": "The Kirby 3 core",
4-
"license": "proprietary",
5-
"type": "kirby-cms",
6-
"version": "3.7.0.2",
7-
"keywords": [
8-
"kirby",
9-
"cms",
10-
"core"
11-
],
12-
"authors": [
13-
{
14-
"name": "Kirby Team",
15-
"email": "support@getkirby.com",
16-
"homepage": "https://getkirby.com"
17-
}
18-
],
19-
"homepage": "https://getkirby.com",
20-
"support": {
21-
"email": "support@getkirby.com",
22-
"issues": "https://github.com/getkirby/kirby/issues",
23-
"forum": "https://forum.getkirby.com",
24-
"source": "https://github.com/getkirby/kirby"
25-
},
26-
"require": {
27-
"php": ">=7.4.0 <8.2.0",
28-
"ext-SimpleXML": "*",
29-
"ext-ctype": "*",
30-
"ext-curl": "*",
31-
"ext-dom": "*",
32-
"ext-filter": "*",
33-
"ext-hash": "*",
34-
"ext-iconv": "*",
35-
"ext-json": "*",
36-
"ext-libxml": "*",
37-
"ext-mbstring": "*",
38-
"ext-openssl": "*",
39-
"claviska/simpleimage": "3.6.5",
40-
"filp/whoops": "2.14.5",
41-
"getkirby/composer-installer": "^1.2.1",
42-
"laminas/laminas-escaper": "2.10.0",
43-
"michelf/php-smartypants": "1.8.1",
44-
"phpmailer/phpmailer": "6.6.3",
45-
"symfony/polyfill-intl-idn": "1.26.0",
46-
"symfony/polyfill-mbstring": "1.26.0"
47-
},
48-
"replace": {
49-
"symfony/polyfill-php72": "*"
50-
},
51-
"suggest": {
52-
"ext-PDO": "Support for using databases",
53-
"ext-apcu": "Support for the Apcu cache driver",
54-
"ext-exif": "Support for exif information from images",
55-
"ext-fileinfo": "Improved mime type detection for files",
56-
"ext-intl": "Improved i18n number formatting",
57-
"ext-memcached": "Support for the Memcached cache driver",
58-
"ext-zip": "Support for ZIP archive file functions",
59-
"ext-zlib": "Sanitization and validation for svgz files"
60-
},
61-
"autoload": {
62-
"psr-4": {
63-
"Kirby\\": "src/"
64-
},
65-
"classmap": [
66-
"dependencies/"
67-
],
68-
"files": [
69-
"config/setup.php",
70-
"config/helpers.php"
71-
]
72-
},
73-
"config": {
74-
"allow-plugins": {
75-
"getkirby/composer-installer": true
76-
},
77-
"optimize-autoloader": true,
78-
"platform": {
79-
"php": "7.4.0"
80-
},
81-
"platform-check": false
82-
},
83-
"extra": {
84-
"unused": [
85-
"symfony/polyfill-intl-idn"
86-
]
87-
},
88-
"scripts": {
89-
"post-update-cmd": "curl -o cacert.pem https://curl.se/ca/cacert.pem",
90-
"analyze": [
91-
"@analyze:composer",
92-
"@analyze:psalm",
93-
"@analyze:phpcpd",
94-
"@analyze:phpmd"
95-
],
96-
"analyze:composer": "composer validate --strict --no-check-version --no-check-all",
97-
"analyze:phpcpd": "phpcpd --fuzzy --exclude tests --exclude vendor .",
98-
"analyze:phpmd": "phpmd . ansi phpmd.xml.dist --exclude 'dependencies/*,tests/*,vendor/*'",
99-
"analyze:psalm": "psalm",
100-
"build": "./scripts/build",
101-
"ci": [
102-
"@fix",
103-
"@analyze",
104-
"@test"
105-
],
106-
"fix": "php-cs-fixer fix",
107-
"test": "phpunit --stderr --coverage-html=tests/coverage",
108-
"zip": "composer archive --format=zip --file=dist"
109-
}
2+
"name": "getkirby/cms",
3+
"description": "The Kirby 3 core",
4+
"license": "proprietary",
5+
"type": "kirby-cms",
6+
"version": "3.7.1",
7+
"keywords": [
8+
"kirby",
9+
"cms",
10+
"core"
11+
],
12+
"authors": [
13+
{
14+
"name": "Kirby Team",
15+
"email": "support@getkirby.com",
16+
"homepage": "https://getkirby.com"
17+
}
18+
],
19+
"homepage": "https://getkirby.com",
20+
"support": {
21+
"email": "support@getkirby.com",
22+
"issues": "https://github.com/getkirby/kirby/issues",
23+
"forum": "https://forum.getkirby.com",
24+
"source": "https://github.com/getkirby/kirby"
25+
},
26+
"require": {
27+
"php": ">=7.4.0 <8.2.0",
28+
"ext-SimpleXML": "*",
29+
"ext-ctype": "*",
30+
"ext-curl": "*",
31+
"ext-dom": "*",
32+
"ext-filter": "*",
33+
"ext-hash": "*",
34+
"ext-iconv": "*",
35+
"ext-json": "*",
36+
"ext-libxml": "*",
37+
"ext-mbstring": "*",
38+
"ext-openssl": "*",
39+
"claviska/simpleimage": "3.6.5",
40+
"filp/whoops": "2.14.5",
41+
"getkirby/composer-installer": "^1.2.1",
42+
"laminas/laminas-escaper": "2.10.0",
43+
"michelf/php-smartypants": "1.8.1",
44+
"phpmailer/phpmailer": "6.6.3",
45+
"symfony/polyfill-intl-idn": "1.26.0",
46+
"symfony/polyfill-mbstring": "1.26.0"
47+
},
48+
"replace": {
49+
"symfony/polyfill-php72": "*"
50+
},
51+
"suggest": {
52+
"ext-PDO": "Support for using databases",
53+
"ext-apcu": "Support for the Apcu cache driver",
54+
"ext-exif": "Support for exif information from images",
55+
"ext-fileinfo": "Improved mime type detection for files",
56+
"ext-intl": "Improved i18n number formatting",
57+
"ext-memcached": "Support for the Memcached cache driver",
58+
"ext-zip": "Support for ZIP archive file functions",
59+
"ext-zlib": "Sanitization and validation for svgz files"
60+
},
61+
"autoload": {
62+
"psr-4": {
63+
"Kirby\\": "src/"
64+
},
65+
"classmap": [
66+
"dependencies/"
67+
],
68+
"files": [
69+
"config/setup.php",
70+
"config/helpers.php"
71+
]
72+
},
73+
"config": {
74+
"allow-plugins": {
75+
"getkirby/composer-installer": true
76+
},
77+
"optimize-autoloader": true,
78+
"platform": {
79+
"php": "7.4.0"
80+
},
81+
"platform-check": false
82+
},
83+
"extra": {
84+
"unused": [
85+
"symfony/polyfill-intl-idn"
86+
]
87+
},
88+
"scripts": {
89+
"post-update-cmd": "curl -o cacert.pem https://curl.se/ca/cacert.pem",
90+
"analyze": [
91+
"@analyze:composer",
92+
"@analyze:psalm",
93+
"@analyze:phpcpd",
94+
"@analyze:phpmd"
95+
],
96+
"analyze:composer": "composer validate --strict --no-check-version --no-check-all",
97+
"analyze:phpcpd": "phpcpd --fuzzy --exclude tests --exclude vendor .",
98+
"analyze:phpmd": "phpmd . ansi phpmd.xml.dist --exclude 'dependencies/*,tests/*,vendor/*'",
99+
"analyze:psalm": "psalm",
100+
"build": "./scripts/build",
101+
"ci": [
102+
"@fix",
103+
"@analyze",
104+
"@test"
105+
],
106+
"fix": "php-cs-fixer fix",
107+
"test": "phpunit --stderr --coverage-html=tests/coverage",
108+
"zip": "composer archive --format=zip --file=dist"
109+
}
110110
}

‎kirby/composer.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)