Sylius 2.x compatibility

.github/workflows/recipe.yaml

@@ -2,7 +2,7 @@ name: Flex Recipe
 
 on:
   push:
-    branches: [ master ]
+    branches: [ $default-branch ]
   pull_request:
 
 jobs:
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
-        sylius: ["~1.12.0", "~1.13.0", "1.14.0"]
+        php: [ '8.2', '8.3' ]
+        sylius: [ '~2.0.0', '~2.1.0' ]
 
     steps:
       - name: Setup PHP

.github/workflows/security.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.2', '8.3']
 
     steps:
       - uses: actions/checkout@v3
@@ -50,4 +50,3 @@ jobs:
         run: composer update --prefer-dist
 
       - uses: symfonycorp/security-checker-action@v4
-

.github/workflows/tests.yaml

@@ -2,7 +2,7 @@ name: Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ $default-branch ]
   pull_request:
 
 jobs:
@@ -14,7 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: [ '8.2', '8.3' ]
+        node: [ '20' ]
 
     env:
       SYMFONY_ARGS: --no-tls
@@ -25,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: ${{ matrix.node }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.14.0
+SYLIUS_VERSION=2.1.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
@@ -138,13 +138,13 @@ test.container: ## Lint the symfony container
 	${CONSOLE} lint:container
 
 test.yaml: ## Lint the symfony Yaml files
-	${CONSOLE} lint:yaml ../../src/Resources/config --parse-tags
+	${CONSOLE} lint:yaml ../../config --parse-tags
 
 test.schema: ## Validate MySQL Schema
 	${CONSOLE} doctrine:schema:validate
 
 test.twig: ## Validate Twig templates
-	${CONSOLE} lint:twig --no-debug templates/ ../../src/Resources/views/
+	${CONSOLE} lint:twig --no-debug templates/ ../../templates/
 
 ###
 ### SYLIUS

README.md

@@ -11,11 +11,11 @@ This plugins allows you to customize colors, logos and background of the Sylius
 
 ## Compatibility
 
-| Sylius Version | PHP Version     |
-|----------------|-----------------|
-| 1.12           | 8.1 - 8.2 - 8.3 |
-| 1.13           | 8.1 - 8.2 - 8.3 |
-| 1.14           | 8.1 - 8.2 - 8.3 |
+| Sylius Version | PHP Version |
+|----------------|-------------|
+| 2.0, 2.1       | 8.2 - 8.3   |
+
+ℹ️ For Sylius 1.x, see our [1.x branch](/tree/1.x) and all 1.x releases.
 
 ## Installation
 

composer.json

@@ -5,10 +5,10 @@
     "description": "Manage your logos, colors and backgrounds with settings in Sylius Admin pannel",
     "license": "MIT",
     "require": {
-        "monsieurbiz/sylius-media-manager-plugin": "^1.0",
-        "monsieurbiz/sylius-settings-plugin": "^1.0",
-        "php": "^8.1",
-        "sylius/sylius": ">=1.12 <2.0"
+        "monsieurbiz/sylius-media-manager-plugin": "^2.0",
+        "monsieurbiz/sylius-settings-plugin": "^2.0",
+        "php": "^8.2 || ^8.3",
+        "sylius/sylius": "~2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.16",
@@ -38,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         },
         "symfony": {
             "docker": false,

config/config.yaml

@@ -0,0 +1,4 @@
+imports:
+    - { resource: 'images.yaml' }
+    - { resource: 'twig_hooks.yaml' }
+    - { resource: 'settings.yaml' }

src/Resources/config/services.yaml → config/services.yaml

@@ -5,9 +5,9 @@ services:
         public: false
 
     MonsieurBiz\SyliusBetterAdminPlugin\:
-        resource: '../../*'
-        exclude: '../../{Entity}'
+        resource: '../src/*'
+        exclude: '../src/{Entity}'
 
     MonsieurBiz\SyliusBetterAdminPlugin\Controller\:
-        resource: '../../Controller'
+        resource: '../src/Controller'
         tags: [ 'controller.service_arguments' ]

src/Resources/config/monsieurbiz/settings.yaml → config/settings.yaml

@@ -13,3 +13,6 @@ monsieurbiz_sylius_settings:
                 circular_icon_color: '#ffffff'
                 logo_login_width: '200'
                 logo_sidebar_width: '90'
+                logo: ''
+                logo_sidebar: ''
+                background_image: ''

config/twig_hooks.yaml

@@ -0,0 +1,24 @@
+sylius_twig_hooks:
+    hooks:
+        sylius_admin.base#stylesheets:
+            monsieurbiz_better_admin_stylesheet:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/shared/layout/base/styles.html.twig"
+                priority: 9999
+        sylius_admin.common.component.sidebar.logo:
+            image:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/shared/crud/common/sidebar/logo/image.html.twig"
+                priority: 9999
+        sylius_admin.security.login:
+            monsieurbiz_better_admin_login:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/common/login.html.twig"
+                priority: 9999
+                context:
+                    form: form
+                    last_error: last_error
+                    last_username: last_username
+        sylius_admin.security.login.page.logo:
+            image:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/common/logo/image.html.twig"
+                priority: 9999
+                context:
+                    paths: paths

src/DependencyInjection/MonsieurBizSyliusBetterAdminExtension.php

@@ -28,7 +28,7 @@ final class MonsieurBizSyliusBetterAdminExtension extends Extension
      */
     public function load(array $config, ContainerBuilder $container): void
     {
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.yaml');
     }
 
@@ -37,6 +37,6 @@ public function load(array $config, ContainerBuilder $container): void
      */
     public function getAlias(): string
     {
-        return 'monsieurbiz_better_admin';
+        return 'monsieur_biz_sylius_better_admin';
     }
 }

src/MonsieurBizSyliusBetterAdminPlugin.php

@@ -13,34 +13,15 @@
 
 namespace MonsieurBiz\SyliusBetterAdminPlugin;
 
-use LogicException;
 use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 final class MonsieurBizSyliusBetterAdminPlugin extends Bundle
 {
     use SyliusPluginTrait;
 
-    /**
-     * Returns the plugin's container extension.
-     *
-     * @throws LogicException
-     *
-     * @return ExtensionInterface|null The container extension
-     */
-    public function getContainerExtension(): ?ExtensionInterface
+    public function getPath(): string
     {
-        if (null === $this->containerExtension) {
-            $this->containerExtension = false;
-            $extension = $this->createContainerExtension();
-            if (null !== $extension) {
-                $this->containerExtension = $extension;
-            }
-        }
-
-        return $this->containerExtension instanceof ExtensionInterface
-            ? $this->containerExtension
-            : null;
+        return \dirname(__DIR__);
     }
 }