Feature/upgrade v2

.github/workflows/analysis.yaml

@@ -19,7 +19,7 @@ jobs:
                 php:
                     - 8.2
                 symfony:
-                    - '6.2.*'
+                    - '6.4.*'
         env:
             APP_ENV: test
         steps:
@@ -38,7 +38,7 @@ jobs:
                 run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
             -
                 name: 'Composer - Set cache'
-                uses: actions/cache@v2
+                uses: actions/cache@v4
                 with:
                     path: '${{ steps.composer-cache.outputs.dir }}'
                     key: 'php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles(''**/composer.json'') }}'
@@ -58,17 +58,12 @@ jobs:
                 id: end-of-setup
             -
                 name: 'PHPStan - Run'
-                run: 'if [ -f rulesets/phpstan.neon ]; then vendor/bin/phpstan analyse -c rulesets/phpstan.neon src/ ; else echo PHPStan rulesets file does not exist, skipping step ; fi'
-                if: 'always() && steps.end-of-setup.outcome == ''success'''
-            -
-                name: 'PHPSpec - Run'
-                run: 'if [ -f phpspec.yml.dist ]; then vendor/bin/phpspec run ; else echo PHPSpec config file does not exist, skipping step ; fi'
-                if: 'always() && steps.end-of-setup.outcome == ''success'''
-            -
-                name: 'Checks security issues - Run'
-                run: 'symfony security:check'
+                run: 'if [ -f ruleset/phpstan.neon ]; then vendor/bin/phpstan analyse -c ruleset/phpstan.neon src/ ; else echo PHPStan rulesets file does not exist, skipping step ; fi'
                 if: 'always() && steps.end-of-setup.outcome == ''success'''
+            # TODO: launch Grumphp
+
     sonarcloud:
+      if: github.event.repository.fork != true
       runs-on: ubuntu-latest
       continue-on-error: true
       steps:

.github/workflows/sylius.yaml

@@ -19,12 +19,15 @@ jobs:
             matrix:
                 php:
                     - 8.2
+                    - 8.4
                 sylius:
-                    - 1.12.0
+                    - 2.1.0
+                    - 2.0.0
                 symfony:
-                    - 6.2
+                    - 6.4
+                    - 7.3
                 node:
-                    - 14.x
+                    - 20.x
         env:
             APP_ENV: test
             package-name: payplug/sylius-payplug-plugin
@@ -43,9 +46,6 @@ jobs:
                 uses: actions/setup-node@v3
                 with:
                     node-version: '${{ matrix.node }}'
-            -
-                name: 'Wkhtmltopdf - Install'
-                run: "sudo apt-get update\nsudo apt-get install xvfb libfontconfig wkhtmltopdf\nprintf '#!/bin/bash\\nxvfb-run -a --server-args=\"-screen 0, 1024x768x24\" /usr/bin/wkhtmltopdf -q $*' | sudo tee /usr/bin/wkhtmltopdf.sh\nsudo chmod a+x /usr/bin/wkhtmltopdf.sh\nsudo ln -s /usr/bin/wkhtmltopdf.sh /usr/local/bin/wkhtmltopdf\n"
             -
                 uses: actions/checkout@v3
             -
@@ -54,7 +54,7 @@ jobs:
                 run: 'echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT'
             -
                 name: 'Composer - Set cache'
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 id: cache-composer
                 with:
                     path: '${{ steps.composer-cache.outputs.dir }}'
@@ -73,48 +73,39 @@ jobs:
                 run: 'echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT'
             -
                 name: 'Yarn - Set Cache'
-                uses: actions/cache@v3
+                uses: actions/cache@v4
                 with:
                     path: '${{ steps.yarn-cache.outputs.dir }}'
                     key: 'node-${{ matrix.node }}-yarn-${{ hashFiles(''**/package.json **/yarn.lock'') }}'
                     restore-keys: "node-${{ matrix.node }}-yarn-\n"
             -
                 name: 'Install Sylius-Standard and Plugin'
-                run: 'make install -e SYLIUS_VERSION=${{ matrix.sylius }} SYMFONY_VERSION=${{ matrix.symfony }} PHP_VERSION=${{ matrix.php }}'
-            -
-                name: 'Output PHP version for Symfony CLI'
-                working-directory: ./tests/Application
-                run: 'php -v | head -n 1 | awk ''{ print $2 }'' > .php-version'
+                run: 'make install -e SYLIUS_VERSION=${{ matrix.sylius }} SYMFONY_VERSION=${{ matrix.symfony }}'
             -
                 name: 'Install certificates'
-                working-directory: ./tests/Application
                 run: 'symfony server:ca:install'
             -
                 name: 'Run Chrome headless'
-                working-directory: ./tests/Application
                 run: 'google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server=''direct://'' --proxy-bypass-list=''*'' https://127.0.0.1 > /dev/null 2>&1 &'
             -
                 name: 'Run webserver'
-                working-directory: ./tests/Application
-                run: 'symfony server:start --port=8080 --dir=public --daemon'
+                run: 'symfony server:start --port=8080 --daemon'
                 id: end-of-setup-sylius
             -
                 name: 'Doctrine Schema Validate - Run'
-                working-directory: ./tests/Application
-                run: 'php bin/console doctrine:schema:validate --skip-sync'
+                run: 'vendor/bin/console doctrine:schema:validate --skip-sync'
             -
                 name: 'Run PHPUnit'
                 run: 'make phpunit'
                 if: 'always() && steps.end-of-setup-sylius.outcome == ''success'''
-            -
-                name: 'Configure Behat'
-                run: 'make behat-configure'
-                if: 'always() && steps.end-of-setup-sylius.outcome == ''success'''
-            -
-                name: 'Run behat'
-                working-directory: ./tests/Application
-                run: 'vendor/bin/behat --strict --no-interaction -f progress || vendor/bin/behat --strict -vvv --no-interaction --rerun'
-                if: 'always() && steps.end-of-setup-sylius.outcome == ''success'''
+#            -
+#                name: 'Configure Behat'
+#                run: 'make behat-configure'
+#                if: 'always() && steps.end-of-setup-sylius.outcome == ''success'''
+#            -
+#                name: 'Run behat'
+#                run: 'vendor/bin/behat --strict --no-interaction -f progress || vendor/bin/behat --strict -vvv --no-interaction --rerun'
+#                if: 'always() && steps.end-of-setup-sylius.outcome == ''success'''
             -
                 uses: actions/upload-artifact@v4
                 if: failure()

.gitignore

@@ -13,3 +13,7 @@
 
 /.idea
 *.map
+
+/tests/TestApplication/.env.local
+/tests/TestApplication/.env.*.local
+/var/

CHANGELOG.md

@@ -0,0 +1,33 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [2.0.0] - Unreleased
+
+### Added
+- Support for Sylius v2.0+
+- PHP 8.2+ compatibility
+- Use Payment Request API from Sylius
+- New Unified Authentication System (OAuth2)
+
+> [!IMPORTANT]
+> Merchants will need to contact support to switch to the new authentication method.
+
+### Changed
+- Plugin structure has been changed to follow the new Symfony bundle structure
+- Front assets have been migrated to use Stimulus
+
+### Removed
+- Drop Payum support
+- Drop Sylius 1.x support
+- Drop usage of Secret key - Use OAuth2 instead
+
+Please refer to [github releases](https://github.com/payplug/SyliusPayPlugPlugin/releases) for historical release information.
+
+---
+
+For migration guides and upgrade instructions, see [UPGRADE.md](UPGRADE.md).
+For contributing guidelines, see [CONTRIBUTING.md](CONTRIBUTING.md).

CONTRIBUTING.md

@@ -6,7 +6,7 @@ From the plugin root directory, run the following commands:
 $ make install -e SYLIUS_VERSION=XX SYMFONY_VERSION=YY PHP_VERSION=ZZ
 ```
 
-Default values : XX=1.12.0 and YY=6.1 and ZZ=8.1
+Default values : XX=1.14.0 and YY=6.4 and ZZ=8.2
 
 To be able to setup the plugin database, remember to configure you database credentials
 in `install/Application/.env.local` and `install/Application/.env.test.local`.
@@ -22,7 +22,7 @@ $ make reset
 
 - GrumPHP (see configuration [grumphp.yml](grumphp.yml).)
 
-  GrumPHP is executed by the Git pre-commit hook, but you can launch it manualy with :
+  GrumPHP is executed by the Git pre-commit hook, but you can launch it manually with :
 
   ```bash
   $ make grumphp

Makefile

@@ -1,91 +1,42 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 COMPOSER_ROOT=composer
-TEST_DIRECTORY=tests/Application
-CONSOLE=cd tests/Application && php bin/console -e test
-COMPOSER=cd tests/Application && composer
-YARN=cd tests/Application && yarn
-
-SYLIUS_VERSION=1.12.0
-SYMFONY_VERSION=6.1
-PHP_VERSION=8.1
+TEST_DIRECTORY=tests/TestApplication
+CONSOLE=vendor/bin/console
+COMPOSER=composer
+SYLIUS_VERSION=2.1.0
+SYMFONY_VERSION=6.4
 PLUGIN_NAME=payplug/sylius-payplug-plugin
 
 ###
 ### DEVELOPMENT
 ### ¯¯¯¯¯¯¯¯¯¯¯
-
-install: sylius ## Install Plugin on Sylius [SYLIUS_VERSION=1.12.0] [SYMFONY_VERSION=6.1] [PHP_VERSION=8.1]
+install: sylius ## Install all dependencies with [SYLIUS_VERSION=2.1.0] [SYMFONY_VERSION=6.4]
 .PHONY: install
 
 reset: ## Remove dependencies
-ifneq ("$(wildcard tests/Application/bin/console)","")
 	${CONSOLE} doctrine:database:drop --force --if-exists || true
-endif
-	rm -rf tests/Application
+	rm -rf vendor
 .PHONY: reset
 
-phpunit: phpunit-configure phpunit-run ## Run PHPUnit
+phpunit: ## Run PHPUnit tests
+	./vendor/bin/phpunit
 .PHONY: phpunit
 
 ###
 ### OTHER
 ### ¯¯¯¯¯¯
-
-sylius: sylius-standard install-plugin install-sylius
+sylius: install-sylius
 .PHONY: sylius
 
-sylius-standard:
-ifeq ($(shell [[ $(SYLIUS_VERSION) == *dev ]] && echo true ),true)
-	${COMPOSER_ROOT} create-project sylius/sylius-standard:${SYLIUS_VERSION} ${TEST_DIRECTORY} --no-install --no-scripts
-else
-	${COMPOSER_ROOT} create-project sylius/sylius-standard ${TEST_DIRECTORY} "~${SYLIUS_VERSION}" --no-install --no-scripts
-endif
-	${COMPOSER} config allow-plugins true
-ifeq ($(shell [[ $(SYLIUS_VERSION) == *dev ]] && echo true ),true)
-	${COMPOSER} require sylius/sylius:"${SYLIUS_VERSION}"
-else
-	${COMPOSER} require sylius/sylius:"~${SYLIUS_VERSION}"
-endif
-
-install-plugin:
-	${COMPOSER} config repositories.plugin '{"type": "path", "url": "../../"}'
-	${COMPOSER} config extra.symfony.allow-contrib true
-	${COMPOSER} config minimum-stability "dev"
-	${COMPOSER} config prefer-stable true
-	${COMPOSER} require "${PLUGIN_NAME}:*" --prefer-source --no-scripts
-
-	cp -r install/Application tests
-	sed -i "4a \ \ \ \ form_themes: ['form/form_gateway_config_row.html.twig']" ${TEST_DIRECTORY}/config/packages/twig.yaml
-	mkdir -p ${TEST_DIRECTORY}/templates/form/
-	cp -R src/Resources/views/form/* ${TEST_DIRECTORY}/templates/form/
-
-# As of sylius/refund-plugin 1.2 the folder does not exist anymore
-ifneq ($(PHP_VERSION), 8)
-	mkdir -p ${TEST_DIRECTORY}/templates/bundles/SyliusAdminBundle/
-	cp -R src/Resources/views/SyliusAdminBundle/* ${TEST_DIRECTORY}/templates/bundles/SyliusAdminBundle/
-endif
-
 install-sylius:
-	#${CONSOLE} sylius:install -n -s default
-	${CONSOLE} doctrine:database:create -n
-	${CONSOLE} messenger:setup-transports -n
-	${CONSOLE} doctrine:migration:migrate -n
-	${CONSOLE} sylius:fixture:load -n
-	${YARN} install
-	${YARN} build
-	${YARN} gulp
-	${CONSOLE} translation:extract en PayPlugSyliusPayPlugPlugin --dump-messages
-	${CONSOLE} translation:extract fr PayPlugSyliusPayPlugPlugin --dump-messages
-
-	${CONSOLE} cache:clear
+	@echo "Installing Sylius ${SYLIUS_VERSION} using TestApplication"
+	${COMPOSER} config extra.symfony.require "^${SYMFONY_VERSION}"
+	${COMPOSER} install
+	${COMPOSER} require --dev sylius/test-application:"^${SYLIUS_VERSION}@alpha" -n -W # TODO: Remove alpha when stable
+	${COMPOSER} test-application:install
 
-phpunit-configure:
-	cp phpunit.xml.dist ${TEST_DIRECTORY}/phpunit.xml
-	echo -e "\nMOCK_SERVER_HOST=localhost\nMOCK_SERVER_PORT=8987\n" >> ${TEST_DIRECTORY}/.env.test.local
 
-phpunit-run:
-	cd ${TEST_DIRECTORY} && ./vendor/bin/phpunit
 
 behat-configure: ## Configure Behat
 	(cd ${TEST_DIRECTORY} && cp behat.yml.dist behat.yml)
@@ -101,7 +52,7 @@ grumphp:
 	vendor/bin/grumphp run
 
 help: SHELL=/bin/bash
-help: ## Dislay this help
+help: ## Display this help
 	@IFS=$$'\n'; for line in `grep -h -E '^[a-zA-Z_#-]+:?.*?##.*$$' $(MAKEFILE_LIST)`; do if [ "$${line:0:2}" = "##" ]; then \
 	echo $$line | awk 'BEGIN {FS = "## "}; {printf "\033[33m    %s\033[0m\n", $$2}'; else \
 	echo $$line | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m%s\n", $$1, $$2}'; fi; \

README.md

@@ -50,7 +50,7 @@ In local environment, the plugin will not work properly because you will not be
 
     ```shell
     mkdir -p templates/bundles/SyliusAdminBundle/
-    cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
+    cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
     ```
 
 4. Add Payplug to refundable payment method for Sylius Refund Plugin in `config/services.yaml`
@@ -70,7 +70,7 @@ In local environment, the plugin will not work properly because you will not be
 
    ```yaml
    sylius_payplug:
-      resource: "@PayPlugSyliusPayPlugPlugin/Resources/config/routing.yaml"
+      resource: "@PayPlugSyliusPayPlugPlugin/config/routing.yaml"
    ```
 
 8. Add Traits for Customer and PaymentMethod entities
@@ -85,6 +85,7 @@ In local environment, the plugin will not work properly because you will not be
    namespace App\Entity\Customer;
 
    use Doctrine\ORM\Mapping as ORM;
+   use PayPlug\SyliusPayPlugPlugin\Entity\CardsOwnerInterface;
    use PayPlug\SyliusPayPlugPlugin\Entity\Traits\CustomerTrait;
    use Sylius\Component\Core\Model\Customer as BaseCustomer;
 
@@ -94,7 +95,7 @@ In local environment, the plugin will not work properly because you will not be
    */
    #[ORM\Entity]
    #[ORM\Table(name: 'sylius_customer')]
-   class Customer extends BaseCustomer
+   class Customer extends BaseCustomer implements CardsOwnerInterface
    {
       use CustomerTrait;
    }
@@ -209,9 +210,9 @@ Copy Sylius templates overridden in plugin to your templates directory (e.g temp
 mkdir -p templates/bundles/SyliusAdminBundle/
 mkdir -p templates/bundles/SyliusShopBundle/
 mkdir -p templates/bundles/SyliusUiBundle/
-cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
-cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusShopBundle/* templates/bundles/SyliusShopBundle/
-cp -R vendor/payplug/sylius-payplug-plugin/src/Resources/views/SyliusUiBundle/* templates/bundles/SyliusUiBundle/
+cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/
+cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusShopBundle/* templates/bundles/SyliusShopBundle/
+cp -R vendor/payplug/sylius-payplug-plugin/templates/SyliusUiBundle/* templates/bundles/SyliusUiBundle/
 ```
 
 You also need to edit your twig config to add your path to avoid our configuration to be prepended :

RELEASE.md

@@ -1,4 +1,6 @@
 # Release Process
 
 Upon releasing a new version there are checks and updates to be made:
-* Update plugin's version inside `src/PayPlugSyliusPayPlugPlugin.php` and `src/Resources/dev/package.json`
+* Update plugin's version inside `src/PayPlugSyliusPayPlugPlugin.php`
+* Ensure that the `CHANGELOG.md` is up to date with the changes made
+* Ensure that the date of the release version is updated in `CHANGELOG.md`

assets/admin/entrypoint.js

@@ -0,0 +1 @@
+// Mandatory by test application