PHPRO-415 Minor changes

phpro · Jul 1, 2024 · 08c61a2 · 08c61a2
1 parent 5faa0bc
commit 08c61a2
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 43 deletions.
diff --git a/.github/workflows/grumphp.yml b/.github/workflows/grumphp.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: true
       matrix:
         php-versions:
-          - "8.1"
+          - "8.3"
         dependencies:
           - "lowest"
     steps:
@@ -27,4 +27,4 @@ jobs:
           run: composer install
 
       -   name: GrumPHP
-          run: ./vendor/bin/grumphp run
+          run: ./vendor/bin/grumphp run
diff --git a/Api/Data/TranslationInterface.php b/Api/Data/TranslationInterface.php
@@ -69,14 +69,14 @@ public function setFrontend($frontend);
     /**
      * Retrieve existing extension attributes object or create a new one.
      *
-     * @return \Phpro\Translations\Api\Data\TranslationExtensionInterface|null
+     * @return TranslationExtensionInterface|null
      */
     public function getExtensionAttributes();
 
     /**
      * Set an extension attributes object.
      *
-     * @param \Phpro\Translations\Api\Data\TranslationExtensionInterface $extensionAttributes
+     * @param TranslationExtensionInterface $extensionAttributes
      * @return $this
      */
     public function setExtensionAttributes(

diff --git a/Api/TranslationRepositoryInterface.php b/Api/TranslationRepositoryInterface.php
@@ -11,9 +11,9 @@ interface TranslationRepositoryInterface
     /**
      * Save Translation
      *
-     * @param \Phpro\Translations\Api\Data\TranslationInterface $translation
+     * @param Data\TranslationInterface $translation
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @return \Phpro\Translations\Api\Data\TranslationInterface
+     * @return Data\TranslationInterface
      */
     public function save(
         Data\TranslationInterface $translation
@@ -24,16 +24,16 @@ public function save(
      *
      * @param string $translationId
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @return \Phpro\Translations\Api\Data\TranslationInterface
+     * @return Data\TranslationInterface
      */
     public function getById($translationId);
 
     /**
      * Retrieve Translation matching the specified criteria.
      *
-     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @param SearchCriteriaInterface $searchCriteria
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @return \Phpro\Translations\Api\Data\TranslationSearchResultsInterface
+     * @return Data\TranslationSearchResultsInterface
      */
     public function getList(
         SearchCriteriaInterface $searchCriteria

diff --git a/Block/Adminhtml/Translation/Edit/GenericButton.php b/Block/Adminhtml/Translation/Edit/GenericButton.php
@@ -13,7 +13,7 @@ abstract class GenericButton
     protected $context;
 
     /**
-     * @param \Magento\Backend\Block\Widget\Context $context
+     * @param Context $context
      */
     public function __construct(Context $context)
     {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,12 +25,14 @@
 ## [1.2.2] - 2022-10-14
 ### Added
 - Hyva support: remove requirejs from head.additional
-- 
+
 ## [1.3.0] - 2024-03-28
 ### Updated
 - PHP ^8.1 compatibility 
 
 ## [1.4.0] - 2024-06-05
+### Updated
+- Set minimum PHP version to 8.3
 ### Bugfix
 - Fix return types console commands
-- Locales are not found if set in env.php and not in core_config_table
+- Locales are not found if set in env.php and not in core_config_table
diff --git a/Console/Command/Export.php b/Console/Command/Export.php
@@ -44,8 +44,6 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $exitCode = 0;
-
         try {
             $locales = $input->getArgument(self::ARGUMENT_LOCALES);
 
@@ -63,9 +61,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('<info>Done!</info>');
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $exitCode = 1;
+            return Command::FAILURE;
         }
 
-        return $exitCode;
+        return Command::SUCCESS;
     }
 }
diff --git a/Console/Command/GenerateFrontendTranslations.php b/Console/Command/GenerateFrontendTranslations.php
@@ -44,8 +44,6 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $exitCode = 0;
-
         try {
             $storeId = (int)$input->getArgument('storeId');
             $statsCollection = $this->generatedTranslations($storeId);
@@ -64,10 +62,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('<info>Please clean full_page and block_html caches manually</info>');
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $exitCode = 1;
+            return Command::FAILURE;
         }
 
-        return $exitCode;
+        return Command::SUCCESS;
     }
 
     /**

diff --git a/Console/Command/Import.php b/Console/Command/Import.php
@@ -57,8 +57,6 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $exitCode = 0;
-
         try {
             $csvFile = $input->getArgument(self::ARGUMENT_CSV_FILE);
             $locale = $input->getArgument(self::ARGUMENT_LOCALE);
@@ -86,9 +84,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('<info>Done!</info>');
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $exitCode = 1;
+            return Command::FAILURE;
         }
 
-        return $exitCode;
+        return Command::SUCCESS;
     }
 }
diff --git a/Console/Command/ImportFull.php b/Console/Command/ImportFull.php
@@ -55,8 +55,6 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $exitCode = 0;
-
         try {
             $csvFile = $input->getArgument(self::ARGUMENT_CSV_FILE);
 
@@ -82,9 +80,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('<info>Done!</info>');
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $exitCode = 1;
+            return Command::FAILURE;
         }
 
-        return $exitCode;
+        return Command::SUCCESS;
     }
 }
diff --git a/Console/Command/PrepareKeysCommand.php b/Console/Command/PrepareKeysCommand.php
@@ -67,8 +67,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $exitCode = 0;
-
         try {
             $phraseCollector = new PhraseCollector(new Tokenizer());
             $adapters = [
@@ -91,9 +89,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('<info>Keys successfully created.</info>');
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
-            $exitCode = 1;
+            return Command::FAILURE;
         }
 
-        return $exitCode;
+        return Command::SUCCESS;
     }
 }
diff --git a/composer.json b/composer.json
@@ -11,18 +11,18 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
         "magento/framework": "^102.0|^103.0",
         "magento/module-backend": "^101.0|^102.0",
         "magento/module-ui": "^101.0|^102.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~3.4.0",
-        "magento/magento-coding-standard": "21",
+        "friendsofphp/php-cs-fixer": "~3.59.0",
+        "magento/magento-coding-standard": "^33",
         "php-parallel-lint/php-parallel-lint": "^1.3",
-        "phpro/grumphp-shim": "^1.5",
-        "phpunit/phpunit": "^8.5",
-        "squizlabs/php_codesniffer": "~3.4"
+        "phpro/grumphp-shim": "^2.6",
+        "phpunit/phpunit": "^9.5",
+        "squizlabs/php_codesniffer": "~3.7"
     },
     "autoload": {
         "psr-4": {
@@ -42,15 +42,16 @@
         "sort-packages": true,
         "allow-plugins": {
             "phpro/grumphp-shim": true,
-            "magento/composer-dependency-version-audit-plugin": true
+            "magento/composer-dependency-version-audit-plugin": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "scripts": {
         "post-install-cmd": [
-            "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard,../../phpcompatibility/php-compatibility/PHPCompatibility)"
+            "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/,../../magento/php-compatibility-fork)"
         ],
         "post-update-cmd": [
-            "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard,../../phpcompatibility/php-compatibility/PHPCompatibility)"
+            "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/,../../magento/php-compatibility-fork)"
         ]
     }
 }
diff --git a/registration.php b/registration.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+Magento\Framework\Component\ComponentRegistrar::register(
+    Magento\Framework\Component\ComponentRegistrar::MODULE,
     'Phpro_Translations',
     __DIR__
 );