pkp#7725 revert back decsion APP path and bringing back global constants

touhidurabir · Aug 30, 2022 · 3a5eb97 · 3a5eb97
1 parent ac2107c
commit 3a5eb97
Show file tree

Hide file tree

Showing 55 changed files with 67 additions and 55 deletions.
diff --git a/classes/components/forms/decision/SelectRevisionDecisionForm.php b/classes/components/forms/decision/SelectRevisionDecisionForm.php
@@ -14,7 +14,7 @@
 
 namespace PKP\components\forms\decision;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use PKP\components\forms\FieldOptions;
 use PKP\components\forms\FormComponent;
 

diff --git a/classes/components/forms/decision/SelectRevisionRecommendationForm.php b/classes/components/forms/decision/SelectRevisionRecommendationForm.php
@@ -14,7 +14,7 @@
 
 namespace PKP\components\forms\decision;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use PKP\components\forms\FieldOptions;
 use PKP\components\forms\FormComponent;
 

diff --git a/classes/decision/DAO.php b/classes/decision/DAO.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;

diff --git a/classes/decision/Decision.php b/classes/decision/Decision.php
@@ -73,3 +73,15 @@ public function getDecisionType(): DecisionType
         return $decisionType;
     }
 }
+
+if (!PKP_STRICT_MODE) {
+    // Some constants are not redefined here because they never existed as global constants
+    define('SUBMISSION_EDITOR_DECISION_INITIAL_DECLINE', Decision::INITIAL_DECLINE);
+    define('SUBMISSION_EDITOR_RECOMMEND_ACCEPT', Decision::RECOMMEND_ACCEPT);
+    define('SUBMISSION_EDITOR_RECOMMEND_PENDING_REVISIONS', Decision::RECOMMEND_PENDING_REVISIONS);
+    define('SUBMISSION_EDITOR_RECOMMEND_RESUBMIT', Decision::RECOMMEND_RESUBMIT);
+    define('SUBMISSION_EDITOR_RECOMMEND_DECLINE', Decision::RECOMMEND_DECLINE);
+    define('SUBMISSION_EDITOR_DECISION_REVERT_DECLINE', Decision::REVERT_DECLINE);
+    define('SUBMISSION_EDITOR_DECISION_SEND_TO_PRODUCTION', Decision::SEND_TO_PRODUCTION);
+    define('SUBMISSION_EDITOR_DECISION_NEW_ROUND', Decision::NEW_EXTERNAL_ROUND);
+}
diff --git a/classes/decision/DecisionType.php b/classes/decision/DecisionType.php
@@ -15,7 +15,7 @@
 
 use APP\core\Application;
 use APP\core\Request;
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\notification\Notification;
 use APP\notification\NotificationManager;

diff --git a/classes/decision/Repository.php b/classes/decision/Repository.php
@@ -16,7 +16,7 @@
 use APP\core\Application;
 use APP\core\Request;
 use APP\core\Services;
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\notification\Notification;
 use APP\notification\NotificationManager;

diff --git a/classes/decision/maps/Schema.php b/classes/decision/maps/Schema.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\maps;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use Illuminate\Support\Enumerable;
 use PKP\services\PKPSchemaService;
 

diff --git a/classes/decision/types/Accept.php b/classes/decision/types/Accept.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;

diff --git a/classes/decision/types/BackFromCopyediting.php b/classes/decision/types/BackFromCopyediting.php
@@ -17,7 +17,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\components\fileAttachers\FileStage;

diff --git a/classes/decision/types/BackFromProduction.php b/classes/decision/types/BackFromProduction.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\components\fileAttachers\FileStage;

diff --git a/classes/decision/types/CancelReviewRound.php b/classes/decision/types/CancelReviewRound.php
@@ -15,7 +15,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\context\Context;

diff --git a/classes/decision/types/Decline.php b/classes/decision/types/Decline.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\context\Context;

diff --git a/classes/decision/types/InitialDecline.php b/classes/decision/types/InitialDecline.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\context\Context;

diff --git a/classes/decision/types/NewExternalReviewRound.php b/classes/decision/types/NewExternalReviewRound.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;

diff --git a/classes/decision/types/RecommendAccept.php b/classes/decision/types/RecommendAccept.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\decision\DecisionType;
 use PKP\decision\types\traits\InExternalReviewRound;

diff --git a/classes/decision/types/RecommendDecline.php b/classes/decision/types/RecommendDecline.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\decision\DecisionType;
 use PKP\decision\types\traits\InExternalReviewRound;

diff --git a/classes/decision/types/RecommendResubmit.php b/classes/decision/types/RecommendResubmit.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\decision\DecisionType;
 use PKP\decision\types\traits\InExternalReviewRound;

diff --git a/classes/decision/types/RecommendRevisions.php b/classes/decision/types/RecommendRevisions.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\decision\DecisionType;
 use PKP\decision\types\traits\InExternalReviewRound;

diff --git a/classes/decision/types/RequestRevisions.php b/classes/decision/types/RequestRevisions.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\context\Context;

diff --git a/classes/decision/types/Resubmit.php b/classes/decision/types/Resubmit.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\context\Context;

diff --git a/classes/decision/types/RevertDecline.php b/classes/decision/types/RevertDecline.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\context\Context;

diff --git a/classes/decision/types/RevertInitialDecline.php b/classes/decision/types/RevertInitialDecline.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;
 use PKP\context\Context;

diff --git a/classes/decision/types/SendExternalReview.php b/classes/decision/types/SendExternalReview.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;

diff --git a/classes/decision/types/SendToProduction.php b/classes/decision/types/SendToProduction.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;

diff --git a/classes/decision/types/SkipExternalReview.php b/classes/decision/types/SkipExternalReview.php
@@ -13,7 +13,7 @@
 
 namespace PKP\decision\types;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\submission\Submission;
 use Illuminate\Validation\Validator;

diff --git a/classes/decision/types/traits/IsRecommendation.php b/classes/decision/types/traits/IsRecommendation.php
@@ -15,7 +15,7 @@
 
 use APP\core\Application;
 use APP\core\Services;
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\submission\Submission;
 use Exception;

diff --git a/classes/mail/Mailable.php b/classes/mail/Mailable.php
@@ -28,7 +28,7 @@
 namespace PKP\mail;
 
 use APP\core\Services;
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\mail\variables\ContextEmailVariable;
 use BadMethodCallException;

diff --git a/classes/mail/mailables/DecisionAcceptNotifyAuthor.php b/classes/mail/mailables/DecisionAcceptNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionBackFromCopyeditingNotifyAuthor.php b/classes/mail/mailables/DecisionBackFromCopyeditingNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionBackFromProductionNotifyAuthor.php b/classes/mail/mailables/DecisionBackFromProductionNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionCancelReviewRoundNotifyAuthor.php b/classes/mail/mailables/DecisionCancelReviewRoundNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionDeclineNotifyAuthor.php b/classes/mail/mailables/DecisionDeclineNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionInitialDeclineNotifyAuthor.php b/classes/mail/mailables/DecisionInitialDeclineNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionNewReviewRoundNotifyAuthor.php b/classes/mail/mailables/DecisionNewReviewRoundNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionNotifyReviewer.php b/classes/mail/mailables/DecisionNotifyReviewer.php
@@ -16,7 +16,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionRequestRevisionsNotifyAuthor.php b/classes/mail/mailables/DecisionRequestRevisionsNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionResubmitNotifyAuthor.php b/classes/mail/mailables/DecisionResubmitNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionRevertDeclineNotifyAuthor.php b/classes/mail/mailables/DecisionRevertDeclineNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionRevertInitialDeclineNotifyAuthor.php b/classes/mail/mailables/DecisionRevertInitialDeclineNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionSendExternalReviewNotifyAuthor.php b/classes/mail/mailables/DecisionSendExternalReviewNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionSendToProductionNotifyAuthor.php b/classes/mail/mailables/DecisionSendToProductionNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/DecisionSkipExternalReviewNotifyAuthor.php b/classes/mail/mailables/DecisionSkipExternalReviewNotifyAuthor.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\submission\Submission;
 use PKP\context\Context;
 use PKP\mail\Mailable;

diff --git a/classes/mail/mailables/RecommendationNotifyEditors.php b/classes/mail/mailables/RecommendationNotifyEditors.php
@@ -15,7 +15,7 @@
 
 namespace PKP\mail\mailables;
 
-use PKP\decision\Decision;
+use APP\decision\Decision;
 use APP\facades\Repo;
 use APP\submission\Submission;
 use Exception;