TonisOrmisson / yii2-survey-base-models

src/Rejection.php

Spacing +17 added lines, -17 removed lines

@@ -41,7 +41,7 @@ 
     {
         return array_merge([
             [['survey_id', 'respondent_id'], 'integer'],
-            [['email_address','time_rejected'], 'required'],
+            [['email_address', 'time_rejected'], 'required'],
             [['bounce'], 'string'],
             [['time_rejected'], 'safe'],
             [['email_address'], 'string', 'max' => 255],
@@ -49,7 +49,7 @@ 
             [['type'], 'string', 'max' => 45],
             [['respondent_id'], 'exist', 'skipOnError' => true, 'targetClass' => Respondent::class, 'targetAttribute' => ['respondent_id' => 'respondent_id']],
             [['survey_id'], 'exist', 'skipOnError' => true, 'targetClass' => Survey::class, 'targetAttribute' => ['survey_id' => 'survey_id']],
-        ],  parent::rules());
+        ], parent::rules());
     }
 
 
@@ -57,9 +57,9 @@ 
      * @param string $email_address
      * @return bool
      */
-    public static function hasBouncedHard($email_address){
+    public static function hasBouncedHard($email_address) {
         $rejection = Rejection::findByEmail($email_address);
-        if($rejection){
+        if ($rejection) {
             return true;
         }
         return false;
@@ -71,7 +71,7 @@ 
      * @param string $email_address
      * @return Rejection[]
      */
-    public static function findHardBounces($email_address){
+    public static function findHardBounces($email_address) {
         return Rejection::find()
             ->andWhere(['email_address'=>$email_address])
 
@@ -84,13 +84,13 @@ 
      * @param string $code
      * @return bool
      */
-    public static function rejectedByCode($code){
+    public static function rejectedByCode($code) {
         $respondent = Respondent::findByToken($code);
-        if($respondent){
+        if ($respondent) {
             $rejections = self::find()
                 ->andWhere(['respondent_id'=>$respondent->primaryKey])
                 ->all();
-            if($rejections){
+            if ($rejections) {
                 return true;
             }
         }
@@ -103,12 +103,12 @@ 
      * @param string $type
      * @return bool
      */
-    public static function bouncedByEmailAddress($email_address,$type = self::BOUNCE_TYPE_HARD){
+    public static function bouncedByEmailAddress($email_address, $type = self::BOUNCE_TYPE_HARD) {
         $rejections = self::find()
             ->andWhere('email_address=:email_address', [':email_address' => $email_address])
             ->andWhere('type=:type', [':type' => $type])
             ->all();
-        if($rejections){
+        if ($rejections) {
             return true;
         }
         return false;
@@ -118,7 +118,7 @@ 
      * @param string $email_address
      * @return Rejection
      */
-    public static function findByEmail($email_address){
+    public static function findByEmail($email_address) {
         return Rejection::findOne(['email_address'=>$email_address]);
     }
 
@@ -138,13 +138,13 @@ 
         return $this->hasOne(Respondent::class, ['respondent_id' => 'respondent_id']);
     }
 
-    public static function getBounceTypes(){
+    public static function getBounceTypes() {
         return [
-            self::BOUNCE_TYPE_COMPLAINT => Yii::t('app','Complaint'),
-            self::BOUNCE_TYPE_SOFT => Yii::t('app','Soft bounce'),
-            self::BOUNCE_TYPE_HARD => Yii::t('app','Hard bounce'),
-            self::BOUNCE_TYPE_ANSWERED => Yii::t('app','Respondent has answered already'),
-            self::BOUNCE_TYPE_OTHER => Yii::t('app','Other'),
+            self::BOUNCE_TYPE_COMPLAINT => Yii::t('app', 'Complaint'),
+            self::BOUNCE_TYPE_SOFT => Yii::t('app', 'Soft bounce'),
+            self::BOUNCE_TYPE_HARD => Yii::t('app', 'Hard bounce'),
+            self::BOUNCE_TYPE_ANSWERED => Yii::t('app', 'Respondent has answered already'),
+            self::BOUNCE_TYPE_OTHER => Yii::t('app', 'Other'),
         ];
     }
 }

src/migrations/m170302_104953_create_rejections.php

Spacing +6 added lines, -6 removed lines

@@ -4,7 +4,7 @@ 
 
 class m170302_104953_create_rejections extends Migration
 {
-    private $tableName ='rejection';
+    private $tableName = 'rejection';
 
 
     public function safeUp()
@@ -21,17 +21,17 @@ 
                 'time_rejected' => $this->dateTime()->notNull()->comment('Rejection time'),
             ]);
 
-            $this->addForeignKey('fk_rejection_survey_id',$this->tableName,'survey_id','survey','survey_id');
-            $this->addForeignKey('fk_rejection_respondent_id','rejection','respondent_id','respondent','respondent_id');
+            $this->addForeignKey('fk_rejection_survey_id', $this->tableName, 'survey_id', 'survey', 'survey_id');
+            $this->addForeignKey('fk_rejection_respondent_id', 'rejection', 'respondent_id', 'respondent', 'respondent_id');
         }
 
     }
 
     public function safeDown()
     {
-        $this->dropForeignKey('fk_rejection_survey_id',$this->tableName);
-        $this->dropForeignKey('fk_rejection_email_id',$this->tableName);
-        $this->dropForeignKey('fk_rejection_respondent_id',$this->tableName);
+        $this->dropForeignKey('fk_rejection_survey_id', $this->tableName);
+        $this->dropForeignKey('fk_rejection_email_id', $this->tableName);
+        $this->dropForeignKey('fk_rejection_respondent_id', $this->tableName);
         $this->dropTable($this->tableName);
     }
 }

src/migrations/m170329_072118_remove_response_code_from_rejection.php

Spacing +2 added lines, -2 removed lines

@@ -6,12 +6,12 @@
 {
     public function safeUp()
     {
-        $this->dropColumn('rejection','response_code');
+        $this->dropColumn('rejection', 'response_code');
     }
 
     public function safeDown()
     {
-        $this->addColumn('rejection','response_code',$this->integer(4)->after('type')
+        $this->addColumn('rejection', 'response_code', $this->integer(4)->after('type')
             ->comment('Email response code in case of bounce'));
     }
 }

src/migrations/m170327_130608_rename_rejection_type.php

Spacing +2 added lines, -2 removed lines

@@ -6,11 +6,11 @@
 {
     public function safeUp()
     {
-        $this->renameColumn('rejection','bounce_type','type');
+        $this->renameColumn('rejection', 'bounce_type', 'type');
     }
 
     public function safeDown()
     {
-        $this->renameColumn('rejection','type','bounce_type');
+        $this->renameColumn('rejection', 'type', 'bounce_type');
     }
 }

src/SurveyHasStatus.php

Spacing +6 added lines, -6 removed lines

@@ -38,12 +38,12 @@ 
      * @param string $status if not set Status will be taken from Email
      * @return boolean
      */
-    public static function create($survey,$status = null){
+    public static function create($survey, $status = null) {
         $model = new static();
         $model->survey_id = $survey->primaryKey;
-        $model->status =$survey->status;
-        if($status){
-            $model->status =$status;
+        $model->status = $survey->status;
+        if ($status) {
+            $model->status = $status;
         }
         return $model->save();
     }
@@ -54,9 +54,9 @@ 
     public function rules()
     {
         return array_merge([
-            [['survey_id','status'], 'required'],
+            [['survey_id', 'status'], 'required'],
             [['status'], 'string', 'max' => 32],
             [['survey_id'], 'integer'],
-        ],  parent::rules());
+        ], parent::rules());
     }
 }

src/Rating.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
      */
     public static function modelName()
     {
-        return Yii::t('app','Rating');
+        return Yii::t('app', 'Rating');
     }
 
      
@@ -49,7 +49,7 @@ 
             [['respondent_id', 'survey_id', 'sample_id', 'value'], 'integer'],
             [['comment'], 'string'],
             [['respondent_id'], 'exist', 'skipOnError' => true, 'targetClass' => Respondent::class, 'targetAttribute' => ['respondent_id' => 'respondent_id']],
-        ],  parent::rules());
+        ], parent::rules());
     }
 
     /**

src/Survey.php

Spacing +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@ 
     public function rules()
     {
         return array_merge([
-            [['name','status'], 'required'],
+            [['name', 'status'], 'required'],
             [['name', 'status'], 'string', 'max' => 255],
-            [['name'], 'string','max' => 500],
-            [['options'], 'string','max' => 1024 * 10],
+            [['name'], 'string', 'max' => 500],
+            [['options'], 'string', 'max' => 1024 * 10],
         ], parent::rules());
     }
 
@@ -64,7 +64,7 @@ 
     /**
      * @return mixed
      */
-    public function getOptionsDecoded(){
+    public function getOptionsDecoded() {
         return json_decode($this->options);
     }
 

src/Respondent.php

Indentation +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
                 if ($i >= static::MAX_ALTERNATIVE_CONTACTS) {
                     $this->addError($attribute, Yii::t('app', 'Maximum alternative phone numbers limit ({0}) reached for {1}', [static::MAX_ALTERNATIVE_CONTACTS, $this->phone_number]));
                 }
-               $this->validatePhoneNumber($attribute, $item);
+                $this->validatePhoneNumber($attribute, $item);
             }
         }
         $this->alternative_phone_numbers = yii\helpers\Json::encode($cleanItems);

Spacing +8 added lines, -8 removed lines

@@ -98,7 +98,7 @@ 
             $this->addError($attribute,
                 Yii::t('app',
                     'Invalid email address "{0}"', [$address]
-                ) . ' ' . Yii::t('app', 'Reason: {0}', [Yii::t('app', 'Invalid email format')])
+                ).' '.Yii::t('app', 'Reason: {0}', [Yii::t('app', 'Invalid email format')])
             );
             return false;
         }
@@ -111,7 +111,7 @@ 
      */
     private function isSameAsMainAddress($attribute, $address)
     {
-        if (empty($address) | $attribute == 'email_address' ) {
+        if (empty($address) | $attribute == 'email_address') {
             return false;
         }
 
@@ -119,7 +119,7 @@ 
             $this->addError($attribute,
                 Yii::t('app',
                     'Email address same as main addrress "{0}"', [$address]
-                ) . ' ' . Yii::t('app', 'Reason: {0}', [Yii::t('app', $attribute . ' duplicates main address')])
+                ).' '.Yii::t('app', 'Reason: {0}', [Yii::t('app', $attribute.' duplicates main address')])
             );
             return false;
         }
@@ -217,7 +217,7 @@ 
             $this->addError($attribute,
                 Yii::t('app',
                     'Invalid phone number "{0}"', [$number]
-                ) . ' ' . Yii::t('app', 'Reason: {0}', [Yii::t('app', $attribute . ' duplicates main phone number')])
+                ).' '.Yii::t('app', 'Reason: {0}', [Yii::t('app', $attribute.' duplicates main phone number')])
             );
         }
         return null;
@@ -244,13 +244,13 @@ 
             '`alternative_phone_numbers` LIKE :phone_number2',
         ];
 
-        $query->andWhere($condition, [':phone_number' => $phone_number, ':phone_number2' => '%\"' . $phone_number . '\"%']);
+        $query->andWhere($condition, [':phone_number' => $phone_number, ':phone_number2' => '%\"'.$phone_number.'\"%']);
 
         if ($query->count() > 0) {
             $this->addError($attribute,
                 Yii::t('app',
                     'Invalid phone number "{0}"', [$phone_number]
-                ) . ' ' . Yii::t('app', 'Reason: {0}', [Yii::t('app', 'Duplicate phone number')])
+                ).' '.Yii::t('app', 'Reason: {0}', [Yii::t('app', 'Duplicate phone number')])
             );
             echo $phone_number;
             die;
@@ -279,13 +279,13 @@ 
             '`alternative_email_addresses` LIKE :email_address2',
         ];
 
-        $query->andWhere($email_condition, [':email_address' => $email_address, ':email_address2' => '%\"' . $email_address . '\"%']);
+        $query->andWhere($email_condition, [':email_address' => $email_address, ':email_address2' => '%\"'.$email_address.'\"%']);
 
         if ($query->count() > 0) {
             $this->addError($attribute,
                 Yii::t('app',
                     'Invalid email address "{0}"', [$email_address]
-                ) . ' ' . Yii::t('app', 'Reason: {0}', [Yii::t('app', 'Duplicates some other address')])
+                ).' '.Yii::t('app', 'Reason: {0}', [Yii::t('app', 'Duplicates some other address')])
             );
             return true;
         }