Skip to content

Commit

Permalink
Merge branch 'bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gharlan
gharlan committed Apr 12, 2023
2 parents b88ed58 + cd835e3 commit 9679404
Show file tree
Hide file tree
Showing 39 changed files with 415 additions and 394 deletions.
5 changes: 0 additions & 5 deletions .tools/phpstan/baseline.neon
View file
Expand Up @@ -615,11 +615,6 @@ parameters:
count: 1
path: ../../redaxo/src/addons/mediapool/lib/service_media_category.php

-
message: "#^Variable \\$warning in empty\\(\\) always exists and is always falsy\\.$#"
count: 1
path: ../../redaxo/src/addons/mediapool/lib/service_media_category.php

-
message: "#^Method rex_var_media\\:\\:getWidget\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#"
count: 1
Expand Down
14 changes: 7 additions & 7 deletions composer.json
View file
Expand Up @@ -11,32 +11,32 @@
"ext-mbstring": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "v3.15.1",
"friendsofphp/php-cs-fixer": "v3.16.0",
"friendsofredaxo/linter": "1.4.0",
"j13k/yaml-lint": "@dev",
"jetbrains/phpstorm-attributes": "^1.0",
"phpstan/extension-installer": "1.2.0",
"phpstan/phpstan": "1.10.9",
"phpstan/phpstan": "1.10.12",
"phpstan/phpstan-deprecation-rules": "1.1.3",
"phpstan/phpstan-phpunit": "1.3.11",
"phpstan/phpstan-symfony": "1.2.24",
"phpstan/phpstan-symfony": "1.2.25",
"phpunit/phpunit": "^10.0.7",
"psalm/plugin-phpunit": "0.18.4",
"psalm/plugin-symfony": "v5.0.2",
"rector/rector": "0.15.23",
"redaxo/php-cs-fixer-config": "2.1.1",
"rector/rector": "0.15.24",
"redaxo/php-cs-fixer-config": "2.1.2",
"redaxo/psalm-plugin": "2.0.0",
"vimeo/psalm": "5.9.0"
},
"replace": {
"erusev/parsedown": "1.7.4",
"erusev/parsedown-extra": "0.8.1",
"filp/whoops": "2.14.5",
"filp/whoops": "2.15.2",
"itsgoingd/clockwork": "v5.1.12",
"lbuchs/webauthn": "v1.1.3",
"phpmailer/phpmailer": "v6.8.0",
"psr/container": "2.0.2",
"psr/http-message": "1.0.1",
"psr/http-message": "1.1",
"psr/log": "1.1.4",
"ramsey/collection": "1.3.0",
"ramsey/http-range": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/core/boot.php
View file
Expand Up @@ -90,7 +90,7 @@
require_once rex_path::core('functions/function_rex_other.php');

// ----------------- VERSION
rex::setProperty('version', '5.15.1');
rex::setProperty('version', '5.15.2-dev');

$cacheFile = rex_path::coreCache('config.yml.cache');
$configFile = rex_path::coreData('config.yml');
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/core/composer.json
View file
Expand Up @@ -2,7 +2,7 @@
"require": {
"erusev/parsedown": "^1.7.4",
"erusev/parsedown-extra": "^0.8.1",
"filp/whoops": "2.14.5",
"filp/whoops": "^2.15.2",
"lbuchs/webauthn": "^1.1.3",
"psr/log": "^1.1.4",
"ramsey/http-range": "^1.1",
Expand Down
30 changes: 15 additions & 15 deletions redaxo/src/core/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 redaxo/src/core/fragments/core/footer.php
View file
Expand Up @@ -11,7 +11,7 @@
<li><a href="https://www.yakamara.de" target="_blank" rel="noreferrer noopener">yakamara.de</a></li>
<li><a href="https://www.redaxo.org" target="_blank" rel="noreferrer noopener">redaxo.org</a></li>
<?php if (rex::getUser()?->isAdmin()): ?>
<li><a href="https://www.redaxo.org/doku/main" target="_blank" rel="noreferrer noopener' ?>"><?= rex_i18n::msg('footer_doku') ?></a></li>
<li><a href="https://www.redaxo.org/doku/main" target="_blank" rel="noreferrer noopener"><?= rex_i18n::msg('footer_doku') ?></a></li>
<?php endif ?>
<li><a href="<?= rex::getUser() ? rex_url::backendPage('credits') : 'https://www.redaxo.org/" target="_blank" rel="noreferrer noopener' ?>"><?= rex_i18n::msg('footer_credits') ?></a></li>
<li class="rex-js-script-time"><!--DYN--><?= rex_i18n::msg('footer_scripttime', $this->time) ?><!--/DYN--></li>
Expand Down
11 changes: 8 additions & 3 deletions redaxo/src/core/lib/error_handler.php
View file
Expand Up @@ -270,9 +270,14 @@ private static function renderWhoops($exception)
$errPage,
);

$errPage = preg_replace('@<button id="copy-button" .*?</button>@s', '$0<button class="rightButton clipboard" data-clipboard-text="'.rex_escape(self::getMarkdownReport($exception)).'" title="Copy exception details and system report as markdown to clipboard">
COPY MARKDOWN
</button>', $errPage);
$errPageMarkdownBtn = preg_replace(
'@<button id="copy-button" .*?</button>@s',
'$0<button class="rightButton clipboard" data-clipboard-text="'.rex_escape(self::getMarkdownReport($exception)).'" title="Copy exception details and system report as markdown to clipboard">COPY MARKDOWN</button>',
$errPage,
);
if (null !== $errPageMarkdownBtn) {
$errPage = $errPageMarkdownBtn;
}
$errPage = str_replace('<button id="copy-button"', '<button ', $errPage);
$errPage = preg_replace('@<button id="hide-error" .*?</button>@s', '', $errPage);

Expand Down
88 changes: 64 additions & 24 deletions redaxo/src/core/schemas/package.json
View file
Expand Up @@ -144,7 +144,7 @@
},
"additionalProperties": true,
"definitions": {
"page": {
"page-base": {
"type": "object",
"required": ["title"],
"properties": {
Expand Down Expand Up @@ -241,39 +241,79 @@
},
"additionalProperties": false
}
}
},
"page": {
"allOf": [
{
"$ref": "#/definitions/page-base"
}
],
"properties": {
"title": true,
"hidden": true,
"hasLayout": true,
"hasNavigation": true,
"popup": true,
"pjax": true,
"perm": true,
"icon": true,
"href": true,
"itemAttr": true,
"itemClass": true,
"linkAttr": true,
"linkClass": true,
"path": true,
"subPath": true,
"subpages": true
},
"additionalProperties": false
},
"main-page": {
"allOf": [
{
"$ref": "#/definitions/page"
"$ref": "#/definitions/page-base"
}
],
"properties": {
"title": true,
"hidden": true,
"hasLayout": true,
"hasNavigation": true,
"popup": true,
"pjax": true,
"perm": true,
"icon": true,
"href": true,
"itemAttr": true,
"itemClass": true,
"linkAttr": true,
"linkClass": true,
"path": true,
"subPath": true,
"subpages": true,
"main": {
"description": "Whether it is a main page",
"type": "boolean",
"default": true
},
{
"properties": {
"main": {
"description": "Whether it is a main page",
"type": "boolean",
"default": true
},
"block": {
"description": "Block name",
"anyOf": [
{
"enum": ["system", "addons"]
},
{
"type": "string"
}
]
"block": {
"description": "Block name",
"anyOf": [
{
"enum": ["system", "addons"]
},
"prio": {
"description": "Page prio",
"type": "integer"
{
"type": "string"
}
}
]
},
"prio": {
"description": "Page prio",
"type": "integer"
}
]
},
"additionalProperties": false
}
}
}
3 changes: 3 additions & 0 deletions redaxo/src/core/vendor/composer/autoload_classmap.php
View file
Expand Up @@ -385,6 +385,9 @@
'Whoops\\Handler\\PlainTextHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/PlainTextHandler.php',
'Whoops\\Handler\\PrettyPageHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php',
'Whoops\\Handler\\XmlResponseHandler' => $vendorDir . '/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php',
'Whoops\\Inspector\\InspectorFactory' => $vendorDir . '/filp/whoops/src/Whoops/Inspector/InspectorFactory.php',
'Whoops\\Inspector\\InspectorFactoryInterface' => $vendorDir . '/filp/whoops/src/Whoops/Inspector/InspectorFactoryInterface.php',
'Whoops\\Inspector\\InspectorInterface' => $vendorDir . '/filp/whoops/src/Whoops/Inspector/InspectorInterface.php',
'Whoops\\Run' => $vendorDir . '/filp/whoops/src/Whoops/Run.php',
'Whoops\\RunInterface' => $vendorDir . '/filp/whoops/src/Whoops/RunInterface.php',
'Whoops\\Util\\HtmlDumperOutput' => $vendorDir . '/filp/whoops/src/Whoops/Util/HtmlDumperOutput.php',
Expand Down
3 changes: 3 additions & 0 deletions redaxo/src/core/vendor/composer/autoload_static.php
View file
Expand Up @@ -507,6 +507,9 @@ class ComposerStaticInitRedaxoCore
'Whoops\\Handler\\PlainTextHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/PlainTextHandler.php',
'Whoops\\Handler\\PrettyPageHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php',
'Whoops\\Handler\\XmlResponseHandler' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php',
'Whoops\\Inspector\\InspectorFactory' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Inspector/InspectorFactory.php',
'Whoops\\Inspector\\InspectorFactoryInterface' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Inspector/InspectorFactoryInterface.php',
'Whoops\\Inspector\\InspectorInterface' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Inspector/InspectorInterface.php',
'Whoops\\Run' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Run.php',
'Whoops\\RunInterface' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/RunInterface.php',
'Whoops\\Util\\HtmlDumperOutput' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Util/HtmlDumperOutput.php',
Expand Down

0 comments on commit 9679404

Please sign in to comment.