TonisOrmisson / yii2-address-form

views/_country-region-row.php

Braces +5 added lines, -2 removed lines

@@ -43,13 +43,16 @@
                 'value' => !is_null($country) ? (new AddressHelper())->formatList($country->getDivisions()) : [],
             ],
         ]);?>
-    <?php else:?>
+    <?php else {
+    :?>
         <?= $form->field($model, 'state')->widget(Select2::class, [
             'data'=>  ArrayHelper::map((new AddressHelper())->formatList($country->getDivisions()),'id', 'name'),
             'options' => [
                 'placeholder' => $widget->placeHolders['state'],
             ],
-        ]);?>
+        ]);
+}
+?>
     <?php endif;?>
     </div>
 </div>

Spacing +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
 use tonisormisson\addressform\AddressHelper;
 use yii\helpers\ArrayHelper;
 
-$country =$widget->getCountry();
+$country = $widget->getCountry();
 $countryDisabled = (count($widget->allowedCountries) < 2 and !empty($widget->allowedCountries));
 ?>
 
@@ -27,12 +27,12 @@ 
             'pluginOptions'=>[
                 'placeholder' => $widget->placeHolders['country'],
             ],
-        ]);?>
-        <?= $countryDisabled ?  $form->field($model, 'country')->hiddenInput(['value'=> $country->getIsoAlpha2()])->label(false) : null ?>
+        ]); ?>
+        <?= $countryDisabled ? $form->field($model, 'country')->hiddenInput(['value'=> $country->getIsoAlpha2()])->label(false) : null ?>
     </div>
 
     <div class="col-sm-6">
-    <?php if(is_null($country)):?>
+    <?php if (is_null($country)):?>
         <?= $form->field($model, 'state')->widget(DepDrop::class, [
             'type'=>DepDrop::TYPE_SELECT2,
             'select2Options'=>['pluginOptions'=>['allowClear'=>true]],
@@ -43,14 +43,14 @@ 
                 'loadingText' => Yii::t("addressform", "Loading") . "...",
                 'value' => !is_null($country) ? (new AddressHelper())->formatList($country->getDivisions()) : [],
             ],
-        ]);?>
+        ]); ?>
     <?php else:?>
         <?= $form->field($model, 'state')->widget(Select2::class, [
-            'data'=>  ArrayHelper::map((new AddressHelper())->formatList($country->getDivisions()),'id', 'name'),
+            'data'=>  ArrayHelper::map((new AddressHelper())->formatList($country->getDivisions()), 'id', 'name'),
             'options' => [
                 'placeholder' => $widget->placeHolders['state'],
             ],
-        ]);?>
-    <?php endif;?>
+        ]); ?>
+    <?php endif; ?>
     </div>
 </div>

views/form.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
             <?= (in_array('postCode', $widget->disabledFields)) ? null: $form->field($model, 'postCode')->textInput(['placeholder'=>$widget->placeHolders['postCode']]) ?>
         </div>
     </div>
-    <?= empty($widget->form) ? Html::submitButton($widget->submitText,$widget->submitOptions) : null?>
+    <?= empty($widget->form) ? Html::submitButton($widget->submitText, $widget->submitOptions) : null?>
 
 <?php (empty($widget->form)) ? ActiveForm::end() : null?>
 <?= Html::endTag("div")?>
\ No newline at end of file

AddressForm.php

Indentation +4 added lines, -4 removed lines

@@ -160,10 +160,10 @@
             $this->address->country = $this->country->getIsoAlpha2();
         }
         if(!empty($this->defaultCountry)) {
-          if(!in_array($this->defaultCountry, $this->allowedCountries) && !empty($this->allowedCountries))  {
-              throw new ErrorException("the set defaultCounty '{$this->defaultCountry}' must be one of the configured allowedCountries");
-          }
-          $this->country = country($this->defaultCountry);
+            if(!in_array($this->defaultCountry, $this->allowedCountries) && !empty($this->allowedCountries))  {
+                throw new ErrorException("the set defaultCounty '{$this->defaultCountry}' must be one of the configured allowedCountries");
+            }
+            $this->country = country($this->defaultCountry);
         }
 
         if (empty($this->submitText)) {

Spacing +5 added lines, -5 removed lines

@@ -100,7 +100,7 @@ 
 
         $countryList = [];
         foreach ($this->countries as $country) {
-            $countryList[$country->getIsoAlpha2()] = $country->getEmoji(). " " . $country->getName();
+            $countryList[$country->getIsoAlpha2()] = $country->getEmoji() . " " . $country->getName();
         }
         return $countryList;
     }
@@ -140,7 +140,7 @@ 
             $params = [];
             if (!empty($this->disabledFields)) {
                 $requiredFields = array_diff(Address::$defaultRequiredFields, $this->disabledFields);
-                $params['requiredFields'] =  $requiredFields;
+                $params['requiredFields'] = $requiredFields;
             }
             $this->address = new Address($params);
         }
@@ -149,8 +149,8 @@ 
             $this->country = country($this->allowedCountries[0]);
             $this->address->country = $this->country->getIsoAlpha2();
         }
-        if(!empty($this->defaultCountry)) {
-          if(!in_array($this->defaultCountry, $this->allowedCountries) && !empty($this->allowedCountries))  {
+        if (!empty($this->defaultCountry)) {
+          if (!in_array($this->defaultCountry, $this->allowedCountries) && !empty($this->allowedCountries)) {
               throw new ErrorException("the set defaultCounty '{$this->defaultCountry}' must be one of the configured allowedCountries");
           }
           $this->country = country($this->defaultCountry);
@@ -182,7 +182,7 @@ 
             'addressLine2' => Yii::t("addressform", "2nd floor, room 203"),
         ];
         foreach ($defaults as $key => $value) {
-            if(!isset($this->placeHolders[$key])) {
+            if (!isset($this->placeHolders[$key])) {
                 $this->placeHolders[$key] = $value;
             }
         }