From 347244141919c9c819c4e993bc5601806a06d431 Mon Sep 17 00:00:00 2001
From: Rasmus Winter <rasmus@outlandish.com>
Date: Mon, 24 Apr 2017 18:16:41 +0100
Subject: [PATCH] Adding post type classes for built-in types; Removing
 template hooks; Bugfixing

---
 composer.json                   |  2 +-
 oowp.php                        | 74 ++-------------------------------
 src/OowpQuery.php               |  4 +-
 src/PostTypeManager.php         |  6 +++
 src/PostTypes/OowpPage.php      | 12 ++++++
 src/PostTypes/OowpPost.php      | 12 ++++++
 src/PostTypes/WordpressPost.php |  4 ++
 src/Views/PostView.php          |  9 ++++
 8 files changed, 48 insertions(+), 75 deletions(-)
 create mode 100644 src/PostTypes/OowpPage.php
 create mode 100644 src/PostTypes/OowpPost.php

diff --git a/composer.json b/composer.json
index 07f5587..2ca0868 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
   "description": "A plugin for WordPress that makes post types easier to manage",
   "minimum-stability": "stable",
   "license": "GPL-3.0",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "autoload": {
     "psr-4": {
       "Outlandish\\Wordpress\\Oowp\\": "src/"
diff --git a/oowp.php b/oowp.php
index 1d39e6a..0401121 100644
--- a/oowp.php
+++ b/oowp.php
@@ -66,74 +66,6 @@ function unregister_taxonomy($taxonomy, $object_type = ''){
 	}
 }
 
-
-/**
- * @return string The full path of the wrapped template
- */
-function oowp_layout_template_file() {
-	return OOWP_Layout::$innerTemplate;
-}
-
-/**
- * @return string The name of the wrapped template
- */
-function oowp_layout_template_name() {
-	return OOWP_Layout::$templateName;
-}
-
-/**
- * This wraps all requested templates in a layout.
- *
- * Create layout.php in your root theme directory to use the same layout on all pages.
- * Create layout-{template}.php for specific versions
- *
- * Example layout: include header, sidebar and footer on all pages, and wrap standard template in a section and a div
- *
- * <?php get_header( oowp_layout_template_name() ); ?>
- *
- *   <section id="primary">
- *     <div id="content" role="main">
- *       <?php include oowp_layout_template_file(); ?>
- *     </div><!-- #content -->
- *   </section><!-- #primary -->
- *
- * <?php get_sidebar( oowp_layout_template_name() ); ?>
- * <?php get_footer( oowp_layout_template_name() ); ?>
- *
- * See http://scribu.net/wordpress/theme-wrappers.html
- */
-
-add_filter( 'template_include', array( 'OOWP_Layout', 'wrap' ), 99 );
-class OOWP_Layout {
-
-	/**
-	 * Stores the full path to the main template file
-	 */
-	static $innerTemplate = null;
-
-	/**
-	 * Stores the base name of the template file; e.g. 'page' for 'page.php' etc.
-	 */
-	static $templateName = null;
-
-	static function wrap( $template ) {
-		self::$innerTemplate = $template;
-
-		self::$templateName = substr( basename( self::$innerTemplate ), 0, -4 );
-
-		$templates = array( 'layout.php' );
-
-		if ( 'index' == self::$templateName ) {
-			self::$templateName = null;
-		} else {
-			// prepend the more specific wrapper filename
-			array_unshift( $templates, sprintf( 'layout-%s.php', self::$templateName ) );
-		}
-
-		// revert to the template passed in if no layout template is found
-		return locate_template( $templates ) ?: $template;
-	}
-}
-
-
-add_shortcode(ListPostsShortcode::NAME, array(ListPostsShortcode::class, 'apply'));
\ No newline at end of file
+add_shortcode(ListPostsShortcode::NAME, function($params, $content) {
+    ListPostsShortcode::apply($params, $content);
+});
\ No newline at end of file
diff --git a/src/OowpQuery.php b/src/OowpQuery.php
index 9fdee16..8d42a9d 100644
--- a/src/OowpQuery.php
+++ b/src/OowpQuery.php
@@ -107,10 +107,8 @@ public function sortByIds($ids) {
 	public function &get_posts() {
 		parent::get_posts();
 
-		$manager = PostTypeManager::get();
 		foreach ($this->posts as $i => $post) {
-			$classname = $manager->getClassName($post->post_type);
-			$this->posts[$i] = new $classname($post);
+			$this->posts[$i] = WordpressPost::createWordpressPost($post);
 		}
 
 		if (count($this->posts)) {
diff --git a/src/PostTypeManager.php b/src/PostTypeManager.php
index 0962314..a18d471 100644
--- a/src/PostTypeManager.php
+++ b/src/PostTypeManager.php
@@ -2,6 +2,8 @@
 
 namespace Outlandish\Wordpress\Oowp;
 
+use Outlandish\Wordpress\Oowp\PostTypes\OowpPage;
+use Outlandish\Wordpress\Oowp\PostTypes\OowpPost;
 use Outlandish\Wordpress\Oowp\PostTypes\WordpressPost;
 use Outlandish\Wordpress\Oowp\Util\AdminUtils;
 
@@ -81,6 +83,10 @@ public function registerPostTypes($classNames)
 
 		/** @var WordpressPost[]|string[] $classNames */
 
+		$classNames[] = OowpPage::class;
+		$classNames[] = OowpPost::class;
+		$classNames = array_unique($classNames);
+
 		// register all classes
 		foreach ($classNames as $className) {
             $this->registerPostType($className);
diff --git a/src/PostTypes/OowpPage.php b/src/PostTypes/OowpPage.php
new file mode 100644
index 0000000..6074a63
--- /dev/null
+++ b/src/PostTypes/OowpPage.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Outlandish\Wordpress\Oowp\PostTypes;
+
+class OowpPage extends WordpressPost
+{
+    static function postType()
+    {
+        return 'page';
+    }
+
+}
diff --git a/src/PostTypes/OowpPost.php b/src/PostTypes/OowpPost.php
new file mode 100644
index 0000000..63e921d
--- /dev/null
+++ b/src/PostTypes/OowpPost.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Outlandish\Wordpress\Oowp\PostTypes;
+
+class OowpPost extends WordpressPost
+{
+    static function postType()
+    {
+        return 'post';
+    }
+
+}
diff --git a/src/PostTypes/WordpressPost.php b/src/PostTypes/WordpressPost.php
index f63bcb4..178be98 100644
--- a/src/PostTypes/WordpressPost.php
+++ b/src/PostTypes/WordpressPost.php
@@ -526,6 +526,7 @@ public function children($queryArgs = array())
 		$queryArgs = wp_parse_args($queryArgs, $defaults);
 		$children = static::fetchAll($queryArgs);
 		$children->posts = array_merge($children->posts, $posts);
+		$children->post_count = count($children->posts);
 		return $children;
 	}
 
@@ -864,6 +865,9 @@ public static function createWordpressPost($data = null) {
 			$postData = self::getPostObject($data);
 			if ($postData) {
 				$className = PostTypeManager::get()->getClassName($postData->post_type);
+                if (!$className) {
+                    $className = MiscPost::class;
+                }
 				if ($postData instanceof $className) {
 					return $postData;
 				} else {
diff --git a/src/Views/PostView.php b/src/Views/PostView.php
index 472ca59..0dfd5bf 100644
--- a/src/Views/PostView.php
+++ b/src/Views/PostView.php
@@ -9,4 +9,13 @@ abstract class PostView extends OowpView
     /** @var WordpressPost */
     public $post;
 
+    public function __construct()
+    {
+        parent::__construct();
+
+        global $post;
+        $this->post = WordpressPost::createWordpressPost($post);
+    }
+
+
 }
\ No newline at end of file