From eeafb388885edb43dcb9330336ef5cd791744eed Mon Sep 17 00:00:00 2001
From: Nate Iler <nate@flipboxdigital.com>
Date: Thu, 6 Dec 2018 16:43:57 -0700
Subject: [PATCH] minor cleanup

---
 src/helpers/ObjectHelper.php              |  1 -
 src/helpers/QueryHelper.php               |  1 -
 src/helpers/SortOrderHelper.php           |  2 --
 src/objects/FieldMutatorTrait.php         | 10 +++++-----
 src/records/ElementAttributeTrait.php     |  3 ++-
 src/records/FieldAttributeTrait.php       |  9 +++++----
 src/records/FieldLayoutAttributeTrait.php |  3 ++-
 src/records/SiteAttributeTrait.php        |  3 ++-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/helpers/ObjectHelper.php b/src/helpers/ObjectHelper.php
index 852a57f..fd3a762 100644
--- a/src/helpers/ObjectHelper.php
+++ b/src/helpers/ObjectHelper.php
@@ -8,7 +8,6 @@
 
 namespace flipbox\craft\ember\helpers;
 
-use craft\helpers\ArrayHelper;
 use craft\helpers\Json as JsonHelper;
 use yii\base\BaseObject;
 use yii\base\InvalidConfigException;
diff --git a/src/helpers/QueryHelper.php b/src/helpers/QueryHelper.php
index 2d01bb9..8d88b49 100644
--- a/src/helpers/QueryHelper.php
+++ b/src/helpers/QueryHelper.php
@@ -8,7 +8,6 @@
 
 namespace flipbox\craft\ember\helpers;
 
-use craft\helpers\ArrayHelper;
 use craft\helpers\StringHelper;
 use yii\db\Query;
 use yii\db\QueryInterface;
diff --git a/src/helpers/SortOrderHelper.php b/src/helpers/SortOrderHelper.php
index 2b38ff2..14a6b45 100644
--- a/src/helpers/SortOrderHelper.php
+++ b/src/helpers/SortOrderHelper.php
@@ -8,8 +8,6 @@
 
 namespace flipbox\craft\ember\helpers;
 
-use craft\helpers\ArrayHelper;
-
 /**
  * @author Flipbox Factory <hello@flipboxfactory.com>
  * @since 2.0.0
diff --git a/src/objects/FieldMutatorTrait.php b/src/objects/FieldMutatorTrait.php
index b30e59f..95c732c 100644
--- a/src/objects/FieldMutatorTrait.php
+++ b/src/objects/FieldMutatorTrait.php
@@ -21,7 +21,7 @@
 trait FieldMutatorTrait
 {
     /**
-     * @var Field|null
+     * @var Field|FieldInterface|null
      */
     private $field;
 
@@ -72,7 +72,7 @@ public function setField($field = null)
     }
 
     /**
-     * @return Field|null
+     * @return FieldInterface|Field|null
      */
     public function getField()
     {
@@ -94,7 +94,7 @@ public function getField()
     }
 
     /**
-     * @return Field|null
+     * @return FieldInterface|Field|null
      */
     protected function resolveField()
     {
@@ -106,7 +106,7 @@ protected function resolveField()
     }
 
     /**
-     * @return Field|null
+     * @return FieldInterface|Field|null
      */
     private function resolveFieldFromId()
     {
@@ -120,7 +120,7 @@ private function resolveFieldFromId()
 
     /**
      * @param mixed $field
-     * @return FieldInterface|Field|null
+     * @return FieldInterface|FieldInterface|Field|null
      */
     protected function internalResolveField($field = null)
     {
diff --git a/src/records/ElementAttributeTrait.php b/src/records/ElementAttributeTrait.php
index ce169f3..e41b619 100644
--- a/src/records/ElementAttributeTrait.php
+++ b/src/records/ElementAttributeTrait.php
@@ -85,11 +85,12 @@ private function resolveElementFromRelation()
             return null;
         }
 
-        /** @var ElementRecord $record */
         if (null === ($record = $this->getRelation('elementRecord'))) {
             return null;
         }
 
+        /** @var ElementRecord $record */
+
         return Craft::$app->getElements()->getElementById($record->id);
     }
 
diff --git a/src/records/FieldAttributeTrait.php b/src/records/FieldAttributeTrait.php
index bdcfa01..e8fc6c7 100644
--- a/src/records/FieldAttributeTrait.php
+++ b/src/records/FieldAttributeTrait.php
@@ -10,6 +10,7 @@
 
 use Craft;
 use craft\base\Field;
+use craft\base\FieldInterface;
 use craft\records\Field as FieldRecord;
 use flipbox\craft\ember\models\FieldRulesTrait;
 use flipbox\craft\ember\objects\FieldMutatorTrait;
@@ -61,7 +62,7 @@ public function getFieldId()
     }
 
     /**
-     * @return Field|null
+     * @return FieldInterface|Field|null
      */
     protected function resolveField()
     {
@@ -73,7 +74,7 @@ protected function resolveField()
     }
 
     /**
-     * @return Field|null
+     * @return FieldInterface|Field|null
      */
     private function resolveFieldFromRelation()
     {
@@ -81,12 +82,12 @@ private function resolveFieldFromRelation()
             return null;
         }
 
-        /** @var FieldRecord $record */
         if (null === ($record = $this->getRelation('fieldRecord'))) {
             return null;
         }
 
-        /** @noinspection PhpIncompatibleReturnTypeInspection */
+        /** @var FieldRecord $record */
+
         return Craft::$app->getFields()->getFieldById($record->id);
     }
 
diff --git a/src/records/FieldLayoutAttributeTrait.php b/src/records/FieldLayoutAttributeTrait.php
index e8cde4e..4c818e7 100644
--- a/src/records/FieldLayoutAttributeTrait.php
+++ b/src/records/FieldLayoutAttributeTrait.php
@@ -81,11 +81,12 @@ private function resolveFieldLayoutFromRelation()
             return null;
         }
 
-        /** @var FieldLayoutRecord $record */
         if (null === ($record = $this->getRelation('fieldLayoutRecord'))) {
             return null;
         }
 
+        /** @var FieldLayoutRecord $record */
+
         return Craft::$app->getFields()->getLayoutById($record->id);
     }
 
diff --git a/src/records/SiteAttributeTrait.php b/src/records/SiteAttributeTrait.php
index 1419696..75336ec 100644
--- a/src/records/SiteAttributeTrait.php
+++ b/src/records/SiteAttributeTrait.php
@@ -87,11 +87,12 @@ private function resolveSiteFromRelation()
             return null;
         }
 
-        /** @var SiteRecord $record */
         if (null === ($record = $this->getRelation('siteRecord'))) {
             return null;
         }
 
+        /** @var SiteRecord $record */
+
         return Craft::$app->getSites()->getSiteById($record->id);
     }