Merge remote-tracking branch 'origin/dev-main' into dev-l9

Author: pdphilip

README.md

@@ -10,32 +10,55 @@
 This package extends Laravel's Eloquent model and query builder with seamless integration of Elasticsearch functionalities. Designed to feel native to Laravel, this package enables you to work with Eloquent models while leveraging the
 powerful search and analytics capabilities of Elasticsearch.
 
+Example:
+
+```php
+$logs = UserLog::where('created_at','>=',Carbon::now()->subDays(30))->get();
+```
+
+```php
+$updates = UserLog::where('status', 1)->update(['status' => 4]);
+```
+
+```php
+$profiles = UserProfile::whereIn('country_code',['US','CA'])->orderByDesc('last_login')->take(10)->get();
+```
+
+```php
+$deleted = UserProfile::where('state','unsubscribed')->where('updated_at','<=',Carbon::now()->subDays(90)->delete();
+```
+
 ```php
-$logs = UserLog::where('type', UserLogType::LOGIN)->where('created_at','>=',Carbon::now()->subDays(30))->get();
+$search = UserProfile::term('loves espressos')->minShouldMatch(2)->highlight()->search();
 ```
 
 ### Read the [Documentation](https://elasticsearch.pdphilip.com/)
 
 ---
 
+> #### Using [OpenSearch](https://opensearch.pdphilip.com/)? [Github](https://github.com/pdphilip/laravel-opensearch)
+
+---
+
+> #### [Package Tests](https://github.com/pdphilip/laravel-elasticsearch-tests)
+
+---
+
 ## Installation
 
 ### Maintained versions (Elasticsearch 8.x):
 
-Please note: Only **version 3** of the package will be maintained.
-
-**Laravel 11.x (main):**
+**Laravel 10.x & 11.x (main):**
 
 ```bash
 composer require pdphilip/elasticsearch
 ```
 
-| Laravel Version | Command                                          | Maintained |
-| --------------- | ------------------------------------------------ | ---------- |
-| Laravel 11.x    | `composer require pdphilip/elasticsearch `       | ✅         |
-| Laravel 10.x    | `composer require pdphilip/elasticsearch:~3.10 ` | ✅         |
-| Laravel 9.x     | `composer require pdphilip/elasticsearch:~3.9`   | ✅         |
-| Laravel 8.x     | `composer require pdphilip/elasticsearch:~3.8`   | ✅         |
+| Laravel Version | Command                                        | Maintained |
+| --------------- | ---------------------------------------------- | ---------- |
+| Laravel 10 & 11 | `composer require pdphilip/elasticsearch:~4 `  | ✅         |
+| Laravel 9       | `composer require pdphilip/elasticsearch:~3.9` | ✅         |
+| Laravel 8       | `composer require pdphilip/elasticsearch:~3.8` | ✅         |
 
 ### Unmaintained versions (Elasticsearch 8.x):
 
@@ -138,6 +161,17 @@ ES_INDEX_PREFIX=my_app
 
 ### 3. If packages are not autoloaded, add the service provider:
 
+For **Laravel 11**:
+
+```php
+//bootstrap/providers.php
+<?php
+return [
+    App\Providers\AppServiceProvider::class,
+    PDPhilip\Elasticsearch\ElasticServiceProvider::class,
+];
+```
+
 For **Laravel 10 and below**:
 
 ```php
@@ -150,17 +184,6 @@ For **Laravel 10 and below**:
 
 ```
 
-For **Laravel 11**:
-
-```php
-//bootstrap/providers.php
-<?php
-return [
-    App\Providers\AppServiceProvider::class,
-    PDPhilip\Elasticsearch\ElasticServiceProvider::class,
-];
-```
-
 Now, you're all set to use Elasticsearch with Laravel as if it were native to the framework.
 
 ---
@@ -182,7 +205,7 @@ Now, you're all set to use Elasticsearch with Laravel as if it were native to th
 -   [Distinct and GroupBy](https://elasticsearch.pdphilip.com/distinct)
 -   [Aggregations](https://elasticsearch.pdphilip.com/aggregation)
 -   [Chunking](https://elasticsearch.pdphilip.com/chunking)
--   [Nested Queries](https://elasticsearch.pdphilip.com/nested-queries) **New in Version 3**
+-   [Nested Queries](https://elasticsearch.pdphilip.com/nested-queries)
 -   [Elasticsearch Specific Queries](https://elasticsearch.pdphilip.com/es-specific)
 -   [Full-Text Search](https://elasticsearch.pdphilip.com/full-text-search)
 -   [Dynamic Indices](https://elasticsearch.pdphilip.com/dynamic-indices)
@@ -197,14 +220,28 @@ Now, you're all set to use Elasticsearch with Laravel as if it were native to th
 -   [Migrations](https://elasticsearch.pdphilip.com/migrations)
 -   [Re-indexing Process](https://elasticsearch.pdphilip.com/re-indexing)
 
+## Misc
+
+-   [Handling Errors](https://elasticsearch.pdphilip.com/handling-errors)
+
+---
+
+# New in Version 4
+
+(and 3.9.1/3.8.1)
+
+-   [Search Highlighting](https://elasticsearch.pdphilip.com/full-text-search#highlighting)
+-   [whereTimestamp()](https://elasticsearch.pdphilip.com/es-specific#where-timestamp)
+-   [Raw Aggregation](https://elasticsearch.pdphilip.com/es-specific#raw-aggregation-queries)
+-   [Updated Error Handling](https://elasticsearch.pdphilip.com/handling-errors)
+-   [Chunk Upgrade: Point In Time (PIT)](https://elasticsearch.pdphilip.com/chunking#chunking-under-the-hood-pit)
+
 ---
 
 # New in Version 3
 
 ### Nested Queries [(see)](https://elasticsearch.pdphilip.com/nested-queries)
 
-This update introduces support for querying, sorting and filtering nested data
-
 -   [Nested Object Queries](https://elasticsearch.pdphilip.com/nested-queries#where-nested-object)
 -   [Order By Nested](https://elasticsearch.pdphilip.com/nested-queries#order-by-nested-field)
 -   [Filter Nested Values](https://elasticsearch.pdphilip.com/nested-queries#filtering-nested-values): Filters nested values of the parent collection

src/Connection.php

@@ -23,6 +23,7 @@ class Connection extends BaseConnection
     protected $elasticMetaHeader = null;
     protected $rebuild = false;
 
+    
     public function __construct(array $config)
     {
         $this->config = $config;

src/Schema/IndexBlueprint.php

@@ -53,26 +53,60 @@ public function keyword($field): Definitions\FieldDefinition
         return $this->addField('keyword', $field);
     }
 
+    
+    //----------------------------------------------------------------------
+    // Numeric Types
+    //----------------------------------------------------------------------
+    
+    public function long($field): Definitions\FieldDefinition
+    {
+        return $this->addField('long', $field);
+    }
+    
     public function integer($field): Definitions\FieldDefinition
     {
         return $this->addField('integer', $field);
     }
 
-    public function long($field): Definitions\FieldDefinition
+    public function short($field): Definitions\FieldDefinition
     {
-        return $this->addField('long', $field);
+        return $this->addField('short', $field);
+    }
+    
+    public function byte($field): Definitions\FieldDefinition
+    {
+        return $this->addField('byte', $field);
+    }
+    
+    public function double($field): Definitions\FieldDefinition
+    {
+        return $this->addField('double', $field);
     }
 
     public function float($field): Definitions\FieldDefinition
     {
         return $this->addField('float', $field);
     }
 
-    public function short($field): Definitions\FieldDefinition
+    public function halfFloat($field): Definitions\FieldDefinition
     {
-        return $this->addField('short', $field);
+        return $this->addField('half_float', $field);
+    }
+    
+    public function scaledFloat($field, $scalingFactor = 100): Definitions\FieldDefinition
+    {
+        return $this->addField('scaled_float', $field, [
+            'scaling_factor' => $scalingFactor,
+        ]);
     }
 
+    public function unsignedLong($field): Definitions\FieldDefinition
+    {
+        return $this->addField('unsigned_long', $field);
+    }
+    
+    //----------------------------------------------------------------------
+    
     public function date($field, $format = null): Definitions\FieldDefinition
     {
         if ($format) {