Merge pull request #194 from elyanory/sylius-1.12

⬆️ Sylius 1.12

Author: jacquesbh

.github/workflows/recipe.yaml

@@ -19,23 +19,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4' ,'8.0']
-        sylius: ["~1.8.0", "~1.9.0", "~1.10.0", "~1.11.0"]
+        php: ['7.4', '8.0', '8.1']
+        sylius: ['~1.8.0', '~1.9.0', '~1.10.0', '~1.11.0', '~1.12.0']
         exclude:
           - php: 8.0
-            sylius: "~1.8.0"
+            sylius: '~1.8.0'
           - php: 8.0
-            sylius: "~1.9.0"
+            sylius: '~1.9.0'
+          - php: 8.1
+            sylius: '~1.8.0'
+          - php: 8.1
+            sylius: '~1.9.0'
           - php: 7.4
-            sylius: "~1.11.0"
+            sylius: '~1.11.0'
+          - php: 7.4
+            sylius: '~1.12.0'
 
     steps:
       - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: gd, intl, json
+
+      - name: Set project php-version
         run: |
-          sudo update-alternatives --set php /usr/bin/php${{ matrix.php }}
-          echo "date.timezone=UTC" >> /tmp/timezone.ini
-          sudo mv /tmp/timezone.ini /etc/php/${{ matrix.php }}/cli/conf.d/timezone.ini
-          echo ${{ matrix.php }} > .php-version
+          echo "${{ matrix.php }}" > .php-version
 
       - uses: actions/checkout@v2
         with:
@@ -82,7 +91,7 @@ jobs:
       - name: Require plugin without install
         working-directory: ./sylius
         run: |
-          composer require --no-install --no-update monsieurbiz/sylius-rich-editor-plugin="*@dev"
+          composer require --no-install --no-scripts monsieurbiz/sylius-rich-editor-plugin="*@dev"
 
       - name: Composer install
         working-directory: ./sylius

.github/workflows/security.yaml

@@ -15,15 +15,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0']
+        php: ['7.4', '8.0', '8.1']
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: gd, intl, json
+
+      - name: Set project php-version
         run: |
-          sudo update-alternatives --set php /usr/bin/php${{ matrix.php }}
-          echo "date.timezone=UTC" | sudo tee /etc/php/${{ matrix.php }}/cli/conf.d/timezone.ini
           echo "${{ matrix.php }}" > .php-version
 
       - uses: actions/cache@v1

.github/workflows/tests.yaml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0']
+        php: ['8.0', '8.1']
 
     env:
       SYMFONY_ARGS: --no-tls
@@ -30,9 +30,13 @@ jobs:
           node-version: '14'
 
       - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: gd, intl, json
+
+      - name: Set project php-version
         run: |
-          sudo update-alternatives --set php /usr/bin/php${{ matrix.php }}
-          echo "date.timezone=UTC" | sudo tee /etc/php/${{ matrix.php }}/cli/conf.d/timezone.ini
           echo "${{ matrix.php }}" > .php-version
 
       - name: Install symfony CLI

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.11.0
+SYLIUS_VERSION=1.12.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console

assets/css/app.scss

@@ -25,7 +25,7 @@ html.is-disabled body {
     padding: 10px;
 
     // These lines are here to avoid font-size style after removing EOL in the editor
-    // @see https://github.com/monsieurbiz/SyliusRichEditorPlugin/issues/132 
+    // @see https://github.com/monsieurbiz/SyliusRichEditorPlugin/issues/132
     p, span {
         font-size: unset !important;
         line-height: unset !important;
@@ -60,7 +60,7 @@ html.is-disabled body {
     right: 0;
     bottom: 0;
     left: 0;
-    z-index: 200;
+    z-index: 999;
     display: none;
     padding: 0.714rem 0 0.714rem 5%;
     -webkit-user-select: none;

composer.json

@@ -5,10 +5,10 @@
     "description": "A Rich Editor plugin for Sylius.",
     "license": "MIT",
     "require": {
-        "php": "~7.4|~8.0",
+        "php": "~7.4|~8.0|~8.1",
         "ext-json": "*",
         "ext-intl": "*",
-        "sylius/sylius": ">=1.8 <1.12"
+        "sylius/sylius": ">=1.8 <1.13"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
@@ -30,7 +30,7 @@
         "mikey179/vfsstream": "^1.6",
         "mockery/mockery": "^1.4",
         "pamil/prophecy-common": "^0.1",
-        "phpspec/phpspec": "^6.1",
+        "phpspec/phpspec": "^6.1|^7.2",
         "phpstan/phpstan": "^0.12.57",
         "phpstan/phpstan-doctrine": "^0.12.19",
         "phpstan/phpstan-webmozart-assert": "^0.12.7",
@@ -56,7 +56,7 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
-        "phpcs": "php-cs-fixer fix --using-cache=false",
+        "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --using-cache=false",
         "phpstan": "phpstan analyse -c phpstan.neon src/",
         "phpmd": "phpmd --exclude Migrations/* src/ ansi phpmd.xml",
         "phpunit": "phpunit",

src/Controller/FormController.php

@@ -140,8 +140,10 @@ public function submitAction(Request $request, FileUploaderInterface $fileUpload
             throw $this->createNotFoundException();
         }
 
+        $data = $request->request->all()[$form->getName()];
+
         // Convert uploaded files to string in form data if necessary, or retrieve current image path if edition
-        $formData = $this->processFormData($form, $fileUploader, $request->request->get($form->getName()));
+        $formData = $this->processFormData($form, $fileUploader, $data);
 
         // Generate form render with error display
         if (!$form->isValid()) {

src/DependencyInjection/MonsieurBizSyliusRichEditorExtension.php

@@ -40,7 +40,7 @@ public function load(array $config, ContainerBuilder $container): void
     /**
      * @inheritdoc
      */
-    public function getAlias()
+    public function getAlias(): string
     {
         return str_replace(['rich_editor', 'monsieur_biz'], ['richeditor', 'monsieurbiz'], parent::getAlias());
     }

src/Resources/config/routing/admin.yaml

@@ -2,19 +2,19 @@ monsieurbiz_richeditor_admin_form_create:
     path: /monsieurbiz_richeditor/form/{code}
     methods: [GET]
     defaults:
-        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController:viewAction
+        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController::viewAction
 
 monsieurbiz_richeditor_admin_form_edit:
     path: /monsieurbiz_richeditor/form/{code}
     methods: [POST]
     defaults:
-        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController:viewAction
+        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController::viewAction
 
 monsieurbiz_richeditor_admin_form_submit:
     path: /monsieurbiz_richeditor/submit/{code}/{isEdition}
     methods: [POST]
     defaults:
-        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController:submitAction
+        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController::submitAction
         isEdition: 0
     requirements:
         isEdition:  1|0
@@ -23,4 +23,4 @@ monsieurbiz_richeditor_admin_form_render_elements:
     path: /monsieurbiz_richeditor/render_elements
     methods: [POST]
     defaults:
-        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController:renderElementsAction
+        _controller: MonsieurBiz\SyliusRichEditorPlugin\Controller\FormController::renderElementsAction