Replace deprecated XML configuration with PHP and YAML #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

HecFranco wants to merge 5 commits into liip:2.x from HecFranco:feature/replace-deprecated-xml

DependencyInjection/Compiler/MailerCompilerPass.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -29,7 +29,7 @@ public function process(ContainerBuilder $container): void
  
                throw new \InvalidArgumentException('To enable mail reporting you have to install "symfony/mailer".');

            }

            $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));

            $loader->load('symfony_mailer.xml');

            $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config'));

            $loader->load('symfony_mailer.php');

        }

    }

DependencyInjection/DoctrineMigrations/DoctrineMigrationsLoader.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ public function __construct() @@
         public function process(ContainerBuilder $container): void
         {
-            if (!($this->loader instanceof CompilerPassInterface)) {
+            if (!$this->loader instanceof CompilerPassInterface) {
                 return;
             }
@@ Expand Down @@

DependencyInjection/LiipMonitorExtension.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -32,10 +32,11 @@ public function __construct()
  
         */

        public function load(array $configs, ContainerBuilder $container): void

        {

            $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

            $loader->load('runner.xml');

            $loader->load('helper.xml');

            $loader->load('commands.xml');

            $locator = new FileLocator(__DIR__.'/../Resources/config');

            $loader = new Loader\PhpFileLoader($container, $locator);

            $loader->load('runner.php');

            $loader->load('helper.php');

            $loader->load('commands.php');

            $configuration = $this->getConfiguration($configs, $container);

            $config = $this->processConfiguration($configuration, $configs);

    @@ -47,7 +48,7 @@ public function load(array $configs, ContainerBuilder $container): void
  
            if ($config['enable_controller']) {

                $container->setParameter(sprintf('%s.view_template', $this->getAlias()), $config['view_template']);

                $container->setParameter(sprintf('%s.failure_status_code', $this->getAlias()), $config['failure_status_code']);

                $loader->load('controller.xml');

                $loader->load('controller.php');

            }

            $this->configureMailer($container, $config);

    @@ -74,7 +75,7 @@ public function load(array $configs, ContainerBuilder $container): void
  
                    $this->setParameters($container, $check, $group, $values);

                    if (!in_array($check, $checksLoaded)) {

                        $loader->load('checks/'.$check.'.xml');

                        $loader->load('checks/'.$check.'.php');

                        $checksLoaded[] = $check;

                    }

                }

Dockerfile

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    FROM php:8.3-cli
+    RUN apt-get update && apt-get install -y \
+        git \
+        unzip \
+        libzip-dev \
+        && docker-php-ext-install zip \
+        && apt-get clean \
+        && rm -rf /var/lib/apt/lists/*
+    COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+    # Allow git operations when /app is mounted from host (different ownership)
+    RUN git config --global --add safe.directory /app
+    WORKDIR /app

Helper/ArrayReporter.php

-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function onStart(\ArrayObject $checks, $runnerConfig)
         {
-            return;
         }
         /**
@@ Expand All @@
          */
         public function onStop(ResultsCollection $results)
         {
-            return;
         }
         /**
          * @return void
          */
         public function onFinish(ResultsCollection $results)
         {
-            return;
         }
     }

Helper/ConsoleReporter.php

-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function onStart(\ArrayObject $checks, $runnerConfig)
         {
-            return;
         }
         /**
          * @return bool|void
          */
         public function onBeforeRun(CheckInterface $check, $checkAlias = null)
         {
-            return;
         }
         /**
          * @return void
          */
         public function onStop(ResultsCollection $results)
         {
-            return;
         }
         /**
          * @return void
          */
         public function onFinish(ResultsCollection $results)
         {
-            return;
         }
     }

Helper/RawConsoleReporter.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -72,30 +72,26 @@ protected function getNagiosPerformanceData(): string @@
          */
         public function onStart(\ArrayObject $checks, $runnerConfig)
         {
-            return;
         }
         /**
          * @return bool|void
          */
         public function onBeforeRun(CheckInterface $check, $checkAlias = null)
         {
-            return;
         }
         /**
          * @return void
          */
         public function onStop(ResultsCollection $results)
         {
-            return;
         }
         /**
          * @return void
          */
         public function onFinish(ResultsCollection $results)
         {
-            return;
         }
     }

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -59,7 +59,7 @@ If you want to enable the REST API provided by the bundle then add the following
  
    ```yml

    _monitor:

        resource: "@LiipMonitorBundle/Resources/config/routing.xml"

        resource: "@LiipMonitorBundle/Resources/config/routing.yaml"

        prefix: /monitor/health

    ```

    @@ -488,7 +488,7 @@ liip_monitor:
  
    ## REST API DOCS ##

    For documentation on the REST API see: [http://myproject.org/monitor/health/](http://myproject.org/monitor/health/).

    Don't forget to add the bundle routes in your `routing.xml` file.

    Don't forget to add the bundle routes in your `routing.yaml` file.

    ## Nagios integration ##

Resources/config/checks/apc_fragmentation.php

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.apc_fragmentation', \Laminas\Diagnostics\Check\ApcFragmentation::class)
+            ->args([
+                '%%liip_monitor.check.apc_fragmentation.warning%%',
+                '%%liip_monitor.check.apc_fragmentation.critical%%',
+            ])
+            ->tag('liip_monitor.check', ['alias' => 'apc_fragmentation'])
+            ->public();
+    };

Resources/config/checks/apc_fragmentation.xml

This file was deleted.

Resources/config/checks/apc_memory.php

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.apc_memory', \Laminas\Diagnostics\Check\ApcMemory::class)
+            ->args([
+                '%%liip_monitor.check.apc_memory.warning%%',
+                '%%liip_monitor.check.apc_memory.critical%%',
+            ])
+            ->tag('liip_monitor.check', ['alias' => 'apc_memory'])
+            ->public();
+    };

Resources/config/checks/apc_memory.xml

This file was deleted.

Resources/config/checks/class_exists.php

-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.class_exists', \Laminas\Diagnostics\Check\ClassExists::class)
+            ->args(['%%liip_monitor.check.class_exists%%'])
+            ->tag('liip_monitor.check', ['alias' => 'class_exists'])
+            ->public();
+    };

Resources/config/checks/class_exists.xml

This file was deleted.

Resources/config/checks/cpu_performance.php

-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.cpu_performance', \Laminas\Diagnostics\Check\CpuPerformance::class)
+            ->args(['%%liip_monitor.check.cpu_performance%%'])
+            ->tag('liip_monitor.check', ['alias' => 'cpu_performance'])
+            ->public();
+    };

Resources/config/checks/cpu_performance.xml

This file was deleted.

Resources/config/checks/custom_error_pages.php

-Original file line number
+Diff line change
@@ -0,0 +1,15 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.custom_error_pages', \Liip\MonitorBundle\Check\CustomErrorPages::class)
+            ->args([
+                '%%liip_monitor.check.custom_error_pages.error_codes%%',
+                '%%liip_monitor.check.custom_error_pages.path%%',
+                param('kernel.project_dir'),
+            ])
+            ->tag('liip_monitor.check', ['alias' => 'custom_error_pages'])
+            ->public();
+    };

Resources/config/checks/custom_error_pages.xml

This file was deleted.

Resources/config/checks/disk_usage.php

-Original file line number
+Diff line change
@@ -0,0 +1,15 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.disk_usage', \Laminas\Diagnostics\Check\DiskUsage::class)
+            ->args([
+                '%%liip_monitor.check.disk_usage.warning%%',
+                '%%liip_monitor.check.disk_usage.critical%%',
+                '%%liip_monitor.check.disk_usage.path%%',
+            ])
+            ->tag('liip_monitor.check', ['alias' => 'disk_usage'])
+            ->public();
+    };

Resources/config/checks/disk_usage.xml

This file was deleted.

Resources/config/checks/doctrine_dbal.php

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.doctrine_dbal', \Liip\MonitorBundle\Check\DoctrineDbalCollection::class)
+            ->args([
+                service('doctrine'),
+                '%%liip_monitor.check.doctrine_dbal%%',
+            ])
+            ->tag('liip_monitor.check_collection')
+            ->public();
+    };

Resources/config/checks/doctrine_dbal.xml

This file was deleted.

Resources/config/checks/doctrine_migrations.php

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    <?php
+    namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+    return function (ContainerConfigurator $container): void {
+        $container->services()
+            ->set('liip_monitor.check.doctrine_migrations', \Liip\MonitorBundle\Check\DoctrineMigrationsCollection::class)
+            ->args([
+                service('service_container'),
+                '%%liip_monitor.check.doctrine_migrations%%',
+            ])
+            ->tag('liip_monitor.check_collection')
+            ->public();
+    };

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace deprecated XML configuration with PHP and YAML #327

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Replace deprecated XML configuration with PHP and YAML #327

Are you sure you want to change the base?

Uh oh!

Replace deprecated XML configuration with PHP and YAML #327

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!