Merge branch '10.x' into 11.x

# Conflicts:
#	CHANGELOG.md
#	src/Engines/AlgoliaEngine.php
#	src/Scout.php

Author: driesvints

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -0,0 +1,68 @@
+name: Bug Report
+description: "Report something that's broken."
+body:
+  - type: markdown
+    attributes:
+      value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem."
+  - type: input
+    attributes:
+      label: Scout Version
+      description: Provide the Scout version that you are using.
+      placeholder: 10.1.0
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Scout Driver
+      description: Tell us which driver you're using. We only support the listed drivers.
+      options:
+        - Algolia
+        - Meilisearch
+        - Typesense
+        - Database
+        - Collection
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Laravel Version
+      description: Provide the Laravel version that you are using. [Please ensure it is still supported.](https://laravel.com/docs/releases#support-policy)
+      placeholder: 10.4.1
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: PHP Version
+      description: Provide the PHP version that you are using.
+      placeholder: 8.1.4
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Database Driver & Version
+      description: If applicable, provide the database driver and version you are using.
+      placeholder: "MySQL 8.0.31 for macOS 13.0 on arm64 (Homebrew)"
+  - type: input
+    attributes:
+      label: SDK Version
+      description: If you're using a third-party service like Algolia or Meilisearch, please provide us with the SDK version.
+      placeholder: 2.4.5
+  - type: input
+    attributes:
+      label: Meilisearch CLI Version
+      description: If you're using Meilisearch, please provide us with the CLI version.
+      placeholder: 1.0.2
+  - type: textarea
+    attributes:
+      label: Description
+      description: Provide a detailed description of the issue you are facing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Provide detailed steps to reproduce your issue. If necessary, please provide a GitHub repository to demonstrate your issue using `laravel new bug-report --github="--public"`.
+    validations:
+      required: true
+      
+

.github/ISSUE_TEMPLATE/1_Bug_report.yml

@@ -12,30 +12,4 @@ permissions:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: true
-
-    name: Static Analysis
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
-
-      - name: Execute type checking
-        run: vendor/bin/phpstan
+    uses: laravel/.github/.github/workflows/static-analysis.yml@main

.github/workflows/static-analysis.yml

@@ -16,19 +16,25 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0', 8.1, 8.2]
-        laravel: [9, 10]
+        php: ['8.0', 8.1, 8.2, 8.3]
+        laravel: [9, 10, 11]
         exclude:
           - php: '8.0'
             laravel: 9
           - php: '8.0'
             laravel: 10
+          - php: '8.0'
+            laravel: 11
+          - php: '8.1'
+            laravel: 11
+          - php: 8.3
+            laravel: 9
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -45,4 +51,46 @@ jobs:
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
+
+  tests-using-meilisearch:
+    runs-on: ubuntu-22.04
+
+    services:
+      meilisearch:
+        image: getmeili/meilisearch:latest
+        ports:
+          - 7700:7700
+        env:
+          MEILI_MASTER_KEY: masterKey
+          MEILI_NO_ANALYTICS: true
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: ['8.0', 8.1, 8.2, 8.3]
+
+    name: PHP ${{ matrix.php }} using Meilisearch
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          ini-values: error_reporting=E_ALL
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+           composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit --group external-network,meilisearch
+        env:
+          MEILISEARCH_HOST: "http://localhost:7700"
+          MEILISEARCH_KEY: 'masterKey'

.github/workflows/tests.yml

@@ -1,6 +1,117 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/scout/compare/v9.8.1...master)
+## [Unreleased](https://github.com/laravel/scout/compare/v10.9.0...11.x)
+
+## [v10.9.0](https://github.com/laravel/scout/compare/v10.8.6...v10.9.0) - 2024-05-07
+
+* Allow Typesense Search Parameter Definition on Models by [@stammbach](https://github.com/stammbach) in https://github.com/laravel/scout/pull/827
+* Fixing issue 825 by [@AbdullahFaqeir](https://github.com/AbdullahFaqeir) in https://github.com/laravel/scout/pull/826
+
+## [v10.8.6](https://github.com/laravel/scout/compare/v10.8.5...v10.8.6) - 2024-04-16
+
+* Prevent unnecessary api calls on Collection (index) by [@AbdullahFaqeir](https://github.com/AbdullahFaqeir) in https://github.com/laravel/scout/pull/820
+
+## [v10.8.5](https://github.com/laravel/scout/compare/v10.8.4...v10.8.5) - 2024-04-02
+
+* [Typesense] Issue when searching with queryCallback by [@karakhanyans](https://github.com/karakhanyans) in https://github.com/laravel/scout/pull/817
+
+## [v10.8.4](https://github.com/laravel/scout/compare/v10.8.3...v10.8.4) - 2024-03-26
+
+* Repaces when and tap functions with Conditionable and Tappable traits by [@ncharalampidis](https://github.com/ncharalampidis) in https://github.com/laravel/scout/pull/811
+* [10.x] Make commands lazy by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/scout/pull/815
+* [10.x] Optional field definitions on model by [@MortenDHansen](https://github.com/MortenDHansen) in https://github.com/laravel/scout/pull/812
+
+## [v10.8.3](https://github.com/laravel/scout/compare/v10.8.2...v10.8.3) - 2024-02-13
+
+* [10.x] Fix zero integer value in options parameter for Typesense by [@alignwebs](https://github.com/alignwebs) in https://github.com/laravel/scout/pull/802
+
+## [v10.8.2](https://github.com/laravel/scout/compare/v10.8.1...v10.8.2) - 2024-01-30
+
+* [10.x] Ordering by model's custom `created_at` column by [@stevebauman](https://github.com/stevebauman) in https://github.com/laravel/scout/pull/801
+
+## [v10.8.1](https://github.com/laravel/scout/compare/v10.8.0...v10.8.1) - 2024-01-23
+
+* [10.x] Fix Typesense search parameters issue  by [@karakhanyans](https://github.com/karakhanyans) in https://github.com/laravel/scout/pull/795
+
+## [v10.8.0](https://github.com/laravel/scout/compare/v10.7.0...v10.8.0) - 2024-01-16
+
+* [10.x] Laravel v11 support by [@nunomaduro](https://github.com/nunomaduro) in https://github.com/laravel/scout/pull/789
+
+## [v10.7.0](https://github.com/laravel/scout/compare/v10.6.1...v10.7.0) - 2024-01-09
+
+* [10.x] Add Typesense engine by [@jasonbosco](https://github.com/jasonbosco) in https://github.com/laravel/scout/pull/773
+
+## [v10.6.1](https://github.com/laravel/scout/compare/v10.6.0...v10.6.1) - 2023-12-05
+
+* Fix unsearchable config by [@Casmo](https://github.com/Casmo) in https://github.com/laravel/scout/pull/783
+
+## [v10.6.0](https://github.com/laravel/scout/compare/v10.5.1...v10.6.0) - 2023-11-28
+
+* Add search engine meta data to results by [@tobz-nz](https://github.com/tobz-nz) in https://github.com/laravel/scout/pull/780
+
+## [v10.5.1](https://github.com/laravel/scout/compare/v10.5.0...v10.5.1) - 2023-10-31
+
+- Call makeSearchableUsing before searching on CollectionEngine by [@Magnesium38](https://github.com/Magnesium38) in https://github.com/laravel/scout/pull/777
+
+## [v10.5.0](https://github.com/laravel/scout/compare/v10.4.0...v10.5.0) - 2023-10-10
+
+- Adds latest and oldest sorting options by [@peterfox](https://github.com/peterfox) in https://github.com/laravel/scout/pull/770
+
+## [v10.4.0](https://github.com/laravel/scout/compare/v10.3.0...v10.4.0) - 2023-09-26
+
+- Allow configuration of Algolia batch size by [@samlev](https://github.com/samlev) in https://github.com/laravel/scout/pull/768
+  **Full Changelog**: https://github.com/laravel/scout/compare/v10.3.0...v10.4.0
+
+## [v10.3.0](https://github.com/laravel/scout/compare/v10.2.4...v10.3.0) - 2023-09-05
+
+- Add "whereNotIn" native support to Meilisearch, Database and Collection engines by [@guestpectacular](https://github.com/guestpectacular) in https://github.com/laravel/scout/pull/760
+
+## [v10.2.4](https://github.com/laravel/scout/compare/v10.2.3...v10.2.4) - 2023-08-08
+
+- Add Configurable Scout Key Type by [@geisi](https://github.com/geisi) in https://github.com/laravel/scout/pull/752
+
+## [v10.2.3](https://github.com/laravel/scout/compare/v10.2.2...v10.2.3) - 2023-07-11
+
+- Override attributesToRetrieve config to ensure search result is complete by [@mmachatschek](https://github.com/mmachatschek) in https://github.com/laravel/scout/pull/751
+
+## [v10.2.2](https://github.com/laravel/scout/compare/v10.2.1...v10.2.2) - 2023-05-24
+
+- Fixes usage with `sqlsrv` databases by @nunomaduro in https://github.com/laravel/scout/pull/740
+
+## [v10.2.1](https://github.com/laravel/scout/compare/v10.2.0...v10.2.1) - 2023-05-10
+
+- Fixes `makeSearchableUsing` not being able to be called by @nunomaduro in https://github.com/laravel/scout/pull/739
+
+## [v10.2.0](https://github.com/laravel/scout/compare/v10.1.1...v10.2.0) - 2023-05-09
+
+- Add 'makeSearchableUsing' method (to allow eager loading when making specific models searchable) by @gdebrauwer in https://github.com/laravel/scout/pull/732
+- Re-add options for search requests by @patrickweh in https://github.com/laravel/scout/pull/734
+
+## [v10.1.1](https://github.com/laravel/scout/compare/v10.1.0...v10.1.1) - 2023-04-18
+
+- Handle empty whereIn clause by @jshah4517 in https://github.com/laravel/scout/pull/729
+
+## [v10.1.0](https://github.com/laravel/scout/compare/v10.0.2...v10.1.0) - 2023-04-11
+
+- Removed redundant default value for config file by @siarheipashkevich in https://github.com/laravel/scout/pull/714
+- Adds support for custom page names using the database engine by @lukeraymonddowning in https://github.com/laravel/scout/pull/728
+
+## [v10.0.2](https://github.com/laravel/scout/compare/v10.0.1...v10.0.2) - 2023-03-07
+
+- Use `newQuery()` instead of `query()` in `DatabaseEngine` by @jbelien in https://github.com/laravel/scout/pull/713
+
+## [v10.0.1](https://github.com/laravel/scout/compare/v10.0.0...v10.0.1) - 2023-03-05
+
+- Fix missing function issue by @JerryBels in https://github.com/laravel/scout/pull/711
+
+## [v10.0.0](https://github.com/laravel/scout/compare/v9.8.1...v10.0.0) - 2023-03-02
+
+- Refactor the use of getScoutKeyName by @driesvints in https://github.com/laravel/scout/pull/509
+- Remove obsolete code for scout key name by @mmachatschek in https://github.com/laravel/scout/pull/545
+- Provide searchable data array with primary key and value for MeiliSearch by @mmachatschek in https://github.com/laravel/scout/pull/546
+- Fix custom scout keys not being utilized when deleting from queue by @stevebauman in https://github.com/laravel/scout/pull/657
+- Drop old PHP and Laravel versions by @driesvints in https://github.com/laravel/scout/pull/675
+- Meilisearch v1 support by @mmachatschek in https://github.com/laravel/scout/pull/678
 
 ## [v9.8.1](https://github.com/laravel/scout/compare/v9.8.0...v9.8.1) - 2023-02-14
 

CHANGELOG.md

@@ -13,6 +13,7 @@ Laravel Scout provides a simple, driver-based solution for adding full-text sear
 
 - [Algolia](https://www.algolia.com/)
 - [Meilisearch](https://github.com/meilisearch/meilisearch)
+- [Typesense](https://github.com/typesense/typesense)
 
 ## Official Documentation
 

README.md

@@ -1,4 +1,4 @@
 # Release Instructions
 
 1. Update the version in [`Scout.php`](./src/Scout.php) and commit it
-2. Create a new GitHub release for this version with the release notes
+2. [Create a new GitHub release](https://github.com/laravel/scout/releases/new) for this version with the release notes

RELEASE.md

@@ -13,7 +13,7 @@ The following dependency versions have been updated:
 
 PR: https://github.com/laravel/scout/pull/509
 
-In Scout 10.x, the `getScoutKeyName` method will return the unqualified key name and no longer qualifies the key name with the table name. If you are overriding the `getScoutKeyName` method you will need to account for this change and make sure you return an unqualified key name.
+In Scout 10.x, the `getScoutKeyName` method will return the unqualified key name and no longer qualifies the key name with the table name. If your application is overriding the `getScoutKeyName` method you should ensure an unqualified key name is returned.
 
 ```diff
 public function getScoutKeyName()

UPGRADE.md

@@ -15,22 +15,24 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/bus": "^9.0|^10.0",
-        "illuminate/contracts": "^9.0|^10.0",
-        "illuminate/database": "^9.0|^10.0",
-        "illuminate/http": "^9.0|^10.0",
-        "illuminate/pagination": "^9.0|^10.0",
-        "illuminate/queue": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0"
+        "illuminate/bus": "^9.0|^10.0|^11.0",
+        "illuminate/contracts": "^9.0|^10.0|^11.0",
+        "illuminate/database": "^9.0|^10.0|^11.0",
+        "illuminate/http": "^9.0|^10.0|^11.0",
+        "illuminate/pagination": "^9.0|^10.0|^11.0",
+        "illuminate/queue": "^9.0|^10.0|^11.0",
+        "illuminate/support": "^9.0|^10.0|^11.0",
+        "symfony/console": "^6.0|^7.0"
     },
     "require-dev": {
         "algolia/algoliasearch-client-php": "^3.2",
+        "typesense/typesense-php": "^4.9.3",
         "meilisearch/meilisearch-php": "^1.0",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^7.0|^8.0",
+        "orchestra/testbench": "^7.31|^8.11|^9.0",
         "php-http/guzzle7-adapter": "^1.0",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3|^10.4"
     },
     "autoload": {
         "psr-4": {
@@ -54,7 +56,8 @@
     },
     "suggest": {
         "algolia/algoliasearch-client-php": "Required to use the Algolia engine (^3.2).",
-        "meilisearch/meilisearch-php": "Required to use the Meilisearch engine (^1.0)."
+        "meilisearch/meilisearch-php": "Required to use the Meilisearch engine (^1.0).",
+        "typesense/typesense-php": "Required to use the Typesense engine (^4.9)."
     },
     "config": {
         "sort-packages": true,