Bump Recurr and update CHANGELOG (#68)

* chore: compatibility with PHP 8

* chore: php-cs-fixer

* fix: cs

* functional version PHP8.0

* functional version PHP8.0 test ok

* fix/misc

* delete gulp-sass

* update gulp-sass

* chore(deps): update plugin to be Symfony 6 + Sylius 1.12 compatible

* fix(flex): add allow-plugin in composer.json

* docs: mention docker-compose

* fix(ci): rerun workflows on synchronize

* fix(ci): symfony flex configuration

* fix(ci): revert database url

* chore: properly ignore drivers

* chore: properly ignore build files

* chore(deps): bump sylius calendar

* fix(controller): remove session injection

* fix(di): lock

* feat: use attributes instead of annotations

* chore(deps): bump minimal php + sylius requirements

* feat: use attributes in test app

* fix: new symfony session config in test app

* fix: CS + review

* fix(config): require pagerfanta

* 👽️ fix - update rrule script path

Maintainer of the lib rrule has changed his pseudo from jakubroztocil to jkbrzt

* chore(deps): bump simshaun/recurr

* Update CHANGELOG

* fix: review

---------

Co-authored-by: Kévin Dunglas <[email protected]>
Co-authored-by: Julie <[email protected]>
Co-authored-by: Hugo Nicolas <[email protected]>
Co-authored-by: Louis VIART <[email protected]>

Author: 5 people

.github/workflows/ci.yml

@@ -1,24 +1,26 @@
 name: CI
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   tests:
 
     runs-on: ubuntu-latest
 
     env:
-      DATABASE_URL: mysql://root:[email protected]/click_n_collect_test?serverVersion=5.7
+      DATABASE_URL: mysql://root:[email protected]/coop_tilleuls_sylius_click_n_collect_plugin_%kernel.environment%?serverVersion=8.0
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Validate composer.json and composer.lock
         run: composer validate
 
-      - name: Install Symfony Flex
-        run: composer global require -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist symfony/flex
-
       - name: Install dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
 

.gitignore

@@ -7,5 +7,6 @@
 
 /tests/Application/yarn.lock
 
-/.php_cs.cache
+/.php-cs-fixer.cache
 /.phpunit.result.cache
+/drivers/

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -18,7 +18,7 @@
         'tests/Application/bin/console',
     ]);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation' => true,

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.0.0
+
+* PHP 8 support
+* Compatibility with Symfony 6 and Sylius 1.12
+* Use PHP attributes instead of annotations
+* Fix(ci): rerun workflows on synchronize
+* Load full calendar scripts and styles from jsdelivr CDN instead of unpkg
+* Replace Location typehints by LocationInterface
+* Add approved by Sylius badge in README.md
+* Fix time slot stays booked when selecting another shipping method
+* Fix rrule script URL
+
 ## 0.2.0
 
 * Add SlotAvailableInterface

CONTRIBUTING.md

@@ -9,8 +9,9 @@ that is full of examples.
 ## Quickstart Installation
 
 1. Run `composer install`.
+2. Run `docker compose up -d` to set up the local MySQL database
 
-2. From the root directory, run the following commands:
+3. From the root directory, run the following commands:
 
        $ (cd tests/Application && yarn install)
        $ (cd tests/Application && yarn build)
@@ -20,7 +21,7 @@ that is full of examples.
        $ (cd tests/Application && bin/console doctrine:schema:create -e panther)
        $ (cd tests/Application && bin/console sylius:fixtures:load -e panther)
 
-To be able to setup a plugin's database, remember to configure you database credentials in `tests/Application/.env` and `tests/Application/.env.test`.
+To be able to setup a plugin's database, remember to configure your database credentials in `tests/Application/.env` and `tests/Application/.env.test`.
 
 ## Usage
 

composer.json

@@ -5,27 +5,32 @@
     "description": "Click and Collect plugin for Sylius, to sell and deliver securely during the COVID-19 pandemic.",
     "license": "AGPL-3.0-or-later",
     "require": {
-        "php": "^7.4",
-        "simshaun/recurr": "^4.0",
-        "sylius/sylius": "^1.7",
-        "symfony/lock": "^4.4 || ^5.0"
+        "php": ">=8.0",
+        "simshaun/recurr": "^5.0",
+        "sylius/calendar": "^0.4.0",
+        "sylius/mailer-bundle": "^2.0",
+        "sylius/sylius": "^1.11",
+        "symfony/lock": "^5.4 || ^6.0",
+        "symfony/webpack-encore-bundle": "^1.16"
     },
     "require-dev": {
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.0",
         "phpstan/phpstan-doctrine": "^0.12.0",
         "phpstan/phpstan-strict-rules": "^0.12.0",
         "phpstan/phpstan-webmozart-assert": "^0.12.0",
-        "phpunit/phpunit": "^8.0",
-        "sensiolabs/security-checker": "^6.0",
-        "sylius-labs/coding-standard": "^3.1",
-        "symfony/browser-kit": "^4.4",
-        "symfony/debug-bundle": "^4.4",
-        "symfony/dotenv": "^4.4",
-        "symfony/intl": "^4.4",
-        "symfony/panther": "^0.7.1",
-        "symfony/web-profiler-bundle": "^4.4",
-        "symfony/web-server-bundle": "^4.4"
+        "phpunit/phpunit": "^9.0",
+        "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+        "sylius-labs/coding-standard": "^4.0",
+        "symfony/browser-kit": "^5.4 || ^6.0",
+        "symfony/css-selector": "^6.1",
+        "symfony/debug-bundle": "^5.4 || ^6.0",
+        "symfony/dotenv": "^5.4 || ^6.0",
+        "symfony/error-handler": "^6.1",
+        "symfony/intl": "^5.4 || ^6.0",
+        "symfony/panther": "^2.0",
+        "symfony/web-profiler-bundle": "^5.4 || ^6.0"
     },
     "prefer-stable": true,
     "autoload": {
@@ -38,7 +43,13 @@
         "classmap": ["tests/Application/Kernel.php"]
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/flex": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "phpstan/extension-installer": true,
+            "symfony/thanks": true
+        }
     },
     "conflict": {
         "doctrine/inflector": "^1.4"

docker-compose.yaml

@@ -0,0 +1,7 @@
+services:
+  mysql:
+    image: mysql:8.0
+    environment:
+      MYSQL_ROOT_PASSWORD: mysql
+    ports:
+      - ${MYSQL_PORT:-3306}:3306