Dev: Code inspection app/models Return type incompatible (#819)

LimeSurvey · Oct 9, 2017 · d139237 · d139237
1 parent 703da1d
commit d139237
Show file tree

Hide file tree

Showing 42 changed files with 131 additions and 54 deletions.
diff --git a/application/models/Answer.php b/application/models/Answer.php
@@ -33,7 +33,9 @@ class Answer extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/Assessment.php b/application/models/Assessment.php
@@ -34,7 +34,9 @@ class Assessment extends LSActiveRecord
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/Boxes.php b/application/models/Boxes.php
@@ -221,6 +221,8 @@ public function getIcons_length()
      */
     public static function model($className=__CLASS__)
     {
-        return parent::model($className);
+        /** @var self $model */
+        $model =parent::model($className);
+        return $model;
     }
 }
diff --git a/application/models/Condition.php b/application/models/Condition.php
@@ -36,7 +36,9 @@ class Condition extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /**
@@ -302,7 +304,7 @@ public function getConditionCountToken($qid, Condition $scenarionr)
     /**
      * @param int $qid
      * @param Condition $scenarionr
-     * @return array
+     * @return CDbDataReader
      */
     public function getConditionsToken($qid, Condition $scenarionr)
     {

diff --git a/application/models/DefaultValue.php b/application/models/DefaultValue.php
@@ -37,7 +37,9 @@ class DefaultValue extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/Dynamic.php b/application/models/Dynamic.php
@@ -33,7 +33,9 @@ public static function model($className = null) {
         elseif (is_numeric($className)) {
             $className = get_called_class() . '_' . $className;
         }
-        return parent::model($className);
+        /** @var self $model */
+        $model =parent::model($className);
+        return $model;
     }
 
     /**

diff --git a/application/models/ExpressionError.php b/application/models/ExpressionError.php
@@ -35,7 +35,9 @@ class ExpressionError extends LSActiveRecord
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/FailedLoginAttempt.php b/application/models/FailedLoginAttempt.php
@@ -28,7 +28,9 @@ class FailedLoginAttempt extends LSActiveRecord
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/Label.php b/application/models/Label.php
@@ -48,7 +48,9 @@ public function primaryKey()
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/LabelSet.php b/application/models/LabelSet.php
@@ -40,7 +40,9 @@ public function primaryKey()
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/Notification.php b/application/models/Notification.php
@@ -257,7 +257,9 @@ public static function getUpdateUrl($surveyId = null) {
 	 */
 	public static function model($className=__CLASS__)
 	{
-		return parent::model($className);
+        /** @var self $model */
+        $model =parent::model($className);
+        return $model;
 	}
 
     /**

diff --git a/application/models/Participant.php b/application/models/Participant.php
@@ -59,7 +59,9 @@ class Participant extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/ParticipantAttribute.php b/application/models/ParticipantAttribute.php
@@ -33,7 +33,9 @@ class ParticipantAttribute extends LSActiveRecord
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/ParticipantAttributeName.php b/application/models/ParticipantAttributeName.php
@@ -37,7 +37,9 @@ public function primaryKey() {
      * @return ParticipantAttributeName
      */
     public static function model($class = __CLASS__) {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/ParticipantAttributeNameLang.php b/application/models/ParticipantAttributeNameLang.php
@@ -36,7 +36,9 @@ public function primaryKey()
      */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/ParticipantShare.php b/application/models/ParticipantShare.php
@@ -36,7 +36,9 @@ class ParticipantShare extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/Permission.php b/application/models/Permission.php
@@ -46,7 +46,9 @@ public function tableName()
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /**
@@ -704,6 +706,6 @@ protected function getOwnerId($iEntityID, $sEntityName)
         if($sEntityName=='survey') {
             return $sEntityName::Model()->findByPk($iEntityID)->owner_id; // ALternative : if owner_id exist in $sEntityName::model()->findByPk($iEntityID), but unsure actually $sEntityName have always a model
         }
-        return;
+        return null;
     }
 }
diff --git a/application/models/Plugin.php b/application/models/Plugin.php
@@ -29,7 +29,9 @@ class Plugin extends CActiveRecord {
      * @return Plugin
      */
     public static function model($className = __CLASS__) {
-        return parent::model($className);
+        /** @var self $model */
+        $model =parent::model($className);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/PluginSetting.php b/application/models/PluginSetting.php
@@ -30,7 +30,9 @@ class PluginSetting extends CActiveRecord {
      * @return PluginSetting
      */
     public static function model($className = __CLASS__) {
-        return parent::model($className);
+        /** @var self $model */
+        $model =parent::model($className);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -55,7 +55,9 @@ class Question extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/QuestionAttribute.php b/application/models/QuestionAttribute.php
@@ -31,7 +31,9 @@ class QuestionAttribute extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */
@@ -150,7 +152,7 @@ public function setMultiple($iSid, $aQidsAndLang, $aAttributesToUpdate, $aValidQ
      * @access public
      * @param int $iQuestionID
      * @param string $sLanguage restrict to this language (@todo : add it in qanda)
-     * @return array
+     * @return array|boolean
      * @throws CException
      */
     public function getQuestionAttributes($iQuestionID,$sLanguage=null)

diff --git a/application/models/QuestionGroup.php b/application/models/QuestionGroup.php
@@ -37,7 +37,9 @@ class QuestionGroup extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/QuotaLanguageSetting.php b/application/models/QuotaLanguageSetting.php
@@ -32,7 +32,9 @@ class QuotaLanguageSetting extends LSActiveRecord
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+		/** @var QuotaLanguageSetting $model */
+	    $model = parent::model($class);
+	    return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/QuotaMember.php b/application/models/QuotaMember.php
@@ -35,7 +35,9 @@ class QuotaMember extends LSActiveRecord
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/Response.php b/application/models/Response.php
@@ -20,7 +20,9 @@ public function beforeDelete() {
          * @return Response
          */
         public static function model($className = null) {
-            return parent::model($className);
+            /** @var self $model */
+            $model =parent::model($className);
+            return $model;
         }
         /**
          *

diff --git a/application/models/Session.php b/application/models/Session.php
@@ -28,7 +28,9 @@ class Session extends CActiveRecord
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/SettingsUser.php b/application/models/SettingsUser.php
@@ -102,6 +102,8 @@ public function search()
 	 */
 	public static function model($className=__CLASS__)
 	{
-		return parent::model($className);
+        /** @var self $model */
+        $model =parent::model($className);
+        return $model;
 	}
 }
diff --git a/application/models/SurveyDynamic.php b/application/models/SurveyDynamic.php
@@ -48,6 +48,7 @@ public static function model($sid = NULL)
             $refresh = true;
         }
 
+        /** @var self $model */
         $model = parent::model(__CLASS__);
 
         //We need to refresh if we changed sid
@@ -695,20 +696,18 @@ protected function filterColumns(CDbCriteria $criteria)
      * @param boolean $bHonorConditions
      * @param boolean $subquestion
      * @param boolean $getComment
-     * @return array
+     * @return array | boolean
      */
     public function getQuestionArray($oQuestion, $oResponses, $bHonorConditions, $subquestion=false, $getComment=false){
         $attributes = QuestionAttribute::model()->getQuestionAttributes($oQuestion->qid);
 
-        if (!(LimeExpressionManager::QuestionIsRelevant($oQuestion->qid) || $bHonorConditions==false) && $attributes['hidden'] === 1)
-        {
+        if (!(LimeExpressionManager::QuestionIsRelevant($oQuestion->qid) || $bHonorConditions==false) && $attributes['hidden'] === 1) {
             return false;
         }
 
         $aQuestionAttributes = $oQuestion->attributes;
 
-        if(count($oQuestion->subquestions) > 0)
-        {
+        if(count($oQuestion->subquestions) > 0) {
             $aQuestionAttributes['subquestions'] = array();
             foreach($oQuestion->subquestions as $oSubquestion){
                 //dont collect scale_id > 0

diff --git a/application/models/SurveyLanguageSetting.php b/application/models/SurveyLanguageSetting.php
@@ -64,7 +64,9 @@ public function primaryKey()
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */

diff --git a/application/models/SurveyLink.php b/application/models/SurveyLink.php
@@ -41,7 +41,9 @@ class SurveyLink extends LSActiveRecord
 	 */
 	public static function model($class = __CLASS__)
 	{
-		return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
 	}
 
     /** @inheritdoc */

diff --git a/application/models/SurveyTimingDynamic.php b/application/models/SurveyTimingDynamic.php
@@ -37,7 +37,8 @@ public static function model($sid = NULL)
             self::$survey = $survey;
             $refresh = true;
         }
-
+
+        /** @var self $model */
         $model = parent::model(__CLASS__);
 
         //We need to refresh if we changed sid

diff --git a/application/models/SurveyURLParameter.php b/application/models/SurveyURLParameter.php
@@ -28,7 +28,9 @@ class SurveyURLParameter extends LSActiveRecord {
      */
     public static function model($class = __CLASS__)
     {
-        return parent::model($class);
+        /** @var self $model */
+        $model =parent::model($class);
+        return $model;
     }
 
     /** @inheritdoc */