Dev Some Scrutinizer fixes

LimeSurvey · Dec 12, 2017 · f42a959 · f42a959
1 parent e8f8efe
commit f42a959
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 38 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -15,6 +15,7 @@ filter:
         - 'application/libraries/admin/http/*'
         - 'application/libraries/admin/pclzip/*'
         - 'application/extensions/*'
+        - 'application/tests/*'
         - 'application/third_party/*'
         - 'third_party/*'
         - 'installer/*'
@@ -55,6 +56,8 @@ tools:
                 - 'tmp/*'
                 - 'upload/*'
                 - 'tests/*'
+                - 'application/tests/*'
+
 coding_style:
     php:    
         braces:

diff --git a/application/core/LSYii_Validators.php b/application/core/LSYii_Validators.php
@@ -148,7 +148,7 @@ public function xssFilter($value)
                 $aParsedExpressions = $oExpressionManager->Tokenize($sExpression, true);
                 foreach ($aParsedExpressions as $aParsedExpression) {
                     if ($aParsedExpression[2] == 'DQ_STRING') {
-                        $sNewValue .= "\"".$filter->purify($aParsedExpression[0])."\""; // This disallow complex HTML construction with XSS 
+                        $sNewValue .= "\"".(string)$filter->purify($aParsedExpression[0])."\""; // This disallow complex HTML construction with XSS 
                     } elseif ($aParsedExpression[2] == 'SQ_STRING') {
                                             $sNewValue .= "'".$filter->purify($aParsedExpression[0])."'";
                     } else {

diff --git a/application/core/plugins/ExportR/RDataWriter.php b/application/core/plugins/ExportR/RDataWriter.php
@@ -78,31 +78,25 @@ protected function transformResponseValue($value, $fieldType, FormattingOptions
                 }
 
                 if ($value == 'Y') {
-// Yes
+                    // Yes
                     return 1;
                 } elseif ($value === '') {
-// No
+                    // No
                     return 0;
-                } else {
-// Not shown
-                    return $this->na;
                 }
-                break;
+                // Not shown
+                return $this->na;
 
             case 'Y':       // Yes no question
                 if ($value == 'Y') {
                     return 1;
                 } elseif ($value == 'N') {
                     return 2;
-                } else {
-                    // No data, probably a hidden question
-                    return $this->na;
                 }
-                break;
-
+                // No data, probably a hidden question
+                return $this->na;
             default:
                 return $value;
-                break;
         }
         return null;
     }

diff --git a/application/helpers/admin/export/CsvWriter.php b/application/helpers/admin/export/CsvWriter.php
@@ -53,7 +53,7 @@ protected function outputRecord($headers, $values, FormattingOptions $oOptions)
             }
 
             // If we don't want headers in our csv, for example in exports like r/spss etc. we suppress the header by setting this switch in the init
-            if ($this->doHeaders == true) {
+            if ($this->doHeaders === true) {
                 $index = 0;
                 foreach ($headers as $header) {
                     $headers[$index] = $this->csvEscape($header);

diff --git a/application/helpers/database_helper.php b/application/helpers/database_helper.php
@@ -101,15 +101,12 @@ function dbQuoteID($id)
         case "mysqli" :
         case "mysql" :
             return "`".$id."`";
-            break;
         case "dblib":
         case "mssql" :
         case "sqlsrv" :
             return "[".$id."]";
-            break;
         case "pgsql":
             return "\"".$id."\"";
-            break;
         default:
             return $id;
     }

diff --git a/application/helpers/globalsettings_helper.php b/application/helpers/globalsettings_helper.php
@@ -31,9 +31,9 @@ function injectglobalsettings()
 }
 
 /**
- * Undocumented function
+ * Returns a global setting
  *
- * @param [type] $settingname
+ * @param string $settingname
  * @return string
  */
 function getGlobalSetting($settingname)

diff --git a/application/libraries/MenuObjects/Menu.php b/application/libraries/MenuObjects/Menu.php
@@ -11,9 +11,9 @@ class Menu implements MenuInterface
     protected $iconClass = "";
 
     /**
-     * @param array $options - Options for either dropdown menu or plain link
-     * @return ExtraMenu
-     */
+    * @param array $options - Options for either dropdown menu or plain link
+    * @return void
+    */
     public function __construct($options)
     {
         if (isset($options['isDropDown'])) {
@@ -39,17 +39,26 @@ public function __construct($options)
 
     public function isDropDown()
     {
-return $this->isDropDown; }
+        return $this->isDropDown; 
+    }
+
     public function getLabel()
     {
-return $this->label; }
+        return $this->label; 
+    }
+
     public function getHref()
     {
-return $this->href; }
+        return $this->href; 
+    }
+
     public function getMenuItems()
     {
-return $this->menuItems; }
+        return $this->menuItems; 
+    }
+
     public function getIconClass()
     {
-return $this->iconClass; }
+        return $this->iconClass; 
+    }
 }
diff --git a/application/models/Condition.php b/application/models/Condition.php
@@ -116,7 +116,7 @@ public function updateCFieldName($iSurveyID, $iQuestionID, $iOldGroupID, $iNewGr
     {
         $oResults = $this->findAllByAttributes(array('cqid'=>$iQuestionID));
         foreach ($oResults as $oRow) {
-            $cfnregs = '';
+            $cfnregs = [];
             if (preg_match('/(\S*?)'.$iSurveyID."X".$iOldGroupID."X".$iQuestionID."(.*)/", $oRow->cfieldname, $cfnregs) > 0) {
                 $sNewCfn = $cfnregs[1].$iSurveyID."X".$iNewGroupID."X".$iQuestionID.$cfnregs[2];
                 Yii::app()->db->createCommand()

diff --git a/application/models/QuestionGroup.php b/application/models/QuestionGroup.php
@@ -257,7 +257,7 @@ private static function getQuestionIdsInGroup($groupId)
      * @param string[] $order
      * @return mixed
      */
-    function getAllGroups($condition, $order = false)
+    public function getAllGroups($condition, $order = false)
     {
         $command = Yii::app()->db->createCommand()
             ->where($condition)

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -141,7 +141,7 @@
  * @property bool $isShowProgress how progress bar
  * @property bool $isNoKeyboard Show on-screen keyboard
  * @property bool $isAllowEditAfterCompletion Allow multiple responses or update responses with one token
- * 
+ * @property SurveyLanguageSetting $defaultlanguage
  * @method mixed active()
  */
 class Survey extends LSActiveRecord

diff --git a/application/models/SurveyURLParameter.php b/application/models/SurveyURLParameter.php
@@ -68,14 +68,6 @@ public function getParametersForSurvey($iSurveyID)
             ->query();
     }
 
-    /**
-     * @param array $compareToArray
-     */
-    public function compareToArray($compareToArray)
-    {
-
-    }
-
     /**
      * @param array $aConditions
      * @return mixed