Completed
Push — 1.10.x ( c135db...ea3352 )
by Julito
26:21
created
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Wiki.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,11 +56,11 @@  discard block
 block discarded – undo
56 56
                 '-',
57 57
                 'Find'
58 58
             ],
59
-            ['Wikilink','Link','Unlink','Anchor'],
60
-            ['Image','Video','Flash','Oembed','Youtube','Audio','Asciimath'],
61
-            ['Table','HorizontalRule','Smiley','SpecialChar','leaflet'],
62
-            ['Format','Font','FontSize'],
63
-            ['Bold','Italic','Underline'],
59
+            ['Wikilink', 'Link', 'Unlink', 'Anchor'],
60
+            ['Image', 'Video', 'Flash', 'Oembed', 'Youtube', 'Audio', 'Asciimath'],
61
+            ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'leaflet'],
62
+            ['Format', 'Font', 'FontSize'],
63
+            ['Bold', 'Italic', 'Underline'],
64 64
             [
65 65
                 'Subscript',
66 66
                 'Superscript',
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         return [
95 95
             ['Save', 'NewPage', 'Templates', '-', 'PasteText'],
96 96
             ['Undo', 'Redo'],
97
-            ['Wikilink', 'Link', 'Image', 'Video', 'Flash', 'Audio', 'Table',  'Asciimath', 'Asciisvg'],
97
+            ['Wikilink', 'Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
98 98
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
99 99
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
100 100
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor', 'Source'],
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/Editor.php 1 patch
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.
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/Component/HTMLPurifier/Filter/AllowIframes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
             } elseif ($vimeoMatch) {
66 66
                 $extra .= ' webkitAllowFullScreen mozallowfullscreen allowFullScreen';
67 67
             }
68
-            return '<iframe ' . $matches[1] . $extra . '></iframe>';
68
+            return '<iframe '.$matches[1].$extra.'></iframe>';
69 69
         } else {
70 70
             return '';
71 71
         }
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/Skill.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@
 block discarded – undo
201 201
     public function getWebIconPath()
202 202
     {
203 203
         if ($this->getIcon()) {
204
-            return api_get_path(WEB_UPLOAD_PATH) . "badges/{$this->getIcon()}";
204
+            return api_get_path(WEB_UPLOAD_PATH)."badges/{$this->getIcon()}";
205 205
         }
206 206
 
207 207
         return \Display::return_icon('badges-default.png', null, null, ICON_SIZE_HUGE, null, true);
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   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -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
     {
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/Repository/SkillRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
  *
14 14
  * @author Angel Fernando Quiroz Campos <[email protected]>
15 15
  */
16
-class SkillRepository extends EntityRepository{
16
+class SkillRepository extends EntityRepository {
17 17
 
18 18
     /**
19 19
      * Get the last acquired skill by a user on course and/or session
Please login to merge, or discard this patch.