From 6a731c250251404c3560bb87c3d91ed409635307 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 5 Jun 2024 16:36:20 +1200 Subject: [PATCH] ENH Use class name instead of self --- src/Controllers/HistoryViewerController.php | 16 ++++++++-------- src/Forms/DataObjectVersionFormFactory.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Controllers/HistoryViewerController.php b/src/Controllers/HistoryViewerController.php index 404d9f77..074df74b 100644 --- a/src/Controllers/HistoryViewerController.php +++ b/src/Controllers/HistoryViewerController.php @@ -41,8 +41,8 @@ class HistoryViewerController extends LeftAndMain private static $required_permission_codes = 'CMS_ACCESS_CMSMain'; private static $allowed_actions = [ - self::FORM_NAME_VERSION, - self::FORM_NAME_COMPARE, + HistoryViewerController::FORM_NAME_VERSION, + HistoryViewerController::FORM_NAME_COMPARE, 'schema', ]; @@ -51,7 +51,7 @@ class HistoryViewerController extends LeftAndMain * * @var string[] */ - protected $formNames = [self::FORM_NAME_VERSION, self::FORM_NAME_COMPARE]; + protected $formNames = [HistoryViewerController::FORM_NAME_VERSION, HistoryViewerController::FORM_NAME_COMPARE]; public function getClientConfig() { @@ -93,7 +93,7 @@ protected function generateSchemaForForm($formName, HTTPRequest $request): HTTPR { switch ($formName) { // Get schema for history form - case self::FORM_NAME_VERSION: + case HistoryViewerController::FORM_NAME_VERSION: $form = $this->getVersionForm([ 'RecordClass' => $request->getVar('RecordClass'), 'RecordID' => $request->getVar('RecordID'), @@ -101,7 +101,7 @@ protected function generateSchemaForForm($formName, HTTPRequest $request): HTTPR 'RecordDate' => $request->getVar('RecordDate'), ]); break; - case self::FORM_NAME_COMPARE: + case HistoryViewerController::FORM_NAME_COMPARE: $form = $this->getCompareForm([ 'RecordClass' => $request->getVar('RecordClass'), 'RecordID' => $request->getVar('RecordID'), @@ -163,7 +163,7 @@ protected function getVersionFormByDate(array $context) $effectiveContext = array_merge($context, ['Record' => $record]); // Ensure the form is scaffolded with archive date enabled. - $form = $this->scaffoldForm(self::FORM_NAME_VERSION, $effectiveContext, [ + $form = $this->scaffoldForm(HistoryViewerController::FORM_NAME_VERSION, $effectiveContext, [ $recordClass, $recordId, ]); @@ -191,7 +191,7 @@ protected function getVersionFormByVersion(array $context) $effectiveContext = array_merge($context, ['Record' => $record]); - return $this->scaffoldForm(self::FORM_NAME_VERSION, $effectiveContext, [ + return $this->scaffoldForm(HistoryViewerController::FORM_NAME_VERSION, $effectiveContext, [ $recordClass, $recordId, ]); @@ -251,7 +251,7 @@ public function getCompareForm(array $context) $effectiveContext = array_merge($context, ['Record' => $recordTo]); - $form = $this->scaffoldForm(self::FORM_NAME_COMPARE, $effectiveContext, [ + $form = $this->scaffoldForm(HistoryViewerController::FORM_NAME_COMPARE, $effectiveContext, [ $recordClass, $recordId, $recordVersionFrom, diff --git a/src/Forms/DataObjectVersionFormFactory.php b/src/Forms/DataObjectVersionFormFactory.php index 7f038c16..ec6cb6df 100644 --- a/src/Forms/DataObjectVersionFormFactory.php +++ b/src/Forms/DataObjectVersionFormFactory.php @@ -34,7 +34,7 @@ class DataObjectVersionFormFactory implements FormFactory * @var string[] */ private static $readonly_types = [ - self::TYPE_HISTORY, + DataObjectVersionFormFactory::TYPE_HISTORY, ]; public function getForm(RequestHandler $controller = null, $name = FormFactory::DEFAULT_NAME, $context = [])