Functional version php8

.gitignore

@@ -7,5 +7,5 @@
 
 /tests/Application/yarn.lock
 
-/.php_cs.cache
+/.php-cs-fixer.cache
 /.phpunit.result.cache

.php_cs.dist → .php-cs-fixer.dist.php

@@ -18,7 +18,7 @@
         'tests/Application/bin/console',
     ]);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation' => true,

composer.json

@@ -5,28 +5,33 @@
     "description": "Click and Collect plugin for Sylius, to sell and deliver securely during the COVID-19 pandemic.",
     "license": "AGPL-3.0-or-later",
     "require": {
-        "php": "^7.4",
+        "php": ">=7.4",
         "simshaun/recurr": "^4.0",
+        "sylius/calendar": "^0.3.0",
         "sylius/sylius": "^1.7",
         "symfony/lock": "^4.4 || ^5.0"
     },
     "require-dev": {
+        "dbrekelmans/bdi": "^1.0",
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.0",
         "phpstan/phpstan-doctrine": "^0.12.0",
         "phpstan/phpstan-strict-rules": "^0.12.0",
         "phpstan/phpstan-webmozart-assert": "^0.12.0",
-        "phpunit/phpunit": "^8.0",
-        "sensiolabs/security-checker": "^6.0",
-        "sylius-labs/coding-standard": "^3.1",
-        "symfony/browser-kit": "^4.4",
-        "symfony/debug-bundle": "^4.4",
-        "symfony/dotenv": "^4.4",
-        "symfony/intl": "^4.4",
-        "symfony/panther": "^0.7.1",
-        "symfony/web-profiler-bundle": "^4.4",
-        "symfony/web-server-bundle": "^4.4"
+        "phpunit/phpunit": "^9.0",
+        "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+        "sylius-labs/coding-standard": "^4.0",
+        "symfony/browser-kit": "^4.4 || ^5.0",
+        "symfony/debug": "^4.4",
+        "symfony/debug-bundle": "^4.4 || ^5.0",
+        "symfony/dotenv": "^4.4 || ^5.0",
+        "symfony/intl": "^4.4 || ^5.0",
+        "symfony/panther": "^1.0",
+        "symfony/web-profiler-bundle": "^4.4 || ^5.0",
+        "symfony/web-server-bundle": "^4.4 || ^5.0"
     },
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
@@ -38,7 +43,12 @@
         "classmap": ["tests/Application/Kernel.php"]
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "phpstan/extension-installer": true,
+            "symfony/thanks": true
+        }
     },
     "conflict": {
         "doctrine/inflector": "^1.4"

src/Entity/ClickNCollectShipment.php

@@ -57,7 +57,7 @@ public function setLocation(?LocationInterface $location): void
 
     public function getCollectionTime(): ?\DateTimeInterface
     {
-        return  $this->collectionTime;
+        return $this->collectionTime;
     }
 
     public function setCollectionTime(?\DateTimeInterface $collectionTime): void

src/Entity/Location.php

@@ -29,7 +29,6 @@ class Location implements LocationInterface
     use TimestampableTrait;
     use ToggleableTrait;
 
-    /** @var mixed */
     protected $id;
     protected ?string $code = null;
     protected string $name = '';

src/Validator/Constraints/SlotAvailable.php

@@ -14,7 +14,6 @@
 namespace CoopTilleuls\SyliusClickNCollectPlugin\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
-use CoopTilleuls\SyliusClickNCollectPlugin\Validator\Constraints\SlotAvailableInterface;
 
 /**
  * Checks if a time slot is available.

src/Validator/Constraints/SlotAvailableInterface.php

@@ -37,8 +37,6 @@ public function getTargets();
      * By default, this is the fully qualified name of the constraint class
      * suffixed with "Validator". You can override this method to change that
      * behavior.
-     *
-     * @return string
      */
     public function validatedBy(): string;
 }

tests/Application/.env

@@ -21,3 +21,5 @@ DATABASE_URL=mysql://root@127.0.0.1/coop_tilleuls_sylius_click_n_collect_plugin_
 # Delivery is disabled by default via "null://localhost"
 MAILER_URL=smtp://localhost
 ###< symfony/swiftmailer-bundle ###
+
+MESSENGER_TRANSPORT_DSN=sync://

tests/Application/Kernel.php

@@ -85,7 +85,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void
 
     protected function getContainerBaseClass(): string
     {
-        if ($this->isTestEnvironment()) {
+        if ($this->isTestEnvironment() && class_exists(MockerContainer::class)) {
             return MockerContainer::class;
         }
 
@@ -97,7 +97,7 @@ protected function getContainerLoader(ContainerInterface $container): LoaderInte
         /* @var ContainerBuilder $container */
         Assert::isInstanceOf($container, ContainerBuilder::class);
 
-        $locator = new FileLocator($this, $this->getRootDir().'/Resources');
+        $locator = new FileLocator($this, $this->getProjectDir().'/src/Resources');
         $resolver = new LoaderResolver([
             new XmlFileLoader($container, $locator),
             new YamlFileLoader($container, $locator),

tests/Application/config/bundles.php

@@ -18,8 +18,8 @@
     Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
-    Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
     Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
+    Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
     Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
     Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],
     Sylius\Bundle\LocaleBundle\SyliusLocaleBundle::class => ['all' => true],
@@ -51,16 +51,13 @@
     Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true],
     Payum\Bundle\PayumBundle\PayumBundle::class => ['all' => true],
     Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
-    WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle::class => ['all' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Sylius\Bundle\FixturesBundle\SyliusFixturesBundle::class => ['all' => true],
     Sylius\Bundle\PayumBundle\SyliusPayumBundle::class => ['all' => true],
     Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true],
     Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['all' => true],
     Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true],
     Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
-    FOS\OAuthServerBundle\FOSOAuthServerBundle::class => ['all' => true],
-    Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle::class => ['all' => true],
     CoopTilleuls\SyliusClickNCollectPlugin\CoopTilleulsSyliusClickNCollectPlugin::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],

tests/Application/config/packages/_sylius.yaml

@@ -2,7 +2,6 @@ imports:
     - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
 
     - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
 
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
 

tests/Application/config/packages/dev/jms_serializer.yaml

@@ -1,6 +1,6 @@
 jms_serializer:
     visitors:
-        json:
+        json_serialization:
             options:
                 - JSON_PRETTY_PRINT
                 - JSON_UNESCAPED_SLASHES

tests/Application/config/packages/doctrine.yaml

@@ -1,10 +1,3 @@
-parameters:
-    # Adds a fallback DATABASE_URL if the env var is not set.
-    # This allows you to run cache:warmup even if your
-    # environment variables are not available yet.
-    # You should not need to change this value.
-    env(DATABASE_URL): ''
-
 doctrine:
     dbal:
         driver: 'pdo_mysql'
@@ -14,12 +7,16 @@ doctrine:
         url: '%env(resolve:DATABASE_URL)%'
 
     orm:
-        auto_generate_proxy_classes: '%kernel.debug%'
-        auto_mapping: true
-        mappings:
-            App:
-                is_bundle: false
-                type: annotation
-                dir: '%kernel.project_dir%/Entity'
-                prefix: 'Tests\CoopTilleuls\SyliusClickNCollectPlugin\Application\Entity'
-                alias: App
+        auto_generate_proxy_classes: true
+        entity_managers:
+            default:
+                auto_mapping: true
+                mappings:
+                    App:
+                        is_bundle: false
+                        type: annotation
+                        dir: '%kernel.project_dir%/Entity'
+                        prefix: 'Tests\CoopTilleuls\SyliusClickNCollectPlugin\Application\Entity'
+                        alias: App
+        default_entity_manager: default
+

tests/Application/config/packages/framework.yaml

@@ -2,6 +2,5 @@ framework:
     secret: '%env(APP_SECRET)%'
     form: true
     csrf_protection: true
-    templating: { engines: ["twig"] }
     session:
         handler_id: ~

tests/Application/config/packages/jms_serializer.yaml

@@ -1,4 +1,4 @@
 jms_serializer:
     visitors:
-        xml:
+        xml_serialization:
             format_output: '%kernel.debug%'

tests/Application/config/packages/security.yaml

@@ -47,7 +47,6 @@ security:
         api:
             pattern: "%sylius.security.api_regex%/.*"
             provider: sylius_admin_user_provider
-            fos_oauth: true
             stateless: true
             anonymous: true
 

tests/CollectionTime/AvailableSlotsComputerTest.php

@@ -18,13 +18,16 @@
 use CoopTilleuls\SyliusClickNCollectPlugin\Repository\CollectionTimeRepositoryInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Tests\CoopTilleuls\SyliusClickNCollectPlugin\Application\Entity\Shipment;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 final class AvailableSlotsComputerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testStartAfterEnd(): void
     {
         $this->expectException(\InvalidArgumentException::class);

tests/CollectionTime/RecurrenceInstanceFinderTest.php

@@ -18,6 +18,7 @@
 use CoopTilleuls\SyliusClickNCollectPlugin\Entity\Location;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Recurr\Recurrence;
 use Tests\CoopTilleuls\SyliusClickNCollectPlugin\Application\Entity\Shipment;
 
@@ -26,6 +27,8 @@
  */
 class RecurrenceInstanceFinderTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testNoCollectionTime(): void
     {
         $this->expectException(\InvalidArgumentException::class);

tests/Validator/Constraints/SlotAvailableValidatorTest.php

@@ -20,6 +20,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\UnitOfWork;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Recurr\Recurrence;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -33,6 +34,8 @@
  */
 final class SlotAvailableValidatorTest extends ConstraintValidatorTestCase
 {
+    use ProphecyTrait;
+
     protected function createValidator(): SlotAvailableValidator
     {
         $unitOfWorkProphecy = $this->prophesize(UnitOfWork::class);