Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

src/DependencyInjection/Compiler/ExportServiceCompilerPass.php

@@ -23,13 +23,9 @@ use Symfony\Component\DependencyInjection\Reference;
 /**
  * Dynamically adds all dependencies to the ExportService.
  */
-class ExportServiceCompilerPass implements CompilerPassInterface
+final class ExportServiceCompilerPass implements CompilerPassInterface
 {
-    /**
-     * @param ContainerBuilder $container
-     * @throws \Exception
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $definition = $container->findDefinition(ServiceExport::class);
 
@@ -48,7 +44,7 @@ class ExportServiceCompilerPass implements CompilerPassInterface
             $definition->addMethodCall('addExportRepository', [new Reference($id)]);
         }
 
-        $path = \dirname(\dirname(\dirname(__DIR__))) . DIRECTORY_SEPARATOR;
+        $path = \dirname(__DIR__, 3) . DIRECTORY_SEPARATOR;
         foreach ($container->getParameter('kimai.export.documents') as $exportPath) {
             if (!is_dir($path . $exportPath)) {
                 continue;

src/DependencyInjection/Compiler/InvoiceServiceCompilerPass.php

@@ -18,13 +18,9 @@ use Symfony\Component\DependencyInjection\Reference;
 /**
  * Dynamically adds all dependencies to the InvoiceService.
  */
-class InvoiceServiceCompilerPass implements CompilerPassInterface
+final class InvoiceServiceCompilerPass implements CompilerPassInterface
 {
-    /**
-     * @param ContainerBuilder $container
-     * @throws \Exception
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $definition = $container->findDefinition(ServiceInvoice::class);
 

src/DependencyInjection/Compiler/TwigContextCompilerPass.php

@@ -9,26 +9,21 @@
 
 namespace App\DependencyInjection\Compiler;
 
-use App\Configuration\ThemeConfiguration;
 use App\Twig\Configuration;
+use App\Twig\Context;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Dynamically adds twig globals.
  */
-class TwigContextCompilerPass implements CompilerPassInterface
+final class TwigContextCompilerPass implements CompilerPassInterface
 {
-    /**
-     * @param ContainerBuilder $container
-     * @throws \Exception
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $twig = $container->getDefinition('twig');
 
-        // @deprecated since 1.15
-        $theme = $container->getDefinition(ThemeConfiguration::class);
+        $theme = $container->getDefinition(Context::class);
         $twig->addMethodCall('addGlobal', ['kimai_context', $theme]);
 
         $config = $container->getDefinition(Configuration::class);

src/DependencyInjection/Compiler/WidgetCompilerPass.php

@@ -10,7 +10,7 @@
 namespace App\DependencyInjection\Compiler;
 
 use App\Kernel;
-use App\Repository\WidgetRepository;
+use App\Widget\WidgetService;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -18,15 +18,11 @@ use Symfony\Component\DependencyInjection\Reference;
 /**
  * Dynamically adds all widgets to the WidgetRepository.
  */
-class WidgetCompilerPass implements CompilerPassInterface
+final class WidgetCompilerPass implements CompilerPassInterface
 {
-    /**
-     * @param ContainerBuilder $container
-     * @throws \Exception
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
-        $definition = $container->findDefinition(WidgetRepository::class);
+        $definition = $container->findDefinition(WidgetService::class);
 
         $taggedRenderer = $container->findTaggedServiceIds(Kernel::TAG_WIDGET);
         foreach ($taggedRenderer as $id => $tags) {