Skip to content

Commit

Permalink
Upgrade dependencies (Symfony 7, PHP 8.3, Node 20, …)
Browse files Browse the repository at this point in the history
  • Loading branch information
ogizanagi committed Apr 4, 2024
1 parent eea07ef commit f89969c
Show file tree
Hide file tree
Showing 9 changed files with 971 additions and 1,004 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
coverage: "none"
ini-values: "memory_limit=-1"
php-version: "8.1"
php-version: "8.3"
tools: symfony

- name: 'Determine composer cache directory'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
- name: 'Setup node'
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '20'

- name: 'Setup PHP'
uses: shivammathur/setup-php@v2
with:
coverage: "none"
ini-values: "memory_limit=-1"
php-version: "8.1"
php-version: "8.3"
tools: symfony

- name: 'Determine composer cache directory'
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20
2 changes: 1 addition & 1 deletion .php-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.1
8.3
50 changes: 26 additions & 24 deletions assets/controllers/swup_plugins_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,32 @@ import SwupScrollPlugin from '@swup/scroll-plugin';
import SwupProgressPlugin from '@swup/progress-plugin';

export default class extends Controller {
connect() {
this.element.addEventListener('swup:pre-connect', this._onPreConnect);
}
connect() {

Check failure on line 6 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 4 spaces but found 2
this.element.addEventListener('swup:pre-connect', this._onPreConnect);

Check failure on line 7 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 8 spaces but found 4
}

Check failure on line 8 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 4 spaces but found 2

disconnect() {
this.element.removeEventListener('swup:pre-connect', this._onPreConnect);
}
disconnect() {

Check failure on line 10 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 4 spaces but found 2
this.element.removeEventListener('swup:pre-connect', this._onPreConnect);

Check failure on line 11 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 8 spaces but found 4
}

Check failure on line 12 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 4 spaces but found 2

_onPreConnect(event) {
event.detail.options.plugins.push(
new SwupScrollPlugin(
{
doScrollingRightAway: true,
animateScroll: {
betweenPages: true,
}
}
),
new SwupProgressPlugin({
transition: 300,
delay: 0,
initialValue: 0.25,
hideImmediately: true
}),
);
}
_onPreConnect(event) {

Check failure on line 14 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 4 spaces but found 2
event.detail.options.plugins.push(

Check failure on line 15 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 8 spaces but found 4
new SwupScrollPlugin(

Check failure on line 16 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 12 spaces but found 6
{

Check failure on line 17 in assets/controllers/swup_plugins_controller.js

View workflow job for this annotation

GitHub Actions / Tests

Expected indentation of 16 spaces but found 8
doScrollingRightAway: true,
animateScroll: {
betweenPages: true,
samePageWithHash: true,
samePage: true
}
}
),
new SwupProgressPlugin({
transition: 300,
delay: 0,
initialValue: 0.25,
hideImmediately: true
}),
);
}
}
4 changes: 4 additions & 0 deletions assets/styles/skeleton-theme/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@
// pages
@import "pages/articles";
@import "pages/article";

html {
scroll-behavior: smooth;
}
58 changes: 30 additions & 28 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "project",
"license": "MIT",
"require": {
"php": ">=8.1",
"php": ">=8.3",
"ext-ctype": "*",
"ext-dom": "*",
"ext-iconv": "*",
Expand All @@ -13,28 +13,28 @@
"league/glide-symfony": "^2.0",
"phpdocumentor/reflection-docblock": "^5.2",
"stenope/stenope": "0.x-dev",
"symfony/asset": "6.4.*",
"symfony/asset-mapper": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/asset": "7.0.*",
"symfony/asset-mapper": "7.0.*",
"symfony/console": "7.0.*",
"symfony/dotenv": "7.0.*",
"symfony/expression-language": "7.0.*",
"symfony/flex": "^1.17",
"symfony/framework-bundle": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/mime": "6.4.*",
"symfony/framework-bundle": "7.0.*",
"symfony/intl": "7.0.*",
"symfony/mime": "7.0.*",
"symfony/monolog-bundle": "^3.1",
"symfony/process": "6.4.*",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/process": "7.0.*",
"symfony/property-access": "7.0.*",
"symfony/property-info": "7.0.*",
"symfony/runtime": "7.0.*",
"symfony/serializer": "7.0.*",
"symfony/stimulus-bundle": "^2.13",
"symfony/string": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/string": "7.0.*",
"symfony/translation": "7.0.*",
"symfony/twig-bundle": "7.0.*",
"symfony/ux-swup": "^2.13",
"symfony/yaml": "6.4.*",
"symfonycasts/sass-bundle": "0.2.3",
"symfony/yaml": "7.0.*",
"symfonycasts/sass-bundle": "^0.6",
"twig/twig": "^2.12|^3.0"
},
"require-dev": {
Expand All @@ -43,14 +43,14 @@
"phpstan/phpstan": "^1.2",
"phpstan/phpstan-strict-rules": "^1.1",
"phpstan/phpstan-symfony": "^1.0",
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"symfony/browser-kit": "7.0.*",
"symfony/css-selector": "7.0.*",
"symfony/debug-bundle": "7.0.*",
"symfony/maker-bundle": "^1.0",
"symfony/phpunit-bridge": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/var-dumper": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*"
"symfony/phpunit-bridge": "7.0.*",
"symfony/stopwatch": "7.0.*",
"symfony/var-dumper": "7.0.*",
"symfony/web-profiler-bundle": "7.0.*"
},
"config": {
"optimize-autoloader": true,
Expand Down Expand Up @@ -86,7 +86,9 @@
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
"assets:install %PUBLIC_DIR%": "symfony-cmd",
"importmap:install": "symfony-cmd",
"sass:build": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
Expand All @@ -104,7 +106,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.4.*"
"require": "7.0.*"
}
},
"prefer-stable": true,
Expand Down
Loading

0 comments on commit f89969c

Please sign in to comment.