Merge pull request #31137 from eileenmcnaughton/throw

[NFC] Fix some references to old exception aliases in code comments

CRM/Case/WorkflowMessage/ActivityExamples.php

@@ -33,7 +33,7 @@ class CRM_Case_WorkflowMessage_ActivityExamples extends WorkflowMessageExample {
    *
    * @param array $example
    *
-   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
    */
   public function build(array &$example): void {
     $workFlow = WorkflowMessage::get(TRUE)->addWhere('name', '=', $example['workflow'])->execute()->first();
@@ -49,9 +49,7 @@ class CRM_Case_WorkflowMessage_ActivityExamples extends WorkflowMessageExample {
    * @param \CRM_Case_WorkflowMessage_CaseActivity $messageTemplate
    * @param array $example
    *
-   * @throws \API_Exception
    * @throws \CRM_Core_Exception
-   * @throws \CiviCRM_API3_Exception
    * @throws \Civi\API\Exception\UnauthorizedException
    */
   private function addExampleData(CRM_Case_WorkflowMessage_CaseActivity $messageTemplate, array $example): void {

CRM/Import/Parser.php

@@ -1387,7 +1387,7 @@ abstract class CRM_Import_Parser implements UserJobInterface {
    * @param string $entity
    *
    * @return array
-   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
    */
   protected function getDedupeRulesForEntity(string $entity): array {
     return (array) ($this->getUserJob()['metadata']['entity_configuration'][$entity]['dedupe_rule'] ?? []);
@@ -1399,7 +1399,7 @@ abstract class CRM_Import_Parser implements UserJobInterface {
    * @param string $entity
    *
    * @return string|null
-   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
    */
   protected function getContactTypeForEntity(string $entity): ?string {
     return $this->getUserJob()['metadata']['entity_configuration'][$entity]['contact_type'] ?? NULL;

Civi/Api4/CustomValue.php

@@ -30,7 +30,6 @@ class CustomValue {
    * @param string $customGroup
    * @param bool $checkPermissions
    * @return \Civi\Api4\Generic\AutocompleteAction
-   * @throws \API_Exception
    */
   public static function autocomplete(string $customGroup, $checkPermissions = TRUE) {
     return (new Generic\AutocompleteAction("Custom_$customGroup", __FUNCTION__))

ext/civiimport/Civi/Api4/Import.php

@@ -131,7 +131,6 @@ class Import {
    *
    * @return \Civi\Api4\Import\Import
    *
-   * @throws \API_Exception
    */
   public static function import(int $userJobID, bool $checkPermissions = TRUE): ImportAction {
     return (new ImportAction('Import_' . $userJobID, __FUNCTION__))
@@ -143,7 +142,6 @@ class Import {
    * @param bool $checkPermissions
    *
    * @return \Civi\Api4\Import\Validate
-   * @throws \API_Exception
    */
   public static function validate(int $userJobID, bool $checkPermissions = TRUE): Validate {
     return (new Validate('Import_' . $userJobID, __FUNCTION__))->setCheckPermissions($checkPermissions);

tests/phpunit/Civi/Token/TokenProcessorTest.php

@@ -315,11 +315,9 @@ class TokenProcessorTest extends \CiviUnitTestCase {
 
   /**
    * Check that we can render contribution and contribution_recur tokens when passing a contribution ID.
-   * This checks Bestspoke tokens
+   * This checks Bespoke tokens
    *
-   * @return void
-   * @throws \API_Exception
-   * @throws \Civi\API\Exception\UnauthorizedException
+   * @throws \CRM_Core_Exception
    */
   public function testRenderContributionRecurTokenFromContribution(): void {
     $cid = $this->individualCreate();
@@ -354,11 +352,9 @@ class TokenProcessorTest extends \CiviUnitTestCase {
 
   /**
    * Check that we can render membership and contribution_recur tokens when passing a membership ID.
-   * This checks Bestspoke Tokens work correctly
+   * This checks Bespoke Tokens work correctly
    *
-   * @return void
-   * @throws \API_Exception
-   * @throws \Civi\API\Exception\UnauthorizedException
+   * @throws \CRM_Core_Exception
    */
   public function testRenderContributionRecurTokenFromMembership(): void {
     $cid = $this->individualCreate();