diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php
index e26e3097..a85181f2 100644
--- a/module/Core/src/Config/EnvVars.php
+++ b/module/Core/src/Config/EnvVars.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-// phpcs:disable
-// TODO Enable coding style checks again once code sniffer 3.7 is released https://github.com/squizlabs/PHP_CodeSniffer/issues/3474
 namespace Shlinkio\Shlink\Core\Config;
 
 use function Shlinkio\Shlink\Config\env;
diff --git a/module/Core/src/Repository/TagRepository.php b/module/Core/src/Repository/TagRepository.php
index 2a144b38..2c4e8db6 100644
--- a/module/Core/src/Repository/TagRepository.php
+++ b/module/Core/src/Repository/TagRepository.php
@@ -74,7 +74,7 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
                 'COUNT(DISTINCT s.id) AS short_urls_count',
                 'COUNT(DISTINCT v.id) AS visits_count',
             )
-            ->from('(' . $subQb->getQuery()->getSQL() . ')', 't')
+            ->from('(' . $subQb->getQuery()->getSQL() . ')', 't') // @phpstan-ignore-line
             ->leftJoin('t', 'short_urls_in_tags', 'st', $nativeQb->expr()->eq('t.id_0', 'st.tag_id'))
             ->leftJoin('st', 'short_urls', 's', $nativeQb->expr()->eq('s.id', 'st.short_url_id'))
             ->leftJoin('st', 'visits', 'v', $nativeQb->expr()->eq('s.id', 'v.short_url_id'))
diff --git a/module/Core/src/Repository/VisitRepository.php b/module/Core/src/Repository/VisitRepository.php
index e0b51ce9..3e33d60a 100644
--- a/module/Core/src/Repository/VisitRepository.php
+++ b/module/Core/src/Repository/VisitRepository.php
@@ -272,6 +272,7 @@ class VisitRepository extends EntitySpecificationRepository implements VisitRepo
         $nativeQb = $this->getEntityManager()->getConnection()->createQueryBuilder();
         $nativeQb->select('v.id AS visit_id', 'v.*', 'vl.*')
                  ->from('visits', 'v')
+                 // @phpstan-ignore-next-line
                  ->join('v', '(' . $subQuery . ')', 'sq', $nativeQb->expr()->eq('sq.id_0', 'v.id'))
                  ->leftJoin('v', 'visit_locations', 'vl', $nativeQb->expr()->eq('v.visit_location_id', 'vl.id'))
                  ->orderBy('v.id', 'DESC');
diff --git a/module/Core/src/ShortUrl/Model/TagsMode.php b/module/Core/src/ShortUrl/Model/TagsMode.php
index 5ae2d9bb..593d6d83 100644
--- a/module/Core/src/ShortUrl/Model/TagsMode.php
+++ b/module/Core/src/ShortUrl/Model/TagsMode.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-// phpcs:disable
-// TODO Enable coding style checks again once code sniffer 3.7 is released https://github.com/squizlabs/PHP_CodeSniffer/issues/3474
 namespace Shlinkio\Shlink\Core\ShortUrl\Model;
 
 enum TagsMode: string
diff --git a/module/Core/src/Visit/Model/VisitType.php b/module/Core/src/Visit/Model/VisitType.php
index 0c4b8841..5352c2f1 100644
--- a/module/Core/src/Visit/Model/VisitType.php
+++ b/module/Core/src/Visit/Model/VisitType.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-// phpcs:disable
-// TODO Enable coding style checks again once code sniffer 3.7 is released https://github.com/squizlabs/PHP_CodeSniffer/issues/3474
 namespace Shlinkio\Shlink\Core\Visit\Model;
 
 enum VisitType: string