.gitignore

@@ -243,6 +243,3 @@ temp/
 # .pnp.*
 
 # End of https://www.toptal.com/developers/gitignore/api/node,phpunit,symfony,composer,yarn
-
-# Snyk
-.dccache

Jenkinsfile

@@ -28,7 +28,7 @@ node {
 
     stage('Deploy staging') {
         // Deploy to staging host
-        sh 'vendor/bin/dep deploy lq5xi.ftp.infomaniak.com --no-interaction'
+        sh 'vendor/bin/dep deploy staging'
     }
 
     /*

composer.json

@@ -8,7 +8,6 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "composer/package-versions-deprecated": "1.11.99.1",
-        "deployer/deployer": "^7.0",
         "doctrine/doctrine-bundle": "^2.3",
         "doctrine/doctrine-migrations-bundle": "^3.1",
         "doctrine/orm": "^2.8",
@@ -18,26 +17,26 @@
         "presta/sitemap-bundle": "^3.2",
         "samayo/bulletproof": "4.0.1",
         "sensio/framework-extra-bundle": "^6.1",
-        "symfony/asset": "^5.4.20",
-        "symfony/console": "^5.4.20",
-        "symfony/dotenv": "^5.4.20",
-        "symfony/filesystem": "^5.4.20",
+        "symfony/asset": "5.4.*",
+        "symfony/console": "5.4.*",
+        "symfony/dotenv": "5.4.*",
+        "symfony/filesystem": "5.4.*",
         "symfony/flex": "^1.3.1",
-        "symfony/form": "^5.4.20",
-        "symfony/framework-bundle": "^5.4.20",
-        "symfony/mailer": "^5.4.20",
+        "symfony/form": "5.4.*",
+        "symfony/framework-bundle": "5.4.*",
+        "symfony/mailer": "5.4.*",
         "symfony/monolog-bundle": "^3.7",
-        "symfony/proxy-manager-bridge": "^5.4.20",
-        "symfony/security-bundle": "^5.4.20",
-        "symfony/twig-bundle": "^5.4.20",
-        "symfony/validator": "^5.4.20",
+        "symfony/proxy-manager-bridge": "5.4.*",
+        "symfony/security-bundle": "5.4.*",
+        "symfony/twig-bundle": "5.4.*",
+        "symfony/validator": "5.4.*",
         "symfony/webpack-encore-bundle": "^1.11",
-        "symfony/yaml": "^5.4.20",
+        "symfony/yaml": "5.4.*",
         "symfonycasts/reset-password-bundle": "^1.7",
         "symfonycasts/verify-email-bundle": "^1.4",
         "twig/extra-bundle": "^2.12|^3.0",
         "twig/intl-extra": "^3.3",
-        "twig/twig": "^3.4.3"
+        "twig/twig": "^2.12|^3.0"
     },
     "config": {
         "optimize-autoloader": true,
@@ -83,10 +82,11 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "^5.4.20"
+            "require": "5.4.*"
         }
     },
     "require-dev": {
+        "deployer/dist": "^6.8",
         "symfony/browser-kit": "^5.4",
         "symfony/css-selector": "^5.4",
         "symfony/debug-bundle": "^5.4",

deploy.php

@@ -1,7 +1,7 @@
 <?php
 namespace Deployer;
 
-require 'recipe/symfony.php';
+require 'recipe/symfony4.php';
 
 // Project name
 set('application', 'pflaenz.li');
@@ -13,11 +13,11 @@ set('repository', 'ssh://git@git.thisfro.ch:222/thisfro/pflaenz.li.git');
 set('git_tty', true); 
 
 set('bin/php', function() {
-        return '/opt/php8.2/bin/php';
+        return '/opt/php8.0/bin/php';
 });
 
 set('bin/composer', function() {
-    return '/opt/php8.2/bin/composer2';
+    return '/opt/php8.0/bin/composer2';
 });
 
 // Shared files/dirs between deploys 
@@ -28,14 +28,14 @@ add('shared_dirs', ['public/uploads']);
 add('writable_dirs', []);
 
 // Set composer options
-set('composer_options', '--verbose --prefer-dist --no-progress --no-interaction --optimize-autoloader --no-scripts');
+set('composer_options', '{{composer_action}} --verbose --prefer-dist --no-progress --no-interaction --optimize-autoloader --no-scripts');
 
 // Hosts
-host('lq5xi.ftp.infomaniak.com')
-    ->set('remote_user', 'lq5xi_thisfro')
+host('beta.pflaenz.li')
+    ->user('lq5xi_thisfro')
     ->set('deploy_path', '~/sites/{{stage}}.{{application}}')
     ->set('http_user', 'uid153060')
-    ->set('stage', 'beta');
+    ->stage('beta');
 
 // Tasks
 
@@ -45,9 +45,9 @@ task('upload:build', function() {
 
 // Build yarn locally
 task('deploy:build:assets', function (): void {
-    runLocally('yarn install');
-    runLocally('yarn encore production');
-})->desc('Install front-end assets');
+    run('yarn install');
+    run('yarn encore production');
+})->local()->desc('Install front-end assets');
 
 before('deploy:symlink', 'deploy:build:assets');
 

package.json

@@ -23,8 +23,8 @@
         "test": "snyk test"
     },
     "dependencies": {
-        "@snyk/protect": "^1.834.0",
         "cookie-notice": "^1.3.6",
-        "friendly-challenge": "^0.8.5"
+        "friendly-challenge": "^0.8.5",
+        "@snyk/protect": "^1.834.0"
     }
 }

symfony.lock

@@ -348,9 +348,15 @@
     "symfony/polyfill-mbstring": {
         "version": "v1.22.1"
     },
+    "symfony/polyfill-php73": {
+        "version": "v1.22.1"
+    },
     "symfony/polyfill-php80": {
         "version": "v1.22.1"
     },
+    "symfony/polyfill-php81": {
+        "version": "v1.23.0"
+    },
     "symfony/polyfill-uuid": {
         "version": "v1.22.1"
     },
@@ -398,6 +404,9 @@
     "symfony/security-csrf": {
         "version": "v5.2.4"
     },
+    "symfony/security-guard": {
+        "version": "v5.2.4"
+    },
     "symfony/security-http": {
         "version": "v5.2.6"
     },

yarn.lock

@@ -1598,9 +1598,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286:
-  version "1.0.30001388"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz"
-  integrity sha512-znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ==
+  version "1.0.30001287"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001287.tgz"
+  integrity sha512-4udbs9bc0hfNrcje++AxBuc6PfLNHwh3PO9kbwnfCQWyqtlzg3py0YgFu8jyRTTo85VAz4U+VLxSlID09vNtWA==
 
 chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.2:
   version "2.4.2"