Merge branch 'release/v7.3.2'

Author: Omranic

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 
 
+## [v7.3.2] - 2024-07-22
+- Upgrade vinkla/hashids to v12 (#85)
+- Fix rules override (#84)
+
 ## [v7.3.1] - 2023-08-30
 - Support new accessarea file-based structure
 
@@ -323,6 +327,7 @@ This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 ## v0.0.1 - 2016-12-20
 - Tag first release
 
+[v7.3.2]: https://github.com/rinvex/laravel-support/compare/v7.3.1...v7.3.2
 [v7.3.1]: https://github.com/rinvex/laravel-support/compare/v7.3.0...v7.3.1
 [v7.3.0]: https://github.com/rinvex/laravel-support/compare/v7.2.6...v7.3.0
 [v7.2.6]: https://github.com/rinvex/laravel-support/compare/v7.2.5...v7.2.6

composer.json

@@ -45,7 +45,7 @@
         "spatie/laravel-sluggable": "^3.4.0",
         "spatie/laravel-schemaless-attributes": "^2.4.0",
         "spatie/laravel-translatable": "^6.0.0",
-        "vinkla/hashids": "^11.0.0",
+        "vinkla/hashids": "^11.0.0 || ^12.0.0",
         "watson/validating": "^8.0.0"
     },
     "require-dev": {

src/Traits/HashidsTrait.php

@@ -58,7 +58,7 @@ public function unhashId($value)
      */
     protected function shouldBeHashed(): bool
     {
-        $accessareas = app('accessareas')->active()->obscured()->keys()->when($this->obscure, fn($collection) => $collection->merge(collect($this->obscure)->intersect(app('accessareas')->active()->keys()))->unique())->toArray();
+        $accessareas = app('accessareas')->active()->obscured()->keys()->when($this->obscure, fn ($collection) => $collection->merge(collect($this->obscure)->intersect(app('accessareas')->active()->keys()))->unique())->toArray();
 
         return in_array(request()->accessarea(), $accessareas) && in_array($this->getRouteKeyName(), config('cortex.foundation.obscure.hashed_keys'));
     }

src/Traits/ValidatingTrait.php

@@ -21,7 +21,7 @@ trait ValidatingTrait
      */
     public function mergeRules(array $rules)
     {
-        $this->rules += $rules;
+        $this->rules = array_merge($this->rules, $rules);
 
         return $this;
     }