refactor: ECS code cleanup

Author: khalwat

src/Units.php

@@ -10,23 +10,23 @@
 
 namespace nystudio107\units;
 
-use nystudio107\units\fields\Units as UnitsField;
-use nystudio107\units\helpers\ClassHelper;
-use nystudio107\units\models\Settings;
-use nystudio107\units\variables\UnitsVariable;
-
 use Craft;
 use craft\base\Plugin;
 use craft\events\PluginEvent;
 use craft\events\RegisterComponentTypesEvent;
+
 use craft\services\Fields;
 use craft\services\Plugins;
 use craft\web\twig\variables\CraftVariable;
-
-use yii\base\Event;
+use nystudio107\units\fields\Units as UnitsField;
+use nystudio107\units\helpers\ClassHelper;
+use nystudio107\units\models\Settings;
+use nystudio107\units\variables\UnitsVariable;
 
 use PhpUnitsOfMeasure\PhysicalQuantity\Length;
 
+use yii\base\Event;
+
 /**
  * Class Units
  *
@@ -71,7 +71,7 @@ public function init()
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = UnitsField::class;
             }
         );
@@ -80,7 +80,7 @@ function (RegisterComponentTypesEvent $event) {
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('units', self::$variable);
@@ -90,7 +90,7 @@ function (Event $event) {
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                 }
             }
@@ -99,11 +99,11 @@ function (PluginEvent $event) {
         Event::on(
             UnitsField::class,
             'craftQlGetFieldSchema',
-            function ($event) {
+            function($event) {
                 $field = $event->sender;
 
                 if (!$field instanceof UnitsField) {
-                  return;
+                    return;
                 }
 
                 $object = $event->schema->createObjectType(ucfirst($field->handle) . 'Units');

src/assetbundles/units/UnitsAsset.php

@@ -10,7 +10,6 @@
 
 namespace nystudio107\units\assetbundles\units;
 
-use Craft;
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 

src/assetbundles/unitsfield/UnitsFieldAsset.php

@@ -10,7 +10,6 @@
 
 namespace nystudio107\units\assetbundles\unitsfield;
 
-use Craft;
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 

src/controllers/UnitsController.php

@@ -10,10 +10,10 @@
 
 namespace nystudio107\units\controllers;
 
-use nystudio107\units\Units;
-
 use craft\web\Controller;
 
+use nystudio107\units\Units;
+
 use yii\web\Response;
 
 /**

src/fields/Units.php

@@ -11,26 +11,25 @@
 
 namespace nystudio107\units\fields;
 
-use nystudio107\units\assetbundles\unitsfield\UnitsFieldAsset;
-
-use nystudio107\units\helpers\ClassHelper;
-use nystudio107\units\models\Settings;
-use nystudio107\units\models\UnitsData;
-use nystudio107\units\Units as UnitsPlugin;
-use nystudio107\units\validators\EmbeddedUnitsDataValidator;
-
 use Craft;
+
 use craft\base\ElementInterface;
 use craft\base\Field;
 use craft\base\PreviewableFieldInterface;
 use craft\helpers\Json;
 use craft\i18n\Locale;
 
-use yii\base\InvalidConfigException;
+use nystudio107\units\assetbundles\unitsfield\UnitsFieldAsset;
+use nystudio107\units\helpers\ClassHelper;
+use nystudio107\units\models\Settings;
+use nystudio107\units\models\UnitsData;
+use nystudio107\units\Units as UnitsPlugin;
+use nystudio107\units\validators\EmbeddedUnitsDataValidator;
 
-use PhpUnitsOfMeasure\AbstractPhysicalQuantity;
 use PhpUnitsOfMeasure\PhysicalQuantity\Length;
 
+use yii\base\InvalidConfigException;
+
 /**
  * @author    nystudio107
  * @package   Units
@@ -178,7 +177,7 @@ public function normalizeValue($value, ElementInterface $element = null)
         if (!$unitsData->validate()) {
             Craft::error(
                 Craft::t('units', 'UnitsData failed validation: ')
-                .print_r($unitsData->getErrors(), true),
+                . print_r($unitsData->getErrors(), true),
                 __METHOD__
             );
         }
@@ -235,7 +234,7 @@ public function getInputHtml($value, ElementInterface $element = null): string
                 'prefix' => Craft::$app->getView()->namespaceInputId(''),
             ];
             $jsonVars = Json::encode($jsonVars);
-            Craft::$app->getView()->registerJs("$('#{$namespacedId}-field').UnitsUnits(".$jsonVars.");");
+            Craft::$app->getView()->registerJs("$('#{$namespacedId}-field').UnitsUnits(" . $jsonVars . ");");
 
             // Render the input template
             return Craft::$app->getView()->renderTemplate(

src/helpers/ClassHelper.php

@@ -52,4 +52,4 @@ public static function getClassesInNamespace(string $className): array
 
         return $result;
     }
-}
+}

src/models/Settings.php

@@ -10,10 +10,10 @@
 
 namespace nystudio107\units\models;
 
-use PhpUnitsOfMeasure\PhysicalQuantity\Length;
-
 use craft\base\Model;
 
+use PhpUnitsOfMeasure\PhysicalQuantity\Length;
+
 /**
  * @author    nystudio107
  * @package   Units
@@ -77,7 +77,7 @@ public function rules(): array
             ['defaultUnitsClass', 'string'],
             ['defaultUnitsClass', 'default', 'value' => Length::class],
             ['defaultValue', 'number'],
-            ['defaultValue', 'default', 'value' =>  0.0],
+            ['defaultValue', 'default', 'value' => 0.0],
             ['defaultUnits', 'string'],
             ['defaultUnits', 'default', 'value' => 'ft'],
             ['defaultChangeableUnits', 'boolean'],
@@ -87,7 +87,7 @@ public function rules(): array
                 ['defaultMax'],
                 'compare',
                 'compareAttribute' => 'defaultMin',
-                'operator' => '>='
+                'operator' => '>=',
             ],
             ['defaultMin', 'default', 'value' => 0],
             ['defaultMax', 'default', 'value' => null],

src/models/UnitsData.php

@@ -11,16 +11,16 @@
 
 namespace nystudio107\units\models;
 
-use nystudio107\units\Units;
-
 use craft\base\Model;
 
-use yii\base\InvalidArgumentException;
+use nystudio107\units\Units;
 
-use PhpUnitsOfMeasure\UnitOfMeasure;
-use PhpUnitsOfMeasure\UnitOfMeasureInterface;
 use PhpUnitsOfMeasure\AbstractPhysicalQuantity;
+
 use PhpUnitsOfMeasure\PhysicalQuantityInterface;
+use PhpUnitsOfMeasure\UnitOfMeasure;
+use PhpUnitsOfMeasure\UnitOfMeasureInterface;
+use yii\base\InvalidArgumentException;
 
 /**
  * @author    nystudio107

src/translations/en/units.php

@@ -34,5 +34,5 @@
     'UnitsData failed validation: ' => 'UnitsData failed validation: ',
     'Default Decimal Points' => 'Default Decimal Points',
     'Default Units' => 'Default Units',
-    'Default settings for newly created Units fields' => 'Default settings for newly created Units fields'
+    'Default settings for newly created Units fields' => 'Default settings for newly created Units fields',
 ];

src/validators/EmbeddedUnitsDataValidator.php

@@ -11,13 +11,13 @@
 
 namespace nystudio107\units\validators;
 
-use nystudio107\units\models\UnitsData;
-
 use Craft;
 
+use nystudio107\units\models\UnitsData;
+
 use yii\base\Model;
-use yii\validators\Validator;
 use yii\validators\NumberValidator;
+use yii\validators\Validator;
 
 /**
  * @author    nystudio107
@@ -105,7 +105,7 @@ protected function normalizeMinMax(UnitsData $unitsData)
     {
         $config = [
             'unitsClass' => $unitsData->unitsClass,
-            'units' => $this->units
+            'units' => $this->units,
         ];
         // Normalize the min
         if (!empty($this->min)) {

src/variables/UnitsVariable.php

@@ -14,7 +14,6 @@
 use nystudio107\units\models\UnitsData;
 
 use PhpUnitsOfMeasure\AbstractPhysicalQuantity;
-use PhpUnitsOfMeasure\PhysicalQuantityInterface;
 use PhpUnitsOfMeasure\PhysicalQuantity\Acceleration;
 use PhpUnitsOfMeasure\PhysicalQuantity\Angle;
 use PhpUnitsOfMeasure\PhysicalQuantity\Area;
@@ -87,7 +86,7 @@ public function __call($method, $args): UnitsData
         if (isset($this->unitsClassMap[$unitsClassKey])) {
             list($value, $units) = $args;
             $config = [
-                'unitsClass' =>$this->unitsClassMap[$unitsClassKey],
+                'unitsClass' => $this->unitsClassMap[$unitsClassKey],
                 'value' => $value,
                 'units' => $units,
             ];
@@ -109,7 +108,7 @@ public function fraction(float $value): string
     {
         list($whole, $decimal) = $this->float2parts($value);
 
-        return $whole.' '.$this->float2ratio($decimal);
+        return $whole . ' ' . $this->float2ratio($decimal);
     }
 
     /**