Pārlūkot izejas kodu

Remove use of doctrine forAll see BT#16186

Julio 5 gadi atpakaļ
vecāks
revīzija
56e88f67ad
2 mainītis faili ar 15 papildinājumiem un 13 dzēšanām
  1. 7 6
      main/lp/lp_subscribe_users.php
  2. 8 7
      main/session/resume_session.php

+ 7 - 6
main/lp/lp_subscribe_users.php

@@ -68,12 +68,13 @@ if (!$session) {
         ->getQuery()
         ->getResult();
 } else {
-    $session->getUserCourseSubscriptionsByStatus($course, Session::STUDENT)
-        ->forAll(
-            function ($i, SessionRelCourseRelUser $sessionCourseUser) use (&$subscribedUsers) {
-                $subscribedUsers[$i] = $sessionCourseUser->getUser();
-            }
-        );
+    $list = $session->getUserCourseSubscriptionsByStatus($course, Session::STUDENT);
+    if ($list) {
+        /** @var SessionRelCourseRelUser $sessionCourseUser */
+        foreach ($list as $sessionCourseUser) {
+            $subscribedUsers[$sessionCourseUser->getUser()->getUserId()] = $sessionCourseUser->getUser();
+        }
+    }
 }
 
 // Getting all users in a nice format.

+ 8 - 7
main/session/resume_session.php

@@ -178,16 +178,17 @@ if ($session->getNbrCourses() === 0) {
             $course,
             $session
         );
+
         // Get coachs of the courses in session
         $namesOfCoaches = [];
-        $coachSubscriptions = $session->getUserCourseSubscriptionsByStatus($course, Session::COACH)
-            ->forAll(
-                function ($index, SessionRelCourseRelUser $subscription) use (&$namesOfCoaches) {
-                    $namesOfCoaches[] = $subscription->getUser()->getCompleteNameWithUserName();
+        $coachSubscriptions = $session->getUserCourseSubscriptionsByStatus($course, Session::COACH);
 
-                    return true;
-                }
-            );
+        if ($coachSubscriptions) {
+            /** @var SessionRelCourseRelUser $subscription */
+            foreach ($coachSubscriptions as $subscription) {
+                $namesOfCoaches[] = $subscription->getUser()->getCompleteNameWithUserName();
+            }
+        }
 
         $orderButtons = '';
         if (SessionManager::orderCourseIsEnabled()) {