diff --git a/.gitignore b/.gitignore index 07229a6..9061dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /behat.yml /phpspec.yml +/.idea diff --git a/.travis.yml b/.travis.yml index d397b7b..96f69a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,10 @@ dist: trusty sudo: false php: - - '7.2' - - '7.3' + - '7.4' + - '8.0' + - '8.1' + - '8.2' cache: yarn: true @@ -70,4 +72,4 @@ script: - vendor/bin/behat --strict -vvv --no-interaction || vendor/bin/behat --strict -vvv --no-interaction --rerun after_failure: - - vendor/lakion/mink-debug-extension/travis/tools/upload-textfiles "${SYLIUS_BUILD_DIR}/*.log" + - cat "${SYLIUS_BUILD_DIR}/*.log" diff --git a/behat.yml.dist b/behat.yml.dist index c959e6f..0154f19 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -4,7 +4,7 @@ imports: default: extensions: - Lakion\Behat\MinkDebugExtension: + FriendsOfBehat\MinkDebugExtension: directory: etc/build clean_start: false screenshot: true diff --git a/composer.json b/composer.json index e4764e8..d544b81 100644 --- a/composer.json +++ b/composer.json @@ -16,9 +16,15 @@ "email": "mykolasvitkus@gmail.com" } ], + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/dbalabka/PayumPayseraGateway" + } + ], "require": { - "php": "^7.2", - "plumtreesystems/payum-paysera-gateway": "^0.3.3", + "php": "^8.1", + "plumtreesystems/payum-paysera-gateway": "dev-patch-1", "sylius/sylius": "^1.5.3", "whitecube/lingua": "^1.0" }, @@ -32,14 +38,13 @@ "friends-of-behat/suite-settings-extension": "^1.0", "friends-of-behat/symfony-extension": "^2.0", "friends-of-behat/variadic-extension": "^1.1", - "lakion/mink-debug-extension": "^1.2.3", - "phpspec/phpspec": "^5.0", - "phpstan/phpstan-doctrine": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpstan/phpstan-webmozart-assert": "^0.11", + "friends-of-behat/mink-debug-extension": "^2.1.0", + "phpspec/phpspec": "^7.0", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-doctrine": "^1.3", + "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^8.0", - "sensiolabs/security-checker": "^5.0", - "sylius-labs/coding-standard": "^3.0", + "sylius-labs/coding-standard": "^4.0", "symfony/browser-kit": "^3.4|^4.1", "symfony/debug-bundle": "^3.4|^4.1", "symfony/dotenv": "^4.2", @@ -66,7 +71,12 @@ }, "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "0.4-dev" + } + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true } } } diff --git a/src/Action/CaptureAction.php b/src/Action/CaptureAction.php index 237caa1..b9677be 100644 --- a/src/Action/CaptureAction.php +++ b/src/Action/CaptureAction.php @@ -12,6 +12,7 @@ class CaptureAction extends BaseCaptureAction { public function __construct($mocked = false) { + parent::__construct($mocked); $mocked ? $this->apiClass = MockedApi::class : $this->apiClass = Api::class; } /** diff --git a/src/Form/PayseraGatewayConfigurationType.php b/src/Form/PayseraGatewayConfigurationType.php index af057c9..f697278 100644 --- a/src/Form/PayseraGatewayConfigurationType.php +++ b/src/Form/PayseraGatewayConfigurationType.php @@ -39,6 +39,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ]), ], ]) + ->add('payment', TextType::class, [ + 'label' => 'sylius.form.gateway_configuration.paysera.payment', + ]) ->add('test', CheckboxType::class, [ 'label' => 'sylius.form.gateway_configuration.paysera.test', ]) @@ -47,4 +50,4 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $data['payum.http_client'] = '@sylius.payum.http_client'; }); } -} \ No newline at end of file +} diff --git a/src/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml index b590862..689e346 100644 --- a/src/Resources/translations/messages.en.yml +++ b/src/Resources/translations/messages.en.yml @@ -5,5 +5,6 @@ sylius: project_id: Project id sign_password: Project password test: Test mode + payment: Payment method payum_gateway_factory: - paysera: Paysera checkout \ No newline at end of file + paysera: Paysera checkout