Merge branch 'master' of github.com:rapidez/statamic into feature/sit…

…e-config
rapidez · Nov 5, 2024 · 6cd5fdc · 6cd5fdc
2 parents aff4690 + 6b879ae
commit 6cd5fdc
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog 
 
-[Unreleased changes](https://github.com/rapidez/statamic/compare/4.2.0...4.2.0)
+[Unreleased changes](https://github.com/rapidez/statamic/compare/4.3.0...4.3.0)
+## [4.3.0](https://github.com/rapidez/statamic/releases/tag/4.3.0) - 2024-10-30
+
+### Changed
+
+- Removed justbetter/statamic-eloquent-driver-globalset-migration-generator (#83)
+
+### Fixed
+
+- Performance optimizations (#77)
+
 ## [4.2.0](https://github.com/rapidez/statamic/releases/tag/4.2.0) - 2024-09-26
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -31,9 +31,9 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.1|^8.2",
-        "justbetter/statamic-eloquent-driver-globalset-migration-generator": "^0.1.0",
         "rapidez/blade-directives": "^0.6",
         "justbetter/statamic-glide-directive": "^2.1",
+        "spatie/once": "*",
         "statamic-rad-pack/runway": "^7.6",
         "statamic/cms": "^5.29",
         "statamic/eloquent-driver": "^4.9",

diff --git a/src/Extend/SitesLinkedToMagentoStores.php b/src/Extend/SitesLinkedToMagentoStores.php
@@ -2,6 +2,7 @@
 
 namespace Rapidez\Statamic\Extend;
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Rapidez\Core\Facades\Rapidez;
 use Statamic\Sites\Sites;
@@ -10,17 +11,20 @@ class SitesLinkedToMagentoStores extends Sites
 {
     public function findByUrl($url)
     {
-        if ($site = $this->findByMageRunCode(request()->server('MAGE_RUN_CODE'))) {
+        if ($site = once(fn() => $this->findByMageRunCode(request()->server('MAGE_RUN_CODE')))) {
             return $site;
         }
 
-        return parent::findByUrl($url);
+        return once(fn() => parent::findByUrl($url));
     }
 
 
     public function findByMageRunCode($code)
     {
-        return collect($this->sites)->get($code);
+        if (!$code || !($this->sites instanceof Collection)) {
+            return null;
+        }
+        return $this->sites->get($code);
     }
 
     protected function getSavedSites()

diff --git a/src/Models/Category.php b/src/Models/Category.php
@@ -15,6 +15,9 @@ class Category extends Model
 
     public function getTable()
     {
-        return 'catalog_category_flat_store_'.(Statamic::isCpRoute() ? (Site::selected()->attributes['magento_store_id'] ?? '1') : (Site::current()->attributes['magento_store_id'] ?? '1'));
+        return 'catalog_category_flat_store_'.once(fn() => (Statamic::isCpRoute() 
+            ? (Site::selected()->attributes['magento_store_id'] ?? '1') 
+            : (Site::current()->attributes['magento_store_id'] ?? '1')
+        ));
     }
 }
diff --git a/src/Models/Product.php b/src/Models/Product.php
@@ -24,6 +24,9 @@ protected static function booting()
 
     public function getTable()
     {
-        return 'catalog_product_flat_' . (Statamic::isCpRoute() ? (Site::selected()->attributes['magento_store_id'] ?? '1') : Site::current()->attributes['magento_store_id'] ?? '1');
+        return 'catalog_product_flat_' . once(fn() => (Statamic::isCpRoute()
+            ? (Site::selected()->attributes['magento_store_id'] ?? '1')
+            : (Site::current()->attributes['magento_store_id'] ?? '1')
+        ));
     }
 }