CRM-14370 - API Kernel - Add UnauthorizedException, NotImplementedException

Conflicts:

	tests/phpunit/Civi/API/Provider/DoctrineCrudProviderTest.php

diff --git a/Civi/API/Exception/NotImplementedException.php b/Civi/API/Exception/NotImplementedException.php
new file mode 100644 (file)
index 0000000..69db92e
--- /dev/null
+++ b/Civi/API/Exception/NotImplementedException.php
@@ -0,0 +1,9 @@
+<?php
+namespace Civi\API\Exception;
+
+require_once 'api/Exception.php';
+class NotImplementedException extends \API_Exception {
+  public function __construct($message, $extraParams = array(), Exception $previous = NULL) {
+    parent::__construct($message, \API_Exception::NOT_IMPLEMENTED, $extraParams, $previous);
+  }
+}
\ No newline at end of file

diff --git a/Civi/API/Exception/UnauthorizedException.php b/Civi/API/Exception/UnauthorizedException.php
new file mode 100644 (file)
index 0000000..5595dcf
--- /dev/null
+++ b/Civi/API/Exception/UnauthorizedException.php
@@ -0,0 +1,9 @@
+<?php
+namespace Civi\API\Exception;
+
+require_once 'api/Exception.php';
+class UnauthorizedException extends \API_Exception {
+  public function __construct($message, $extraParams = array(), Exception $previous = NULL) {
+    parent::__construct($message, \API_Exception::UNAUTHORIZED, $extraParams, $previous);
+  }
+}
\ No newline at end of file

diff --git a/Civi/API/Kernel.php b/Civi/API/Kernel.php
index e5c098f9bec93b115f2d464e0e41e9d9560cd98a..1189bde7f45358872f97fc20b61b9e0c11841695 100644 (file)
--- a/Civi/API/Kernel.php
+++ b/Civi/API/Kernel.php
@@ -234,7 +234,7 @@ class Kernel {
     $resolveEvent = $this->dispatcher->dispatch(Events::RESOLVE, new ResolveEvent($apiRequest));
     $apiRequest = $resolveEvent->getApiRequest();
     if (!$resolveEvent->getApiProvider()) {
-      throw new \API_Exception("API (" . $apiRequest['entity'] . ", " . $apiRequest['action'] . ") does not exist (join the API team and implement it!)", \API_Exception::NOT_IMPLEMENTED);
+      throw new \Civi\API\Exception\NotImplementedException("API (" . $apiRequest['entity'] . ", " . $apiRequest['action'] . ") does not exist (join the API team and implement it!)");
     }
     return array($resolveEvent->getApiProvider(), $apiRequest);
   }
@@ -249,7 +249,7 @@ class Kernel {
   public function authorize($apiProvider, $apiRequest) {
     $event = $this->dispatcher->dispatch(Events::AUTHORIZE, new AuthorizeEvent($apiProvider, $apiRequest));
     if (!$event->isAuthorized()) {
-      throw new \API_Exception("Authorization failed", \API_Exception::UNAUTHORIZED);
+      throw new \Civi\API\Exception\UnauthorizedException("Authorization failed");
     }
   }
 

diff --git a/Civi/API/Subscriber/PermissionCheck.php b/Civi/API/Subscriber/PermissionCheck.php
index f108d7b152b7b83d9f2d84d91b1d0b7f9e859fe6..00bc3fef88c6c63ca96229a7302975c191d04359 100644 (file)
--- a/Civi/API/Subscriber/PermissionCheck.php
+++ b/Civi/API/Subscriber/PermissionCheck.php
@@ -67,7 +67,7 @@ class PermissionCheck implements EventSubscriberInterface {
           $permissions = implode(' and ', $permissions);
         }
         // FIXME: Generating the exception ourselves allows for detailed error but doesn't play well with multiple authz subscribers.
-        throw new \API_Exception("API permission check failed for {$apiRequest['entity']}/{$apiRequest['action']} call; insufficient permission: require $permissions", \API_Exception::UNAUTHORIZED);
+        throw new \Civi\API\Exception\UnauthorizedException("API permission check failed for {$apiRequest['entity']}/{$apiRequest['action']} call; insufficient permission: require $permissions");
       }
 
       $event->authorize();