Merge branch 'bugfix/db-connection' into develop

src/AdvancedCustomFields.php

@@ -23,7 +23,6 @@ class AdvancedCustomFields
     public function __construct(Post $post)
     {
         $this->post = $post;
-        FieldFactory::$connection = $post->getConnectionName();
     }
 
     /**

src/Field/BasicField.php

@@ -49,23 +49,26 @@ abstract class BasicField
 
     /**
      * Constructor method.
+     *
+     * @param Post $post
      */
-    public function __construct()
+    public function __construct(Post $post)
     {
+        $this->post = $post;
         $this->postMeta = new PostMeta();
+        $this->postMeta->setConnection($post->getConnectionName());
     }
 
     /**
      * Get the value of a field according it's post ID.
      *
      * @param string $field
-     * @param Post $post
      *
      * @return array|string
      */
-    public function fetchValue($field, Post $post)
+    public function fetchValue($field)
     {
-        $postMeta = $this->postMeta->where('post_id', $post->ID)
+        $postMeta = $this->postMeta->where('post_id', $this->post->ID)
             ->where('meta_key', $field)
             ->first();
 
@@ -85,16 +88,14 @@ public function fetchValue($field, Post $post)
 
     /**
      * @param string $fieldName
-     * @param Post $post
      *
      * @return string
      */
-    public function fetchFieldKey($fieldName, Post $post)
+    public function fetchFieldKey($fieldName)
     {
-        $this->post = $post;
         $this->name = $fieldName;
 
-        $postMeta = $this->postMeta->where('post_id', $post->ID)
+        $postMeta = $this->postMeta->where('post_id', $this->post->ID)
             ->where('meta_key', '_' . $fieldName)
             ->first();
 
@@ -133,21 +134,4 @@ public function __toString()
     {
         return $this->get();
     }
-
-    /**
-     * @return string
-     */
-    public function getConnection()
-    {
-        return $this->connection;
-    }
-
-    /**
-     * @param string $connection
-     */
-    public function setConnection($connection)
-    {
-        $this->connection = $connection;
-        $this->postMeta->setConnection($connection);
-    }
 }

src/Field/DateTime.php

@@ -20,11 +20,10 @@ class DateTime extends BasicField implements FieldInterface
 
     /**
      * @param string $fieldName
-     * @param Post   $post
      */
-    public function process($fieldName, Post $post)
+    public function process($fieldName)
     {
-        $dateString = $this->fetchValue($fieldName, $post);
+        $dateString = $this->fetchValue($fieldName);
         $format = $this->getDateFormatFromString($dateString);
         $this->date = Carbon::createFromFormat($format, $dateString);
     }

src/Field/File.php

@@ -44,12 +44,11 @@ class File extends BasicField implements FieldInterface
 
     /**
      * @param string $field
-     * @param Post   $post
      */
-    public function process($field, Post $post)
+    public function process($field)
     {
-        $value = $this->fetchValue($field, $post);
-        $file = $post->find($value);
+        $value = $this->fetchValue($field);
+        $file = $this->post->find($value);
         $this->fillFields($file);
     }
 

src/Field/Gallery.php

@@ -25,16 +25,15 @@ class Gallery extends Image implements FieldInterface
 
     /**
      * @param $field
-     * @param Post $post
      */
-    public function process($field, Post $post)
+    public function process($field)
     {
-        $ids = $this->fetchValue($field, $post);
-        $attachments = $post->whereIn('ID', $ids)->get();
+        $ids = $this->fetchValue($field);
+        $attachments = $this->post->whereIn('ID', $ids)->get();
         $metaDataValues = $this->fetchMultipleMetadataValues($attachments);
 
         foreach ($attachments as $attachment) {
-            $image = new Image();
+            $image = new Image($this->post);
             $image->fillFields($attachment);
             $image->fillMetadataFields($metaDataValues[$attachment->ID]);
             $this->images[] = $image;

src/Field/Image.php

@@ -55,13 +55,12 @@ class Image extends BasicField implements FieldInterface
 
     /**
      * @param string $field
-     * @param Post   $post
      */
-    public function process($field, Post $post)
+    public function process($field)
     {
-        $attachmentId = $this->fetchValue($field, $post);
+        $attachmentId = $this->fetchValue($field);
 
-        $attachment = $post->find(intval($attachmentId));
+        $attachment = $this->post->find(intval($attachmentId));
         $this->fillFields($attachment);
 
         $imageData = $this->fetchMetadataValue($attachment);
@@ -107,7 +106,7 @@ public function size($size)
      */
     protected function fillThumbnailFields(array $data)
     {
-        $size = new static();
+        $size = new static($this->post);
         $size->filename = $data['file'];
         $size->width = $data['width'];
         $size->height = $data['height'];
@@ -133,7 +132,7 @@ protected function fetchMetadataValue(Post $attachment)
     /**
      * @param Collection $attachments
      *
-     * @return Collection
+     * @return Collection|array
      */
     protected function fetchMultipleMetadataValues(Collection $attachments)
     {

src/Field/PostObject.php

@@ -19,16 +19,15 @@ class PostObject extends BasicField implements FieldInterface
 
     /**
      * @param string $fieldName
-     * @param Post   $post
      */
-    public function process($fieldName, Post $post)
+    public function process($fieldName)
     {
-        $postId = $this->fetchValue($fieldName, $post);
+        $postId = $this->fetchValue($fieldName);
 
         if (is_array($postId)) {
-            $this->object = $post->whereIn('ID', $postId)->get();
+            $this->object = $this->post->whereIn('ID', $postId)->get();
         } else {
-            $this->object = $post->find($postId);
+            $this->object = $this->post->find($postId);
         }
     }
 

src/Field/Repeater.php

@@ -22,14 +22,12 @@ class Repeater extends BasicField implements FieldInterface
 
     /**
      * @param string $fieldName
-     * @param Post   $post
      */
-    public function process($fieldName, Post $post)
+    public function process($fieldName)
     {
         $this->name = $fieldName;
-        $this->post = $post;
 
-        $builder = $this->fetchPostsMeta($fieldName, $post);
+        $builder = $this->fetchPostsMeta($fieldName, $this->post);
         $fields = $this->fetchFields($fieldName, $builder);
 
         $this->fields = new Collection($fields);

src/Field/Term.php

@@ -23,19 +23,22 @@ class Term extends BasicField implements FieldInterface
      */
     protected $term;
 
-    public function __construct()
+    /**
+     * @param Post $post
+     */
+    public function __construct(Post $post)
     {
-        parent::__construct();
+        parent::__construct($post);
         $this->term = new \Corcel\Term();
+        $this->term->setConnection($post->getConnectionName());
     }
 
     /**
      * @param string $fieldName
-     * @param Post   $post
      */
-    public function process($fieldName, Post $post)
+    public function process($fieldName)
     {
-        $value = $this->fetchValue($fieldName, $post);
+        $value = $this->fetchValue($fieldName);
         if (is_array($value)) {
             $this->items = $this->term->whereIn('term_id', $value)->get(); // ids
         } else {

src/Field/Text.php

@@ -17,9 +17,12 @@ class Text extends BasicField implements FieldInterface
      */
     protected $value;
 
-    public function process($field, Post $post)
+    /**
+     * @param string $field
+     */
+    public function process($field)
     {
-        $this->value = $this->fetchValue($field, $post);
+        $this->value = $this->fetchValue($field);
     }
 
     /**

src/Field/User.php

@@ -22,19 +22,22 @@ class User extends BasicField implements FieldInterface
      */
     protected $value;
 
-    public function __construct()
+    /**
+     * @param Post $post
+     */
+    public function __construct(Post $post)
     {
-        parent::__construct();
+        parent::__construct($post);
         $this->user = new \Corcel\User();
+        $this->user->setConnection($post->getConnectionName());
     }
 
     /**
      * @param string $fieldName
-     * @param Post   $post
      */
-    public function process($fieldName, Post $post)
+    public function process($fieldName)
     {
-        $userId = $this->fetchValue($fieldName, $post);
+        $userId = $this->fetchValue($fieldName);
         $this->value = $this->user->find($userId);
     }
 

src/FieldFactory.php

@@ -24,32 +24,22 @@
  */
 class FieldFactory
 {
-    /**
-     * @var null|string
-     */
-    public static $connection = null;
-
     private function __construct()
     {
     }
 
     /**
-     * @param string      $name
-     * @param Post        $post
+     * @param string $name
+     * @param Post $post
      * @param null|string $type
      *
      * @return FieldInterface|Collection|string
      */
     public static function make($name, Post $post, $type = null)
     {
         if (null === $type) {
-            $fakeText = new Text();
-
-            if (static::$connection) {
-                $fakeText->setConnection(static::$connection);
-            }
-
-            $key = $fakeText->fetchFieldKey($name, $post);
+            $fakeText = new Text($post);
+            $key = $fakeText->fetchFieldKey($name);
 
             if ($key === null) { // Field does not exist
                 return null;
@@ -73,52 +63,48 @@ public static function make($name, Post $post, $type = null)
             case 'select':
             case 'checkbox':
             case 'radio':
-                $field = new Text();
+                $field = new Text($post);
                 break;
             case 'image':
             case 'img':
-                $field = new Image();
+                $field = new Image($post);
                 break;
             case 'file':
-                $field = new File();
+                $field = new File($post);
                 break;
             case 'gallery':
-                $field = new Gallery();
+                $field = new Gallery($post);
                 break;
             case 'true_false':
             case 'boolean':
-                $field = new Boolean();
+                $field = new Boolean($post);
                 break;
             case 'post_object':
             case 'post':
             case 'relationship':
-                $field = new PostObject();
+                $field = new PostObject($post);
                 break;
             case 'page_link':
-                $field = new PageLink();
+                $field = new PageLink($post);
                 break;
             case 'taxonomy':
             case 'term':
-                $field = new Term();
+                $field = new Term($post);
                 break;
             case 'user':
-                $field = new User();
+                $field = new User($post);
                 break;
             case 'date_picker':
             case 'date_time_picker':
             case 'time_picker':
-                $field = new DateTime();
+                $field = new DateTime($post);
                 break;
             case 'repeater':
-                $field = new Repeater();
+                $field = new Repeater($post);
                 break;
         }
 
-        if (static::$connection) {
-            $field->setConnection(static::$connection);
-        }
-
-        $field->process($name, $post);
+        $field->process($name);
 
         return $field;
     }

src/FieldInterface.php

@@ -13,9 +13,8 @@ interface FieldInterface
 {
     /**
      * @param string $fieldName
-     * @param Post   $post
      */
-    public function process($fieldName, Post $post);
+    public function process($fieldName);
 
     /**
      * @return mixed