Completed
Push — 1.11.x ( 5cd232...3f0be8 )
by José
381:04 queued 342:41
created
Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/UniqueAnswerImage.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@
 block discarded – undo
18 18
     {
19 19
         $config['toolbarGroups'] = array(
20 20
             '/',
21
-            array('name' => 'basicstyles',    'groups' =>array('basicstyles', 'cleanup', )),
22
-            array('name' => 'paragraph',    'groups' =>array('list', 'indent', 'blocks', 'align' )),
21
+            array('name' => 'basicstyles', 'groups' =>array('basicstyles', 'cleanup',)),
22
+            array('name' => 'paragraph', 'groups' =>array('list', 'indent', 'blocks', 'align')),
23 23
             array('name' => 'links'),
24 24
             array('name' => 'insert'),
25 25
             '/',
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Minimal.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
             ],
35 35
             [
36 36
                 'name' => 'links',
37
-                'items' => [ 'Link', 'Unlink', 'Anchor']
37
+                'items' => ['Link', 'Unlink', 'Anchor']
38 38
             ]
39 39
         ];
40 40
 
Please login to merge, or discard this patch.
CoreBundle/Component/Editor/CkEditor/Toolbar/ProjectCommentStudent.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
         return [
90 90
             ['Save', 'NewPage', 'Templates', '-', 'PasteFromWord'],
91 91
             ['Undo', 'Redo'],
92
-            ['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table',  'Asciimath'],
92
+            ['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
93 93
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
94 94
             ['JustifyLeft', 'JustifyCenter', 'JustifyBlock'],
95 95
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'TextColor'],
Please login to merge, or discard this patch.
CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@
 block discarded – undo
16 16
     public function getConfig()
17 17
     {
18 18
         $config['toolbarGroups'] = array(
19
-            array('name' => 'document',  'groups' =>array('document', 'doctools')),
20
-            array('name' => 'clipboard',    'groups' =>array('clipboard', 'undo')),
21
-            array('name' => 'editing',    'groups' =>array('clipboard', 'undo')),
19
+            array('name' => 'document', 'groups' =>array('document', 'doctools')),
20
+            array('name' => 'clipboard', 'groups' =>array('clipboard', 'undo')),
21
+            array('name' => 'editing', 'groups' =>array('clipboard', 'undo')),
22 22
             //array('name' => 'forms',    'groups' =>array('clipboard', 'undo', )),
23 23
             '/',
24
-            array('name' => 'basicstyles',    'groups' =>array('basicstyles', 'cleanup')),
25
-            array('name' => 'paragraph',    'groups' =>array('list', 'indent', 'blocks', 'align')),
24
+            array('name' => 'basicstyles', 'groups' =>array('basicstyles', 'cleanup')),
25
+            array('name' => 'paragraph', 'groups' =>array('list', 'indent', 'blocks', 'align')),
26 26
             array('name' => 'links'),
27 27
             array('name' => 'insert'),
28 28
             '/',
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/Editor.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
                 return $var ? 'true' : 'false'; // Lowercase necessary!
129 129
             case 'integer':
130 130
             case 'double':
131
-                return (string)$var;
131
+                return (string) $var;
132 132
             case 'resource':
133 133
             case 'string':
134 134
                 return '"'.str_replace(
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -137,7 +137,7 @@
 block discarded – undo
137 137
                     array('\r', '\n', '\x3c', '\x3e', '\x26'),
138 138
                     addslashes($var)
139 139
                 ).'"';
140
-             case 'array':
140
+                case 'array':
141 141
                 // Arrays in JSON can't be associative. If the array is empty or if it
142 142
                 // has sequential whole number keys starting with 0, it's not associative
143 143
                 // so we can go ahead and convert it as an array.
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Filesystem/Data.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -86,13 +86,13 @@
 block discarded – undo
86 86
         return $this->get($file);
87 87
     }
88 88
 
89
-     /**
90
-     * Gets a file from the data/courses/MATHS/scorm directory
91
-     * @param string $courseCode
92
-     * @param string $file
93
-      *
94
-     * @return SplFileInfo
95
-     */
89
+        /**
90
+         * Gets a file from the data/courses/MATHS/scorm directory
91
+         * @param string $courseCode
92
+         * @param string $file
93
+         *
94
+         * @return SplFileInfo
95
+         */
96 96
     public function getCourseScormDocument($courseCode, $file)
97 97
     {
98 98
         $file = 'courses/'.$courseCode.'/scorm/'.$file;
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
     /**
118 118
      * Create folders
119
-     * @param array            $folderList
119
+     * @param string[]            $folderList
120 120
      * @param OutputInterface  $output
121 121
      * @param string           $folderPermissions
122 122
      */
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
      * http://chamilo/courses/ABC/document/file.jpg
201 201
      * @param string $content
202 202
      *
203
-     * @return string
203
+     * @return \simplehtmldom_1_5\simple_html_dom
204 204
      */
205 205
     public function convertRelativeToAbsoluteUrl($content)
206 206
     {
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/ExtraFieldOptions.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,11 +60,11 @@
 block discarded – undo
60 60
      */
61 61
     protected $priorityMessage;
62 62
 
63
-     /**
64
-     * @var integer
65
-     *
66
-     * @ORM\Column(name="option_order", type="integer", nullable=true)
67
-     */
63
+        /**
64
+         * @var integer
65
+         *
66
+         * @ORM\Column(name="option_order", type="integer", nullable=true)
67
+         */
68 68
     protected $optionOrder;
69 69
 
70 70
     /**
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/ExtraFieldValues.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -153,13 +153,13 @@
 block discarded – undo
153 153
         return $this;
154 154
     }
155 155
 
156
-     /**
157
-     * Set comment
158
-     *
159
-     * @param string $comment
160
-      *
161
-     * @return ExtraFieldValues
162
-     */
156
+        /**
157
+         * Set comment
158
+         *
159
+         * @param string $comment
160
+         *
161
+         * @return ExtraFieldValues
162
+         */
163 163
     public function setComment($comment)
164 164
     {
165 165
         $this->comment = $comment;
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/Session.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -470,7 +470,7 @@
 block discarded – undo
470 470
             Criteria::expr()->eq("user", $user)
471 471
         );
472 472
 
473
-        if (!is_null($status))  {
473
+        if (!is_null($status)) {
474 474
             $criteria->andWhere(
475 475
                 Criteria::expr()->eq("status", $status)
476 476
             );
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
     }
365 365
 
366 366
     /**
367
-     * @param $courses
367
+     * @param ArrayCollection $courses
368 368
      */
369 369
     public function setCourses($courses)
370 370
     {
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
      * @param Course $course
461 461
      * @param string $status
462 462
      *
463
-     * @return \Doctrine\Common\Collections\Collection|static
463
+     * @return ArrayCollection
464 464
      */
465 465
     public function getUserInCourse(User $user, Course $course, $status = null)
466 466
     {
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
      * Set description
507 507
      *
508 508
      * @param string $description
509
-     * @return Groups
509
+     * @return Session
510 510
      */
511 511
     public function setDescription($description)
512 512
     {
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
     }
840 840
 
841 841
     /**
842
-     * @return array
842
+     * @return string[]
843 843
      */
844 844
     public static function getStatusList()
845 845
     {
@@ -991,7 +991,7 @@  discard block
 block discarded – undo
991 991
      * Get user from course by status
992 992
      * @param \Chamilo\CoreBundle\Entity\Course $course
993 993
      * @param string $status
994
-     * @return \Doctrine\Common\Collections\Collection|static
994
+     * @return ArrayCollection
995 995
      */
996 996
     public function getUserCourseSubscriptionsByStatus(Course $course, $status)
997 997
     {
Please login to merge, or discard this patch.