Catch the right Redis exception type in graceful-degradation blocks (#1830)

Author: lazerg

src/Controller/Controller.php

@@ -67,7 +67,7 @@ protected function getPackagesMetadata(FavoriteManager $favMgr, DownloadManager
             if ($search) {
                 $favorites = $favMgr->getFaverCounts($ids);
             }
-        } catch (\Predis\Connection\ConnectionException $e) {
+        } catch (\Predis\PredisException $e) {
         }
 
         return ['downloads' => $downloads, 'favers' => $favorites];

src/Controller/ExploreController.php

@@ -16,10 +16,10 @@
 use App\Entity\Version;
 use App\Model\DownloadManager;
 use App\Model\FavoriteManager;
-use Doctrine\DBAL\ConnectionException;
 use Pagerfanta\Adapter\FixedAdapter;
 use Pagerfanta\Pagerfanta;
 use Predis\Client as RedisClient;
+use Predis\PredisException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -53,7 +53,7 @@ public function exploreAction(RedisClient $redis): Response
                     return array_search($a->getId(), $popularIds) > array_search($b->getId(), $popularIds) ? 1 : -1;
                 });
             }
-        } catch (ConnectionException $e) {
+        } catch (PredisException $e) {
             $popular = [];
         }
 
@@ -96,7 +96,7 @@ public function popularAction(Request $req, RedisClient $redis, FavoriteManager
             $packages->setNormalizeOutOfRangePages(true);
             $packages->setMaxPerPage($perPage);
             $packages->setCurrentPage(max(1, $req->query->getInt('page', 1)));
-        } catch (ConnectionException $e) {
+        } catch (PredisException $e) {
             $packages = new Pagerfanta(new FixedAdapter(0, []));
         }
 

src/Controller/PackageController.php

@@ -61,7 +61,7 @@
 use Pagerfanta\Doctrine\ORM\QueryAdapter;
 use Pagerfanta\Pagerfanta;
 use Predis\Client as RedisClient;
-use Predis\Connection\ConnectionException;
+use Predis\PredisException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -418,7 +418,7 @@ public function viewProvidersAction(Request $req, string $name, RedisClient $red
 
                 return $trendiness[$a->getId()] > $trendiness[$b->getId()] ? -1 : 1;
             });
-        } catch (ConnectionException $e) {
+        } catch (PredisException $e) {
         }
 
         if ($req->getRequestFormat() === 'json') {
@@ -581,7 +581,7 @@ public function viewPackageAction(Request $req, string $name, CsrfTokenManagerIn
                 }
                 $data['downloads'] = $this->downloadManager->getDownloads($package);
                 $data['favers'] = $this->favoriteManager->getFaverCount($package);
-            } catch (\RuntimeException|ConnectionException $e) {
+            } catch (\RuntimeException|PredisException $e) {
                 $data['downloads'] = null;
                 $data['favers'] = null;
             }
@@ -681,7 +681,7 @@ public function viewPackageAction(Request $req, string $name, CsrfTokenManagerIn
             if ($user) {
                 $data['is_favorite'] = $this->favoriteManager->isMarked($user, $package);
             }
-        } catch (\RuntimeException|ConnectionException) {
+        } catch (\RuntimeException|PredisException) {
         }
 
         $data['dependents'] = Killswitch::isEnabled(Killswitch::PAGE_DETAILS_ENABLED) && Killswitch::isEnabled(Killswitch::LINKS_ENABLED) ? $repo->getDependentCount($package->getName()) : 0;
@@ -799,15 +799,15 @@ public function viewPackageDownloadsAction(Request $req, string $name): Response
         try {
             $data['downloads']['total'] = $this->downloadManager->getDownloads($package);
             $data['favers'] = $this->favoriteManager->getFaverCount($package);
-        } catch (ConnectionException) {
+        } catch (PredisException) {
             $data['downloads']['total'] = null;
             $data['favers'] = null;
         }
 
         foreach ($versions as $version) {
             try {
                 $data['downloads']['versions'][$version->getVersion()] = $this->downloadManager->getDownloads($package, $version);
-            } catch (ConnectionException) {
+            } catch (PredisException) {
                 $data['downloads']['versions'][$version->getVersion()] = null;
             }
         }

src/Controller/WebController.php

@@ -21,7 +21,7 @@
 use App\Service\BlogRssFetcher;
 use App\Util\Killswitch;
 use Predis\Client as RedisClient;
-use Predis\Connection\ConnectionException;
+use Predis\PredisException;
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -181,7 +181,7 @@ public function statsAction(RedisClient $redis): Response
                 'labels' => array_keys($dlChartMonthly),
                 'values' => $redis->mget(array_values($dlChartMonthly)),
             ];
-        } catch (ConnectionException $e) {
+        } catch (PredisException $e) {
             $downloads = 'N/A';
             $dlChart = $dlChartMonthly = null;
         }

src/Model/PackageManager.php

@@ -157,7 +157,7 @@ public function deletePackage(Package $package, ?string $reason = null, ?string
         // delete redis stats
         try {
             $this->redis->del('views:'.$packageId);
-        } catch (\Predis\Connection\ConnectionException $e) {
+        } catch (\Predis\PredisException $e) {
         }
 
         // attempt search index cleanup

src/Security/RecaptchaHelper.php

@@ -14,7 +14,7 @@
 
 use App\Entity\User;
 use Predis\Client;
-use Predis\Connection\ConnectionException;
+use Predis\PredisException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
@@ -52,7 +52,7 @@ public function requiresRecaptcha(RecaptchaContext $context): bool
 
         try {
             $result = $this->redisCache->mget($keys);
-        } catch (ConnectionException) {
+        } catch (PredisException) {
             return false;
         }
         foreach ($result as $count) {

src/Security/Voter/PackageVoter.php

@@ -15,7 +15,7 @@
 use App\Entity\Package;
 use App\Entity\User;
 use App\Model\DownloadManager;
-use Predis\Connection\ConnectionException;
+use Predis\PredisException;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Vote;
@@ -85,7 +85,7 @@ private function canDelete(Package $package, User $user): bool
 
         try {
             $downloads = $this->downloadManager->getDownloads($package);
-        } catch (ConnectionException $e) {
+        } catch (PredisException $e) {
             return false;
         }
 

src/Validator/PopularPackageSafetyValidator.php

@@ -17,7 +17,7 @@
 use App\Model\DownloadManager;
 use Doctrine\DBAL\Connection;
 use Doctrine\Persistence\ManagerRegistry;
-use Predis\Connection\ConnectionException;
+use Predis\PredisException;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -61,7 +61,7 @@ public function validate(mixed $value, Constraint $constraint): void
 
         try {
             $downloads = $this->downloadManager->getTotalDownloads($value);
-        } catch (ConnectionException $e) {
+        } catch (PredisException $e) {
             $downloads = \PHP_INT_MAX;
         }