fix commands for lumen (without facades)

Author: basemkhirat

src/Commands/CreateIndexCommand.php

@@ -2,7 +2,6 @@
 
 namespace Basemkhirat\Elasticsearch\Commands;
 
-use Basemkhirat\Elasticsearch\Facades\ES;
 use Illuminate\Console\Command;
 
 class CreateIndexCommand extends Command
@@ -21,6 +20,21 @@ class CreateIndexCommand extends Command
      */
     protected $description = 'Create a new index using defined setting and mapping in config file';
 
+    /**
+     * ES object
+     * @var object
+     */
+    protected $es;
+
+    /**
+     * CreateIndexCommand constructor.
+     */
+    function __construct()
+    {
+        parent::__construct();
+        $this->es = app("es");
+    }
+
     /**
      * Execute the console command.
      *
@@ -31,7 +45,7 @@ public function handle()
 
         $connection = $this->option("connection") ? $this->option("connection") : config("es.default");
 
-        $client = ES::connection($connection)->raw();
+        $client = $this->es->connection($connection)->raw();
 
         $indices = !is_null($this->argument('index')) ?
             [$this->argument('index')] :
@@ -68,7 +82,7 @@ public function handle()
 
             if (isset($config['aliases'])) {
 
-                foreach($config['aliases'] as $alias) {
+                foreach ($config['aliases'] as $alias) {
 
                     $this->info("Creating alias: {$alias} for index: {$index}");
 
@@ -112,8 +126,6 @@ public function handle()
             }
 
 
-
-
         }
 
     }

src/Commands/DropIndexCommand.php

@@ -2,7 +2,6 @@
 
 namespace Basemkhirat\Elasticsearch\Commands;
 
-use Basemkhirat\Elasticsearch\Facades\ES;
 use Illuminate\Console\Command;
 
 class DropIndexCommand extends Command
@@ -23,6 +22,21 @@ class DropIndexCommand extends Command
      */
     protected $description = 'Drop an index';
 
+    /**
+     * ES object
+     * @var object
+     */
+    protected $es;
+
+    /**
+     * DropIndexCommand constructor.
+     */
+    function __construct()
+    {
+        parent::__construct();
+        $this->es = app("es");
+    }
+
     /**
      * Execute the console command.
      *
@@ -34,7 +48,7 @@ public function handle()
         $connection = $this->option("connection") ? $this->option("connection") : config("es.default");
         $force = $this->option("force") ? $this->option("force") : 0;
 
-        $client = ES::connection($connection)->raw();
+        $client = $this->es->connection($connection)->raw();
 
         $indices = !is_null($this->argument('index')) ?
             [$this->argument('index')] :
@@ -47,7 +61,7 @@ public function handle()
                 continue;
             }
 
-            if($force or $this->confirm("Are you sure to drop \"$index\" index")) {
+            if ($force or $this->confirm("Are you sure to drop \"$index\" index")) {
 
                 $this->info("Dropping index: {$index}");
 

src/Commands/ListIndicesCommand.php

@@ -4,8 +4,10 @@
 
 use Illuminate\Console\Command;
 
-use Basemkhirat\Elasticsearch\Facades\ES;
-
+/**
+ * Class ListIndicesCommand
+ * @package Basemkhirat\Elasticsearch\Commands
+ */
 class ListIndicesCommand extends Command
 {
     /**
@@ -28,6 +30,20 @@ class ListIndicesCommand extends Command
      */
     protected $headers = ["configured (es.php)", "health", "status", "index", "uuid", "pri", "rep", "docs.count", "docs.deleted", "store.size", "pri.store.size"];
 
+    /**
+     * ES object
+     * @var object
+     */
+    protected $es;
+
+    /**
+     * ListIndicesCommand constructor.
+     */
+    function __construct()
+    {
+        parent::__construct();
+        $this->es = app("es");
+    }
 
     /**
      * Execute the console command.
@@ -39,48 +55,78 @@ public function handle()
 
         $connection = $this->option("connection") ? $this->option("connection") : config("es.default");
 
-        $indices = ES::connection($connection)->raw()->cat()->indices();
-
-        if($indices != "") {
-
-             $this->table($this->headers, $this->getIndices($indices));
+        $indices = $this->es->connection($connection)->raw()->cat()->indices();
 
+        if (is_array($indices)) {
+            $indices = $this->getIndicesFromArrayResponse($indices);
         } else {
+            $indices = $this->getIndicesFromStringResponse($indices);
+        }
 
+        if (count($indices)) {
+            $this->table($this->headers, $indices);
+        } else {
             $this->warn('No indices found.');
+        }
+
+    }
+
+
+    /**
+     * Get a list of indices data
+     * Match newer versions of elasticsearch/elasticsearch package (5.1.1 or higher)
+     * @param $indices
+     * @return array
+     */
+    function getIndicesFromArrayResponse($indices)
+    {
+
+        foreach ($indices as $row) {
+
+            if (in_array($row['index'], array_keys(config("es.indices")))) {
+                $row = array_prepend($row, "yes");
+            } else {
+                $row = array_prepend($row, "no");
+            }
+
+            $data[] = $row;
 
         }
 
+        return $data;
+
     }
 
     /**
-     * Convert lines into array
+     * Get list of indices data
+     * Match older versions of elasticsearch/elasticsearch package.
      * @param $indices
      * @return array
      */
-    function getIndices($indices){
+    function getIndicesFromStringResponse($indices)
+    {
 
         $lines = explode("\n", trim($indices));
 
         $data = [];
 
-        foreach ($lines as $line){
+        foreach ($lines as $line) {
 
             $row = [];
 
             $line_array = explode(" ", trim($line));
 
-            foreach ($line_array as $item){
+            foreach ($line_array as $item) {
 
-                if(trim($item) != ""){
+                if (trim($item) != "") {
                     $row[] = $item;
                 }
 
             }
 
-            if(in_array($row[2], array_keys(config("es.indices")))){
+            if (in_array($row[2], array_keys(config("es.indices")))) {
                 $row = array_prepend($row, "yes");
-            }else{
+            } else {
                 $row = array_prepend($row, "no");
             }