Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vendor-Updates #6102

Merged
merged 4 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 23 additions & 23 deletions .github/workflows/visual-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,29 @@ jobs:
repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
ref: ${{ github.event.client_payload.pull_request.head.ref }}

- name: Setup nodejs
uses: actions/setup-node@v4
with:
node-version: 22
cache: npm
cache-dependency-path: .github/workflows/visual-tests.yml

- name: Install npm packages
run: npm install playwright pixelmatch pngjs fs mkdirp

- name: Get installed Playwright version (used in cache key)
id: playwright-version
run: echo "PLAYWRIGHT_VERSION=$(node -e "process.stdout.write(require('playwright/package.json').version)")" >> $GITHUB_ENV
- name: Cache Playwright browser binaries
uses: actions/cache@v4
id: playwright-cache
with:
path: ~/.cache/ms-playwright
key: playwright-${{ env.PLAYWRIGHT_VERSION }}
- name: Install Playwright browsers binaries if cache missed
run: npx playwright install chromium --with-deps
if: steps.playwright-cache.outputs.cache-hit != 'true'

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand Down Expand Up @@ -85,29 +108,6 @@ jobs:
php redaxo/bin/console package:install structure/history --ansi -v
php redaxo/bin/console package:install structure/version --ansi -v

- name: Setup nodejs
uses: actions/setup-node@v4
with:
node-version: 21
cache: npm
cache-dependency-path: .github/workflows/visual-tests.yml

- name: Install npm packages
run: npm install playwright pixelmatch pngjs fs mkdirp

- name: Get installed Playwright version (used in cache key)
id: playwright-version
run: echo "PLAYWRIGHT_VERSION=$(node -e "process.stdout.write(require('playwright/package.json').version)")" >> $GITHUB_ENV
- name: Cache Playwright browser binaries
uses: actions/cache@v4
id: playwright-cache
with:
path: ~/.cache/ms-playwright
key: playwright-${{ env.PLAYWRIGHT_VERSION }}
- name: Install Playwright browsers binaries if cache missed
run: npx playwright install chromium --with-deps
if: steps.playwright-cache.outputs.cache-hit != 'true'

- name: Start php server
run: |
cat <<EOF > router.php
Expand Down
26 changes: 13 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
},
"require-dev": {
"friendsofredaxo/linter": "1.4.0",
"jetbrains/phpstorm-attributes": "^1.0",
"jetbrains/phpstorm-attributes": "^1.1",
"phpstan/extension-installer": "1.3.1",
"phpstan/phpstan": "1.10.66",
"phpstan/phpstan": "1.10.67",
"phpstan/phpstan-deprecation-rules": "1.1.4",
"phpstan/phpstan-phpunit": "1.3.16",
"phpstan/phpstan-symfony": "1.3.9",
"phpunit/phpunit": "^10.5.17",
"phpstan/phpstan-symfony": "1.3.12",
"phpunit/phpunit": "^10.5.20",
"psalm/plugin-phpunit": "0.19.0",
"psalm/plugin-symfony": "v5.1.0",
"rector/rector": "1.0.4",
"redaxo/php-cs-fixer-config": "2.8.0",
"redaxo/php-cs-fixer-config": "2.9.0",
"redaxo/psalm-plugin": "2.0.0",
"vimeo/psalm": "5.23.1"
},
"replace": {
"erusev/parsedown": "1.7.4",
"erusev/parsedown-extra": "0.8.1",
"filp/whoops": "2.15.4",
"itsgoingd/clockwork": "v5.2.1",
"itsgoingd/clockwork": "v5.2.2",
"lbuchs/webauthn": "v2.1.1",
"phpmailer/phpmailer": "v6.9.1",
"psr/container": "2.0.2",
Expand All @@ -40,17 +40,17 @@
"ramsey/http-range": "1.1.0",
"scssphp/scssphp": "v1.12.1",
"splitbrain/php-archive": "1.3.1",
"symfony/console": "v6.4.6",
"symfony/console": "v6.4.7",
"symfony/deprecation-contracts": "v3.4.0",
"symfony/http-foundation": "v6.4.4",
"symfony/http-foundation": "v6.4.7",
"symfony/polyfill-ctype": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*",
"symfony/polyfill-php83": "v1.29.0",
"symfony/service-contracts": "v3.4.2",
"symfony/string": "v6.4.4",
"symfony/var-dumper": "v6.4.6",
"symfony/yaml": "v6.4.3",
"symfony/string": "v6.4.7",
"symfony/var-dumper": "v6.4.7",
"symfony/yaml": "v6.4.7",
"voku/anti-xss": "4.1.42",
"voku/portable-ascii": "2.0.1",
"voku/portable-utf8": "6.0.13"
Expand Down Expand Up @@ -153,8 +153,8 @@
],
"baseline": [
"@phpstan:baseline",
"@taint:baseline",
"@psalm:baseline"
"@psalm:baseline",
"@taint:baseline"
],
"check": [
"@cs",
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/addons/debug/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"itsgoingd/clockwork": "^5.2.1"
"itsgoingd/clockwork": "^5.2.2"
},

"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.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
class Clockwork
{
// Clockwork library version
const VERSION = '5.2.1';
const VERSION = '5.2.2';

// Array of data sources, these objects collect metadata for the current application run
protected $dataSources = [];
Expand Down
8 changes: 4 additions & 4 deletions redaxo/src/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"lbuchs/webauthn": "^2.1.1",
"psr/log": "^3",
"ramsey/http-range": "^1.1",
"symfony/console": "^6.4.6",
"symfony/http-foundation": "^6.4.4",
"symfony/var-dumper": "^6.4.6",
"symfony/yaml": "^6.4.3",
"symfony/console": "^6.4.7",
"symfony/http-foundation": "^6.4.7",
"symfony/var-dumper": "^6.4.7",
"symfony/yaml": "^6.4.7",
"voku/anti-xss": "^4.1.42"
},

Expand Down
62 changes: 31 additions & 31 deletions redaxo/src/core/composer.lock

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