From 016d95d3fe033f468b551b42bdc96e194f73e553 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 25 May 2020 10:52:53 +1200 Subject: [PATCH] [NFC] Remove some more of the old cvs blocks --- CRM/Core/Smarty/plugins/block.icon.php | 2 -- CRM/Core/Smarty/plugins/function.copyIcon.php | 2 -- CRM/Event/Controller/Registration.php | 6 +----- CRM/Event/Controller/Search.php | 10 ++-------- CRM/Event/StateMachine/Registration.php | 13 ++----------- CRM/Event/StateMachine/Search.php | 8 ++------ CRM/Extension/ClassLoader.php | 7 +------ CRM/Grant/BAO/Grant.php | 6 +----- CRM/Grant/BAO/Query.php | 6 +----- CRM/Grant/Form/Grant.php | 8 -------- CRM/Grant/Form/Task.php | 8 -------- CRM/Upgrade/Form.php | 6 +----- Civi/Api4/Action/Setting/Set.php | 8 -------- Civi/Api4/Action/System/Check.php | 8 -------- Civi/Api4/Action/System/Flush.php | 8 -------- Civi/Api4/Result/ReplaceResult.php | 11 ++++------- .../Provider/ContactTypeCreationSpecProvider.php | 14 +++++--------- Civi/Api4/Utils/ArrayInsertionUtil.php | 12 ++++-------- 18 files changed, 24 insertions(+), 119 deletions(-) diff --git a/CRM/Core/Smarty/plugins/block.icon.php b/CRM/Core/Smarty/plugins/block.icon.php index 8fb0213b49..ac68cfe027 100644 --- a/CRM/Core/Smarty/plugins/block.icon.php +++ b/CRM/Core/Smarty/plugins/block.icon.php @@ -13,8 +13,6 @@ * * @package CRM * @author Andrew Hunt, AGH Strategies - * $Id$ - * */ /** diff --git a/CRM/Core/Smarty/plugins/function.copyIcon.php b/CRM/Core/Smarty/plugins/function.copyIcon.php index 0adaf0e593..19f4a36991 100644 --- a/CRM/Core/Smarty/plugins/function.copyIcon.php +++ b/CRM/Core/Smarty/plugins/function.copyIcon.php @@ -13,8 +13,6 @@ * * @package CRM * @author Andrew Hunt, AGH Strategies - * $Id$ - * */ /** diff --git a/CRM/Event/Controller/Registration.php b/CRM/Event/Controller/Registration.php index 5233eb3e80..561d2ed8b8 100644 --- a/CRM/Event/Controller/Registration.php +++ b/CRM/Event/Controller/Registration.php @@ -10,11 +10,7 @@ */ /** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * Class CRM_Event_Controller_Registration */ class CRM_Event_Controller_Registration extends CRM_Core_Controller { diff --git a/CRM/Event/Controller/Search.php b/CRM/Event/Controller/Search.php index 8bf9a9996e..927c9422fe 100644 --- a/CRM/Event/Controller/Search.php +++ b/CRM/Event/Controller/Search.php @@ -9,14 +9,6 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - /** * This class is used by the Search functionality. * @@ -36,6 +28,8 @@ class CRM_Event_Controller_Search extends CRM_Core_Controller { * @param string $title * @param bool|int $action * @param bool $modal + * + * @throws \CRM_Core_Exception */ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) { diff --git a/CRM/Event/StateMachine/Registration.php b/CRM/Event/StateMachine/Registration.php index b86e7baf20..e70a4bc8ef 100644 --- a/CRM/Event/StateMachine/Registration.php +++ b/CRM/Event/StateMachine/Registration.php @@ -9,17 +9,8 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - /** * State machine for managing different states of the EventWizard process. - * */ class CRM_Event_StateMachine_Registration extends CRM_Core_StateMachine { @@ -27,9 +18,9 @@ class CRM_Event_StateMachine_Registration extends CRM_Core_StateMachine { * Class constructor. * * @param object $controller - * @param \const|int $action + * @param int $action * - * @return \CRM_Event_StateMachine_Registration CRM_Event_StateMachine + * @throws \CRM_Core_Exception */ public function __construct($controller, $action = CRM_Core_Action::NONE) { parent::__construct($controller, $action); diff --git a/CRM/Event/StateMachine/Search.php b/CRM/Event/StateMachine/Search.php index f98de49db6..f235ac4026 100644 --- a/CRM/Event/StateMachine/Search.php +++ b/CRM/Event/StateMachine/Search.php @@ -10,11 +10,7 @@ */ /** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * Class CRM_Event_StateMachine_Search */ class CRM_Event_StateMachine_Search extends CRM_Core_StateMachine { @@ -28,7 +24,7 @@ class CRM_Event_StateMachine_Search extends CRM_Core_StateMachine { /** * Class constructor. * - * @param object $controller + * @param CRM_Core_Controller $controller * @param int $action */ public function __construct($controller, $action = CRM_Core_Action::NONE) { diff --git a/CRM/Extension/ClassLoader.php b/CRM/Extension/ClassLoader.php index 9ce09a4492..2e181a8877 100644 --- a/CRM/Extension/ClassLoader.php +++ b/CRM/Extension/ClassLoader.php @@ -10,12 +10,7 @@ */ /** - * - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * Class CRM_Extension_ClassLoader */ class CRM_Extension_ClassLoader { diff --git a/CRM/Grant/BAO/Grant.php b/CRM/Grant/BAO/Grant.php index df3eece720..c314802a2b 100644 --- a/CRM/Grant/BAO/Grant.php +++ b/CRM/Grant/BAO/Grant.php @@ -10,11 +10,7 @@ */ /** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * Class CRM_Grant_BAO_Grant */ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php index 5efbb3b1ff..d91699ca81 100644 --- a/CRM/Grant/BAO/Query.php +++ b/CRM/Grant/BAO/Query.php @@ -10,11 +10,7 @@ */ /** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * Class CRM_Grant_BAO_Query */ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query { diff --git a/CRM/Grant/Form/Grant.php b/CRM/Grant/Form/Grant.php index 7f81aceb68..80d4f97b8d 100644 --- a/CRM/Grant/Form/Grant.php +++ b/CRM/Grant/Form/Grant.php @@ -9,14 +9,6 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - /** * This class generates form components for processing a case * diff --git a/CRM/Grant/Form/Task.php b/CRM/Grant/Form/Task.php index 561bd0bfc9..b983cec3d7 100644 --- a/CRM/Grant/Form/Task.php +++ b/CRM/Grant/Form/Task.php @@ -9,14 +9,6 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - /** * Class for grant form task actions. * FIXME: This needs refactoring to properly inherit from CRM_Core_Form_Task and share more functions. diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 10c2b54253..e1f7bcd2de 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -10,11 +10,7 @@ */ /** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * Class CRM_Upgrade_Form */ class CRM_Upgrade_Form extends CRM_Core_Form { const QUEUE_NAME = 'CRM_Upgrade'; diff --git a/Civi/Api4/Action/Setting/Set.php b/Civi/Api4/Action/Setting/Set.php index 9353436c82..cd8413331f 100644 --- a/Civi/Api4/Action/Setting/Set.php +++ b/Civi/Api4/Action/Setting/Set.php @@ -10,14 +10,6 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - namespace Civi\Api4\Action\Setting; use Civi\Api4\Generic\Result; diff --git a/Civi/Api4/Action/System/Check.php b/Civi/Api4/Action/System/Check.php index 9b44021cad..9080f60a8d 100644 --- a/Civi/Api4/Action/System/Check.php +++ b/Civi/Api4/Action/System/Check.php @@ -10,14 +10,6 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - namespace Civi\Api4\Action\System; /** diff --git a/Civi/Api4/Action/System/Flush.php b/Civi/Api4/Action/System/Flush.php index 8d5ab9119e..5eefb63cae 100644 --- a/Civi/Api4/Action/System/Flush.php +++ b/Civi/Api4/Action/System/Flush.php @@ -10,14 +10,6 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - namespace Civi\Api4\Action\System; /** diff --git a/Civi/Api4/Result/ReplaceResult.php b/Civi/Api4/Result/ReplaceResult.php index c1d6522f86..890a2a87e0 100644 --- a/Civi/Api4/Result/ReplaceResult.php +++ b/Civi/Api4/Result/ReplaceResult.php @@ -10,16 +10,13 @@ +--------------------------------------------------------------------+ */ +namespace Civi\Api4\Result; + /** + * Class ReplaceResult * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * @package Civi\Api4\Result */ - -namespace Civi\Api4\Result; - class ReplaceResult extends \Civi\Api4\Generic\Result { /** * @var array diff --git a/Civi/Api4/Service/Spec/Provider/ContactTypeCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/ContactTypeCreationSpecProvider.php index 1e45728d8c..891fe67920 100644 --- a/Civi/Api4/Service/Spec/Provider/ContactTypeCreationSpecProvider.php +++ b/Civi/Api4/Service/Spec/Provider/ContactTypeCreationSpecProvider.php @@ -10,19 +10,15 @@ +--------------------------------------------------------------------+ */ -/** - * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * - */ - - namespace Civi\Api4\Service\Spec\Provider; use Civi\Api4\Service\Spec\RequestSpec; +/** + * Class ContactTypeCreationSpecProvider + * + * @package Civi\Api4\Service\Spec\Provider + */ class ContactTypeCreationSpecProvider implements Generic\SpecProviderInterface { /** diff --git a/Civi/Api4/Utils/ArrayInsertionUtil.php b/Civi/Api4/Utils/ArrayInsertionUtil.php index 4c2d2f6b2d..951f769790 100644 --- a/Civi/Api4/Utils/ArrayInsertionUtil.php +++ b/Civi/Api4/Utils/ArrayInsertionUtil.php @@ -10,17 +10,13 @@ +--------------------------------------------------------------------+ */ +namespace Civi\Api4\Utils; + /** + * Class ArrayInsertionUtil * - * @package CRM - * @copyright CiviCRM LLC https://civicrm.org/licensing - * $Id$ - * + * @package Civi\Api4\Utils */ - - -namespace Civi\Api4\Utils; - class ArrayInsertionUtil { /** -- 2.25.1