Dev Fixed Scrutinizer issues

LimeSurvey · Dec 11, 2017 · 0cf80e4 · 0cf80e4
1 parent a5ce5c6
commit 0cf80e4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -39,6 +39,7 @@ tools:
                 - 'third_party/*'
                 - 'application/helpers/adodb/*'
                 - 'application/libraries/admin/http/*'
+                - 'application/libraries/admin/Services_JSON.php'
                 - 'application/libraries/admin/pclzip/*'
                 - 'application/extensions/*'
                 - 'application/views/*'

diff --git a/application/controllers/admin/assessments.php b/application/controllers/admin/assessments.php
@@ -80,7 +80,7 @@ public function index($iSurveyID)
      * Renders template(s) wrapped in header and footer
      *
      * @param string $sAction Current action, the folder to fetch views from
-     * @param array $aViewUrls View url(s)
+     * @param array|string $aViewUrls View url(s)
      * @param array $aData Data to be passed on. Optional.
      */
     protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls = array(), $aData = array())

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -246,8 +246,8 @@ public function renderInternal($_viewFile_, $_data_ = null, $_return_ = false)
      * Rendering the subviews and views of _renderWrappedTemplate
      *
      * @param string $sAction
-     * @param array $aViewUrls
-     * @param array|string $aData
+     * @param array|string $aViewUrls
+     * @param array $aData
      * @return string
      */
     private function renderCentralContents($sAction, $aViewUrls, $aData = [])

diff --git a/application/models/ParticipantAttributeName.php b/application/models/ParticipantAttributeName.php
@@ -261,7 +261,7 @@ function getAllAttributesValues()
      * @param mixed $sLanguageFilter
      * @return array
      */
-    function getVisibleAttributes($sLanguageFilter = null)
+    public function getVisibleAttributes($sLanguageFilter = null)
     {
         if ($sLanguageFilter == null) {
             $sLanguageFilter = Yii::app()->session['adminlang'];
@@ -319,7 +319,7 @@ function getVisibleAttributes($sLanguageFilter = null)
      * @param string $participant_id the id of the participant to return values/names for (if empty, returns all)
      * @return array
      */
-    function getParticipantVisibleAttribute($participant_id)
+    public function getParticipantVisibleAttribute($participant_id)
     {
         $output = array();
 
@@ -372,7 +372,7 @@ function getParticipantVisibleAttribute($participant_id)
         }
     }
 
-    function getAttributeValue($participantid, $attributeid)
+    public function getAttributeValue($participantid, $attributeid)
     {
         $data = Yii::app()->db->createCommand()
             ->select('*')
@@ -417,7 +417,7 @@ function getCPDBAttributes()
      * @param int $attribute_id
      * @return array
      */
-    function getAttributesValues($attribute_id = null)
+    public function getAttributesValues($attribute_id = null)
     {
         if (empty($attribute_id)) {
             return array();
@@ -438,7 +438,7 @@ function getAttributesValues($attribute_id = null)
      * @param array $attributeIds
      * @return array
      */
-    function getNotAddedAttributes($attributeIds)
+    public function getNotAddedAttributes($attributeIds)
     {
         $output = array();
         $notin = array();
@@ -475,7 +475,7 @@ function getNotAddedAttributes($attributeIds)
      * @param mixed $data
      * @return bool|int
      */
-    function storeAttribute($data)
+    public function storeAttribute($data)
     {
         // Do not allow more than 60 attributes because queries will break because of too many joins
         if (ParticipantAttributeName::model()->count() > 59) {
@@ -495,7 +495,7 @@ function storeAttribute($data)
         return $iAttributeID;
     }
 
-    function editParticipantAttributeValue($data)
+    public function editParticipantAttributeValue($data)
     {
         $query = ParticipantAttribute::model()
             ->find('participant_id = :participant_id AND attribute_id=:attribute_id',
@@ -520,7 +520,7 @@ function editParticipantAttributeValue($data)
      * @param integer $attid
      * @return void
      */
-    public function delAttribute($attid)
+    public public function delAttribute($attid)
     {
         Yii::app()->db->createCommand()->delete('{{participant_attribute_names_lang}}', 'attribute_id = '.$attid);
         Yii::app()->db->createCommand()->delete('{{participant_attribute_names}}', 'attribute_id = '.$attid);
@@ -558,7 +558,7 @@ public function getAttributeNames($attributeid)
      * @param string $lang
      * @return ParticipantAttributeNameLang
      */
-    function getAttributeName($attributeid, $lang = 'en')
+    public function getAttributeName($attributeid, $lang = 'en')
     {
         return Yii::app()->db->createCommand()
             ->select('*')
@@ -576,7 +576,7 @@ function getAttributeName($attributeid, $lang = 'en')
      * @return ParticipantAttributeName
      * TODO: Tonis: this is a bad name for this method - it overrides parent method doing totally different thing
      */
-    function getAttribute($attribute_id)
+    public function getAttribute($attribute_id)
     {
         $data = Yii::app()->db->createCommand()
             ->select('*')
@@ -619,7 +619,7 @@ function saveAttribute($data)
      * @todo Doc
      * @param array $data
      */
-    function saveAttributeLanguages($data)
+    public function saveAttributeLanguages($data)
     {
         $query = Yii::app()->db
             ->createCommand()
@@ -650,7 +650,7 @@ function saveAttributeLanguages($data)
     /**
      * @param array $data
      */
-    public function storeAttributeValues($data)
+    public public function storeAttributeValues($data)
     {
         foreach ($data as $record) {
             Yii::app()->db->createCommand()->insert('{{participant_attribute_values}}', $record);