Merge pull request #9 from delyriand/feature/sylius-2-0

Sylius 2.0 and 2.1 support 🎉

Author: Maxime

.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

.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:

.php-cs-fixer.dist.php

@@ -11,6 +11,8 @@
 
 declare(strict_types=1);
 
+use PhpCsFixer\UnsupportedPhpVersionAllowedConfigInterface;
+
 $header = <<<'HEADER'
 This file is part of Monsieur Biz' Blog plugin for Sylius.
 
@@ -267,4 +269,8 @@
     ->setFinder($finder)
 ;
 
+if ($config instanceof UnsupportedPhpVersionAllowedConfigInterface) {
+    $config->setUnsupportedPhpVersionAllowed(true);
+}
+
 return $config;

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

README.md

@@ -7,15 +7,15 @@
 
 This plugin adds a blog to your Sylius project. It allows you to create blog articles, tags and authors.
 
-## Compatibility
+![List of article in a Sylius blog](images/blog_front.png)
 
 ## 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 |
+| 2.0, 2.1       | 8.2 - 8.3       |
+
+ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusBlogPlugin/tree/1.x) and all 1.x releases.
 
 ## Installation
 
@@ -28,7 +28,7 @@ composer config --no-plugins --json extra.symfony.endpoint '["https://api.github
 Install the plugin via composer:
 
 ```bash
-composer require monsieurbiz/sylius-blog-plugin:dev-master
+composer require monsieurbiz/sylius-blog-plugin
 ```
 
 <!-- The section on the flex recipe will be displayed when the flex recipe will be available on contrib repo
@@ -66,6 +66,21 @@ And finally, update your database:
 bin/console doctrine:migrations:migrate
 ```
 
+## Type of posts
+
+![List of article in a Sylius admin](images/blog_admin.png)
+
+This plugin allows you to create 2 types of posts:
+- **Blog articles**: These are the main content of your blog, where you can write detailed posts.
+- **Case studies**: These are more focused posts that showcase specific projects or achievements.
+
+Case studies are disabled by default. You can enable them by setting the env var `MONSIEURBIZ_SYLIUS_BLOG_ENABLE_CASE_STUDIES` to `true` in your `.env` file:
+
+```dotenv
+MONSIEURBIZ_SYLIUS_BLOG_ENABLE_CASE_STUDIES=true
+```
+
+The structure of the code allows you to easily add new types of posts in the future if needed.
 
 ## License
 

composer.json

@@ -5,10 +5,10 @@
     "description": "Add blog features on Sylius application.",
     "license": "MIT",
     "require": {
-        "php": "^8.1",
-        "sylius/sylius": ">=1.12 <2.0",
-        "monsieurbiz/sylius-rich-editor-plugin": "^2.8",
-        "monsieurbiz/sylius-media-manager-plugin": "^1.1"
+        "php": "^8.2",
+        "sylius/sylius": "~2.0",
+        "monsieurbiz/sylius-rich-editor-plugin": "^3.0",
+        "monsieurbiz/sylius-media-manager-plugin": "^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.16",
@@ -30,15 +30,15 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
-        "phpcs": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --using-cache=no",
+        "phpcs": "php-cs-fixer fix --using-cache=no",
         "phpstan": "phpstan analyse -c phpstan.neon src/",
         "phpmd": "phpmd --exclude Migrations/* src/ ansi phpmd.xml",
         "phpunit": "phpunit",
         "phpspec": "phpspec run"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "2.0-dev"
         },
         "symfony": {
             "docker": false,

dist/.env.dev

@@ -1 +1,2 @@
 SYLIUS_FIXTURES_HOSTNAME=${SYMFONY_DEFAULT_ROUTE_HOST:-localhost}
+MONSIEURBIZ_SYLIUS_BLOG_ENABLE_CASE_STUDIES=true

dist/src/Context/Channel/RequestBased/HostnameAndPortBasedRequestResolver.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of Monsieur Biz' Blog plugin for Sylius.
+ *
+ * (c) Monsieur Biz <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace App\Context\Channel\RequestBased;
+
+use Sylius\Component\Channel\Context\RequestBased\RequestResolverInterface;
+use Sylius\Component\Channel\Model\ChannelInterface;
+use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
+use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
+use Symfony\Component\HttpFoundation\Request;
+
+#[AutoconfigureTag('sylius.context.channel.request_based.resolver')]
+final class HostnameAndPortBasedRequestResolver implements RequestResolverInterface
+{
+    public function __construct(private ChannelRepositoryInterface $channelRepository)
+    {
+    }
+
+    public function findChannel(Request $request): ?ChannelInterface
+    {
+        return $this->channelRepository->findOneEnabledByHostname($request->getHost() . ':' . $request->getPort());
+    }
+}

dist/src/Form/Extension/ProductTypeExtension.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of Monsieur Biz' Blog plugin for Sylius.
+ *
+ * (c) Monsieur Biz <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace App\Form\Extension;
+
+use MonsieurBiz\SyliusRichEditorPlugin\Form\Type\RichEditorType;
+use Sylius\Bundle\ProductBundle\Form\Type\ProductTranslationType;
+use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ProductTypeExtension extends AbstractTypeExtension
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder->remove('description');
+        $builder->add('description', RichEditorType::class, [
+            'required' => false,
+            'label' => 'sylius.form.product.description',
+            'locale' => $builder->getName(),
+        ]);
+    }
+
+    public static function getExtendedTypes(): iterable
+    {
+        return [ProductTranslationType::class];
+    }
+}