Make stuff work again

.scrutinizer.yml

@@ -7,18 +7,21 @@ build:
             tests:
                 override:
                     - php-scrutinizer-run
-                    -
-                        command: phpcs-run
-                        use_website_config: true
                     - js-scrutinizer-run
         tests: true
+    environment:
+        php:
+            version: '8.0'
+
 filter:
     excluded_paths:
         - 'tests/*'
         - 'features/*'
+
 checks:
     php: true
     javascript: true
+
 coding_style:
     php:
         spaces:

behat.yml.dist

@@ -1,22 +1,29 @@
+
 imports:
     - vendor/sylius/sylius/src/Sylius/Behat/Resources/config/suites.yml
     - tests/Behat/Resources/suites.yml
 
 default:
     extensions:
-        Lakion\Behat\MinkDebugExtension:
+        DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
+
+        FriendsOfBehat\MinkDebugExtension:
             directory: etc/build
             clean_start: false
             screenshot: true
 
         Behat\MinkExtension:
             files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
-            base_url: "http://localhost:8080/"
+            base_url: "https://127.0.0.1:8080/"
             default_session: symfony
-            javascript_session: chrome
+            javascript_session: chrome_headless
             sessions:
                 symfony:
                     symfony: ~
+                chrome_headless:
+                    chrome:
+                        api_url: http://127.0.0.1:9222
+                        validate_certificate: false
                 chrome:
                     selenium2:
                         browser: chrome
@@ -30,6 +37,8 @@ default:
                                     - "start-fullscreen"
                                     - "start-maximized"
                                     - "no-sandbox"
+                            extra_capabilities:
+                                unexpectedAlertBehaviour: accept
                 firefox:
                     selenium2:
                         browser: firefox

composer.json

@@ -4,57 +4,77 @@
     "keywords": ["sylius", "sylius-plugin"],
     "description": "This plugin provides 'send notification when product is available' feature for products out of stock.",
     "license": "MIT",
-    "version": "1.0.0",
     "require": {
-        "php": "^7.2",
-
-        "sylius/sylius": "^1.4"
+        "php": "^7.4 || ^8.0 || ^8.1",
+        "sylius/sylius": "^1.10 || 1.11"
     },
     "require-dev": {
-        "behat/behat": "^3.4",
-        "behat/mink": "^1.7@dev",
-        "behat/mink-browserkit-driver": "^1.3",
-        "behat/mink-extension": "^2.2",
-        "behat/mink-selenium2-driver": "^1.3",
+        "behat/behat": "^3.6.1",
+        "behat/mink-selenium2-driver": "^1.4",
+        "dmore/behat-chrome-extension": "^1.3",
+        "dmore/chrome-mink-driver": "^2.7",
+        "friends-of-behat/mink": "^1.8",
+        "friends-of-behat/mink-browserkit-driver": "^1.4",
+        "friends-of-behat/mink-debug-extension": "^2.0.0",
+        "friends-of-behat/mink-extension": "^2.4",
         "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^2.0",
-        "friends-of-behat/variadic-extension": "^1.1",
-        "lakion/mink-debug-extension": "^1.2.3",
-        "phpspec/phpspec": "^5.0",
-        "phpstan/phpstan-doctrine": "^0.10",
-        "phpstan/phpstan-shim": "^0.10",
-        "phpstan/phpstan-webmozart-assert": "^0.10",
-        "phpunit/phpunit": "^6.5",
-        "sensiolabs/security-checker": "^5.0",
-        "sylius-labs/coding-standard": "^2.0",
-        "symfony/browser-kit": "^3.4|^4.1",
-        "symfony/debug-bundle": "^3.4|^4.1",
-        "symfony/dotenv": "^4.2",
-        "symfony/intl": "^3.4|^4.1",
-        "symfony/web-profiler-bundle": "^3.4|^4.1",
-        "symfony/web-server-bundle": "^3.4|^4.1"
+        "friends-of-behat/symfony-extension": "^2.1",
+        "friends-of-behat/variadic-extension": "^1.3",
+        "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
+        "phpspec/phpspec": "^7.0",
+        "phpstan/extension-installer": "^1.0",
+        "phpstan/phpstan": "0.12.99",
+        "phpstan/phpstan-doctrine": "0.12.33",
+        "phpstan/phpstan-strict-rules": "^0.12.0",
+        "phpstan/phpstan-webmozart-assert": "0.12.12",
+        "phpunit/phpunit": "^9.5",
+        "sensiolabs/security-checker": "^6.0",
+        "sylius-labs/coding-standard": "^4.0",
+        "symfony/browser-kit": "^5.4",
+        "symfony/debug-bundle": "^5.4",
+        "symfony/dotenv": "^5.4",
+        "symfony/intl": "^5.4",
+        "symfony/web-profiler-bundle": "^5.4",
+        "vimeo/psalm": "4.23.0",
+        "polishsymfonycommunity/symfony-mocker-container": "^1.0"
     },
-    "conflict": {
-        "symfony/symfony": "4.1.8",
-        "symfony/browser-kit": "4.1.8",
-        "symfony/dependency-injection": "4.1.8",
-        "symfony/dom-crawler": "4.1.8",
-        "symfony/routing": "4.1.8"
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "symfony/thanks": true,
+            "phpstan/extension-installer": true
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.11-dev"
+        }
     },
-    "prefer-stable": true,
     "autoload": {
         "psr-4": {
-            "Workouse\\AvailabilityNotifierPlugin\\": "src/",
-            "Tests\\Workouse\\AvailabilityNotifierPlugin\\": "tests/"
+            "Workouse\\AvailabilityNotifierPlugin\\": "src/"
         }
     },
     "autoload-dev": {
-        "classmap": ["tests/Application/Kernel.php"]
+        "psr-4": {
+            "Workouse\\AvailabilityNotifierPlugin\\": "src/",
+            "Tests\\Workouse\\AvailabilityNotifierPlugin\\": "tests/"
+        },
+        "classmap": [
+            "tests/Application/Kernel.php"
+        ]
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.5-dev"
-        }
+    "scripts": {
+        "post-install-cmd": [
+            "php bin/create_node_symlink.php"
+        ],
+        "post-update-cmd": [
+            "php bin/create_node_symlink.php"
+        ],
+        "post-create-project-cmd": [
+            "php bin/create_node_symlink.php"
+        ]
     }
 }

src/Controller/AvailabilityNotifierController.php

@@ -20,6 +20,7 @@
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Twig\Environment;
 use Workouse\AvailabilityNotifierPlugin\Entity\AvailabilityNotifier;
 use Workouse\AvailabilityNotifierPlugin\Entity\AvailabilityNotifierInterface;
 use Workouse\AvailabilityNotifierPlugin\Form\Type\AvailabilityNotifierType;
@@ -58,7 +59,7 @@ class AvailabilityNotifierController
     private $validator;
 
     public function __construct(
-        TwigEngine $templatingEngine,
+        Environment $templatingEngine,
         FormFactoryInterface $formFactory,
         CustomerRepositoryInterface $customerRepository,
         FactoryInterface $customerFactory,
@@ -85,9 +86,11 @@ public function indexAction($productId): Response
     {
         $form = $this->formFactory->create(AvailabilityNotifierType::class);
 
-        return $this->templatingEngine->renderResponse(
-            '@WorkouseAvailabilityNotifierPlugin/_outOfStock.html.twig',
-            ['form' => $form->createView(), 'productId' => $productId]
+        return new Response(
+            $this->templatingEngine->render(
+                '@WorkouseAvailabilityNotifierPlugin/_outOfStock.html.twig',
+                ['form' => $form->createView(), 'productId' => $productId]
+            )
         );
     }
 
@@ -175,12 +178,14 @@ public function adminIndexAction($productId): Response
             'status' => false,
         ]));
 
-        return $this->templatingEngine->renderResponse(
-            '@WorkouseAvailabilityNotifierPlugin/Admin/_waiting_customers.html.twig',
-            [
-                'availabilityNotifiers' => $availabilityNotifiers,
-                'availabilityNotifiersTotal' => $availabilityNotifiersTotal,
-            ]
+        return new Response(
+            $this->templatingEngine->render(
+                '@WorkouseAvailabilityNotifierPlugin/Admin/_waiting_customers.html.twig',
+                [
+                    'availabilityNotifiers' => $availabilityNotifiers,
+                    'availabilityNotifiersTotal' => $availabilityNotifiersTotal,
+                ]
+            )
         );
     }
 }