Merge pull request #30 from Setono/php8

Fix some deps
Setono · Jan 24, 2022 · 4f66a88 · 4f66a88
2 parents e9e269b + cc9ed09
commit 4f66a88
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -1,15 +1,16 @@
 {
     "name": "setono/sylius-trustpilot-plugin",
-    "type": "sylius-plugin",
     "description": "Trustpilot plugin for Sylius.",
+    "license": "MIT",
+    "type": "sylius-plugin",
     "keywords": [
         "sylius",
         "sylius-plugin",
         "trustpilot"
     ],
-    "license": "MIT",
     "require": {
         "php": ">=7.4",
+        "sylius/resource-bundle": "^1.8",
         "sylius/sylius": "^1.3",
         "symfony/config": "^4.4 || ^5.0",
         "thecodingmachine/safe": "^1.1"
@@ -24,14 +25,7 @@
         "symfony/intl": "^4.4 || ^5.0",
         "symfony/web-profiler-bundle": "^4.4 || ^5.0"
     },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.2-dev"
-        }
-    },
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Setono\\SyliusTrustpilotPlugin\\": "src/"
@@ -43,7 +37,20 @@
             "Tests\\Setono\\SyliusTrustpilotPlugin\\": "tests/"
         }
     },
-    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": false,
+            "ergebnis/composer-normalize": true,
+            "phpstan/extension-installer": true,
+            "symfony/thanks": true
+        },
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.2-dev"
+        }
+    },
     "scripts": {
         "all": [
             "composer checks",

diff --git a/src/Controller/TrustpilotCustomerTrait.php b/src/Controller/TrustpilotCustomerTrait.php
@@ -11,19 +11,18 @@
 use Setono\SyliusTrustpilotPlugin\Model\OrderTrustpilotAwareInterface;
 use Sylius\Bundle\CoreBundle\Doctrine\ORM\OrderRepository;
 use Sylius\Component\Resource\ResourceActions;
-use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Webmozart\Assert\Assert;
 
+/**
+ * @mixin CustomerController
+ */
 trait TrustpilotCustomerTrait
 {
-    use ControllerTrait;
     use ContainerAwareTrait;
 
-    abstract protected function getParameter(string $name);
-
     public function trustpilotBlockAction(Request $request): Response
     {
         /** @var OrderRepository $orderRepository */