CI: Fix phpunit tests

src/CoreBundle/Component/Utils/CreateDefaultPages.php

@@ -101,7 +101,21 @@ class CreateDefaultPages
 
         // Categories for extra content in admin blocks
 
-        $adminBlocks = [
+        foreach ($this->getCategoriesForAdminBlocks() as $nameBlock) {
+            $usersAdminBlock = (new PageCategory())
+                ->setTitle($nameBlock)
+                ->setType('grid')
+                ->setCreator($user)
+            ;
+            $this->pageCategoryRepository->update($usersAdminBlock);
+        }
+
+        return true;
+    }
+
+    public function getCategoriesForAdminBlocks()
+    {
+        return [
             'block-admin-users',
             'block-admin-courses',
             'block-admin-sessions',
@@ -112,16 +126,5 @@ class CreateDefaultPages
             'block-admin-platform',
             'block-admin-chamilo',
         ];
-
-        foreach ($adminBlocks as $nameBlock) {
-            $usersAdminBlock = (new PageCategory())
-                ->setTitle($nameBlock)
-                ->setType('grid')
-                ->setCreator($user)
-            ;
-            $this->pageCategoryRepository->update($usersAdminBlock);
-        }
-
-        return true;
     }
 }

src/CoreBundle/Controller/Api/UpdateCCalendarEventAction.php

@@ -39,17 +39,19 @@ class UpdateCCalendarEventAction extends BaseResourceFileAction
 
         $calendarEvent->getReminders()->clear();
 
-        foreach ($result['reminders'] as $reminderInfo) {
+        if (isset($result['reminders'])) {
-            $reminder = new AgendaReminder();
+            foreach ($result['reminders'] as $reminderInfo) {
-            $reminder->count = $reminderInfo['count'];
+                $reminder = new AgendaReminder();
-            $reminder->period = $reminderInfo['period'];
+                $reminder->count = $reminderInfo['count'];
-
+                $reminder->period = $reminderInfo['period'];
-            $reminder
+
-                ->setType('')
+                $reminder
-                ->decodeDateInterval()
+                    ->setType('')
-            ;
+                    ->decodeDateInterval()
-
+                ;
-            $calendarEvent->addReminder($reminder);
+
+                $calendarEvent->addReminder($reminder);
+            }
         }
 
         return $calendarEvent;

tests/CoreBundle/Repository/Node/CourseRepositoryTest.php

@@ -117,7 +117,7 @@ class CourseRepositoryTest extends AbstractApiTest
         $this->assertSame(1, $count);
 
         // Check tools (all declared in the ToolChain minus blog and "course_tool")
-        $this->assertCount(26, $course->getTools());
+        $this->assertCount(24, $course->getTools());
 
         // Check resource links for each Tool
         foreach ($course->getTools() as $tool) {

tests/CoreBundle/Repository/PageRepositoryTest.php

@@ -317,7 +317,10 @@ class PageRepositoryTest extends AbstractApiTest
         $result = $createDefaultPages->createDefaultPages($admin, $this->getAccessUrl(), 'en_US');
         $this->assertTrue($result);
         $this->assertSame(2, $pageRepo->count([]));
-        $this->assertSame(6, $pageCategoryRepo->count([]));
+        $this->assertSame(
+            6 + count($createDefaultPages->getCategoriesForAdminBlocks()),
+            $pageCategoryRepo->count([])
+        );
 
         $result = $createDefaultPages->createDefaultPages($admin, $this->getAccessUrl(), 'en_US');
         $this->assertFalse($result);