Skip to content

Commit

Permalink
Merge branch 'bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
gharlan committed Oct 1, 2022
2 parents ccc2044 + 782265c commit 763ecff
Show file tree
Hide file tree
Showing 15 changed files with 152 additions and 126 deletions.
13 changes: 13 additions & 0 deletions .tools/bin/update-all
Expand Up @@ -95,6 +95,19 @@ find redaxo/src/addons/phpmailer/vendor -name "*.md" ! -name "LICENSE.md" -type

printf "\nUpdate root composer.json and vendor/\n"
.tools/bin/update-root-composer
composer require --dev --ansi --fixed \
friendsofredaxo/linter \
phpstan/extension-installer \
phpstan/phpstan \
phpstan/phpstan-deprecation-rules \
phpstan/phpstan-phpunit \
phpstan/phpstan-symfony \
psalm/plugin-phpunit \
psalm/plugin-symfony \
rector/rector \
redaxo/php-cs-fixer-config \
redaxo/psalm-plugin \
vimeo/psalm
composer update --ansi

printf "\nUpdate redaxo/src/core/assets/jquery.min.js\n"
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Expand Up @@ -15,14 +15,14 @@
"friendsofredaxo/linter": "1.3.0",
"jetbrains/phpstorm-attributes": "^1.0",
"phpstan/extension-installer": "1.1.0",
"phpstan/phpstan": "1.8.4",
"phpstan/phpstan": "1.8.6",
"phpstan/phpstan-deprecation-rules": "1.0.0",
"phpstan/phpstan-phpunit": "1.1.1",
"phpstan/phpstan-symfony": "1.2.13",
"phpunit/phpunit": "^9.5",
"psalm/plugin-phpunit": "0.17.0",
"psalm/plugin-symfony": "3.1.8",
"rector/rector": "0.14.2",
"psalm/plugin-symfony": "v3.1.9",
"rector/rector": "0.14.5",
"redaxo/php-cs-fixer-config": "1.0.0",
"redaxo/psalm-plugin": "1.0.0",
"vimeo/psalm": "4.27.0"
Expand All @@ -31,7 +31,7 @@
"erusev/parsedown": "1.7.4",
"erusev/parsedown-extra": "0.8.1",
"filp/whoops": "2.14.5",
"itsgoingd/clockwork": "v5.1.7",
"itsgoingd/clockwork": "v5.1.8",
"phpmailer/phpmailer": "v6.6.4",
"psr/container": "1.1.1",
"psr/http-message": "1.0.1",
Expand All @@ -40,18 +40,18 @@
"ramsey/http-range": "1.0.0",
"scssphp/scssphp": "v1.11.0",
"splitbrain/php-archive": "1.3.1",
"symfony/console": "v5.4.12",
"symfony/console": "v5.4.13",
"symfony/deprecation-contracts": "v2.5.2",
"symfony/http-foundation": "v5.4.12",
"symfony/http-foundation": "v5.4.13",
"symfony/polyfill-ctype": "*",
"symfony/polyfill-php70": "*",
"symfony/polyfill-php72": "*",
"symfony/polyfill-php73": "*",
"symfony/polyfill-php80": "v1.26.0",
"symfony/polyfill-php81": "v1.26.0",
"symfony/service-contracts": "v2.5.2",
"symfony/string": "v5.4.12",
"symfony/var-dumper": "v5.4.11",
"symfony/string": "v5.4.13",
"symfony/var-dumper": "v5.4.13",
"symfony/yaml": "v5.4.12",
"voku/anti-xss": "4.1.39",
"voku/portable-ascii": "2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/addons/debug/composer.json
@@ -1,6 +1,6 @@
{
"require": {
"itsgoingd/clockwork": "^5.1.7"
"itsgoingd/clockwork": "^5.1.8"
},

"config": {
Expand Down
14 changes: 7 additions & 7 deletions redaxo/src/addons/debug/composer.lock

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

Expand Up @@ -15,7 +15,7 @@
class Clockwork
{
// Clockwork library version
const VERSION = '5.1.7';
const VERSION = '5.1.8';

// Array of data sources, these objects collect metadata for the current application run
protected $dataSources = [];
Expand Down
6 changes: 3 additions & 3 deletions redaxo/src/core/composer.json
Expand Up @@ -5,10 +5,10 @@
"filp/whoops": "^2.14.5",
"psr/log": "^1.1.4",
"ramsey/http-range": "^1.0",
"symfony/console": "^5.4.12",
"symfony/http-foundation": "^5.4.12",
"symfony/console": "^5.4.13",
"symfony/http-foundation": "^5.4.13",
"symfony/polyfill-php80": "^1.26",
"symfony/var-dumper": "^5.4.11",
"symfony/var-dumper": "^5.4.13",
"symfony/yaml": "^5.4.12",
"voku/anti-xss": "^4.1.39"
},
Expand Down
50 changes: 25 additions & 25 deletions redaxo/src/core/composer.lock

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

0 comments on commit 763ecff

Please sign in to comment.