code refactor

taslangraham · taslangraham · commit a4bf9d9d63a8 · 2025-05-27T14:44:34.000-05:00
diff --git a/classes/migration/upgrade/v3_4_0/I7264_UpdateEmailTemplates.php b/classes/migration/upgrade/v3_4_0/I7264_UpdateEmailTemplates.php
@@ -26,8 +26,6 @@ protected function oldNewVariablesMap(): array
                 $newVariable = 'pressUrl';
             } elseif ($newVariable === 'contextSignature') {
                 $newVariable = 'pressSignature';
-            } elseif ($newVariable === 'contextAcronym') {
-                $newVariable = 'pressAcronym';
             }
         });
 
diff --git a/classes/migration/upgrade/v3_5_0/I11125_UpdateEmailTemplateVariables.php b/classes/migration/upgrade/v3_5_0/I11125_UpdateEmailTemplateVariables.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * @file classes/migration/upgrade/v3_4_0/I11125_UpdateEmailTemplateVariables.php
+ * @file classes/migration/upgrade/v3_5_0/I11125_UpdateEmailTemplateVariables.php
  *
- * Copyright (c) 2014-2025 Simon Fraser University
- * Copyright (c) 2000-2025 John Willinsky
+ * Copyright (c) 2025 Simon Fraser University
+ * Copyright (c) 2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class I11125_UpdateEmailTemplateVariables
  *
  * @brief Migration to update Email Template variable names
  */
 
-namespace APP\migration\upgrade\v3_4_0;
+namespace APP\migration\upgrade\v3_5_0;
 
-class I11125_UpdateEmailTemplateVariables extends \PKP\migration\upgrade\v3_4_0\I11125_UpdateEmailTemplateVariables
+class I11125_UpdateEmailTemplateVariables extends \PKP\migration\upgrade\v3_5_0\I11125_UpdateEmailTemplateVariables
 {
     public function oldToNewVariablesMap(): array
     {
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -162,6 +162,7 @@
 		<migration class="PKP\migration\upgrade\v3_4_0\I7624_StrftimeDeprecation"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I11238_PrepareDBForStructuredCitations"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I11241_MissingDecisionConstantsUpdate"/>
+		<migration class="APP\migration\upgrade\v3_5_0\I11125_UpdateEmailTemplateVariables"/>
 		<code function="downloadIPGeoDB"/>
 		<note file="docs/release-notes/README-3.5.0" />
 	</upgrade>

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ protected function oldNewVariablesMap(): array`
`26`	`26`	`$newVariable = 'pressUrl';`
`27`	`27`	`} elseif ($newVariable === 'contextSignature') {`
`28`	`28`	`$newVariable = 'pressSignature';`
`29`		`- } elseif ($newVariable === 'contextAcronym') {`
`30`		`- $newVariable = 'pressAcronym';`
`31`	`29`	`}`
`32`	`30`	`});`
`33`	`31`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/**`
`4`		`- * @file classes/migration/upgrade/v3_4_0/I11125_UpdateEmailTemplateVariables.php`
	`4`	`+ * @file classes/migration/upgrade/v3_5_0/I11125_UpdateEmailTemplateVariables.php`
`5`	`5`	`*`
`6`		`- * Copyright (c) 2014-2025 Simon Fraser University`
`7`		`- * Copyright (c) 2000-2025 John Willinsky`
	`6`	`+ * Copyright (c) 2025 Simon Fraser University`
	`7`	`+ * Copyright (c) 2025 John Willinsky`
`8`	`8`	`* Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.`
`9`	`9`	`*`
`10`	`10`	`* @class I11125_UpdateEmailTemplateVariables`
`11`	`11`	`*`
`12`	`12`	`* @brief Migration to update Email Template variable names`
`13`	`13`	`*/`
`14`	`14`
`15`		`-namespace APP\migration\upgrade\v3_4_0;`
	`15`	`+namespace APP\migration\upgrade\v3_5_0;`
`16`	`16`
`17`		`-class I11125_UpdateEmailTemplateVariables extends \PKP\migration\upgrade\v3_4_0\I11125_UpdateEmailTemplateVariables`
	`17`	`+class I11125_UpdateEmailTemplateVariables extends \PKP\migration\upgrade\v3_5_0\I11125_UpdateEmailTemplateVariables`
`18`	`18`	`{`
`19`	`19`	`public function oldToNewVariablesMap(): array`
`20`	`20`	`{`