Merge branch 'release/2.2.0'

Author: trasher

.composer-require-checker.config.json

@@ -47,6 +47,7 @@
     "GALETTE_NIGHTLY",
     "GALETTE_PHOTOS_PATH",
     "GALETTE_PLUGINS_PATH",
+    "GALETTE_PLUGINS_DATA_PATH",
     "GALETTE_ROOT",
     "GALETTE_TELEMETRY_URI",
     "GALETTE_TEMPIMAGES_PATH",

.github/workflows/ci-linux.yml

@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '8.1', '8.3' ]
+        php-versions: [ '8.1', '8.4' ]
         coverage: [none]
       fail-fast: false
 
@@ -72,6 +72,12 @@ jobs:
           cd galette-core/galette/plugins/plugin-events
           ../../vendor/bin/phpcs lib/ ./*.php
 
+      - name: CS Fixer
+        if: matrix.php-versions == '8.1'
+        run: |
+          cd galette-core/galette/plugins/plugin-events
+          ../../vendor/bin/php-cs-fixer check --show-progress=dots --verbose --diff
+
       - name: Twig CS
         run: |
           cd galette-core/galette/plugins/plugin-events
@@ -82,7 +88,7 @@ jobs:
           cd galette-core/galette/plugins/plugin-events
           composer require maglnet/composer-require-checker -W
           vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json
-        if: matrix.php-versions == '8.3'
+        if: matrix.php-versions == '8.4'
 
       - name: PHPStan checks
         run: |
@@ -119,16 +125,16 @@ jobs:
           - { php-version: "8.1", db-image: "postgres:11", coverage: none, always: false }
           - { php-version: "8.1", db-image: "postgres:16", coverage: none, always: false }
           #higher stable php version
-          - { php-version: "8.3", db-image: "mysql:5.7", coverage: none, always: true }
-          - { php-version: "8.3", db-image: "mysql:8.1", coverage: none, always: false }
-          - { php-version: "8.3", db-image: "mariadb:10.4", coverage: none, always: true }
-          - { php-version: "8.3", db-image: "mariadb:11", coverage: none, always: false }
-          - { php-version: "8.3", db-image: "postgres:11", coverage: none, always: true }
-          - { php-version: "8.3", db-image: "postgres:16", coverage: none, always: true }
+          - { php-version: "8.4", db-image: "mysql:5.7", coverage: none, always: true }
+          - { php-version: "8.4", db-image: "mysql:8.1", coverage: none, always: false }
+          - { php-version: "8.4", db-image: "mariadb:10.4", coverage: none, always: true }
+          - { php-version: "8.4", db-image: "mariadb:11", coverage: none, always: false }
+          - { php-version: "8.4", db-image: "postgres:11", coverage: none, always: true }
+          - { php-version: "8.4", db-image: "postgres:16", coverage: none, always: true }
       fail-fast: false
 
     env:
-      skip: ${{ matrix.always == false && (github.event_name == 'pull_request' || github.repository != 'galette/galette-events' || !(github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags'))) }}
+      skip: ${{ matrix.always == false && (github.event_name == 'pull_request' || github.repository != 'galette/plugin-events' || !(github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags'))) }}
       DB: ${{ matrix.db-image }}
 
     services:
@@ -156,7 +162,7 @@ jobs:
           --health-timeout=5s
           --health-retries=10
 
-    name: PHP ${{ matrix.php-version }} ${{ matrix.db-image }} ${{ (matrix.always == false && (github.event_name == 'pull_request' || github.repository != 'galette/galette' || !(github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags')))) && ' (skipped)' || matrix.coverage == 'xdebug' && ' (with coverage)' || ''}}
+    name: PHP ${{ matrix.php-version }} ${{ matrix.db-image }} ${{ (matrix.always == false && (github.event_name == 'pull_request' || github.repository != 'galette/plugin-events' || !(github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags')))) && ' (skipped)' || matrix.coverage == 'xdebug' && ' (with coverage)' || ''}}
 
     steps:
       - name: PHP

.php-cs-fixer.dist.php

@@ -0,0 +1,23 @@
+<?php 
+
+$finder = (new PhpCsFixer\Finder())
+    ->in([
+        __DIR__ . '/lib',
+        __DIR__ . '/tests',
+    ])
+;
+
+return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
+    ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer.plugin-galette-events.cache')
+    ->setRules([
+        '@PSR12' => true,
+        '@PER-CS' => true,
+        '@PHP82Migration' => true,
+        'trailing_comma_in_multiline' => false,
+        'cast_spaces' => false,
+        'single_line_empty_body' => false,
+        'no_unused_imports' => true
+    ])
+    ->setFinder($finder)
+;

.scrutinizer.yml

@@ -7,14 +7,13 @@ build:
         override:
             - composer self-update
             - git clone --depth=1 https://github.com/galette/galette -b develop galette && pushd galette
-            - ./bin/install_deps && popd
 
     nodes:
 
         analysis:
             environment:
                 php:
-                    version: 8.1
+                    version: 8.2
 
             project_setup:
                 override:

README.md

@@ -16,7 +16,7 @@ A [Galette](https://galette.eu) plugin to manage events and bookings.
 To use Galette Events plugin, you'll need a reliable Galette version, and of course the plugin itself by either:
 
 * download latest stable version available from [Galette Event plugin page](https://doc.galette.eu/en/master/plugins/events.html)
-* use [Galette Events plugin soure code from repository](http://doc.galette.eu/en/develop/development/git.html) (make sure you install third party dependencies), this solution requires some technical skills
+* use [Galette Events plugin soure code from repository](https://doc.galette.eu/en/develop/development/git.html) (make sure you install third party dependencies), this solution requires some technical skills
 
 ### Français
 
@@ -32,4 +32,4 @@ Un plugin [Galette](https://galette.eu) pour gérer évènements et réservation
 Pour utiliser le plugin Évènements pour Galette, vous aurez besoin d'une version adéquate de Galette, ainsi que du plugin lui même :
 
 * télécharger la dernière version stable depuis la [page du  plugin Évènements pour Galette](https://doc.galette.eu/en/master/plugins/events.html)
-* utiliser [le code source du plugin Évènements pour Galette depuis le dépôt](http://doc.galette.eu/en/develop/development/git.html) (assurez-vous d'installer les biliothèques tierces), cette solution requiert quelques compétences techniques
+* utiliser [le code source du plugin Évènements pour Galette depuis le dépôt](https://doc.galette.eu/en/develop/development/git.html) (assurez-vous d'installer les biliothèques tierces), cette solution requiert quelques compétences techniques

_config.inc.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2024 The Galette Team
+ * Copyright © 2003-2025 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *

_define.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2024 The Galette Team
+ * Copyright © 2003-2025 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *
@@ -25,10 +25,10 @@
     'Galette Events',       //Name
     'Events management',    //Short description
     'Johan Cwiklinski',     //Author
-    '2.1.3',                //Version
-    '1.1.4',                //Galette compatible version
+    '2.2.0',                //Version
+    '1.2.0',                //Galette compatible version
     'events',               //routing name and translation domain
-    '2024-10-20',           //Release date
+    '2025-10-09',           //Release date
     [   //Permissions needed
         'events_events'             => 'member',
         'events_bookings'           => 'member',

_routes.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright © 2003-2024 The Galette Team
+ * Copyright © 2003-2025 The Galette Team
  *
  * This file is part of Galette (https://galette.eu).
  *

bin/release

@@ -6,10 +6,9 @@ from datetime import datetime
 from termcolor import colored
 from urllib.parse import urlparse
 
-# on Tuxfamily
-ssh_path = 'galette/galette-repository/plugins/'
-ssh_host = 'ssh.tuxfamily.org'
-galette_dl_repo = 'http://download.tuxfamily.org/galette/plugins/'
+ssh_path = '/var/www/galette.eu/download/plugins/'
+ssh_host = 'galette.eu'
+galette_dl_repo = 'https://galette.eu/download/plugins/'
 is_local = False
 
 local_dl_repo = os.path.join(

lang/Makefile

@@ -1,4 +1,4 @@
-INSTALLDIR = .
+INSTALLDIR = $(shell pwd)
 LANGUAGES = `find ./ -name "events_*.po" -print | sed 's|^\./events_\(.*\).po|\1|'`
 DOMAINS = events
 PHP_SOURCES = $(shell find ../ -maxdepth 1 -name \*.php) \
@@ -8,7 +8,7 @@ PHP_SOURCES = $(shell find ../ -maxdepth 1 -name \*.php) \
 all : extract mo
 
 twig :
-	../bin/twig-cache
+	cd ../../../../ && bin/console galette:twig-cache $(shell basename $(abspath $(CURDIR)/..)) && cd ${INSTALLDIR}
 
 po :
 	@echo "Generating PO files:"