Merge branch 'master' of github.com:eonx-com/easy-monorepo into featu…

…re/MTCE-357-fix-results-count-when-large-dataset-is-enabled
eonx-com · Feb 21, 2025 · 6ac0dca · 6ac0dca
2 parents aca2418 + 4337b96
commit 6ac0dca
Show file tree

Hide file tree

Showing 39 changed files with 172 additions and 120 deletions.
diff --git a/.github/workflows/php_ci.yml b/.github/workflows/php_ci.yml
@@ -48,10 +48,10 @@ jobs:
                 with:
                     path: ${{ steps.cache-extensions.outputs.dir }}
                     key: ${{ steps.cache-extensions.outputs.key }}
-                    restore-keys: ${{ steps.cache-extensions.outputs.key }}
 
+            # TODO: Change the version of the action after 2.33 is released
             -   name: Setup PHP ${{ matrix.php }}
-                uses: shivammathur/setup-php@v2
+                uses: shivammathur/setup-php@297b3cde3c3c3202e03cd5e9b679a74c06f72214
                 with:
                     php-version: ${{ matrix.php }}
                     coverage: ${{ matrix.actions.coverage || 'none' }}

diff --git a/.github/workflows/split_packages.yml b/.github/workflows/split_packages.yml
@@ -27,10 +27,9 @@ jobs:
                 with:
                     path: '${{ steps.cache-extensions.outputs.dir }}'
                     key: '${{ steps.cache-extensions.outputs.key }}'
-                    restore-keys: '${{ steps.cache-extensions.outputs.key }}'
             -
                 name: 'Setup PHP 8.2'
-                uses: shivammathur/setup-php@v2
+                uses: shivammathur/setup-php@297b3cde3c3c3202e03cd5e9b679a74c06f72214
                 with:
                     php-version: 8.2
                     coverage: none
@@ -51,7 +50,7 @@ jobs:
             matrix:
                 mapping: '${{ fromJson(needs.provide_packages_json.outputs.matrix) }}'
                 tag:
-                    - 6.6.0
+                    - 6.7.0
         name: 'Split ${{ matrix.mapping.dir }}'
         env:
             DIR: 'packages/${{ matrix.mapping.dir }}'

diff --git a/.github/workflows/split_tests.yml b/.github/workflows/split_tests.yml
@@ -31,10 +31,10 @@ jobs:
                 with:
                     path: ${{ steps.cache-extensions.outputs.dir }}
                     key: ${{ steps.cache-extensions.outputs.key }}
-                    restore-keys: ${{ steps.cache-extensions.outputs.key }}
 
+            # TODO: Change the version of the action after 2.33 is released
             -   name: Setup PHP 8.2
-                uses: shivammathur/setup-php@v2
+                uses: shivammathur/setup-php@297b3cde3c3c3202e03cd5e9b679a74c06f72214
                 with:
                     php-version: 8.2
                     coverage: none
@@ -82,8 +82,9 @@ jobs:
                     key: ${{ steps.cache-extensions.outputs.key }}
                     restore-keys: ${{ steps.cache-extensions.outputs.key }}
 
+            # TODO: Change the version of the action after 2.33 is released
             -   name: Setup PHP ${{ matrix.php }}
-                uses: shivammathur/setup-php@v2
+                uses: shivammathur/setup-php@297b3cde3c3c3202e03cd5e9b679a74c06f72214
                 with:
                     php-version: ${{ matrix.php }}
                     coverage: pcov

diff --git a/composer.json b/composer.json
@@ -168,6 +168,7 @@
             "EonX\\EasyTemplatingBlock\\": "packages/EasyTemplatingBlock/src",
             "EonX\\EasyTemplatingBlock\\Bundle\\": "packages/EasyTemplatingBlock/bundle",
             "EonX\\EasyTest\\": "packages/EasyTest/src",
+            "EonX\\EasyTest\\Bundle\\": "packages/EasyTest/bundle",
             "EonX\\EasyUtils\\": "packages/EasyUtils/src",
             "EonX\\EasyUtils\\Bundle\\": "packages/EasyUtils/bundle",
             "EonX\\EasyUtils\\Laravel\\": "packages/EasyUtils/laravel",

diff --git a/packages/EasyActivity/composer.json b/packages/EasyActivity/composer.json
@@ -8,8 +8,8 @@
         "doctrine/collections": "^1.7.2 || ^2.1",
         "doctrine/dbal": "^3.8",
         "doctrine/orm": "^2.20",
-        "eonx-com/easy-doctrine": "^6.7",
-        "eonx-com/easy-lock": "^6.7",
+        "eonx-com/easy-doctrine": "^6.8",
+        "eonx-com/easy-lock": "^6.8",
         "nesbot/carbon": "^3.8.4",
         "symfony/config": "^7.1",
         "symfony/dependency-injection": "^7.1",
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.12",
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-test": "^6.8",
         "phpunit/phpunit": "^10.2",
         "symfony/framework-bundle": "^7.1"
     },
@@ -42,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyApiPlatform/composer.json b/packages/EasyApiPlatform/composer.json
@@ -23,9 +23,9 @@
     "require-dev": {
         "doctrine/annotations": "^2.0",
         "doctrine/doctrine-bundle": "^2.12",
-        "eonx-com/easy-bugsnag": "^6.7",
-        "eonx-com/easy-error-handler": "^6.7",
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-bugsnag": "^6.8",
+        "eonx-com/easy-error-handler": "^6.8",
+        "eonx-com/easy-test": "^6.8",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^10.2",
         "symfony/browser-kit": "^7.1",
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyApiToken/composer.json b/packages/EasyApiToken/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.2",
         "ext-openssl": "*",
-        "eonx-com/easy-utils": "^6.7",
+        "eonx-com/easy-utils": "^6.8",
         "nette/utils": "^4.0",
         "psr/log": "^3.0",
         "symfony/dependency-injection": "^7.1",
@@ -59,7 +59,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyAsync/composer.json b/packages/EasyAsync/composer.json
@@ -19,10 +19,10 @@
     "require-dev": {
         "doctrine/annotations": "^2.0",
         "doctrine/doctrine-bundle": "^2.12",
-        "eonx-com/easy-event-dispatcher": "^6.7",
-        "eonx-com/easy-logging": "^6.7",
-        "eonx-com/easy-random": "^6.7",
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-event-dispatcher": "^6.8",
+        "eonx-com/easy-logging": "^6.8",
+        "eonx-com/easy-random": "^6.8",
+        "eonx-com/easy-test": "^6.8",
         "phpunit/phpunit": "^10.2",
         "symfony/doctrine-bridge": "^7.1",
         "symfony/framework-bundle": "^7.1"
@@ -51,7 +51,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyAsync/laravel/EasyAsyncServiceProvider.php b/packages/EasyAsync/laravel/EasyAsyncServiceProvider.php
@@ -80,7 +80,10 @@ static function (Container $app): LoggerInterface {
                     ? [EasyLoggingBundleParam::KeyChannel->value => BundleParam::LogChannel->value]
                     : [];
 
-                return $app->make(LoggerInterface::class, $loggerParams);
+                /** @var \Psr\Log\LoggerInterface $logger */
+                $logger = $app->make(LoggerInterface::class, $loggerParams);
+
+                return $logger;
             }
         );
     }

diff --git a/packages/EasyBankFiles/composer.json b/packages/EasyBankFiles/composer.json
@@ -9,11 +9,11 @@
         "ext-dom": "*",
         "ext-libxml": "*",
         "ext-mbstring": "*",
-        "eonx-com/easy-error-handler": "^6.7",
+        "eonx-com/easy-error-handler": "^6.8",
         "nette/utils": "^4.0"
     },
     "require-dev": {
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-test": "^6.8",
         "mockery/mockery": "^1.6",
         "phpunit/phpunit": "^10.2"
     },
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyBatch/composer.json b/packages/EasyBatch/composer.json
@@ -6,20 +6,20 @@
     "require": {
         "php": "^8.2",
         "doctrine/dbal": "^3.8",
-        "eonx-com/easy-encryption": "^6.7",
-        "eonx-com/easy-event-dispatcher": "^6.7",
-        "eonx-com/easy-lock": "^6.7",
-        "eonx-com/easy-pagination": "^6.7",
-        "eonx-com/easy-random": "^6.7",
-        "eonx-com/easy-utils": "^6.7",
+        "eonx-com/easy-encryption": "^6.8",
+        "eonx-com/easy-event-dispatcher": "^6.8",
+        "eonx-com/easy-lock": "^6.8",
+        "eonx-com/easy-pagination": "^6.8",
+        "eonx-com/easy-random": "^6.8",
+        "eonx-com/easy-utils": "^6.8",
         "nesbot/carbon": "^3.8.4",
         "symfony/config": "^7.1",
         "symfony/dependency-injection": "^7.1",
         "symfony/http-kernel": "^7.1",
         "symfony/messenger": "^7.1"
     },
     "require-dev": {
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-test": "^6.8",
         "phpunit/phpunit": "^10.2"
     },
     "autoload": {
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyBugsnag/composer.json b/packages/EasyBugsnag/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.2",
         "bugsnag/bugsnag": "^3.29",
-        "eonx-com/easy-utils": "^6.7",
+        "eonx-com/easy-utils": "^6.8",
         "guzzlehttp/guzzle": "^7.0",
         "nesbot/carbon": "^3.8.4",
         "nette/utils": "^4.0",
@@ -26,7 +26,7 @@
         "doctrine/doctrine-bundle": "^2.12",
         "doctrine/collections": "^1.7.2 || ^2.1",
         "doctrine/orm": "^2.20",
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-test": "^6.8",
         "laravel/lumen-framework": "^11.0",
         "phpunit/phpunit": "^10.2",
         "symfony/doctrine-bridge": "^7.1",
@@ -60,7 +60,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyDecision/composer.json b/packages/EasyDecision/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "eonx-com/easy-utils": "^6.7",
+        "eonx-com/easy-utils": "^6.8",
         "psr/cache": "^3.0",
         "symfony/config": "^7.1",
         "symfony/dependency-injection": "^7.1",
@@ -39,7 +39,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyDoctrine/composer.json b/packages/EasyDoctrine/composer.json
@@ -12,8 +12,8 @@
         "doctrine/dbal": "^3.8",
         "doctrine/doctrine-bundle": "^2.12",
         "doctrine/orm": "^2.20",
-        "eonx-com/easy-event-dispatcher": "^6.7",
-        "eonx-com/easy-utils": "^6.7",
+        "eonx-com/easy-event-dispatcher": "^6.8",
+        "eonx-com/easy-utils": "^6.8",
         "myclabs/deep-copy": "^1.11",
         "nesbot/carbon": "^3.8.4",
         "symfony/config": "^7.1",
@@ -25,9 +25,9 @@
     "require-dev": {
         "aws/aws-sdk-php": "^3.288.1",
         "doctrine/doctrine-migrations-bundle": "^3.3",
-        "eonx-com/easy-bugsnag": "^6.7",
-        "eonx-com/easy-error-handler": "^6.7",
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-bugsnag": "^6.8",
+        "eonx-com/easy-error-handler": "^6.8",
+        "eonx-com/easy-test": "^6.8",
         "mockery/mockery": "^1.6",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^10.2"
@@ -55,7 +55,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyEncryption/composer.json b/packages/EasyEncryption/composer.json
@@ -8,15 +8,15 @@
         "ext-sodium": "*",
         "doctrine/collections": "^1.7.2 || ^2.1",
         "doctrine/orm": "^2.20",
-        "eonx-com/easy-utils": "^6.7",
+        "eonx-com/easy-utils": "^6.8",
         "paragonie/halite": "^5.1",
         "symfony/config": "^7.1",
         "symfony/dependency-injection": "^7.1",
         "symfony/http-kernel": "^7.1"
     },
     "require-dev": {
         "aws/aws-sdk-php": "^3.288.1",
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-test": "^6.8",
         "laravel/lumen-framework": "^11.0",
         "phpunit/phpunit": "^10.2",
         "symfony/filesystem": "^7.1",
@@ -45,7 +45,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyErrorHandler/bundle/CompilerPass/RegisterTraceableErrorHandlerCompilerPass.php b/packages/EasyErrorHandler/bundle/CompilerPass/RegisterTraceableErrorHandlerCompilerPass.php
@@ -14,10 +14,7 @@ final class RegisterTraceableErrorHandlerCompilerPass implements CompilerPassInt
 {
     public function process(ContainerBuilder $container): void
     {
-        if (
-            $container->has('test.service_container')
-            || ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug'))
-        ) {
+        if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
             $container
                 ->register(TraceableErrorHandlerInterface::class, TraceableErrorHandler::class)
                 ->setDecoratedService(ErrorHandlerInterface::class)

diff --git a/packages/EasyErrorHandler/composer.json b/packages/EasyErrorHandler/composer.json
@@ -5,8 +5,8 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "eonx-com/easy-logging": "^6.7",
-        "eonx-com/easy-utils": "^6.7",
+        "eonx-com/easy-logging": "^6.8",
+        "eonx-com/easy-utils": "^6.8",
         "nesbot/carbon": "^3.8.4",
         "nikic/php-parser": "^5.0",
         "symfony/config": "^7.1",
@@ -22,9 +22,9 @@
         "symfony/translation": "^7.1"
     },
     "require-dev": {
-        "eonx-com/easy-bugsnag": "^6.7",
-        "eonx-com/easy-test": "^6.7",
-        "eonx-com/easy-webhook": "^6.7",
+        "eonx-com/easy-bugsnag": "^6.8",
+        "eonx-com/easy-test": "^6.8",
+        "eonx-com/easy-webhook": "^6.8",
         "laravel/lumen-framework": "^11.0",
         "phpunit/phpunit": "^10.2",
         "symfony/framework-bundle": "^7.1"
@@ -55,7 +55,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }
diff --git a/packages/EasyEventDispatcher/composer.json b/packages/EasyEventDispatcher/composer.json
@@ -10,7 +10,7 @@
         "symfony/http-kernel": "^7.1"
     },
     "require-dev": {
-        "eonx-com/easy-test": "^6.7",
+        "eonx-com/easy-test": "^6.8",
         "laravel/lumen-framework": "^11.0",
         "phpunit/phpunit": "^10.2",
         "symfony/config": "^7.1"
@@ -31,7 +31,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.7-dev"
+            "dev-master": "6.8-dev"
         }
     }
 }