Merge pull request #107 from JacquesDurand/chore/sylius-112-compatibi…

…lity

chore(deps): sylius 1.12 compatibility

.github/workflows/code_quality.yaml

@@ -17,8 +17,12 @@ jobs:
         steps:
             - uses: actions/checkout@v2
 
-            - name: PHP - Switch
-              run: sudo update-alternatives --set php /usr/bin/php7.3
+            -
+              name: 'Setup PHP'
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.4'
+                  coverage: none
 
             - name: Composer - Get Cache Directory
               id: composer-cache
@@ -35,9 +39,6 @@ jobs:
               run: mkdir -p /home/runner/.composer/cache
               if: steps.cache-composer.outputs.cache-hit != 'true'
 
-            - name: Composer - Self Update
-              run: sudo composer self-update
-
             - name: Composer - Validate composer.json and composer.lock
               run: composer validate --strict
 

SyliusShopBundle/views/Common/Macro/sorting.html.twig

@@ -4,7 +4,7 @@
 
     {% if grid.isSortedBy(field.name) %}
         <th class="sortable sorted {{ order == 'desc' ? 'descending' : 'ascending' }} sylius-table-column-{{ field.name }}">
-            <a href="{{ link(field.name, attributes, (order== 'desc' ? 'asc' : 'desc'), grid.parameters.all) }}">{{ field.label|trans }}</a>
+            <a href="{{ link(field.name, attributes, (order == 'desc' ? 'asc' : 'desc'), grid.parameters.all) }}">{{ field.label|trans }}</a>
         </th>
     {% else %}
         <th class="sortable sylius-table-column-{{ field.name }}">

SyliusShopBundle/views/Product/Show/_price.html.twig

@@ -1,14 +1,14 @@
 {% import "@SyliusShop/Common/Macro/money.html.twig" as money %}
 
 {% set variant = product|sylius_resolve_variant %}
-{% set hasDiscount = variant|sylius_has_discount({'channel': sylius.channel}) %}
+{% set has_discount = variant|sylius_has_discount({'channel': sylius.channel}) %}
 
 <span class="h3" data-js-product-price id="product-price" {{ sylius_test_html_attribute('product-price', money.calculatePrice(product|sylius_resolve_variant)) }}>
     {{ money.calculatePrice(product|sylius_resolve_variant) }}
 </span>
 
 <span class="h3 text-muted" id="product-original-price" {{ sylius_test_html_attribute('product-original-price', money.calculateOriginalPrice(variant)) }}>
-    {% if hasDiscount %}
+    {% if has_discount %}
     <del>{{ money.calculateOriginalPrice(variant) }}</del>
     {% endif %}
 </span>

composer.json

@@ -11,8 +11,8 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
-        "sylius/sylius": "~1.8.0 || ~1.9.0 || ~1.10.0 || ~1.11.0",
+        "php": "^7.4 || ^8.0",
+        "sylius/sylius": "~1.8.0 || ~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0",
         "symfony/webpack-encore-bundle": "^1.12"
     },
     "require-dev": {
@@ -32,11 +32,11 @@
         "friendsoftwig/twigcs": "^4.0 || ^5.0",
         "sensiolabs/security-checker": "^6.0",
         "sylius-labs/coding-standard": "^4.0",
-        "symfony/browser-kit": "^4.4 || ^5.2",
-        "symfony/debug-bundle": "^4.4 || ^5.2",
-        "symfony/dotenv": "^4.4 || ^5.2",
-        "symfony/intl": "^4.4 || ^5.2",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.2",
+        "symfony/browser-kit": "^5.4",
+        "symfony/debug-bundle": "^5.4",
+        "symfony/dotenv": "^5.4",
+        "symfony/intl": "^5.4",
+        "symfony/web-profiler-bundle": "^5.4",
         "vimeo/psalm": "4.7.1"
     },
     "autoload-dev": {
@@ -50,13 +50,14 @@
             "title": "Sylius Bootstrap Theme"
         },
         "branch-alias": {
-            "dev-master": "0.4-dev"
+            "dev-master": "0.5-dev"
         }
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "symfony/thanks": true
         }
     },
     "scripts": {