Merge pull request #264 from mesilov/dev

Dev

Author: mesilov

.github/workflows/integration-tests.yml renamed to .github/workflows/integration.yml

@@ -2,13 +2,7 @@ name: "Integration tests"
 
 on:
   push:
-    branches:
-      - 'master'
-      - 'dev'
-      - '2.x'
-    paths:
-      - 'src/**'
-      - 'tests/**'
+  pull_request:
 
 env:
   COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"

src/Core/Batch.php

@@ -608,6 +608,7 @@ protected function getTraversable(bool $isHaltOnError): Generator
                     'batchApiCommandUuid' => $batchResult->getApiCommand()->getUuid()->toString(),
                 ]
             );
+            // todo try to multiplex requests
             $response = $batchResult->getResponseData();
 
             // single queries

src/Core/BulkItemsReader/ReadStrategies/FilterWithoutBatchWithoutCountOrder.php

@@ -45,7 +45,7 @@ public function getTraversableList(string $apiMethod, array $order, array $filte
             'limit'     => $limit,
         ]);
 
-        // дефолтная стратегия из документации https://dev.1c-bitrix.ru/rest_help/rest_sum/start.php
+        // Дефолтная стратегия из документации https://dev.1c-bitrix.ru/rest_help/rest_sum/start.php
         //
         //Особенности:
         //— ✅ отключён подсчёт количества элементов в выборке

tests/Integration/Fabric.php

@@ -12,6 +12,8 @@
 use Bitrix24\SDK\Services\ServiceBuilder;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
+use Monolog\Processor\IntrospectionProcessor;
+use Monolog\Processor\MemoryUsageProcessor;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -45,6 +47,12 @@ public static function getBulkItemsReader(): BulkItemsReaderInterface
      */
     public static function getCore(): CoreInterface
     {
+
+        print(print_r($_ENV, true));
+        print(print_r($_ENV['BITRIX24_PHP_SDK_PLAYGROUND_WEBHOOK']));
+        print(print_r($_ENV['BITRIX24_WEBHOOK']));
+        exit();
+
         return (new CoreBuilder())
             ->withLogger(self::getLogger())
             ->withWebhookUrl($_ENV['BITRIX24_PHP_SDK_PLAYGROUND_WEBHOOK'] ?? $_ENV['BITRIX24_WEBHOOK'])
@@ -58,8 +66,8 @@ public static function getLogger(): LoggerInterface
     {
         $log = new Logger('integration-test');
         $log->pushHandler(new StreamHandler(STDOUT, (int)$_ENV['INTEGRATION_TEST_LOG_LEVEL']));
-        $log->pushProcessor(new \Monolog\Processor\MemoryUsageProcessor(true, true));
-        $log->pushProcessor(new \Monolog\Processor\IntrospectionProcessor());
+        $log->pushProcessor(new MemoryUsageProcessor(true, true));
+        $log->pushProcessor(new IntrospectionProcessor());
 
         return $log;
     }