Merge pull request #2 from lbanka/fix-scope-id-validation

Fix scope_id validation when using default scope

Author: jissereitsma

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.2] - 20 June 2023
+### Fixed
+- Fix scope_id validation when using default scope #2 @lbanka
+
 ## [1.0.1] - 17 June 2023
 ### Added
 - Allow to use scope codes #1 @lbanka

Console/Command/ThemeChangeCommand.php

@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $themeName = trim($input->getArgument('theme_name'));
         $themeId = $this->getThemeId($themeName);
 
-        if (!$themeId > 0) {
+        if (is_null($themeId)) {
             $output->writeln('<error>Not a valid theme: ' . $themeName . '</error>');
             return Command::FAILURE;
         }
@@ -111,8 +111,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
         }
 
-        if (!$scopeId > 0) {
-            $output->writeln('<error>Not a valid scopeId: ' . $scopeId . '</error>');
+        if (is_null($scopeId)) {
+            $output->writeln('<error>Not a valid scope_id</error>');
             return Command::FAILURE;
         }
 
@@ -126,24 +126,24 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return Command::SUCCESS;
     }
 
-    private function getThemeId(string $themeName): int
+    private function getThemeId(string $themeName): ?int
     {
         $themeModel = $this->themeFactory->create();
         $this->themeResourceModel->load($themeModel, $themeName, 'theme_path');
-        return (int)$themeModel->getId();
+        return $themeModel->getId() ? (int)$themeModel->getId() : null;
     }
 
-    private function getWebsiteId(string $scopeId): int
+    private function getWebsiteId(string $scopeId): ?int
     {
         $websiteModel = $this->websiteFactory->create();
         $this->websiteResourceModel->load($websiteModel, $scopeId, 'code');
-        return (int)$websiteModel->getId();
+        return $websiteModel->getId() ? (int)$websiteModel->getId() : null;
     }
 
-    private function getStoreId(string $scopeId): int
+    private function getStoreId(string $scopeId): ?int
     {
         $storeModel = $this->storeFactory->create();
         $this->storeResourceModel->load($storeModel, $scopeId, 'code');
-        return (int)$storeModel->getId();
+        return $storeModel->getId() ? (int)$storeModel->getId() : null;
     }
 }

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "yireo/magento2-theme-commands",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "OSL-3.0",
   "description": "CLI commands to manipulate themes",
   "type": "magento2-module",