Merge pull request #24 from lanfisis/feature/sylius-2

Sylius 2.0 support 🎉

Author: lanfisis

.github/workflows/recipe.yaml

@@ -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' ]
 
     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

.github/workflows/tests.yaml

@@ -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.0.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
@@ -78,6 +78,8 @@ setup_application:
 	$(MAKE) apply_dist
 	(cd ${APP_DIR} && ${COMPOSER} require --no-progress monsieurbiz/${PLUGIN_NAME}="*@dev")
 	rm -rf ${APP_DIR}/var/cache
+	mkdir -p ${APP_DIR}/public/media/gallery
+	cp -r fixtures/gallery/* ${APP_DIR}/public/media/gallery
 
 
 ${APP_DIR}/docker-compose.yaml:
@@ -136,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

@@ -13,11 +13,11 @@ This plugin adds a media manager to your images, videos and other files type fie
 
 ## 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            | 8.2 - 8.3   |
+
+ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusMediaManagerPlugin/tree/1.x) and all 1.x releases.
 
 ## Installation
 
@@ -97,6 +97,10 @@ Use `MonsieurBiz\SyliusMediaManagerPlugin\Form\Type\FaviconType`
 
 Use `MonsieurBiz\SyliusMediaManagerPlugin\Form\Type\AudioType`
 
+### All the previous file types
+
+Use `MonsieurBiz\SyliusMediaManagerPlugin\Form\Type\FileType`
+
 ## Configuration
 
 You can specify the default maximum file size allowed for the media manager by setting the `MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE` environment variable.

UPGRADE-2.0.md

@@ -0,0 +1,20 @@
+# UPGRADE FROM `1.2` TO `2.0`
+
+**Replace form type option name**
+
+If you use one of the following options with Media Manager form type (`AudioType`, `FaviconType`, `ImageType`, `PdfType` or `VideoType`), 
+you had to rename it as follows:
+
+* `["file-type" => "TYPE"]` became `["file_type" => "TYPE"]`
+* `["filter-width" => INT]` became `["filter_width" => INT]]`
+
+**Use new services**
+
+`FileHelper` service has been split into dedicated services:
+* `FileRepositoryInterface` to list file from a folder or get one file by it path
+* `DirectoryOperatorInterface` where all directory operations takes place
+* `FileMetadataResolverInterface` for file types resolution
+* `FilePathResolverInterface` for absolute and relative path resolution
+* `FileValidatorInterface` for file validation
+
+If you use `FileHelper` service, you need to inject one of the service above instead.

composer.json

@@ -5,8 +5,9 @@
     "description": "Add a media manager to your Sylius.",
     "license": "MIT",
     "require": {
-        "php": "^8.1",
-        "sylius/sylius": ">=1.12 <2.0"
+        "php": "^8.2",
+        "sylius/sylius": "~2.0.0",
+        "phpdocumentor/reflection-docblock": "^5.6"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.16",
@@ -36,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         },
         "symfony": {
             "docker": false,

config/config.yaml

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

src/Resources/config/images.yaml renamed to config/images.yaml

@@ -0,0 +1,29 @@
+parameters:
+    monsieurbiz_sylius_media_manager.max_file_size.default: '%env(resolve:MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE)%'
+    monsieurbiz_sylius_media_manager.max_file_size.image: '%env(default:monsieurbiz_sylius_media_manager.max_file_size.default:resolve:MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE_IMAGE)%'
+    monsieurbiz_sylius_media_manager.max_file_size.audio: '%env(default:monsieurbiz_sylius_media_manager.max_file_size.default:resolve:MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE_AUDIO)%'
+    monsieurbiz_sylius_media_manager.max_file_size.video: '%env(default:monsieurbiz_sylius_media_manager.max_file_size.default:resolve:MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE_VIDEO)%'
+    monsieurbiz_sylius_media_manager.max_file_size.pdf: '%env(default:monsieurbiz_sylius_media_manager.max_file_size.default:resolve:MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE_PDF)%'
+    monsieurbiz_sylius_media_manager.max_file_size.favicon: '%env(default:monsieurbiz_sylius_media_manager.max_file_size.default:resolve:MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE_FAVICON)%'
+    monsieurbiz_sylius_media_manager.max_file_size.file: '%env(default:monsieurbiz_sylius_media_manager.max_file_size.default:resolve:MONSIEURBIZ_SYLIUS_MEDIA_MANAGER_MAX_FILE_SIZE_FILE)%'
+    monsieurbiz_sylius_media_manager.liip_imagine.exclude_extensions:
+        - 'svg'
+        - 'ico'
+
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
+
+    MonsieurBiz\SyliusMediaManagerPlugin\:
+        resource: '../src/*'
+        exclude: '../src/{Model}'
+
+    # Decorator to allow us to have multiple data roots for svg images.
+    MonsieurBiz\SyliusMediaManagerPlugin\Twig\Extension\FilterExtensionDecorator:
+        decorates: 'liip_imagine.templating.filter_extension'
+        arguments:
+            $loaders: '%liip_imagine.loaders%'
+            $publicDir: '%sylius_core.public_dir%'
+            $excludeExtensions: '%monsieurbiz_sylius_media_manager.liip_imagine.exclude_extensions%'