[3.4] Inspection clean ups

src/Legacy/Storage.php

@@ -11,6 +11,7 @@
 use Bolt\Helpers\Html;
 use Bolt\Helpers\Str;
 use Bolt\Pager;
+use Bolt\Storage\Entity\FieldValue;
 use Bolt\Storage\Field\Collection\RepeatingFieldCollection;
 use Bolt\Translation\Translator as Trans;
 use Doctrine\DBAL\Connection as DoctrineConn;
@@ -2414,7 +2415,6 @@ protected function getRelation($content)
 
     public function getRepeaters($content)
     {
-
         $ids = Arr::column($content, 'id');
 
         if (empty($ids)) {
@@ -2426,7 +2426,7 @@ public function getRepeaters($content)
         // Try with the key first, if this isn't available then fall back to using the slug
         $contenttypeslug = (isset($first->contenttype['key'])) ? $first->contenttype['key'] : $first->contenttype['slug'] ;
         $contenttype = $this->getContentType($contenttypeslug);
-        $repo = $this->app['storage']->getRepository('Bolt\Storage\Entity\FieldValue');
+        $repo = $this->app['storage']->getRepository(FieldValue::class);
 
         foreach ($ids as $id) {
             foreach ($contenttype['fields'] as $fieldkey => $field) {

src/Nut/DatabaseImport.php

@@ -68,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         // See if we're going to continue
-        if ($this->checkContinue($input, $output) === false) {
+        if ($this->checkContinue($input) === false) {
             return 0;
         }
 

src/Provider/PrefillServiceProvider.php

@@ -15,7 +15,7 @@ public function register(Application $app)
 
         $app['prefill'] = $app->share(
             function ($app) {
-                return new Prefill\ApiClient($app['guzzle.client'], $app['prefill.api_url']);
+                return new Prefill\ApiClient($app['guzzle.client']);
             }
         );
 

src/Storage/Field/Collection/FieldCollection.php

@@ -147,7 +147,7 @@ public function serialize()
         $this->initialize();
 
         foreach ($this->collection as $field) {
-            $output[$field->getFieldname()] = $field->getValue();
+            $output[$field->getFieldName()] = $field->getValue();
         }
 
         return $output;

src/Storage/Migration/Import.php

@@ -2,8 +2,10 @@
 
 namespace Bolt\Storage\Migration;
 
-use Bolt\Storage\Repository;
 use Bolt\Collection\Arr;
+use Bolt\Storage\Entity\Relations;
+use Bolt\Storage\Field\Type\RelationType;
+use Bolt\Storage\Repository;
 
 /**
  * Database records import class.
@@ -211,7 +213,7 @@ protected function insertRecord($filename, $contenttypeslug, array $values)
         $record->setValues($values);
 
         foreach ($repo->getClassMetadata()->getFieldMappings() as $field) {
-            if (is_a($field['fieldtype'], 'Bolt\Storage\Field\Type\RelationType', true)) {
+            if (is_a($field['fieldtype'], RelationType::class, true)) {
                 if (count($values[$field['fieldname']])) {
                     $this->relationQueue[$contenttypeslug . '/' . $values['slug']] = array_merge(
                         (array) $this->relationQueue[$contenttypeslug][$values['slug']],
@@ -265,7 +267,7 @@ protected function processRelationQueue()
                 $relation = $this->app['query']->getContent($linkKey);
                 $relations[(string)$relation->getContentType()][] = $relation->getId();
             }
-            $related = $this->app['storage']->createCollection('Bolt\Storage\Entity\Relations');
+            $related = $this->app['storage']->createCollection(Relations::class);
             $related->setFromPost($relations, $entity);
             $entity->setRelation($related);
             $this->app['storage']->save($entity);