Merge pull request ekyna#9 from Prometee/symfony-6

Symfony 6.0

Author: ekyna

Diff for: .github/workflows/build.yml

@@ -16,22 +16,33 @@ jobs:
             fail-fast: false
             matrix:
                 php: [7.2, 7.3, 7.4, 8.0]
-                symfony: [^3.4, ^4.4, ^5.2]
+                symfony: [^5.4, ^6.0]
+
+                exclude:
+                    -
+                        php: 7.2
+                        symfony: ^6.0
+                    -
+                        php: 7.3
+                        symfony: ^6.0
+                    -
+                        php: 7.4
+                        symfony: ^6.0
 
         env:
             APP_ENV: test
 
         steps:
             -
-                uses: actions/checkout@v2
+                uses: actions/checkout@v3
 
             -
                 name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: "${{ matrix.php }}"
                     extensions: intl
-                    tools: symfony
+                    tools: flex,symfony
                     coverage: none
 
             -
@@ -41,22 +52,25 @@ jobs:
 
             -
                 name: Cache Composer
-                uses: actions/cache@v2
+                uses: actions/cache@v3
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
                     restore-keys: |
                         ${{ runner.os }}-php-${{ matrix.php }}-composer-
+
             -
-                name: Restrict Symfony version
+                name: Configure global composer
                 if: matrix.symfony != ''
                 run: |
-                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10"
-                    composer config extra.symfony.require "${{ matrix.symfony }}"
+                    composer global config --no-plugins allow-plugins.symfony/flex true
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex"
 
             -
                 name: Install PHP dependencies
                 run: composer install --no-interaction
+                env:
+                    SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
             -
                 name: Run analysis

Diff for: composer.json

@@ -18,16 +18,15 @@
     "homepage": "https://github.com/ekyna/PayumMonetico",
     "license": "MIT",
     "require": {
-        "php": "^7.2|^8.0",
         "ext-json": "*",
         "payum/core": "^1.5",
-        "psr/log": "^1.0|^2.0",
-        "symfony/options-resolver": "^3.4|^4.4|^5.2",
+        "psr/log": "^1.0|^3.0",
+        "symfony/options-resolver": "^5.4|^6.0",
         "sokil/php-isocodes": "^2.0|^3.0"
     },
     "require-dev": {
-        "php-http/guzzle6-adapter": "^1.1|^2.0",
-        "phpunit/phpunit": "^7.0|^8.0|^9.0"
+        "php-http/guzzle7-adapter": "^1.0",
+        "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {
         "psr-4": {

Diff for: src/Action/Api/AbstractApiAction.php

@@ -34,7 +34,7 @@ abstract class AbstractApiAction implements ActionInterface, GatewayAwareInterfa
     /**
      * @inheritDoc
      */
-    public function setApi($api)
+    public function setApi($api): void
     {
         if (!$api instanceof Api) {
             throw new UnsupportedApiException('Not supported.');
@@ -46,7 +46,7 @@ public function setApi($api)
     /**
      * {@inheritDoc}
      */
-    public function setLogger(LoggerInterface $logger)
+    public function setLogger(LoggerInterface $logger): void
     {
         $this->logger = $logger;
     }
@@ -56,7 +56,7 @@ public function setLogger(LoggerInterface $logger)
      *
      * @param string $message
      */
-    protected function log($message)
+    protected function log(string $message): void
     {
         if (!$this->logger) {
             return;
@@ -67,12 +67,8 @@ protected function log($message)
 
     /**
      * Logs the given message and data.
-     *
-     * @param string $message
-     * @param array  $data
-     * @param array  $filterKeys
      */
-    protected function logData($message, array $data, array $filterKeys = [])
+    protected function logData(string $message, array $data, array $filterKeys = []): void
     {
         if (!$this->logger) {
             return;
@@ -82,7 +78,7 @@ protected function logData($message, array $data, array $filterKeys = [])
             $data = array_intersect_key($data, array_flip($filterKeys));
         }
 
-        $data = array_map(function ($key, $value) {
+        $data = array_map(static function ($key, $value) {
             return "$key: $value";
         }, array_keys($data), $data);