switch to laminas/laminas-diagnostics (#226)

liip · Jan 16, 2020 · 4d32cd9 · 4d32cd9
1 parent 76a3d2a
commit 4d32cd9
Show file tree

Hide file tree

Showing 52 changed files with 189 additions and 170 deletions.
diff --git a/Check/CustomErrorPages.php b/Check/CustomErrorPages.php
@@ -2,10 +2,10 @@
 
 namespace Liip\MonitorBundle\Check;
 
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Failure;
+use Laminas\Diagnostics\Result\Success;
 use Symfony\Bundle\TwigBundle\DependencyInjection\Configuration;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Failure;
-use ZendDiagnostics\Result\Success;
 
 /**
  * Checks if error pages have been customized.

diff --git a/Check/DoctrineDbal.php b/Check/DoctrineDbal.php
@@ -3,8 +3,8 @@
 namespace Liip\MonitorBundle\Check;
 
 use Doctrine\Common\Persistence\ConnectionRegistry;
-use ZendDiagnostics\Check\AbstractCheck;
-use ZendDiagnostics\Result\Success;
+use Laminas\Diagnostics\Check\AbstractCheck;
+use Laminas\Diagnostics\Result\Success;
 
 class DoctrineDbal extends AbstractCheck
 {

diff --git a/Check/DoctrineDbalCollection.php b/Check/DoctrineDbalCollection.php
@@ -3,7 +3,7 @@
 namespace Liip\MonitorBundle\Check;
 
 use Doctrine\Common\Persistence\ConnectionRegistry;
-use ZendDiagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/DoctrineMigrationsCollection.php b/Check/DoctrineMigrationsCollection.php
@@ -3,10 +3,10 @@
 namespace Liip\MonitorBundle\Check;
 
 use Doctrine\Migrations\Configuration\Configuration;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Check\DoctrineMigration as LaminasDoctrineMigration;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Check\DoctrineMigration as ZendDoctrineMigration;
 
 /**
  * Class DoctrineMigrationsCollection.
@@ -53,7 +53,7 @@ public function getChecks()
         if (null === $this->checks) {
             $this->checks = [];
             foreach ($this->migrations as $key => $migration) {
-                $check = new ZendDoctrineMigration($this->container->get($migration));
+                $check = new LaminasDoctrineMigration($this->container->get($migration));
                 $check->setLabel(sprintf('Doctrine migrations "%s"', $key));
 
                 $this->checks[$key] = $check;

diff --git a/Check/DoctrineMongoDb.php b/Check/DoctrineMongoDb.php
@@ -3,10 +3,10 @@
 namespace Liip\MonitorBundle\Check;
 
 use Doctrine\Bundle\MongoDBBundle\ManagerRegistry;
+use Laminas\Diagnostics\Check\AbstractCheck;
+use Laminas\Diagnostics\Result\Success;
 use MongoDB\Driver\Command;
 use MongoDB\Driver\Exception\ConnectionException;
-use ZendDiagnostics\Check\AbstractCheck;
-use ZendDiagnostics\Result\Success;
 
 class DoctrineMongoDb extends AbstractCheck
 {

diff --git a/Check/DoctrineMongoDbCollection.php b/Check/DoctrineMongoDbCollection.php
@@ -3,7 +3,7 @@
 namespace Liip\MonitorBundle\Check;
 
 use Doctrine\Common\Persistence\ConnectionRegistry;
-use ZendDiagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
 
 /**
  * @author Hugues Gobet <hugues.gobet@gmail.com>

diff --git a/Check/Expression.php b/Check/Expression.php
@@ -2,11 +2,11 @@
 
 namespace Liip\MonitorBundle\Check;
 
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Failure;
+use Laminas\Diagnostics\Result\Success;
+use Laminas\Diagnostics\Result\Warning;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Failure;
-use ZendDiagnostics\Result\Success;
-use ZendDiagnostics\Result\Warning;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/ExpressionCollection.php b/Check/ExpressionCollection.php
@@ -2,7 +2,7 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/GuzzleHttpServiceCollection.php b/Check/GuzzleHttpServiceCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\GuzzleHttpService;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\GuzzleHttpService;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/HttpServiceCollection.php b/Check/HttpServiceCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\HttpService;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\HttpService;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/MemcacheCollection.php b/Check/MemcacheCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\Memcache;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\Memcache;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/MemcachedCollection.php b/Check/MemcachedCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\Memcached;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\Memcached;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/PdoConnectionCollection.php b/Check/PdoConnectionCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\PDOCheck;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\PDOCheck;
 
 class PdoConnectionCollection implements CheckCollectionInterface
 {

diff --git a/Check/PhpFlagsCollection.php b/Check/PhpFlagsCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\PhpFlag;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\PhpFlag;
 
 class PhpFlagsCollection implements CheckCollectionInterface
 {

diff --git a/Check/PhpVersionCollection.php b/Check/PhpVersionCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\PhpVersion;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\PhpVersion;
 
 class PhpVersionCollection implements CheckCollectionInterface
 {

diff --git a/Check/ProcessRunningCollection.php b/Check/ProcessRunningCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\ProcessRunning;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\ProcessRunning;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/RabbitMQCollection.php b/Check/RabbitMQCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\RabbitMQ;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\RabbitMQ;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/RedisCollection.php b/Check/RedisCollection.php
@@ -2,8 +2,8 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckCollectionInterface;
-use ZendDiagnostics\Check\Redis;
+use Laminas\Diagnostics\Check\CheckCollectionInterface;
+use Laminas\Diagnostics\Check\Redis;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/SymfonyRequirements.php b/Check/SymfonyRequirements.php
@@ -2,10 +2,10 @@
 
 namespace Liip\MonitorBundle\Check;
 
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Failure;
-use ZendDiagnostics\Result\Success;
-use ZendDiagnostics\Result\Warning;
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Failure;
+use Laminas\Diagnostics\Result\Success;
+use Laminas\Diagnostics\Result\Warning;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Check/SymfonyVersion.php b/Check/SymfonyVersion.php
@@ -2,11 +2,11 @@
 
 namespace Liip\MonitorBundle\Check;
 
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Failure;
+use Laminas\Diagnostics\Result\Success;
+use Laminas\Diagnostics\Result\Warning;
 use Symfony\Component\HttpKernel\Kernel;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Failure;
-use ZendDiagnostics\Result\Success;
-use ZendDiagnostics\Result\Warning;
 
 /**
  * Checks the version of this app against the latest stable release.

diff --git a/DependencyInjection/LiipMonitorExtension.php b/DependencyInjection/LiipMonitorExtension.php
@@ -154,36 +154,21 @@ private function setParameters(ContainerBuilder $container, $checkName, $group,
             case 'file_xml':
             case 'file_yaml':
             case 'expressions':
+            case 'pdo_connections':
                 $container->setParameter($prefix.'.'.$group, $values);
                 break;
 
             case 'symfony_version':
-                break;
-
             case 'opcache_memory':
-                if (!class_exists('ZendDiagnostics\Check\OpCacheMemory')) {
-                    throw new \InvalidArgumentException('Please require at least "v1.0.4" of "ZendDiagnostics"');
-                }
                 break;
 
             case 'doctrine_migrations':
-                if (!class_exists('ZendDiagnostics\Check\DoctrineMigration')) {
-                    throw new \InvalidArgumentException('Please require at least "v1.0.6" of "ZendDiagnostics"');
-                }
-
-                if (!class_exists('Doctrine\Migrations\Configuration\Configuration')) {
+                if (!class_exists(DoctrineMigrationConfiguration::class)) {
                     throw new \InvalidArgumentException('Please require at least "v2.0.0" of "Doctrine Migrations Library"');
                 }
 
                 $container->setParameter($prefix.'.'.$group, $values);
                 break;
-
-            case 'pdo_connections':
-                if (!class_exists('ZendDiagnostics\Check\PDOCheck')) {
-                    throw new \InvalidArgumentException('Please require at least "v1.0.5" of "ZendDiagnostics"');
-                }
-                $container->setParameter($prefix.'.'.$group, $values);
-                break;
         }
 
         if (is_array($values)) {

diff --git a/Helper/AbstractMailReporter.php b/Helper/AbstractMailReporter.php
@@ -3,10 +3,10 @@
 namespace Liip\MonitorBundle\Helper;
 
 use ArrayObject;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Collection as ResultsCollection;
-use ZendDiagnostics\Result\ResultInterface;
-use ZendDiagnostics\Runner\Reporter\ReporterInterface;
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Collection as ResultsCollection;
+use Laminas\Diagnostics\Result\ResultInterface;
+use Laminas\Diagnostics\Runner\Reporter\ReporterInterface;
 
 abstract class AbstractMailReporter implements ReporterInterface
 {

diff --git a/Helper/ArrayReporter.php b/Helper/ArrayReporter.php
@@ -2,13 +2,13 @@
 
 namespace Liip\MonitorBundle\Helper;
 
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Collection as ResultsCollection;
-use ZendDiagnostics\Result\ResultInterface;
-use ZendDiagnostics\Result\SkipInterface;
-use ZendDiagnostics\Result\SuccessInterface;
-use ZendDiagnostics\Result\WarningInterface;
-use ZendDiagnostics\Runner\Reporter\ReporterInterface;
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Collection as ResultsCollection;
+use Laminas\Diagnostics\Result\ResultInterface;
+use Laminas\Diagnostics\Result\SkipInterface;
+use Laminas\Diagnostics\Result\SuccessInterface;
+use Laminas\Diagnostics\Result\WarningInterface;
+use Laminas\Diagnostics\Runner\Reporter\ReporterInterface;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Helper/ConsoleReporter.php b/Helper/ConsoleReporter.php
@@ -2,15 +2,15 @@
 
 namespace Liip\MonitorBundle\Helper;
 
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Collection as ResultsCollection;
+use Laminas\Diagnostics\Result\ResultInterface;
+use Laminas\Diagnostics\Result\SkipInterface;
+use Laminas\Diagnostics\Result\SuccessInterface;
+use Laminas\Diagnostics\Result\WarningInterface;
+use Laminas\Diagnostics\Runner\Reporter\ReporterInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Collection as ResultsCollection;
-use ZendDiagnostics\Result\ResultInterface;
-use ZendDiagnostics\Result\SkipInterface;
-use ZendDiagnostics\Result\SuccessInterface;
-use ZendDiagnostics\Result\WarningInterface;
-use ZendDiagnostics\Runner\Reporter\ReporterInterface;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>

diff --git a/Helper/RawConsoleReporter.php b/Helper/RawConsoleReporter.php
@@ -2,15 +2,15 @@
 
 namespace Liip\MonitorBundle\Helper;
 
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Collection as ResultsCollection;
+use Laminas\Diagnostics\Result\ResultInterface;
+use Laminas\Diagnostics\Result\SkipInterface;
+use Laminas\Diagnostics\Result\SuccessInterface;
+use Laminas\Diagnostics\Result\WarningInterface;
+use Laminas\Diagnostics\Runner\Reporter\ReporterInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Collection as ResultsCollection;
-use ZendDiagnostics\Result\ResultInterface;
-use ZendDiagnostics\Result\SkipInterface;
-use ZendDiagnostics\Result\SuccessInterface;
-use ZendDiagnostics\Result\WarningInterface;
-use ZendDiagnostics\Runner\Reporter\ReporterInterface;
 
 /**
  * Like ConsoleReporter, but without coloration, and no message.

diff --git a/Helper/SwiftMailerReporter.php b/Helper/SwiftMailerReporter.php
@@ -2,11 +2,11 @@
 
 namespace Liip\MonitorBundle\Helper;
 
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Collection as ResultsCollection;
+use Laminas\Diagnostics\Result\ResultInterface;
 use Swift_Mailer;
 use Swift_Message;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Collection as ResultsCollection;
-use ZendDiagnostics\Result\ResultInterface;
 
 /**
  * @author louis <louis@systemli.org>

diff --git a/Helper/SymfonyMailerReporter.php b/Helper/SymfonyMailerReporter.php
@@ -2,11 +2,11 @@
 
 namespace Liip\MonitorBundle\Helper;
 
+use Laminas\Diagnostics\Check\CheckInterface;
+use Laminas\Diagnostics\Result\Collection as ResultsCollection;
+use Laminas\Diagnostics\Result\ResultInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
-use ZendDiagnostics\Check\CheckInterface;
-use ZendDiagnostics\Result\Collection as ResultsCollection;
-use ZendDiagnostics\Result\ResultInterface;
 
 class SymfonyMailerReporter extends AbstractMailReporter
 {