Merge pull request #2 from FLUX-SE/v2.0.0

V2.0.0
FLUX-SE · Apr 2, 2021 · 3623fa8 · 3623fa8
2 parents 091799a + 320db10
commit 3623fa8
Show file tree

Hide file tree

Showing 9 changed files with 123 additions and 30 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @FLUX-SE/core-team
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,76 @@
+name: Build
+
+on:
+    push: ~
+    pull_request: ~
+    release:
+        types: [created]
+    schedule:
+        -
+            cron: "0 1 * * 6" # Run at 1am every Saturday
+    workflow_dispatch: ~
+
+jobs:
+    tests:
+        runs-on: ubuntu-latest
+
+        name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}"
+
+        strategy:
+            fail-fast: false
+            matrix:
+                php: [7.4, 7.3]
+                symfony: [^4.4, ^5.2]
+
+        env:
+            APP_ENV: test
+
+        steps:
+            -
+                uses: actions/checkout@v2
+
+            -
+                name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: "${{ matrix.php }}"
+                    extensions: intl
+                    tools: symfony
+                    coverage: none
+
+            -
+                name: Output PHP version for Symfony CLI
+                run: php -v | head -n 1 | awk '{ print $2 }' > .php-version
+
+            -
+                name: Get Composer cache directory
+                id: composer-cache
+                run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+            -
+                name: Cache Composer
+                uses: actions/cache@v2
+                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
+                if: matrix.symfony != ''
+                run: |
+                    composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10"
+                    composer config extra.symfony.require "${{ matrix.symfony }}"
+
+            -
+                name: Install PHP dependencies
+                run: composer install --no-interaction
+
+            -
+                name: Run analysis
+                run: composer analyse
+
+            -
+                name: Run PHPUnit
+                run: vendor/bin/phpunit --colors=always
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE)
-[![Build Status][ico-travis]][link-travis]
+[![Build Status][ico-github-actions]][link-github-actions]
 [![Quality Score][ico-code-quality]][link-code-quality]
 
 ## Payum Stripe checkout session gateway bundle
@@ -104,13 +104,12 @@ The Sylius plugin :
 
 https://github.com/FLUX-SE/SyliusPayumStripePlugin
 
-
 [ico-version]: https://img.shields.io/packagist/v/FLUX-SE/payum-stripe-bundle.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
-[ico-travis]: https://img.shields.io/travis/FLUX-SE/PayumStripeBundle/master.svg?style=flat-square
+[ico-github-actions]: https://github.com/FLUX-SE/PayumStripeBundle/workflows/Build/badge.svg
 [ico-code-quality]: https://img.shields.io/scrutinizer/g/FLUX-SE/PayumStripeBundle.svg?style=flat-square
 
 [link-packagist]: https://packagist.org/packages/flux-se/payum-stripe-bundle
-[link-travis]: https://travis-ci.org/FLUX-SE/PayumStripeBundle
+[link-github-actions]: https://github.com/FLUX-SE/PayumStripeBundle/actions?query=workflow%3A"Build"
 [link-scrutinizer]: https://scrutinizer-ci.com/g/FLUX-SE/PayumStripeBundle/code-structure
 [link-code-quality]: https://scrutinizer-ci.com/g/FLUX-SE/PayumStripeBundle
diff --git a/composer.json b/composer.json
@@ -2,27 +2,41 @@
     "name": "flux-se/payum-stripe-bundle",
     "description": "Payum Stripe gateways bundle",
     "type": "symfony-bundle",
+    "license": "MIT",
     "require": {
-        "flux-se/payum-stripe": "^1.2.1",
-        "symfony/http-kernel": "^4.1|^5.1.5",
-        "symfony/dependency-injection": "^4.1|^5.1.5",
-        "symfony/config": "^4.1|^5.1.5"
+        "flux-se/payum-stripe": "^2.0.0-RC",
+        "payum/payum-bundle": "^2.4",
+        "symfony/http-kernel": "^4.4|^5.2",
+        "symfony/dependency-injection": "^4.4|^5.2",
+        "symfony/config": "^4.4|^5.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^8|^9",
-        "symplify/easy-coding-standard": "^8.3",
-        "php-http/guzzle6-adapter": "^2.0"
+        "symplify/easy-coding-standard": "^8|^9",
+        "php-http/guzzle6-adapter": "^2.0",
+        "phpstan/phpstan": "^0.12.82",
+        "vimeo/psalm": "^4.3"
     },
     "autoload": {
         "psr-4": { "FluxSE\\PayumStripeBundle\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Tests\\FluxSE\\PayumStripeBundle\\": "tests/" }
     },
-    "license": "MIT",
+    "scripts": {
+        "analyse": [
+            "@composer validate --strict",
+            "vendor/bin/ecs check .",
+            "vendor/bin/phpstan.phar analyse -c phpstan.neon -l max src/",
+            "vendor/bin/psalm"
+        ],
+        "fix": [
+            "vendor/bin/ecs check . --fix"
+        ]
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "2.0-dev"
         }
     },
     "authors": [

diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,2 @@
+parameters:
+    reportUnmatchedIgnoredErrors: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,8 +8,8 @@
 >
 
     <testsuites>
-        <testsuite name="Payum Stripe checkout session gateway bundle Test Suite">
-            <directory>./Tests/</directory>
+        <testsuite name="Payum Stripe gateway bundle Test Suite">
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/psalm.xml b/psalm.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="6"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/src/DependencyInjection/FluxSEPayumStripeExtension.php b/src/DependencyInjection/FluxSEPayumStripeExtension.php
@@ -13,11 +13,11 @@
 class FluxSEPayumStripeExtension extends Extension
 {
     /**
-     * {@inheritdoc}
+     * @param string[] $configs
      *
      * @throws Exception
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader(
             $container,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		parameters:
		reportUnmatchedIgnoredErrors: false