Completed
Push — master ( 565c08...93d030 )
by José
125:33 queued 71:22
created
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/Editor/Connector.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
             'root_sys' => api_get_path(SYS_PATH),
52 52
             'sys_root' => api_get_path(SYS_PATH), // just an alias
53 53
             'sys_course_path' => api_get_path(SYS_COURSE_PATH),
54
-         //   'sys_config_path' => $app['path.config'],
54
+            //   'sys_config_path' => $app['path.config'],
55 55
             'path.temp' => api_get_path(SYS_ARCHIVE_PATH),
56 56
             //'sys_log_path' => $app['path.logs']
57 57
         );
@@ -325,9 +325,9 @@  discard block
 block discarded – undo
325 325
      **/
326 326
     public function access($attr, $path, $data, $volume)
327 327
     {
328
-    	return strpos(basename($path), '.') === 0       // if file/folder begins with '.' (dot)
329
-    		? !($attr == 'read' || $attr == 'write')    // set read+write to false, other (locked+hidden) set to true
330
-    		:  null;                                    // else elFinder decide it itself
328
+        return strpos(basename($path), '.') === 0       // if file/folder begins with '.' (dot)
329
+            ? !($attr == 'read' || $attr == 'write')    // set read+write to false, other (locked+hidden) set to true
330
+            :  null;                                    // else elFinder decide it itself
331 331
     }
332 332
 
333 333
     /**
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -327,7 +327,7 @@
 block discarded – undo
327 327
     {
328 328
     	return strpos(basename($path), '.') === 0       // if file/folder begins with '.' (dot)
329 329
     		? !($attr == 'read' || $attr == 'write')    // set read+write to false, other (locked+hidden) set to true
330
-    		:  null;                                    // else elFinder decide it itself
330
+    		:  null; // else elFinder decide it itself
331 331
     }
332 332
 
333 333
     /**
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,6 +79,7 @@  discard block
 block discarded – undo
79 79
     /**
80 80
      * Available driver list.
81 81
      * @param array
82
+     * @param string[] $list
82 83
      */
83 84
     public function setDriverList($list)
84 85
     {
@@ -87,7 +88,7 @@  discard block
 block discarded – undo
87 88
 
88 89
     /**
89 90
      * Available driver list.
90
-     * @return array
91
+     * @return string[]
91 92
      */
92 93
     private function getDefaultDriverList()
93 94
     {
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/Repository/SequenceRepository.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
      */
26 26
     public function findRequirementForResource($resourceId, $type)
27 27
     {
28
-  /*      $criteria = Criteria::create()
28
+    /*      $criteria = Criteria::create()
29 29
             ->where(Criteria::expr()->eq("resourceId", $resourceId))
30 30
             ->andWhere(Criteria::expr()->eq("type", $type));
31 31
 */
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
             foreach ($from as $subVertex) {
53 53
                 $vertexId = $subVertex->getId();
54 54
                 $sessionInfo = api_get_session_info($vertexId);
55
-                $sessionInfo['admin_link'] = '<a href="' . \SessionManager::getAdminPath($vertexId) . '">' . $sessionInfo['name'] . '</a>';
55
+                $sessionInfo['admin_link'] = '<a href="'.\SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
56 56
                 $result['requirements'][] = $sessionInfo;
57 57
             }
58 58
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
             foreach ($to as $subVertex) {
61 61
                 $vertexId = $subVertex->getId();
62 62
                 $sessionInfo = api_get_session_info($vertexId);
63
-                $sessionInfo['admin_link'] = '<a href="' . \SessionManager::getAdminPath($vertexId) . '">' . $sessionInfo['name'] . '</a>';
63
+                $sessionInfo['admin_link'] = '<a href="'.\SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
64 64
                 $result['dependencies'][] = $sessionInfo;
65 65
             }
66 66
         }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
      *
76 76
      * @param int $resourceId
77 77
      * @param int $type
78
-     * @return boolean
78
+     * @return boolean|null
79 79
      */
80 80
     public function deleteResource($resourceId, $type)
81 81
     {
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/ExtraFieldOptionRelFieldOption.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
      */
43 43
     protected $relatedFieldOptionId;
44 44
 
45
-     /**
46
-     * @var integer
47
-     *
48
-     * @ORM\Column(name="role_id", type="integer", precision=0, scale=0, nullable=true, unique=false)
49
-     */
45
+        /**
46
+         * @var integer
47
+         *
48
+         * @ORM\Column(name="role_id", type="integer", precision=0, scale=0, nullable=true, unique=false)
49
+         */
50 50
     protected $roleId;
51 51
 
52 52
     /**
@@ -128,12 +128,12 @@  discard block
 block discarded – undo
128 128
         return $this->relatedFieldOptionId;
129 129
     }
130 130
 
131
-     /**
132
-     * Set roleId
133
-     *
134
-     * @param integer $roleId
135
-     * @return ExtraFieldOptionRelFieldOption
136
-     */
131
+        /**
132
+         * Set roleId
133
+         *
134
+         * @param integer $roleId
135
+         * @return ExtraFieldOptionRelFieldOption
136
+         */
137 137
     public function setRoleId($roleId)
138 138
     {
139 139
         $this->roleId = $roleId;
Please login to merge, or discard this patch.