Completed
Pull Request — 1.10.x (#1225)
by Angel Fernando Quiroz
139:04 queued 100:40
created
src/Chamilo/CoreBundle/Entity/Session.php 2 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -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.
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.
src/Chamilo/CoreBundle/Entity/SessionCategory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
      * Set url
67 67
      *
68 68
      * @param $url
69
-     * @return AccessUrlRelCourse
69
+     * @return SessionCategory
70 70
      */
71 71
     public function setUrl($url)
72 72
     {
Please login to merge, or discard this patch.
src/Chamilo/CourseBundle/Entity/CLpCategory.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,6 @@
 block discarded – undo
96 96
     /**
97 97
      * Set category name
98 98
      *
99
-     * @param string $blogName
100 99
      *
101 100
      * @return CLpCategory
102 101
      */
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
  */
20 20
 class CLpCategory
21 21
 {
22
-  /**
22
+    /**
23 23
      * @var integer
24 24
      *
25 25
      * @ORM\Column(name="iid", type="integer")
Please login to merge, or discard this patch.
src/Chamilo/CourseBundle/Entity/CToolIntro.php 1 patch
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
      * Get id
96 96
      *
97
-     * @return string
97
+     * @return integer
98 98
      */
99 99
     public function getId()
100 100
     {
Please login to merge, or discard this patch.
src/Chamilo/UserBundle/Entity/User.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -928,7 +928,7 @@  discard block
 block discarded – undo
928 928
     /**
929 929
      * Get pictureUri
930 930
      *
931
-     * @return Media
931
+     * @return string
932 932
      */
933 933
     public function getPictureUri()
934 934
     {
@@ -1305,7 +1305,7 @@  discard block
 block discarded – undo
1305 1305
     }
1306 1306
 
1307 1307
     /**
1308
-     * @return Media
1308
+     * @return string
1309 1309
      */
1310 1310
     public function getAvatar()
1311 1311
     {
Please login to merge, or discard this patch.
certificates/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
     case 'export':
16 16
         $hideExportLink = api_get_setting('hide_certificate_export_link');
17 17
         $hideExportLinkStudent = api_get_setting('hide_certificate_export_link_students');
18
-        if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true') ) {
18
+        if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true')) {
19 19
             api_not_allowed(true);
20 20
         }
21 21
 
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             $pageFormat = $pdfParams['orientation'] == 'landscape' ? 'A4-L' : 'A4';
37 37
 
38 38
             $userInfo = api_get_user_info($certificate->user_id);
39
-            $pdfName = api_replace_dangerous_char(get_lang('Certificate') . ' ' . $userInfo['username']);
39
+            $pdfName = api_replace_dangerous_char(get_lang('Certificate').' '.$userInfo['username']);
40 40
 
41 41
             $pdf = new PDF($pageFormat, $pdfParams['orientation'], $pdfParams);
42 42
             $pdf->html_to_pdf($certificatePathList, $pdfName, null, false, false);
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/TinyMce/TinyMce.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
      */
48 48
     public function editorReplace()
49 49
     {
50
-        $toolbar  = new Toolbar\Basic($this->urlGenerator, $this->toolbarSet, $this->config, 'TinyMce');
50
+        $toolbar = new Toolbar\Basic($this->urlGenerator, $this->toolbarSet, $this->config, 'TinyMce');
51 51
         $toolbar->setLanguage($this->getLocale());
52 52
         $config = $toolbar->getConfig();
53 53
         $config['selector'] = "#".$this->name;
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/TinyMce/Toolbar/Basic.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@
 block discarded – undo
22 22
                 "searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking",
23 23
                 "save table contextmenu directionality emoticons template paste textcolor"
24 24
             ),
25
-           'content_css'=> "css/content.css",
26
-           'toolbar' => "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | l      ink image | print preview media fullpage | forecolor backcolor emoticons",
25
+            'content_css'=> "css/content.css",
26
+            'toolbar' => "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | l      ink image | print preview media fullpage | forecolor backcolor emoticons",
27 27
             'file_browser_callback' => 'elFinderBrowser'
28 28
         );
29 29
 
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/Editor/Driver/HomeDriver.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
                 'driver' => 'HomeDriver',
32 32
                 'alias' => get_lang('Portal'),
33 33
                 'path' => $home,
34
-                'URL' => api_get_path(WEB_PATH) . 'home',
34
+                'URL' => api_get_path(WEB_PATH).'home',
35 35
                 'accessControl' => array($this, 'access'),
36 36
             );
37 37
         }
Please login to merge, or discard this patch.