Merge pull request #238 from symfony-cmf/raise-error

no longer swallow the phpcr-odm exception

Author: dbu

Doctrine/Phpcr/RouteProvider.php

@@ -18,6 +18,7 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Routing\Route as SymfonyRoute;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
@@ -31,7 +32,7 @@
 /**
  * Loads routes from Doctrine PHPCR-ODM.
  *
- * This is <strong>NOT</strong> not a doctrine repository but just the route
+ * This is <strong>NOT</strong> a doctrine repository but just the route
  * provider for the NestedMatcher. (you could of course implement this
  * interface in a repository class, if you need that)
  *
@@ -44,10 +45,20 @@ class RouteProvider extends DoctrineProvider implements RouteProviderInterface
      */
     private $candidatesStrategy;
 
-    public function __construct(ManagerRegistry $managerRegistry, CandidatesInterface $candidatesStrategy, $className = null)
-    {
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    public function __construct(
+        ManagerRegistry $managerRegistry,
+        CandidatesInterface $candidatesStrategy,
+        $className = null,
+        LoggerInterface $logger = null
+    ) {
         parent::__construct($managerRegistry, $className);
         $this->candidatesStrategy = $candidatesStrategy;
+        $this->logger = $logger;
     }
 
     /**
@@ -79,11 +90,9 @@ public function getRouteCollectionForRequest(Request $request)
                 }
             }
         } catch (RepositoryException $e) {
-            // TODO: how to determine whether this is a relevant exception or not?
-            // https://github.com/symfony-cmf/RoutingBundle/issues/143
-            // for example, getting /my//test (note the double /) is just an invalid path
-            // and means another router might handle this.
-            // but if the PHPCR backend is down for example, we want to alert the user
+            if ($this->logger) {
+                $this->logger->critical($e);
+            }
         }
 
         return $collection;

Resources/config/provider-phpcr.xml

@@ -17,6 +17,7 @@
             <argument type="service" id="doctrine_phpcr"/>
             <argument type="service" id="cmf_routing.phpcr_candidates_prefix"/>
             <argument>%cmf_routing.route_model.class%</argument>
+            <argument type="service" id="logger" on-invalid="ignore" />
             <call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.phpcr.manager_name%</argument></call>
             <call method="setRouteCollectionLimit"><argument>%cmf_routing.route_collection_limit%</argument></call>
         </service>