Merge pull request #37 from maximehuran/3.x

Author: maximehuran

.github/copilot-instructions.md

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

.github/workflows/recipe.yaml

@@ -2,7 +2,7 @@ name: Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ $default-branch ]
   pull_request:
 
 jobs:
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.2', '8.3']
-        node: ['20']
+        php: [ '8.2', '8.3' ]
+        node: [ '20' ]
 
     env:
       SYMFONY_ARGS: --no-tls

.github/workflows/tests.yaml

@@ -34,9 +34,9 @@
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation' => true,
-        '@PHP71Migration' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHPUnit60Migration:risky' => true,
+        '@PHP7x1Migration' => true,
+        '@PHP7x1Migration:risky' => true,
+        '@PHPUnit6x0Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'align_multiline_comment' => [
@@ -254,7 +254,7 @@
         'trim_array_spaces' => true,
         'type_declaration_spaces' => true,
         'unary_operator_spaces' => true,
-        'visibility_required' => [
+        'modifier_keywords' => [
             'elements' => [
                 'const',
                 'property',

.php-cs-fixer.dist.php

@@ -72,17 +72,12 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins --json extra.symfony.endpoint '["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master","flex://defaults"]')
 	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
-	# Temporary fix for Sylius 2.1
-	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress api-platform/state)
-	# End Temporary fix for Sylius 2.1
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini
 	(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)
 	$(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:
@@ -141,13 +136,13 @@ test.container: ## Lint the symfony container
 	${CONSOLE} lint:container
 
 test.yaml: ## Lint the symfony Yaml files
-	${CONSOLE} lint:yaml ../../config --parse-tags
+	${CONSOLE} lint:yaml ../../src/Resources/config --parse-tags
 
 test.schema: ## Validate MySQL Schema
 	${CONSOLE} doctrine:schema:validate
 
 test.twig: ## Validate Twig templates
-	${CONSOLE} lint:twig --no-debug templates/ ../../templates/
+	${CONSOLE} lint:twig --no-debug templates/ ../../src/Resources/views/
 
 ###
 ### SYLIUS

Makefile

@@ -9,17 +9,15 @@
 
 This plugin adds a media manager to your images, videos and other files type fields in Sylius.
 
-![Example of field display](docs/images/media-manager-product-medias.png)
-![Example of image listing](docs/images/media-manager-images.png)
-![Example of PDF listing](docs/images/media-manager-pdfs.png)
+![Demo of the media manager](docs/images/demo.gif)
 
 ## Compatibility
 
-| Sylius Version | PHP Version |
-|----------------|-------------|
-| 2.0, 2,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](https://github.com/monsieurbiz/SyliusMediaManagerPlugin/tree/1.x) and all 1.x releases.
+ℹ️ For Sylius 1.x, see our [1.x branch](/tree/1.x) and all 1.x releases.
 
 ## Installation
 
@@ -50,7 +48,7 @@ return [
 ];
 ```
 
-Copy the plugin configuration files in your `config` folder: https://github.com/monsieurbiz/symfony-recipes/tree/master/monsieurbiz/sylius-media-manager-plugin/1.0/config
+Copy the plugin configuration files in your `config` folder: https://github.com/monsieurbiz/symfony-recipes/tree/master/monsieurbiz/sylius-media-manager-plugin/3.0/config
 
 Add these variables to your `.env` :
 
@@ -99,10 +97,6 @@ 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.

README.md

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