Browse Source

Fix deprecation warnings

Jordi Boggiano 11 years ago
parent
commit
1865ebaa5c

+ 4 - 4
src/Packagist/WebBundle/Command/ClearVersionsCommand.php

@@ -55,7 +55,7 @@ EOF
 
         $versionRepo = $doctrine->getRepository('PackagistWebBundle:Version');
 
-        $packages = $doctrine->getEntityManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
+        $packages = $doctrine->getManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
         $ids = array();
         foreach ($packages as $package) {
             $ids[] = $package['id'];
@@ -82,8 +82,8 @@ EOF
                 }
             }
 
-            $doctrine->getEntityManager()->flush();
-            $doctrine->getEntityManager()->clear();
+            $doctrine->getManager()->flush();
+            $doctrine->getManager()->clear();
             unset($versions);
         }
 
@@ -95,7 +95,7 @@ EOF
                 $package->setCrawledAt(new \DateTime);
             }
 
-            $doctrine->getEntityManager()->flush();
+            $doctrine->getManager()->flush();
         }
     }
 }

+ 3 - 3
src/Packagist/WebBundle/Command/CompileStatsCommand.php

@@ -58,13 +58,13 @@ class CompileStatsCommand extends ContainerAwareCommand
         $doctrine = $this->getContainer()->get('doctrine');
         $this->redis = $redis = $this->getContainer()->get('snc_redis.default');
 
-        $minMax = $doctrine->getEntityManager()->getConnection()->fetchAssoc('SELECT MAX(id) maxId, MIN(id) minId FROM package');
+        $minMax = $doctrine->getManager()->getConnection()->fetchAssoc('SELECT MAX(id) maxId, MIN(id) minId FROM package');
         if (!isset($minMax['minId'])) {
             return 0;
         }
 
         $ids = range($minMax['minId'], $minMax['maxId']);
-        $res = $doctrine->getEntityManager()->getConnection()->fetchAssoc('SELECT MIN(createdAt) minDate FROM package');
+        $res = $doctrine->getManager()->getConnection()->fetchAssoc('SELECT MIN(createdAt) minDate FROM package');
         $date = new \DateTime($res['minDate']);
         $date->modify('00:00:00');
         $yesterday = new \DateTime('yesterday 00:00:00');
@@ -120,7 +120,7 @@ class CompileStatsCommand extends ContainerAwareCommand
 
         // fetch existing ids
         $doctrine = $this->getContainer()->get('doctrine');
-        $packages = $doctrine->getEntityManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
+        $packages = $doctrine->getManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
         $ids = array();
         foreach ($packages as $row) {
             $ids[] = $row['id'];

+ 1 - 1
src/Packagist/WebBundle/Command/DumpPackagesCommand.php

@@ -56,7 +56,7 @@ class DumpPackagesCommand extends ContainerAwareCommand
         $doctrine = $this->getContainer()->get('doctrine');
 
         if ($force) {
-            $packages = $doctrine->getEntityManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
+            $packages = $doctrine->getManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
         } else {
             $packages = $doctrine->getRepository('PackagistWebBundle:Package')->getStalePackagesForDumping();
         }

+ 1 - 1
src/Packagist/WebBundle/Command/GenerateTokensCommand.php

@@ -46,6 +46,6 @@ class GenerateTokensCommand extends ContainerAwareCommand
             $apiToken = substr($tokenGenerator->generateToken(), 0, 20);
             $user->setApiToken($apiToken);
         }
-        $doctrine->getEntityManager()->flush();
+        $doctrine->getManager()->flush();
     }
 }

+ 4 - 4
src/Packagist/WebBundle/Command/IndexPackagesCommand.php

@@ -79,8 +79,8 @@ class IndexPackagesCommand extends ContainerAwareCommand
         if ($package) {
             $packages = array(array('id' => $doctrine->getRepository('PackagistWebBundle:Package')->findOneByName($package)->getId()));
         } elseif ($force || $indexAll) {
-            $packages = $doctrine->getEntityManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
-            $doctrine->getEntityManager()->getConnection()->executeQuery('UPDATE package SET indexedAt = NULL');
+            $packages = $doctrine->getManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
+            $doctrine->getManager()->getConnection()->executeQuery('UPDATE package SET indexedAt = NULL');
         } else {
             $packages = $doctrine->getRepository('PackagistWebBundle:Package')->getStalePackagesForIndexing();
         }
@@ -128,8 +128,8 @@ class IndexPackagesCommand extends ContainerAwareCommand
                 }
             }
 
-            $doctrine->getEntityManager()->flush();
-            $doctrine->getEntityManager()->clear();
+            $doctrine->getManager()->flush();
+            $doctrine->getManager()->clear();
             unset($packages);
 
             $update->addCommit();

+ 2 - 2
src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

@@ -66,7 +66,7 @@ class UpdatePackagesCommand extends ContainerAwareCommand
             $packages = array(array('id' => $doctrine->getRepository('PackagistWebBundle:Package')->findOneByName($package)->getId()));
             $flags = Updater::UPDATE_TAGS;
         } elseif ($force) {
-            $packages = $doctrine->getEntityManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
+            $packages = $doctrine->getManager()->getConnection()->fetchAll('SELECT id FROM package ORDER BY id ASC');
             $flags = Updater::UPDATE_TAGS;
         } else {
             $packages = $doctrine->getRepository('PackagistWebBundle:Package')->getStalePackages();
@@ -119,7 +119,7 @@ class UpdatePackagesCommand extends ContainerAwareCommand
                 }
             }
 
-            $doctrine->getEntityManager()->clear();
+            $doctrine->getManager()->clear();
             unset($packages);
         }
     }

+ 1 - 1
src/Packagist/WebBundle/Controller/ApiController.php

@@ -50,7 +50,7 @@ class ApiController extends Controller
             return new Response(file_get_contents($rootJson));
         }
 
-        $em = $this->get('doctrine')->getEntityManager();
+        $em = $this->get('doctrine')->getManager();
 
         gc_enable();
 

+ 2 - 2
src/Packagist/WebBundle/Package/Dumper.php

@@ -194,8 +194,8 @@ class Dumper
             }
 
             // update dump dates
-            $this->doctrine->getEntityManager()->flush();
-            $this->doctrine->getEntityManager()->clear();
+            $this->doctrine->getManager()->flush();
+            $this->doctrine->getManager()->clear();
             unset($packages);
 
             if ($current % 250 === 0 || !$packageIds) {

+ 2 - 2
src/Packagist/WebBundle/Package/Updater.php

@@ -96,7 +96,7 @@ class Updater
         $pruneDate->modify('-8days');
 
         $versions = $repository->getPackages();
-        $em = $this->doctrine->getEntityManager();
+        $em = $this->doctrine->getManager();
 
         if ($repository->hadInvalidBranches()) {
             throw new InvalidRepositoryException('Some branches contained invalid data and were discarded, it is advised to review the log and fix any issues present in branches');
@@ -157,7 +157,7 @@ class Updater
 
     private function updateInformation(Package $package, PackageInterface $data, $flags)
     {
-        $em = $this->doctrine->getEntityManager();
+        $em = $this->doctrine->getManager();
         $version = new Version();
 
         $version->setNormalizedVersion($data->getVersion());