Completed
Pull Request — 1.11.x (#1589)
by José
46:32
created
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   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
     }
373 373
 
374 374
     /**
375
-     * @param $courses
375
+     * @param ArrayCollection $courses
376 376
      */
377 377
     public function setCourses($courses)
378 378
     {
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
      * Set description
515 515
      *
516 516
      * @param string $description
517
-     * @return Groups
517
+     * @return Session
518 518
      */
519 519
     public function setDescription($description)
520 520
     {
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
     }
848 848
 
849 849
     /**
850
-     * @return array
850
+     * @return string[]
851 851
      */
852 852
     public static function getStatusList()
853 853
     {
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.
src/Chamilo/UserBundle/Entity/Repository/UserRepository.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@
 block discarded – undo
25 25
 {
26 26
 
27 27
     /**
28
-    * @param string $keyword
28
+     * @param string $keyword
29 29
      *
30
-    * @return mixed
31
-    */
30
+     * @return mixed
31
+     */
32 32
     public function searchUserByKeyword($keyword)
33 33
     {
34 34
         $qb = $this->createQueryBuilder('a');
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
                         INNER JOIN ChamiloUserBundle:User AS U WITH UF.friendUserId = U
259 259
                         WHERE
260 260
                             U.status != 6 AND
261
-                            UF.relationType NOT IN(" . USER_RELATION_TYPE_DELETED . ", " . USER_RELATION_TYPE_RRHH . ") AND
261
+                            UF.relationType NOT IN(" . USER_RELATION_TYPE_DELETED.", ".USER_RELATION_TYPE_RRHH.") AND
262 262
                             UF.userId = $currentUserId AND
263 263
                             UF.friendUserId != $currentUserId AND
264 264
                             U = R.user AND
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                 $dql = "SELECT DISTINCT U
283 283
                         FROM ChamiloUserBundle:User U
284 284
                         INNER JOIN ChamiloCoreBundle:TrackEOnline T WITH U.id = T.loginUserId
285
-                        WHERE T.loginDate >= '" . $limit_date . "'";
285
+                        WHERE T.loginDate >= '" . $limit_date."'";
286 286
             }
287 287
         }
288 288
 
Please login to merge, or discard this patch.
plugin/formLogin_hide_unhide/plugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 
12 12
 //the plugin title
13
-$plugin_info['title']      = 'Hide/Unhide the Login/Password default form';
13
+$plugin_info['title'] = 'Hide/Unhide the Login/Password default form';
14 14
 
15 15
 //the comments that go with the plugin
16 16
 $plugin_info['comment']     = "If you use another way of authentication than local, you may want to hide the Login/Password default Form to avoid users mistakes. This plugin replace the Login/Password form with a text that unhide the Login/Password form if you click on it.";
@@ -31,4 +31,4 @@  discard block
 block discarded – undo
31 31
 $plugin_info['settings_form'] = $form;
32 32
 
33 33
 //set the templates that are going to be used
34
-$plugin_info['templates']   = array('template.tpl');
34
+$plugin_info['templates'] = array('template.tpl');
Please login to merge, or discard this patch.
plugin/createdrupaluser/src/HookCreateDrupalUser.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
         $data = $hook->getEventData();
30 30
 
31 31
         $drupalDomain = CreateDrupalUser::create()->get('drupal_domain');
32
-        $drupalDomain = rtrim($drupalDomain, '/') . '/';
32
+        $drupalDomain = rtrim($drupalDomain, '/').'/';
33 33
 
34 34
         if ($data['type'] === HOOK_EVENT_TYPE_POST) {
35 35
             $return = $data['return'];
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
             );
51 51
 
52 52
             $options = array(
53
-                'location' => $drupalDomain . 'sites/all/modules/chamilo/soap.php?wsdl',
53
+                'location' => $drupalDomain.'sites/all/modules/chamilo/soap.php?wsdl',
54 54
                 'uri' => $drupalDomain
55 55
             );
56 56
 
Please login to merge, or discard this patch.
plugin/before_login/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
     $form = new FormValidator('form');
36 36
 
37
-    $renderer =& $form->defaultRenderer();
37
+    $renderer = & $form->defaultRenderer();
38 38
     $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
39 39
     $renderersetCustomElementTemplate->setCustomElementTemplate('<tr><td>{element}</td></tr>');
40 40
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     $form2 = new FormValidator('form');
55 55
 
56 56
     if (!empty($option2) && !empty($urlOption2)) {
57
-        $renderer =& $form2->defaultRenderer();
57
+        $renderer = & $form2->defaultRenderer();
58 58
         $renderer->setHeaderTemplate('');
59 59
         $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
60 60
         $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
Please login to merge, or discard this patch.
plugin/before_login/plugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,9 +41,9 @@
 block discarded – undo
41 41
 $defaults['option1_url'] = api_get_plugin_setting('before_login', 'option1_url');
42 42
 $defaults['option2_url'] = api_get_plugin_setting('before_login', 'option2_url');
43 43
 
44
-$plugin_info['templates']   = array('template.tpl');
44
+$plugin_info['templates'] = array('template.tpl');
45 45
 if (file_exists(__DIR__.'/custom.template.tpl')) {
46
-    $plugin_info['templates']   = array( 'custom.template.tpl');
46
+    $plugin_info['templates'] = array('custom.template.tpl');
47 47
 }
48 48
 $form->setDefaults($defaults);
49 49
 
Please login to merge, or discard this patch.