Merge pull request #2 from wirelane/doctrine-upgrade-fetch-api

Fix deprecations

Author: bkonetzny

Command/CleanUpCommand.php

@@ -99,7 +99,7 @@ private function cleanUpExpiredJobs(EntityManager $em, Connection $con, InputInt
             $count++;
 
             $result = $con->executeQuery($incomingDepsSql, array('id' => $job->getId()));
-            if ($result->fetchColumn() !== false) {
+            if ($result->fetchOne() !== false) {
                 $em->transactional(function() use ($em, $job) {
                     $this->resolveDependencies($em, $job);
                     $em->remove($job);

Console/Application.php

@@ -38,7 +38,7 @@ public function __construct(KernelInterface $kernel)
         }
     }
 
-    public function doRun(InputInterface $input, OutputInterface $output)
+    public function doRun(InputInterface $input, OutputInterface $output): int
     {
         $this->input = $input;
 
@@ -54,7 +54,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         }
     }
 
-    public function onTick()
+    public function onTick(): void
     {
         if ( ! $this->input->hasOption('jms-job-id') || null === $jobId = $this->input->getOption('jms-job-id')) {
             return;
@@ -78,7 +78,7 @@ public function onTick()
         }
     }
 
-    private function saveDebugInformation(\Exception $ex = null)
+    private function saveDebugInformation(\Exception $ex = null): void
     {
         if ( ! $this->input->hasOption('jms-job-id') || null === $jobId = $this->input->getOption('jms-job-id')) {
             return;

Entity/CronJob.php

@@ -35,4 +35,4 @@ public function getLastRunAt()
     {
         return $this->lastRunAt;
     }
-}
+}

Entity/Job.php

@@ -27,8 +27,8 @@
 /**
  * @ORM\Entity
  * @ORM\Table(name = "jms_jobs", indexes = {
- *     @ORM\Index("cmd_search_index", columns = {"command"}),
- *     @ORM\Index("sorting_index", columns = {"state", "priority", "id"}),
+ *     @ORM\Index(name = "cmd_search_index", columns = {"command"}),
+ *     @ORM\Index(name = "sorting_index", columns = {"state", "priority", "id"}),
  * })
  * @ORM\ChangeTrackingPolicy("DEFERRED_EXPLICIT")
  *

Entity/Listener/StatisticsListener.php

@@ -22,4 +22,4 @@ public function postGenerateSchema(GenerateSchemaEventArgs $event)
         $table->addColumn('charValue', 'float', array('notnull' => true));
         $table->setPrimaryKey(array('job_id', 'characteristic', 'createdAt'));
     }
-}
+}

Entity/Repository/JobManager.php

@@ -21,7 +21,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
@@ -49,7 +49,7 @@ public function findJob($command, array $args = array())
     {
         return $this->getJobManager()->createQuery("SELECT j FROM JMSJobQueueBundle:Job j WHERE j.command = :command AND j.args = :args")
             ->setParameter('command', $command)
-            ->setParameter('args', $args, Type::JSON_ARRAY)
+            ->setParameter('args', $args, Types::JSON)
             ->setMaxResults(1)
             ->getOneOrNullResult();
     }
@@ -75,7 +75,7 @@ public function getOrCreateIfNotExists($command, array $args = array())
 
         $firstJob = $this->getJobManager()->createQuery("SELECT j FROM JMSJobQueueBundle:Job j WHERE j.command = :command AND j.args = :args ORDER BY j.id ASC")
              ->setParameter('command', $command)
-             ->setParameter('args', $args, 'json_array')
+             ->setParameter('args', $args, Types::JSON)
              ->setMaxResults(1)
              ->getSingleResult();
 
@@ -384,7 +384,7 @@ private function getJobIdsOfIncomingDependencies(Job $job)
     {
         $jobIds = $this->getJobManager()->getConnection()
             ->executeQuery("SELECT source_job_id FROM jms_job_dependencies WHERE dest_job_id = :id", array('id' => $job->getId()))
-            ->fetchAll(\PDO::FETCH_COLUMN);
+            ->fetchFirstColumn();
 
         return $jobIds;
     }

Entity/Type/SafeObjectType.php

@@ -2,17 +2,50 @@
 
 namespace JMS\JobQueueBundle\Entity\Type;
 
-use Doctrine\DBAL\Types\ObjectType;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\Type;
 
-class SafeObjectType extends ObjectType
+class SafeObjectType extends Type
 {
-    public function getSQLDeclaration(array $fieldDeclaration, \Doctrine\DBAL\Platforms\AbstractPlatform $platform): string
+    public const TYPE_NAME =  'jms_job_safe_object';
+
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
+    {
+        return $platform->getBlobTypeDeclarationSQL($column);
+    }
+
+    public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        return $platform->getBlobTypeDeclarationSQL($fieldDeclaration);
+        return serialize($value);
+    }
+
+    public function convertToPHPValue($value, AbstractPlatform $platform)
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        $value = is_resource($value) ? stream_get_contents($value) : $value;
+
+        set_error_handler(function (int $code, string $message): bool {
+            throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
+        });
+
+        try {
+            return unserialize($value);
+        } finally {
+            restore_error_handler();
+        }
     }
 
     public function getName(): string
     {
-        return 'jms_job_safe_object';
+        return self::TYPE_NAME;
+    }
+
+    public function requiresSQLCommentHint(AbstractPlatform $platform): bool
+    {
+        return true;
     }
-}
+}