Merge pull request #189 from jgrossi/dev

Merging from dev for 1.1.2
corcel · Aug 5, 2016 · cb273d1 · cb273d1
2 parents 486e921 + 7d9ecc6
commit cb273d1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Post.php b/src/Post.php
@@ -513,8 +513,10 @@ public function getKeywordsStrAttribute()
      */
     public function newFromBuilder($attributes = [], $connection = null)
     {
-        if (array_key_exists($attributes->post_type, static::$postTypes)) {
+        if (is_object($attributes) && array_key_exists($attributes->post_type, static::$postTypes)) {
             $class = static::$postTypes[$attributes->post_type];
+        } elseif (is_array($attributes) && array_key_exists($attributes['post_type'], static::$postTypes)) {
+            $class = static::$postTypes[$attributes['post_type']];
         } else {
             $class = get_called_class();
         }

diff --git a/tests/PostTypeTest.php b/tests/PostTypeTest.php
@@ -0,0 +1,21 @@
+<?php
+
+use Corcel\Post;
+use Corcel\Page;
+use Thunder\Shortcode\Shortcode\ShortcodeInterface;
+
+class Video extends Post
+{
+}
+
+class PostTypeTest extends PHPUnit_Framework_TestCase
+{
+    public function testPostTypeConstructor()
+    {
+        Post::registerPostType('video', 'Video');
+
+        $post = new Post();
+        $model = $post->newFromBuilder(['post_type' => 'video']);
+        $this->assertInstanceOf("Video", $model);
+    }
+}