Completed
Pull Request — 1.11.x (#1459)
by José
164:59 queued 133:05
created
plugin/search_course/lib/register_course_widget.class.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
     /**
58 58
      * Handle the subscribe action.
59 59
      *
60
-     * @return bool
60
+     * @return null|boolean
61 61
      */
62 62
     function action_subscribe_user()
63 63
     {
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 
152 152
     /**
153 153
      *
154
-     * @param type $course_code
154
+     * @param string $course_code
155 155
      * @return type
156 156
      */
157 157
     function retrieve_course($course_code)
Please login to merge, or discard this patch.
plugin/search_course/lib/search_course_widget.class.php 3 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -40,11 +40,19 @@
 block discarded – undo
40 40
         return isset($_GET[$key]) ? $_GET[$key] : $default;
41 41
     }
42 42
 
43
+    /**
44
+     * @param string $key
45
+     *
46
+     * @return string
47
+     */
43 48
     public static function server($key, $default = '')
44 49
     {
45 50
         return isset($_SERVER[$key]) ? $_SERVER[$key] : $default;
46 51
     }
47 52
 
53
+    /**
54
+     * @param string $name
55
+     */
48 56
     public static function get_lang($name)
49 57
     {
50 58
         return SearchCoursePlugin::create()->get_lang($name);
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-require_once dirname(__FILE__) . '/register_course_widget.class.php';
3
+require_once dirname(__FILE__).'/register_course_widget.class.php';
4 4
 
5 5
 /**
6 6
  * Search course widget.
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
         $url = self::server('REQUEST_URI');
61 61
         $url = explode('?', $url);
62 62
         $url = reset($url);
63
-        $url = self::server('SERVER_NAME') . $url;
63
+        $url = self::server('SERVER_NAME').$url;
64 64
 
65 65
         $root = api_get_path('WEB_PATH');
66 66
         $root = str_replace('https://', '', $root);
67 67
         $root = str_replace('http://', '', $root);
68
-        $index_url = $root . 'index.php';
68
+        $index_url = $root.'index.php';
69 69
 
70 70
         return $url == $index_url || $url == $root;
71 71
     }
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
         $url = self::server('REQUEST_URI');
81 81
         $url = explode('?', $url);
82 82
         $url = reset($url);
83
-        $url = self::server('SERVER_NAME') . $url;
83
+        $url = self::server('SERVER_NAME').$url;
84 84
 
85 85
         $root = api_get_path('WEB_PATH');
86 86
         $root = str_replace('https://', '', $root);
87 87
         $root = str_replace('http://', '', $root);
88
-        $index_url = $root . 'user_portal.php';
88
+        $index_url = $root.'user_portal.php';
89 89
 
90 90
         return $url == $index_url || $url == $root;
91 91
     }
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
             $parameters[self::PARAM_ACTION] = $action;
154 154
         }
155 155
         $parameters = implode('&', $parameters);
156
-        $parameters = $parameters ? '?' . $parameters : '';
157
-        return $self . $parameters;
156
+        $parameters = $parameters ? '?'.$parameters : '';
157
+        return $self.$parameters;
158 158
     }
159 159
 
160 160
     /**
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
241 241
             $details = implode(' - ', $details);
242 242
             $title = $course['title'];
243 243
 
244
-            $href = api_get_path(WEB_COURSE_PATH).$course['code'] .'/index.php';
245
-            echo '<tr><td><b><a href="' . $href . '">' . "$title</a></b><br/>$details</td><td>";
244
+            $href = api_get_path(WEB_COURSE_PATH).$course['code'].'/index.php';
245
+            echo '<tr><td><b><a href="'.$href.'">'."$title</a></b><br/>$details</td><td>";
246 246
             if (!api_is_anonymous()) {
247 247
                 if ($course['registration_code']) {
248 248
                     Display::display_icon(
@@ -336,13 +336,13 @@  discard block
 block discarded – undo
336 336
 
337 337
         if (api_is_anonymous())
338 338
         {
339
-            $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD;
339
+            $course_fiter = 'visibility = '.COURSE_VISIBILITY_OPEN_WORLD;
340 340
         }
341 341
         else
342 342
         {
343
-            $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD . ' OR ';
344
-            $course_fiter .= 'visibility = ' . COURSE_VISIBILITY_OPEN_PLATFORM . ' OR ';
345
-            $course_fiter .= '(visibility = ' . COURSE_VISIBILITY_REGISTERED . ' AND subscribe = 1)';
343
+            $course_fiter = 'visibility = '.COURSE_VISIBILITY_OPEN_WORLD.' OR ';
344
+            $course_fiter .= 'visibility = '.COURSE_VISIBILITY_OPEN_PLATFORM.' OR ';
345
+            $course_fiter .= '(visibility = '.COURSE_VISIBILITY_REGISTERED.' AND subscribe = 1)';
346 346
         }
347 347
 
348 348
         $sql = <<<EOT
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -123,8 +123,7 @@  discard block
 block discarded – undo
123 123
         if ($has_content)
124 124
         {
125 125
             echo '<div class="list">';
126
-        }
127
-        else
126
+        } else
128 127
         {
129 128
             echo '<div>';
130 129
         }
@@ -132,8 +131,7 @@  discard block
 block discarded – undo
132 131
         if (RegisterCourseWidget::factory()->run())
133 132
         {
134 133
             $result = true;
135
-        }
136
-        else
134
+        } else
137 135
         {
138 136
             $result = $this->action_display();
139 137
         }
@@ -337,8 +335,7 @@  discard block
 block discarded – undo
337 335
         if (api_is_anonymous())
338 336
         {
339 337
             $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD;
340
-        }
341
-        else
338
+        } else
342 339
         {
343 340
             $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD . ' OR ';
344 341
             $course_fiter .= 'visibility = ' . COURSE_VISIBILITY_OPEN_PLATFORM . ' OR ';
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
     /**
95 95
      * @param array $templates
96 96
      *
97
-     * @return null
97
+     * @return null|string
98 98
      */
99 99
     public function formatTemplates($templates)
100 100
     {
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     public function createHtmlStyle()
56 56
     {
57 57
         $style = '';
58
-        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '' ) {
58
+        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '') {
59 59
             $cssFile = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/editor.css';
60 60
             if (!is_file($cssFile)) {
61 61
                 $cssFile = api_get_path(WEB_CSS_PATH).'editor.css';
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
         return [[
148 148
             'title' => get_lang('EmptyTemplate'),
149 149
             'description' => null,
150
-            'image' => api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/empty.gif',
150
+            'image' => api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/empty.gif',
151 151
             'html' => '
152 152
                 <!DOCYTPE html>
153 153
                 <html>
154 154
                     <head>
155
-                        <meta charset="' . api_get_system_encoding() . '" />
155
+                        <meta charset="' . api_get_system_encoding().'" />
156 156
                     </head>
157
-                    <body  dir="' . api_get_text_direction() . '">
157
+                    <body  dir="' . api_get_text_direction().'">
158 158
                         <p>
159 159
                             <br/>
160 160
                         </p>
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');
178 178
         $replace = array(
179 179
             '',
180
-            api_get_path(REL_CODE_PATH) . 'img/',
180
+            api_get_path(REL_CODE_PATH).'img/',
181 181
             api_get_path(REL_PATH),
182 182
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH),
183 183
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH)
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         foreach ($systemTemplates as $template) {
189 189
             $image = $template->getImage();
190 190
             $image = !empty($image) ? $image : 'empty.gif';
191
-            $image = api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/' . $image;
191
+            $image = api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/'.$image;
192 192
 
193 193
             /*$image = $this->urlGenerator->generate(
194 194
                 'get_document_template_action',
@@ -240,12 +240,12 @@  discard block
 block discarded – undo
240 240
             $templateItem['image'] = api_get_path(WEB_APP_PATH)
241 241
                 . 'home/default_platform_document/template_thumb/noimage.gif';
242 242
             $templateItem['html'] = file_get_contents(api_get_path(SYS_COURSE_PATH)
243
-                . $courseDirectory . '/document' . $templateData['path']);
243
+                . $courseDirectory.'/document'.$templateData['path']);
244 244
 
245 245
             $image = $template->getImage();
246 246
             if (!empty($image)) {
247 247
                 $templateItem['image'] = api_get_path(WEB_COURSE_PATH)
248
-                    . $courseDirectory . '/upload/template_thumbnails/' . $template->getImage();
248
+                    . $courseDirectory.'/upload/template_thumbnails/'.$template->getImage();
249 249
             }
250 250
 
251 251
             $templateList[] = $templateItem;
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/Connector.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 
85 85
     /**
86 86
      * Available driver list.
87
-     * @return array
87
+     * @return string[]
88 88
      */
89 89
     private function getDefaultDriverList()
90 90
     {
Please login to merge, or discard this patch.
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.
src/Chamilo/CoreBundle/Component/Editor/Driver/DropBoxDriver.php 3 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
     /**
134 134
      * Close connection
135 135
      *
136
-     * @return void
136
+     * @return boolean
137 137
      * @author Dmitry (dio) Levashov
138 138
      **/
139 139
     public function umount() {
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
      * Close opened file
489 489
      *
490 490
      * @param  resource  $fp  file pointer
491
-     * @return bool
491
+     * @return boolean|null
492 492
      * @author Dmitry (dio) Levashov
493 493
      **/
494 494
     protected function _fclose($fp, $path='') {
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
      *
506 506
      * @param  string  $path  parent dir path
507 507
      * @param string  $name  new directory name
508
-     * @return string|bool
508
+     * @return string|false
509 509
      * @author Dmitry (dio) Levashov
510 510
      **/
511 511
     protected function _mkdir($path, $name) {
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -633,8 +633,8 @@
 block discarded – undo
633 633
     }
634 634
 
635 635
     /**
636
-    * {@inheritdoc}
637
-    */
636
+     * {@inheritdoc}
637
+     */
638 638
     protected function _archive($dir, $files, $name, $arc) {
639 639
         return false;
640 640
     }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
      * @return resource|false
465 465
      * @author Dmitry (dio) Levashov
466 466
      **/
467
-    protected function _fopen($path, $mode='rb') {
467
+    protected function _fopen($path, $mode = 'rb') {
468 468
         $fp = $this->tmbPath
469 469
             ? @fopen($this->tmpname($path), 'w+')
470 470
             : @tmpfile();
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
      * @return bool
492 492
      * @author Dmitry (dio) Levashov
493 493
      **/
494
-    protected function _fclose($fp, $path='') {
494
+    protected function _fclose($fp, $path = '') {
495 495
         @fclose($fp);
496 496
         if ($path) {
497 497
             @unlink($this->tmpname($path));
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/BranchSync.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -532,7 +532,6 @@  discard block
 block discarded – undo
532 532
      /**
533 533
      * Set sslPubKey
534 534
      *
535
-     * @param string $sslPubKey
536 535
      * @return BranchSync
537 536
      */
538 537
     public function setBranchType($branchType)
@@ -714,7 +713,7 @@  discard block
 block discarded – undo
714 713
     }
715 714
 
716 715
     /**
717
-     * @return mixed
716
+     * @return null|BranchSync
718 717
      */
719 718
     public function getParent()
720 719
     {
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
136 136
      */
137 137
     private $lastSyncType;
138 138
 
139
-     /**
140
-     * @var string
141
-     *
142
-     * @ORM\Column(name="ssl_pub_key", type="string", length=250, nullable=true, unique=false)
143
-     */
139
+        /**
140
+         * @var string
141
+         *
142
+         * @ORM\Column(name="ssl_pub_key", type="string", length=250, nullable=true, unique=false)
143
+         */
144 144
     private $sslPubKey;
145 145
 
146 146
     /**
@@ -529,12 +529,12 @@  discard block
 block discarded – undo
529 529
         return $this->sslPubKey;
530 530
     }
531 531
 
532
-     /**
533
-     * Set sslPubKey
534
-     *
535
-     * @param string $sslPubKey
536
-     * @return BranchSync
537
-     */
532
+        /**
533
+         * Set sslPubKey
534
+         *
535
+         * @param string $sslPubKey
536
+         * @return BranchSync
537
+         */
538 538
     public function setBranchType($branchType)
539 539
     {
540 540
         $this->branchType = $branchType;
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/CourseRelUser.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@
 block discarded – undo
139 139
     }
140 140
 
141 141
     /**
142
-     * @param $user
142
+     * @param User $user
143 143
      * @return $this
144 144
      */
145 145
     public function setUser($user)
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
      * @param $tool learnpath | document | etc
23 23
      * @param $itemId
24 24
      * @param Course $course
25
-     * @param int $sessionId
26
-     * @param int $groupId
25
+     * @param int $session
26
+     * @param int $group
27 27
      *
28 28
      * @return \Doctrine\ORM\QueryBuilder
29 29
      */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -196,7 +196,7 @@
 block discarded – undo
196 196
                     $users = \GroupManager::getStudentsAndTutors($groupId);
197 197
                     $newUserList = array();
198 198
                     if (!empty($users)) {
199
-                        foreach($users as $user) {
199
+                        foreach ($users as $user) {
200 200
                             $newUserList[] = $user['user_id'];
201 201
                         }
202 202
                         $this->unsubcribeUsersToItem(
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Entity/SequenceResource.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
     }
59 59
 
60 60
     /**
61
-     * @return string
61
+     * @return integer
62 62
      */
63 63
     public function getType()
64 64
     {
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
     }
124 124
 
125 125
     /**
126
-     * @param mixed $sequence
126
+     * @param Sequence $sequence
127 127
      * @return $this
128 128
      */
129 129
     public function setSequence(Sequence $sequence)
Please login to merge, or discard this patch.