Merge pull request #54 from FriendsOfShopware/sw-65

feat: make shopware 6.5 compatible
FriendsOfShopware · Feb 22, 2023 · 948d01d · 948d01d
2 parents ab570a0 + 102dc5d
commit 948d01d
Show file tree

Hide file tree

Showing 33 changed files with 207 additions and 513 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,16 +1,16 @@
-name: BuildPlugin
+name: Build extension
 on:
-    push:
-        branches:
-            - '0.3'
+  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
-    build:
-        uses: FriendsOfShopware/actions/.github/workflows/store.yml@main
-        with:
-            extensionName: ${{ github.event.repository.name }}
-            shopwareVersion: '6.4.0'
-        secrets:
-            accountUser: ${{ secrets.ACCOUNT_USER }}
-            accountPassword: ${{ secrets.ACCOUNT_PASSWORD }}
-            ghToken: ${{ secrets.GITHUB_TOKEN }}
+  build:
+    uses: FriendsOfShopware/actions/.github/workflows/store-shopware-cli.yml@main
+    with:
+      extensionName: ${{ github.event.repository.name }}
+    secrets:
+      accountUser: ${{ secrets.ACCOUNT_USER }}
+      accountPassword: ${{ secrets.ACCOUNT_PASSWORD }}
+      ghToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
diff --git a/.gitpod.yml b/.gitpod.yml
diff --git a/CHANGELOG_en-GB.md → CHANGELOG.md b/CHANGELOG_en-GB.md → CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.0.0
+
+- Shopware 6.5 compatibility
+
 # 0.3.6
 
 - Updated psysh package

diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "frosh/development-helper",
-    "version": "0.3.6",
+    "version": "1.0.0",
     "description": "Development Helper",
     "type": "shopware-platform-plugin",
     "license": "MIT",
@@ -16,16 +16,11 @@
         }
     },
     "require": {
-        "shopware/core": "~6.4.11",
+        "shopware/core": "~6.5.0",
         "nikic/php-parser": "*",
         "friendsofphp/php-cs-fixer": "*",
         "psy/psysh": "^0.11.9"
     },
-    "config": {
-        "platform": {
-            "php": "7.4.3"
-        }
-    },
     "extra": {
         "shopware-plugin-class": "Frosh\\DevelopmentHelper\\FroshDevelopmentHelper",
         "copyright": "FriendsOfShopware",

diff --git a/src/Command/ExtendTemplate.php b/src/Command/ExtendTemplate.php
@@ -2,6 +2,7 @@
 
 namespace Frosh\DevelopmentHelper\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Frosh\DevelopmentHelper\Component\Twig\BlockCollector;
 use Shopware\Core\Framework\Adapter\Cache\CacheClearer;
 use Symfony\Component\Console\Command\Command;
@@ -13,25 +14,20 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Filesystem;
 
+#[AsCommand('frosh:extend:template', description: 'Generates the template extension for you')]
 class ExtendTemplate extends Command
 {
-    public static $defaultName = 'frosh:extend:template';
-    private BlockCollector $blockCollector;
-    private array $pluginInfos;
-    private CacheClearer $cacheClearer;
+    private readonly CacheClearer $cacheClearer;
 
-    public function __construct(BlockCollector $blockCollector, array $pluginInfos, CacheClearer $cacheClearer)
+    public function __construct(private readonly BlockCollector $blockCollector, private readonly array $pluginInfos, CacheClearer $cacheClearer)
     {
         parent::__construct();
-        $this->blockCollector = $blockCollector;
-        $this->pluginInfos = $pluginInfos;
         $this->cacheClearer = $cacheClearer;
     }
 
     protected function configure()
     {
         $this
-            ->setDescription('Generates the template extension for you')
             ->addArgument('pluginName', InputArgument::REQUIRED, 'Plugin Name');
     }
 

diff --git a/src/Command/MakeDefinition.php b/src/Command/MakeDefinition.php
@@ -2,6 +2,7 @@
 
 namespace Frosh\DevelopmentHelper\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Frosh\DevelopmentHelper\Component\Generator\Definition\CollectionGenerator;
 use Frosh\DevelopmentHelper\Component\Generator\Definition\EntityConsoleQuestion;
 use Frosh\DevelopmentHelper\Component\Generator\Definition\DefinitionGenerator;
@@ -14,60 +15,23 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
+#[AsCommand('frosh:make:definition', description: 'Generates an entity')]
 class MakeDefinition extends Command
 {
-    public static $defaultName = 'frosh:make:definition';
-
-    /**
-     * @var EntityLoader
-     */
-    private $entityLoader;
-
-    /**
-     * @var EntityConsoleQuestion
-     */
-    private $entityConsoleQuestion;
-
-    /**
-     * @var DefinitionGenerator
-     */
-    private $definitionGenerator;
-
-    /**
-     * @var EntityGenerator
-     */
-    private $entityGenerator;
-
-    /**
-     * @var CollectionGenerator
-     */
-    private $collectionGenerator;
-
-    /**
-     * @var FixCodeStyle
-     */
-    private $fixCodeStyle;
-
     public function __construct(
-        EntityLoader $entityLoader,
-        EntityConsoleQuestion $entityConsoleQuestion,
-        DefinitionGenerator $definitionGenerator,
-        EntityGenerator $entityGenerator,
-        CollectionGenerator $collectionGenerator,
-        FixCodeStyle $fixCodeStyle
+        private readonly EntityLoader $entityLoader,
+        private readonly EntityConsoleQuestion $entityConsoleQuestion,
+        private readonly DefinitionGenerator $definitionGenerator,
+        private readonly EntityGenerator $entityGenerator,
+        private readonly CollectionGenerator $collectionGenerator,
+        private readonly FixCodeStyle $fixCodeStyle
     ) {
         parent::__construct();
-        $this->entityLoader = $entityLoader;
-        $this->entityConsoleQuestion = $entityConsoleQuestion;
-        $this->definitionGenerator = $definitionGenerator;
-        $this->entityGenerator = $entityGenerator;
-        $this->collectionGenerator = $collectionGenerator;
-        $this->fixCodeStyle = $fixCodeStyle;
     }
 
     protected function configure(): void
     {
-        $this->setDescription('Generates an entity')
+        $this
             ->addArgument('namespace', InputArgument::REQUIRED, 'Namespace (FroshTest\\Content\\Store)');
     }