Cleanups & update vendors

deps

@@ -72,6 +72,7 @@
 [WhiteOctoberPagerfantaBundle]
     git=http://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git
     target=/bundles/WhiteOctober/PagerfantaBundle
+    version=origin/symfony2.0
 
 [solarium]
     git=https://github.com/basdenooijer/solarium.git

deps.lock

@@ -6,15 +6,15 @@ doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1
 doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553
 swiftmailer daaff2b8515390fbb10882647311f476b89a67e6
 assetic f829ad23d23c87480151a21faad49fefe7c09e5d
-twig-extensions 3076c971976e1baaf86e5820c7a1da3f5c1c14eb
+twig-extensions 560990d47ba3fefea18420f9951b54d490715b19
 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582
-composer b947420cae2a60230565e2c6d5c7a4b0eee84b1e
+composer b1f528fb0673f987399caa3d01c457d5cf9f4598
 SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31
 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
-SensioGeneratorBundle c6af9719ae9e81fa4e086f40697d35e7090921cc
+SensioGeneratorBundle 87fe88c4c8dc09cb197ba4b2d6d5b834e2c64980
 AsseticBundle 41b5913b5086a0909af92adcb4a6005ee0051b16
 FOSUserBundle 67300def4b2628512197c1fe05cd25727c309e20
-WhiteOctoberPagerfanta bbbf256d830a6036a6a7671d6b1dc3038e38294a
-WhiteOctoberPagerfantaBundle 60db33325971201cfacb3cbe90d8e25c8c89fd66
+WhiteOctoberPagerfanta a061ad2f464192e72d82fd2aa793d3eb8e397d76
+WhiteOctoberPagerfantaBundle 9c1d1bd119cde420ca3fd1ba2011594446d6d825
 solarium 672d77be590bdbbd919fd4e3bfdcdd6107d08807
-NelmioSolariumBundle fa3a47ef54b6c909def9ac58a09e1c6fded2331b
+NelmioSolariumBundle a9b40e09ad80d1d7f0626bd4da3f701220bd7676

src/Packagist/WebBundle/Command/IndexPackagesCommand.php

@@ -36,11 +36,7 @@ class IndexPackagesCommand extends ContainerAwareCommand
                 new InputOption('force', null, InputOption::VALUE_NONE, 'Force a re-indexing of all packages'),
                 new InputArgument('package', InputArgument::OPTIONAL, 'Package name to index'),
             ))
-            ->setDescription('Indexes packages')
-            ->setHelp(<<<EOF
-
-EOF
-            )
+            ->setDescription('Indexes packages in Solr')
         ;
     }
 
@@ -56,32 +52,28 @@ EOF
         $doctrine = $this->getContainer()->get('doctrine');
         $solarium = $this->getContainer()->get('solarium.client');
 
+        if ($package) {
+            $packages = array($doctrine->getRepository('PackagistWebBundle:Package')->findOneByName($package));
+        } elseif ($force) {
+            $packages = $doctrine->getRepository('PackagistWebBundle:Package')->findAll();
+        } else {
+            $packages = $doctrine->getRepository('PackagistWebBundle:Package')->getStalePackagesForIndexing();
+        }
+
+        // clear index before a full-update
         if ($force && !$package) {
             if ($verbose) {
                 $output->writeln('Deleting existing index');
             }
 
             $update = $solarium->createUpdate();
-
             $update->addDeleteQuery('*:*');
             $update->addCommit();
 
             $solarium->update($update);
-
-            $doctrine
-                ->getEntityManager()
-                ->createQuery('UPDATE PackagistWebBundle:Package p SET p.indexedAt = NULL')
-                ->getResult();
-        }
-
-        if ($package) {
-            $packages = array($doctrine->getRepository('PackagistWebBundle:Package')->findOneByName($package));
-        } elseif ($force) {
-            $packages = $doctrine->getRepository('PackagistWebBundle:Package')->findAll();
-        } else {
-            $packages = $doctrine->getRepository('PackagistWebBundle:Package')->getStalePackagesForIndexing();
         }
 
+        // update package index
         foreach ($packages as $package) {
             if ($verbose) {
                 $output->writeln('Indexing '.$package->getName());
@@ -89,24 +81,18 @@ EOF
 
             try {
                 $update = $solarium->createUpdate();
-
                 $document = $update->createDocument();
-
                 $this->updateDocumentFromPackage($document, $package);
-
                 $update->addDocument($document);
                 $update->addCommit();
-
                 $solarium->update($update);
-
                 $package->setIndexedAt(new \DateTime);
-
-                $em = $doctrine->getEntityManager();
-                $em->flush();
             } catch (\Exception $e) {
                 $output->writeln('<error>Exception: '.$e->getMessage().', skipping package '.$package->getName().'.</error>');
             }
         }
+
+        $doctrine->getEntityManager()->flush();
     }
 
     private function updateDocumentFromPackage(\Solarium_Document_ReadWrite $document, Package $package)

src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

@@ -57,10 +57,6 @@ class UpdatePackagesCommand extends ContainerAwareCommand
                 new InputArgument('package', InputArgument::OPTIONAL, 'Package name to update (implicitly enables --force)'),
             ))
             ->setDescription('Updates packages')
-            ->setHelp(<<<EOF
-
-EOF
-            )
         ;
     }