enigmatix / yii2-confirmation

ConfirmationBehavior.php

Braces +33 added lines, -22 removed lines

@@ -106,8 +106,9 @@ 
 
         foreach ($changedValues as $attribute => $value) {
 
-            if ($this->skipOnNull && $value === null || $attribute == $this->timestampAttribute)
-                continue;
+            if ($this->skipOnNull && $value === null || $attribute == $this->timestampAttribute) {
+                            continue;
+            }
 
             if(!$this->isAuthorised($user, $attribute, $value)){
                 $this->createConfirmationRequest();
@@ -127,15 +128,17 @@ 
     protected function isAuthorised($user, $attribute, $value){
 
         //Check for pre-defined administration roles
-        if ($this->userIsAuthorised($user))
-            return true;
+        if ($this->userIsAuthorised($user)) {
+                    return true;
+        }
 
         //Check for valid release token , eg that the token exists and is for the same record as this
         if($this->releaseToken != null){
             $confirmation =  ConfirmationRequest::findOne(['release_token' => $this->releaseToken]);
 
-            if($confirmation == null)
-                return false;
+            if($confirmation == null) {
+                            return false;
+            }
 
             $model = $confirmation->constructObject();
 
@@ -144,9 +147,10 @@ 
         }
 
         //Check to see if any protected attributes have been altered
-        foreach ($this->protectedAttributes as $attribute)
-            if($this->hasChanged($attribute))
+        foreach ($this->protectedAttributes as $attribute) {
+                    if($this->hasChanged($attribute))
                 return false;
+        }
 
         return true;
     }
@@ -158,9 +162,10 @@ 
      * @return bool
      */
     protected function userIsAuthorised($user){
-        foreach ($this->allow as $role)
-            if($user->can($role))
+        foreach ($this->allow as $role) {
+                    if($user->can($role))
                 return true;
+        }
 
         return false;
     }
@@ -204,9 +209,10 @@ 
     public function getChangedValues(){
         $changedAttributes = [];
 
-        foreach ($this->owner->attributes() as $attribute)
-            if($this->hasChanged($attribute))
+        foreach ($this->owner->attributes() as $attribute) {
+                    if($this->hasChanged($attribute))
                 $changedAttributes[$attribute] = $this->owner->$attribute;
+        }
 
         unset($changedAttributes[$this->timestampAttribute]);
 
@@ -271,20 +277,25 @@ 
         $email  = ArrayHelper::getValue($values,'email');
         $object = $model->constructObject();
 
-        if($email == null)
-            $email = ArrayHelper::getValue($values,'email_address');
+        if($email == null) {
+                    $email = ArrayHelper::getValue($values,'email_address');
+        }
 
-        if($email == null)
-            $email = ArrayHelper::getValue($object,'email');
+        if($email == null) {
+                    $email = ArrayHelper::getValue($object,'email');
+        }
 
-        if($email == null)
-            $email = ArrayHelper::getValue($object,'email_address');
+        if($email == null) {
+                    $email = ArrayHelper::getValue($object,'email_address');
+        }
 
-        if($email == null)
-            $email = ArrayHelper::getValue($object,$this->createdByAttribute.'.email');
+        if($email == null) {
+                    $email = ArrayHelper::getValue($object,$this->createdByAttribute.'.email');
+        }
 
-        if($email == null)
-            throw new InvalidCallException("Unable to locate email address via record, changed values, or user account");
+        if($email == null) {
+                    throw new InvalidCallException("Unable to locate email address via record, changed values, or user account");
+        }
 
         return $email;
     }

ConfirmationRequest.php

Braces +3 added lines, -2 removed lines

@@ -126,9 +126,10 @@
 
         foreach ($changedValues as $field => $value){
             $oldValue = $model->oldAttributes[$field];
-            if($current->$field !== $oldValue && $current->$field !== $value)
-                throw new ErrorException("Unable to release change, protected field $field has been updated since this request."
+            if($current->$field !== $oldValue && $current->$field !== $value) {
+                            throw new ErrorException("Unable to release change, protected field $field has been updated since this request."
                 . " Expected to find $value or $oldValue, found " . $current->$field);
+            }
 
         }