minor cleanup

flipboxfactory · Dec 6, 2018 · eeafb38 · eeafb38
1 parent a736254
commit eeafb38
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -8,8 +8,6 @@
 
 namespace flipbox\craft\ember\helpers;
 
-use craft\helpers\ArrayHelper;
-
 /**
  * @author Flipbox Factory <[email protected]>
  * @since 2.0.0

diff --git 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
@@ -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
@@ -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,20 +74,20 @@ protected function resolveField()
     }
 
     /**
-     * @return Field|null
+     * @return FieldInterface|Field|null
      */
     private function resolveFieldFromRelation()
     {
         if (false === $this->isRelationPopulated('fieldRecord')) {
             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
@@ -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
@@ -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);
     }