#7822 Fix fatal error with pickier PHP release and array_intersect (#…

…7861)
pkp · May 9, 2022 · 80209e1 · 80209e1
1 parent 94abf3d
commit 80209e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/classes/security/authorization/internal/QueryAssignedToUserAccessPolicy.inc.php b/classes/security/authorization/internal/QueryAssignedToUserAccessPolicy.inc.php
@@ -64,7 +64,7 @@ public function effect()
         // Managers are allowed to access discussions they are not participants in
         // as long as they have Manager-level access to the workflow stage
         $accessibleWorkflowStages = $this->getAuthorizedContextObject(ASSOC_TYPE_ACCESSIBLE_WORKFLOW_STAGES);
-        $managerAssignments = array_intersect([Role::ROLE_ID_MANAGER], $accessibleWorkflowStages[$query->getStageId()]);
+        $managerAssignments = array_intersect([Role::ROLE_ID_MANAGER], $accessibleWorkflowStages[$query->getStageId()] ?? []);
         if (!empty($managerAssignments)) {
             return AuthorizationPolicy::AUTHORIZATION_PERMIT;
         }

diff --git a/pages/workflow/PKPWorkflowHandler.inc.php b/pages/workflow/PKPWorkflowHandler.inc.php
@@ -84,7 +84,7 @@ public function access($args, $request)
         // Get the closest workflow stage that user has an assignment.
         $workingStageId = null;
         for ($workingStageId = $currentStageId; $workingStageId >= WORKFLOW_STAGE_ID_SUBMISSION; $workingStageId--) {
-            if (isset($accessibleWorkflowStages[$workingStageId]) && array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[$workingStageId])) {
+            if (isset($accessibleWorkflowStages[$workingStageId]) && array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[$workingStageId] ?? [])) {
                 break;
             }
         }
@@ -93,7 +93,7 @@ public function access($args, $request)
         // submission. Try to get the closest future workflow stage.
         if ($workingStageId == null) {
             for ($workingStageId = $currentStageId; $workingStageId <= WORKFLOW_STAGE_ID_PRODUCTION; $workingStageId++) {
-                if (isset($accessibleWorkflowStages[$workingStageId]) && array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[$workingStageId])) {
+                if (isset($accessibleWorkflowStages[$workingStageId]) && array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[$workingStageId] ?? [])) {
                     break;
                 }
             }
@@ -156,13 +156,13 @@ public function index($args, $request)
         $canPublish = false; // Ability to publish, unpublish and create versions
         $canAccessEditorialHistory = false; // Access to activity log
         // unassigned managers
-        if (!$accessibleWorkflowStages && array_intersect($this->getAuthorizedContextObject(ASSOC_TYPE_USER_ROLES), [Role::ROLE_ID_MANAGER])) {
+        if (!$accessibleWorkflowStages && array_intersect($this->getAuthorizedContextObject(ASSOC_TYPE_USER_ROLES), [Role::ROLE_ID_MANAGER] ?? [])) {
             $canAccessProduction = true;
             $canPublish = true;
             $canAccessPublication = true;
             $canAccessEditorialHistory = true;
-        } elseif (!empty($accessibleWorkflowStages[$currentStageId]) && array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[$currentStageId])) {
-            $canAccessProduction = (bool) array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[WORKFLOW_STAGE_ID_PRODUCTION]);
+        } elseif (!empty($accessibleWorkflowStages[$currentStageId]) && array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[$currentStageId] ?? [])) {
+            $canAccessProduction = (bool) array_intersect($editorialWorkflowRoles, $accessibleWorkflowStages[WORKFLOW_STAGE_ID_PRODUCTION] ?? []);
             $canAccessPublication = true;
 
             $stageAssignmentDao = DAORegistry::getDAO('StageAssignmentDAO'); /** @var StageAssignmentDAO $stageAssignmentDao */
@@ -176,7 +176,7 @@ public function index($args, $request)
             // for the production workflow stage. An unassigned admin or manager may
             // have been granted access and should be allowed to publish.
             if (empty($result) && is_array($accessibleWorkflowStages[WORKFLOW_STAGE_ID_PRODUCTION])) {
-                $canPublish = (bool) array_intersect([Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_MANAGER], $accessibleWorkflowStages[WORKFLOW_STAGE_ID_PRODUCTION]);
+                $canPublish = (bool) array_intersect([Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_MANAGER], $accessibleWorkflowStages[WORKFLOW_STAGE_ID_PRODUCTION] ?? []);
 
             // Otherwise, check stage assignments
             // "Recommend only" stage assignments can not publish
@@ -192,7 +192,7 @@ public function index($args, $request)
                 }
             }
         }
-        if (!empty($accessibleWorkflowStages[$currentStageId]) && array_intersect([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR], $accessibleWorkflowStages[$currentStageId])) {
+        if (!empty($accessibleWorkflowStages[$currentStageId]) && array_intersect([Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR], $accessibleWorkflowStages[$currentStageId] ?? [])) {
             $canAccessEditorialHistory = true;
         }
         /** @var GenreDAO $genreDao */
@@ -406,7 +406,7 @@ public function index($args, $request)
         }
 
         // Add the revision decision/recommendation forms if this app supports a review stage
-        if (count(array_intersect([WORKFLOW_STAGE_ID_INTERNAL_REVIEW, WORKFLOW_STAGE_ID_EXTERNAL_REVIEW], Application::getApplicationStages()))) {
+        if (count(array_intersect([WORKFLOW_STAGE_ID_INTERNAL_REVIEW, WORKFLOW_STAGE_ID_EXTERNAL_REVIEW], Application::getApplicationStages() ?? []))) {
             $selectRevisionDecisionForm = new PKP\components\forms\decision\SelectRevisionDecisionForm();
             $selectRevisionRecommendationForm = new PKP\components\forms\decision\SelectRevisionRecommendationForm();
             $state['components'][$selectRevisionDecisionForm->id] = $selectRevisionDecisionForm->getConfig();