Merge pull request #13 from vesper8/master

made compatible with Laravel 5.6, 5.7 and 5.8

Author: leeovery

composer.json

@@ -20,13 +20,13 @@
   ],
   "require": {
     "php": "^7.1.3",
-    "cartalyst/tags": "6.0.*",
+    "cartalyst/tags": "6.0.*|7.0.*|8.0.*",
     "guzzlehttp/guzzle": "^6.3",
-    "illuminate/database": "5.6.*",
-    "illuminate/support": "5.6.*",
-    "illuminate/console": "5.6.*",
-    "illuminate/contracts": "5.6.*",
-    "illuminate/events": "5.6.*",
+    "illuminate/database": "5.6.*|5.7.*|5.8.*",
+    "illuminate/support": "5.6.*|5.7.*|5.8.*",
+    "illuminate/console": "5.6.*|5.7.*|5.8.*",
+    "illuminate/contracts": "5.6.*|5.7.*|5.8.*",
+    "illuminate/events": "5.6.*|5.7.*|5.8.*",
     "league/fractal": "^0.17.0"
   },
   "require-dev": {

migrations/2016_11_18_165313_create_post_table.php

@@ -16,13 +16,15 @@ public function up()
         Schema::create('posts', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('wp_id')->unique();
+            $table->string('type');
             $table->string('title');
             $table->string('slug');
+            $table->string('link');
             $table->string('featured_image')->nullable();
             $table->boolean('sticky')->default(false);
             $table->longText('excerpt')->nullable();
             $table->longText('content');
-            $table->string('format');
+            $table->string('format')->nullable();
             $table->string('status');
             $table->timestamp('published_at')->nullable();
             $table->integer('author_id')->nullable();

src/Commands/Importer.php

@@ -16,6 +16,7 @@ class Importer extends Command
      * @var string
      */
     protected $signature = 'wordpress-to-laravel:import
+                                {postRestBase? : The REST API endpoint (defaults to "posts").}
                                 {page? : The page number from WP to import.}
                                 {per-page? : The number of posts per page to fetch.}
                                 {--F|force-all : This option will grab every published post from the WP DB and sync them all (along with the other embedded bits) to your local DB}
@@ -65,6 +66,7 @@ public function __construct(WordpressToLaravel $wordpressToLaravel, Dispatcher $
      */
     public function handle()
     {
+        $postRestBase = $this->argument('postRestBase') ?: 'posts';
         $page = $this->argument('page') ?: 1;
         $perPage = $this->argument('per-page') ?: 5;
         $truncate = $this->option('truncate') ?: false;
@@ -75,7 +77,7 @@ public function handle()
         $this->registerListeners();
 
         $this->wordpressToLaravel->import(
-            $page, $perPage, $truncate, $forceAll
+            $postRestBase, $page, $perPage, $truncate, $forceAll
         );
 
         $this->outputCounts();

src/PostTransformer.php

@@ -52,13 +52,15 @@ public function transform($post)
     {
         return [
             'wp_id'          => (int)$post->id,
+            'type'           => $post->type,
             'title'          => $post->title->rendered,
             'slug'           => $post->slug,
-            'sticky'         => $post->sticky ? 1 : 0,
-            'excerpt'        => $post->excerpt->rendered,
-            'content'        => $post->content->rendered,
-            'format'         => $post->format,
-            'status'         => 'publish',
+            'link'           => $post->link,
+            'sticky'         => $post->sticky ?? 0,
+            'excerpt'        => $post->excerpt->rendered ?? '',
+            'content'        => $post->content->rendered ?? '',
+            'format'         => $post->format ?? null,
+            'status'         => $post->status,
             'featured_image' => $this->getFeaturedImage($post),
             'published_at'   => $this->carbonDate($post->date),
             'created_at'     => $this->carbonDate($post->date),

src/WordpressToLaravel.php

@@ -110,10 +110,10 @@ protected function setupTransformers()
      * @param bool $truncate
      * @param bool $forceAll
      */
-    public function import($page = 1, $perPage = 5, $truncate = false, $forceAll = false)
+    public function import($postRestBase, $page = 1, $perPage = 5, $truncate = false, $forceAll = false)
     {
         $this->truncate($truncate)
-             ->fetchPosts($page, $perPage, $forceAll)
+             ->fetchPosts($postRestBase, $page, $perPage, $forceAll)
              ->map(function ($post) {
                  return $this->transformPost($post);
              })
@@ -130,13 +130,13 @@ public function import($page = 1, $perPage = 5, $truncate = false, $forceAll = f
      * @param bool $forceAll
      * @return Collection
      */
-    protected function fetchPosts($page, $perPage, $forceAll)
+    protected function fetchPosts($postRestBase, $page, $perPage, $forceAll)
     {
         $posts = collect();
 
         while (true) {
             $stop = collect(
-                $this->sendRequest($this->makeUrl($page++, $perPage))
+                $this->sendRequest($this->makeUrl($postRestBase, $page++, $perPage))
             )->map(function ($post) use ($posts) {
                 $posts->push($post);
             })->isEmpty();
@@ -191,10 +191,10 @@ protected function sendRequest($url, $tries = 3)
      * @param int $perPage
      * @return string
      */
-    protected function makeUrl($page, $perPage)
+    protected function makeUrl($postRestBase, $page, $perPage)
     {
         $queryString = sprintf(
-            'posts?_embed=true&filter[orderby]=modified&page=%d&per_page=%d',
+            "{$postRestBase}?_embed=true&filter[orderby]=modified&page=%d&per_page=%d",
             $page, $perPage
         );