Merge branch 'develop' into develop-v5

# Conflicts: # CHANGELOG.md # composer.json
studioespresso · Mar 23, 2024 · e59aa31 · e59aa31
2 parents 3a072b8 + 9495e90
commit e59aa31
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## 5.0.0-beta.1 - 2024-03-23
+- Updated Fractal to 0.20. ([#292](https://github.com/studioespresso/craft-scout/pull/292))
+
 ## 5.0.0-alpha.1 - 2023-12-20
 ### Added
 - Initial Craft 5 support
 
 
+## 4.0.0 - 2024-03-18
+- Updated Fractal to 0.20. ([#292](https://github.com/studioespresso/craft-scout/pull/292))
+
+## 3.4.1 - 2024-03-18
+### Added
+- Added version constraint to prevent installation with craftcms/element-api
+
+
 ## 3.4.0 - 2024-03-15
-## Added
+### Added
 - Related element types are now configurable ([#273](https://github.com/studioespresso/craft-scout/pull/273))
 
 ## 3.3.3 - 2024-03-01

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "studioespresso/craft-scout",
     "description": "Craft Scout provides a simple solution for adding full-text search to your entries. Scout will automatically keep your search indexes in sync with your entries.",
     "type": "craft-plugin",
-    "version": "5.0.0-alpha.1",
+    "version": "5.0.0-beta.1",
     "keywords": [
         "craft",
         "cms",
@@ -27,9 +27,12 @@
     ],
     "require": {
         "php": "^8.2.0",
-        "craftcms/cms": "^5.0.0-alpha",
+        "craftcms/cms": "^5.0.0-beta.1",
         "algolia/algoliasearch-client-php": "^2.3|^3.0",
-        "league/fractal": "^0.18|^0.19"
+        "league/fractal": "^0.20"
+    },
+    "conflict": {
+        "craftcms/element-api": "<4.0.0"
     },
     "repositories": [
         {

diff --git a/src/ScoutIndex.php b/src/ScoutIndex.php
@@ -21,7 +21,7 @@ class ScoutIndex extends BaseObject
     /** @var IndexSettings */
     public $indexSettings;
 
-    /** @var string */
+    /** @var <class-string> */
     public $elementType = Entry::class;
 
     /** @var callable|string|array|\League\Fractal\TransformerAbstract */

diff --git a/src/serializer/AlgoliaSerializer.php b/src/serializer/AlgoliaSerializer.php
@@ -7,12 +7,12 @@ class AlgoliaSerializer extends \League\Fractal\Serializer\ArraySerializer
     /**
      * Serialize a collection.
      *
-     * @param string $resourceKey
+     * @param ?string $resourceKey
      * @param array  $data
      *
      * @return array
      */
-    public function collection($resourceKey, array $data)
+    public function collection(?string $resourceKey, array $data): array
     {
         if ($resourceKey) {
             return [$resourceKey => $data];