Skip to content

Commit

Permalink
Merge pull request #5932 from getkirby/release/3.9.8-rc.1
Browse files Browse the repository at this point in the history 
3.9.8-rc.1
  • Loading branch information
@bastianallgeier
bastianallgeier authored Nov 7, 2023
2 parents cfc0210 + 59344f2 commit 1ce4180
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 53 deletions.
6 changes: 3 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Kirby 3 core",
"license": "proprietary",
"type": "kirby-cms",
"version": "3.9.7",
"version": "3.9.8-rc.1",
"keywords": [
"kirby",
"cms",
Expand Down Expand Up @@ -38,14 +38,14 @@
"ext-openssl": "*",
"claviska/simpleimage": "4.0.6",
"composer/semver": "3.4.0",
"filp/whoops": "2.15.3",
"filp/whoops": "2.15.4",
"getkirby/composer-installer": "^1.2.1",
"laminas/laminas-escaper": "2.12.0",
"michelf/php-smartypants": "1.8.1",
"phpmailer/phpmailer": "6.8.1",
"symfony/polyfill-intl-idn": "1.28.0",
"symfony/polyfill-mbstring": "1.28.0",
"symfony/yaml": "5.4.23"
"symfony/yaml": "5.4.30"
},
"replace": {
"symfony/polyfill-php72": "*"
Expand Down
26 changes: 13 additions & 13 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion panel/dist/js/index.js
View file

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions vendor/bin/yaml-lint.bat
View file

This file was deleted.

1 change: 1 addition & 0 deletions vendor/composer/autoload_classmap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@
'Kirby\\Toolkit\\Query' => $baseDir . '/src/Toolkit/Query.php',
'Kirby\\Toolkit\\Silo' => $baseDir . '/src/Toolkit/Silo.php',
'Kirby\\Toolkit\\Str' => $baseDir . '/src/Toolkit/Str.php',
'Kirby\\Toolkit\\SymmetricCrypto' => $baseDir . '/src/Toolkit/SymmetricCrypto.php',
'Kirby\\Toolkit\\Tpl' => $baseDir . '/src/Toolkit/Tpl.php',
'Kirby\\Toolkit\\V' => $baseDir . '/src/Toolkit/V.php',
'Kirby\\Toolkit\\View' => $baseDir . '/src/Toolkit/View.php',
Expand Down
1 change: 1 addition & 0 deletions vendor/composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ class ComposerStaticInita8011b477bb239488e5d139cdeb7b31e
'Kirby\\Toolkit\\Query' => __DIR__ . '/../..' . '/src/Toolkit/Query.php',
'Kirby\\Toolkit\\Silo' => __DIR__ . '/../..' . '/src/Toolkit/Silo.php',
'Kirby\\Toolkit\\Str' => __DIR__ . '/../..' . '/src/Toolkit/Str.php',
'Kirby\\Toolkit\\SymmetricCrypto' => __DIR__ . '/../..' . '/src/Toolkit/SymmetricCrypto.php',
'Kirby\\Toolkit\\Tpl' => __DIR__ . '/../..' . '/src/Toolkit/Tpl.php',
'Kirby\\Toolkit\\V' => __DIR__ . '/../..' . '/src/Toolkit/V.php',
'Kirby\\Toolkit\\View' => __DIR__ . '/../..' . '/src/Toolkit/View.php',
Expand Down
28 changes: 14 additions & 14 deletions vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,17 @@
},
{
"name": "filp/whoops",
"version": "2.15.3",
"version_normalized": "2.15.3.0",
"version": "2.15.4",
"version_normalized": "2.15.4.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "c83e88a30524f9360b11f585f71e6b17313b7187"
"reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187",
"reference": "c83e88a30524f9360b11f585f71e6b17313b7187",
"url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
"reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
"shasum": ""
},
"require": {
Expand All @@ -168,7 +168,7 @@
"symfony/var-dumper": "Pretty print complex values better with var-dumper available",
"whoops/soap": "Formats errors as SOAP responses"
},
"time": "2023-07-13T12:00:00+00:00",
"time": "2023-11-03T12:00:00+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -204,7 +204,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.15.3"
"source": "https://github.com/filp/whoops/tree/2.15.4"
},
"funding": [
{
Expand Down Expand Up @@ -1006,17 +1006,17 @@
},
{
"name": "symfony/yaml",
"version": "v5.4.23",
"version_normalized": "5.4.23.0",
"version": "v5.4.30",
"version_normalized": "5.4.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b"
"reference": "c6980e82a6656f6ebfabfd82f7585794cb122554"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/4cd2e3ea301aadd76a4172756296fe552fb45b0b",
"reference": "4cd2e3ea301aadd76a4172756296fe552fb45b0b",
"url": "https://api.github.com/repos/symfony/yaml/zipball/c6980e82a6656f6ebfabfd82f7585794cb122554",
"reference": "c6980e82a6656f6ebfabfd82f7585794cb122554",
"shasum": ""
},
"require": {
Expand All @@ -1033,7 +1033,7 @@
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
},
"time": "2023-04-23T19:33:36+00:00",
"time": "2023-10-27T18:36:14+00:00",
"bin": [
"Resources/bin/yaml-lint"
],
Expand Down Expand Up @@ -1064,7 +1064,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v5.4.23"
"source": "https://github.com/symfony/yaml/tree/v5.4.30"
},
"funding": [
{
Expand Down
20 changes: 10 additions & 10 deletions vendor/composer/installed.php
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php return array(
'root' => array(
'name' => 'getkirby/cms',
'pretty_version' => '3.9.7',
'version' => '3.9.7.0',
'pretty_version' => '3.9.8-rc.1',
'version' => '3.9.8.0-RC1',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand All @@ -29,17 +29,17 @@
'dev_requirement' => false,
),
'filp/whoops' => array(
'pretty_version' => '2.15.3',
'version' => '2.15.3.0',
'reference' => 'c83e88a30524f9360b11f585f71e6b17313b7187',
'pretty_version' => '2.15.4',
'version' => '2.15.4.0',
'reference' => 'a139776fa3f5985a50b509f2a02ff0f709d2a546',
'type' => 'library',
'install_path' => __DIR__ . '/../filp/whoops',
'aliases' => array(),
'dev_requirement' => false,
),
'getkirby/cms' => array(
'pretty_version' => '3.9.7',
'version' => '3.9.7.0',
'pretty_version' => '3.9.8-rc.1',
'version' => '3.9.8.0-RC1',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand Down Expand Up @@ -158,9 +158,9 @@
),
),
'symfony/yaml' => array(
'pretty_version' => 'v5.4.23',
'version' => '5.4.23.0',
'reference' => '4cd2e3ea301aadd76a4172756296fe552fb45b0b',
'pretty_version' => 'v5.4.30',
'version' => '5.4.30.0',
'reference' => 'c6980e82a6656f6ebfabfd82f7585794cb122554',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/yaml',
'aliases' => array(),
Expand Down
13 changes: 6 additions & 7 deletions vendor/filp/whoops/src/Whoops/Resources/css/whoops.base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,12 @@ header {
border-radius: 6px;
background-color: rgba(255, 255, 255, .05);
}
.frame-comment a {
font-weight: bold;
text-decoration: none;
}
.frame-comment a:hover {
color: #4bb1b1;
}

.frame-comment a {
font-weight: bold;
text-decoration: underline;
color: #c6c6c6;
}

.frame-comment:not(:last-child) {
border-bottom: 1px dotted rgba(0, 0, 0, .3);
Expand Down
4 changes: 4 additions & 0 deletions vendor/symfony/yaml/Inline.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ public static function initialize(int $flags, int $parsedLineNumber = null, stri
*/
public static function parse(string $value = null, int $flags = 0, array &$references = [])
{
if (null === $value) {
return '';
}

self::initialize($flags);

$value = trim($value);
Expand Down

0 comments on commit 1ce4180

Please sign in to comment.