tests: add functional test (#74)

* feat: Removed AbstractEvent and event Uid

* fix: Fixed CS

* tests: Added functional tests

Author: yohang

.github/workflows/ci.yml

@@ -42,6 +42,7 @@ jobs:
   phpunit:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         php-versions: [ '8.2', '8.3', '8.4' , '8.5' ]
         dependencies-versions: [ lowest, highest ]

.gitignore

@@ -1,4 +1,5 @@
 .phpunit.result.cache
 .php-cs-fixer.cache
 composer.lock
+tests/Bridge/Symfony/Fixtures/app/var
 vendor

TODO.md

@@ -20,22 +20,22 @@
         "php": ">=8.2"
     },
     "require-dev": {
-        "doctrine/common": "^3.1.2",
         "doctrine/orm": "^2.9.3|^3.0.0",
         "phpunit/phpunit": "^11.5.44",
         "psr/simple-cache": ">=0.2.0,<4",
         "symfony/dependency-injection": ">=4.4,<9.0",
         "symfony/config": ">=4.4,<9.0",
         "symfony/var-dumper": ">=4.4,<9.0",
-        "symfony/yaml": ">=4.4,<9.0",
         "twig/twig": "^3.3.2",
         "phpspec/prophecy-phpunit": "^2.3.0",
-        "symfony/cache": ">=5.3,<9.0",
         "symfony/http-kernel": ">=5.3,<9.0",
         "rector/rector": "^2.2",
         "friendsofphp/php-cs-fixer": "^3.90",
         "vimeo/psalm": "^6.13@dev",
-        "infection/infection": "^0.31.9"
+        "infection/infection": "^0.31.9",
+        "symfony/framework-bundle": ">=4.4,<9.0",
+        "symfony/twig-bundle": ">=4.4,<9.0",
+        "doctrine/doctrine-bundle": ">=2.7.2,<4.0"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "CalendR\\Test\\": "tests/"
+            "CalendR\\Test\\": "tests/",
+            "App\\": "tests/Bridge/Symfony/Fixtures/"
         }
     },
     "extra": {

composer.json

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
+    <php>
+        <env name="KERNEL_CLASS" value="AppKernel" />
+        <env name="APP_ENV" value="test" />
+    </php>
     <source>
         <include>
             <directory>src</directory>

phpunit.xml.dist

@@ -19,8 +19,8 @@ public function getEventsQueryBuilder(\DateTimeInterface $begin, \DateTimeInterf
         return $qb
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lt($begin, ':end'),
-                    $qb->expr()->gt($end, ':begin'),
+                    $qb->expr()->lt($this->getBeginFieldName(), ':end'),
+                    $qb->expr()->gt($this->getEndFieldName(), ':begin'),
                 )
             )
             ->setParameter(':begin', $begin)

src/Bridge/Doctrine/ORM/EventRepository.php

@@ -9,7 +9,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 final class CalendRExtension extends Extension
 {
@@ -22,8 +22,8 @@ public function load(array $configs, ContainerBuilder $container): void
         /** @var array{periods: array{default_first_weekday: DayOfWeek|int}} $config */
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yaml');
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.php');
 
         $defaultFirstWeekday = $config['periods']['default_first_weekday'];
         if (!($defaultFirstWeekday instanceof DayOfWeek)) {

src/Bridge/Symfony/Bundle/DependencyInjection/CalendRExtension.php

@@ -4,7 +4,7 @@
 
 namespace CalendR\Bridge\Symfony\Bundle\DependencyInjection\Compiler;
 
-use CalendR\Event\Manager;
+use CalendR\Event\EventManager;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -16,7 +16,7 @@ final class EventProviderPass implements CompilerPassInterface
     #[\Override]
     public function process(ContainerBuilder $container): void
     {
-        $eventManager = $container->getDefinition(Manager::class);
+        $eventManager = $container->getDefinition(EventManager::class);
 
         foreach ($container->findTaggedServiceIds(self::TAG) as $id => $attributes) {
             /** @var string $providerAlias */

src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/EventProviderPass.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+use CalendR\Bridge\Twig\CalendRExtension;
+use CalendR\Calendar;
+use CalendR\Event\EventManager;
+use CalendR\Period\PeriodPeriodFactory;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set(EventManager::class)
+            ->public();
+
+    $container->services()
+        ->set(PeriodPeriodFactory::class)
+            ->public();
+
+    $container->services()
+        ->set(Calendar::class)
+            ->arg('$factory', service(PeriodPeriodFactory::class))
+            ->arg('$eventManager', service(EventManager::class))
+            ->public();
+
+    $container->services()
+        ->set(CalendRExtension::class)
+        ->arg('$factory', service(Calendar::class))
+        ->tag('twig.extension');
+
+    $container->services()
+        ->alias('calendr', Calendar::class)
+            ->public();
+
+    $container->services()
+        ->alias('calendr.factory', PeriodPeriodFactory::class)
+            ->public();
+
+    $container->services()
+        ->alias('calendr.event_manager', EventManager::class)
+            ->public();
+};