modernize

mygento · May 15, 2024 · fac18bb · fac18bb
1 parent fe365d4
commit fac18bb
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 104 deletions.
diff --git a/.github/workflows/grumphp.yml b/.github/workflows/grumphp.yml
@@ -13,10 +13,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.1', '8.3']
+        php-versions: ['7.4', '8.1', '8.2', '8.3']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
@@ -27,7 +28,7 @@ jobs:
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.

diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 /nbproject/
 .php_cs.cache
 .php-cs-fixer.cache
+/generated
diff --git a/Console/Report.php b/Console/Report.php
@@ -25,9 +25,9 @@ class Report extends Command
 {
     public const ARGUMENT = 'period';
     public const ARGUMENT_DESCRIPTION = 'Period. Possible values: '
-    . self::TODAY_PERIOD . ', '
-    . self::YESTERDAY_PERIOD . ', '
-    . self::WEEK_PERIOD;
+        . self::TODAY_PERIOD . ', '
+        . self::YESTERDAY_PERIOD . ', '
+        . self::WEEK_PERIOD;
     public const COMMAND = 'mygento:kkm:report';
     public const COMMAND_DESCRIPTION = 'Show report of kkm transaction for period.';
     public const WEEK_PERIOD = 'week';
@@ -74,7 +74,7 @@ public function __construct(
      * @throws \Exception
      * @return int
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->output = $output;
 

diff --git a/Console/SendRefund.php b/Console/SendRefund.php
@@ -87,7 +87,7 @@ public function __construct(
      * @throws \Mygento\Kkm\Exception\VendorBadServerAnswerException
      * @return int|null
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->appState->setAreaCode(\Magento\Framework\App\Area::AREA_GLOBAL);
 

diff --git a/Console/SendResell.php b/Console/SendResell.php
@@ -80,7 +80,7 @@ public function __construct(
      * @throws \Mygento\Kkm\Exception\VendorBadServerAnswerException
      * @return int|null
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->appState->setAreaCode(\Magento\Framework\App\Area::AREA_GLOBAL);
 

diff --git a/Console/SendSell.php b/Console/SendSell.php
@@ -79,7 +79,7 @@ public function __construct(
      * @throws \Mygento\Kkm\Exception\VendorBadServerAnswerException
      * @return int|null
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->appState->setAreaCode(\Magento\Framework\App\Area::AREA_GLOBAL);
 

diff --git a/Console/UpdateStatus.php b/Console/UpdateStatus.php
@@ -83,7 +83,7 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return int|null
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $transactionUuid = $input->getArgument(self::TRANSACTION_UUID_ARGUMENT);
 
@@ -138,7 +138,7 @@ protected function configure()
 To update all transaction with status 'wait':
       <comment>%command.full_name% </comment>
 HELP
-            . self::RUN_ALL_PARAM
+                . self::RUN_ALL_PARAM
         );
         parent::configure();
     }

diff --git a/Model/Report.php b/Model/Report.php
@@ -174,14 +174,14 @@ private function collectStatistics($searchCriteriaBuilder)
                 )
                 ->where(sprintf('%s.%s = %s', $salesOrderAlias, OrderInterface::STORE_ID, $this->storeId));
         }
-//        $transactionAttempts = $this->attemptRepository->getList(
-//            $searchCriteriaBuilder->create()
-//        );
+        //        $transactionAttempts = $this->attemptRepository->getList(
+        //            $searchCriteriaBuilder->create()
+        //        );
 
         /** @var $statistics \Mygento\Kkm\Model\Statistics */
         $statistics = $this->statisticsFactory->create();
 
-//        $items = array_merge($transactions->getItems(), $transactionAttempts->getItems());
+        //        $items = array_merge($transactions->getItems(), $transactionAttempts->getItems());
         $items = $transactions->getItems();
         foreach ($items as $item) {
             $info = $item->getAdditionalInformation(TransactionEntity::RAW_DETAILS);

diff --git a/Plugin/ExtraSalesViewToolbarButtons.php b/Plugin/ExtraSalesViewToolbarButtons.php
@@ -220,9 +220,9 @@ private function canBeShownCheckStatusButton($transactions, $storeId)
         foreach ($transactions as $transaction) {
             $status = $transaction->getKkmStatus();
             // может быть завршенная транзакция по предоплате
-//            if ($status === Response::STATUS_DONE) {
-//                return false;
-//            }
+            //            if ($status === Response::STATUS_DONE) {
+            //                return false;
+            //            }
             if ($status === Response::STATUS_WAIT) {
                 $isWait = true;
             }