Requests that match only OPTIONS should be 404

Because the OptionsController matches on all URIs, Silex reports a 405
Method Not Allowed when it should be a 404 Not Found.

src/CorsServiceProvider.php

@@ -6,6 +6,10 @@
 use Silex\Controller;
 use Silex\ControllerCollection;
 use Silex\ServiceProviderInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * The CORS service provider provides a `cors` service that a can be included in your project as application middleware.
@@ -22,6 +26,13 @@ public function boot(Application $app)
         $app->match("{route}", new OptionsController())
             ->assert("route", ".+")
             ->method("OPTIONS");
+
+        $app->on(KernelEvents::EXCEPTION, function (GetResponseForExceptionEvent $event) {
+            $e = $event->getException();
+            if ($e instanceof MethodNotAllowedHttpException && $e->getHeaders()["Allow"] === "OPTIONS") {
+                $event->setException(new NotFoundHttpException());
+            }
+        });
     }
 
     /**

src/OptionsController.php

@@ -28,7 +28,7 @@ public function __invoke(Application $app, Request $request)
 
         $app["request_context"]->setMethod("OPTIONS");
 
-        if (count($allow) == 0) {
+        if (count($allow) === 0) {
             throw new NotFoundHttpException();
         }
 

src/Test/CorsServiceProviderTest.php

@@ -300,4 +300,14 @@ public function testNotEnabledMethod()
         $this->assertEquals("405", $response->getStatusCode());
         $this->assertEquals("POST, OPTIONS", $response->headers->get("Allow"));
     }
+
+    public function testRouteWithOptionsOnlyRespondsWith404()
+    {
+        $client = new Client($this->app);
+        $client->request("GET", "/foo");
+
+        $response = $client->getResponse();
+
+        $this->assertEquals("404", $response->getStatusCode());
+    }
 }