From 6af2eb04f10a819850e4afb309f2f5e1ba2bc6da Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Mon, 21 Jan 2019 17:23:56 +0100 Subject: [PATCH 1/2] Fix the 1.2 build --- app/TestAppKernel.php | 8 ++++++++ app/config/routing_test.yml | 11 +++++++++++ app/config/routing_test_cached.yml | 5 +++++ composer.lock | 30 +++++++++++++++--------------- 4 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 app/config/routing_test.yml create mode 100644 app/config/routing_test_cached.yml diff --git a/app/TestAppKernel.php b/app/TestAppKernel.php index 4a9ce78f56..96e39c2b4a 100644 --- a/app/TestAppKernel.php +++ b/app/TestAppKernel.php @@ -17,6 +17,14 @@ class TestAppKernel extends AppKernel { + public function registerBundles(): array + { + return array_merge( + parent::registerBundles(), + [new \Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin()] + ); + } + protected function getContainerBaseClass(): string { return MockerContainer::class; diff --git a/app/config/routing_test.yml b/app/config/routing_test.yml new file mode 100644 index 0000000000..41948fa285 --- /dev/null +++ b/app/config/routing_test.yml @@ -0,0 +1,11 @@ +# This file is part of the Sylius package. +# (c) Paweł Jędrzejewski + +_main: + resource: routing.yml + +sylius_test_plugin_main: + path: /test/main + controller: FrameworkBundle:Template:template + defaults: + template: "@SyliusTestPlugin/main.html.twig" diff --git a/app/config/routing_test_cached.yml b/app/config/routing_test_cached.yml new file mode 100644 index 0000000000..bf18774d5d --- /dev/null +++ b/app/config/routing_test_cached.yml @@ -0,0 +1,5 @@ +# This file is part of the Sylius package. +# (c) Paweł Jędrzejewski + +_test: + resource: routing_test.yml diff --git a/composer.lock b/composer.lock index 59bd636f82..583fb936d9 100644 --- a/composer.lock +++ b/composer.lock @@ -2634,16 +2634,16 @@ }, { "name": "knplabs/gaufrette", - "version": "v0.8.0", + "version": "v0.8.1", "source": { "type": "git", "url": "https://github.com/KnpLabs/Gaufrette.git", - "reference": "1f7c4bf5fa603d9396ba812cf3171713adc7b394" + "reference": "80cc42e1c5f008a8fc9d02e856c60140c7d1ea19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/Gaufrette/zipball/1f7c4bf5fa603d9396ba812cf3171713adc7b394", - "reference": "1f7c4bf5fa603d9396ba812cf3171713adc7b394", + "url": "https://api.github.com/repos/KnpLabs/Gaufrette/zipball/80cc42e1c5f008a8fc9d02e856c60140c7d1ea19", + "reference": "80cc42e1c5f008a8fc9d02e856c60140c7d1ea19", "shasum": "" }, "require": { @@ -2719,7 +2719,7 @@ "filesystem", "media" ], - "time": "2018-12-21T14:09:42+00:00" + "time": "2019-01-11T10:04:44+00:00" }, { "name": "knplabs/knp-gaufrette-bundle", @@ -5197,16 +5197,16 @@ }, { "name": "sonata-project/core-bundle", - "version": "3.14.1", + "version": "3.15.0", "source": { "type": "git", "url": "https://github.com/sonata-project/SonataCoreBundle.git", - "reference": "b38dfe1709c02cb9bb95f38c48103803f0aaaf3c" + "reference": "664d338cde48effa27c96846a131d75b4b5ea255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/b38dfe1709c02cb9bb95f38c48103803f0aaaf3c", - "reference": "b38dfe1709c02cb9bb95f38c48103803f0aaaf3c", + "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/664d338cde48effa27c96846a131d75b4b5ea255", + "reference": "664d338cde48effa27c96846a131d75b4b5ea255", "shasum": "" }, "require": { @@ -5277,7 +5277,7 @@ "keywords": [ "sonata" ], - "time": "2019-01-17T07:33:02+00:00" + "time": "2019-01-20T13:25:19+00:00" }, { "name": "sonata-project/datagrid-bundle", @@ -5340,16 +5340,16 @@ }, { "name": "sonata-project/doctrine-extensions", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/sonata-project/sonata-doctrine-extensions.git", - "reference": "1f619e6f5a27b5bbaa48ab0872b19dc2064bc03f" + "reference": "187495be73b2099c6ff8d0c2384ca31a8adca66e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/sonata-doctrine-extensions/zipball/1f619e6f5a27b5bbaa48ab0872b19dc2064bc03f", - "reference": "1f619e6f5a27b5bbaa48ab0872b19dc2064bc03f", + "url": "https://api.github.com/repos/sonata-project/sonata-doctrine-extensions/zipball/187495be73b2099c6ff8d0c2384ca31a8adca66e", + "reference": "187495be73b2099c6ff8d0c2384ca31a8adca66e", "shasum": "" }, "require": { @@ -5404,7 +5404,7 @@ "doctrine2", "json" ], - "time": "2019-01-15T23:01:57+00:00" + "time": "2019-01-19T09:07:22+00:00" }, { "name": "sonata-project/intl-bundle", From 629f94965accdf3834b2cde6d8c12f723765252e Mon Sep 17 00:00:00 2001 From: Mateusz Zalewski Date: Tue, 22 Jan 2019 08:51:25 +0100 Subject: [PATCH 2/2] Fix routing and install stripe/stripe-php --- app/config/config_test.yml | 1 + app/config/config_test_cached.yml | 3 ++ composer.json | 3 +- composer.lock | 60 ++++++++++++++++++++++++++++++- 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/app/config/config_test.yml b/app/config/config_test.yml index afd14a90a2..4cd54bd525 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -9,6 +9,7 @@ parameters: framework: test: ~ + router: { resource: '%kernel.project_dir%/app/config/routing_test.yml' } session: storage_id: session.storage.mock_file diff --git a/app/config/config_test_cached.yml b/app/config/config_test_cached.yml index 4e651d6039..a895449dea 100644 --- a/app/config/config_test_cached.yml +++ b/app/config/config_test_cached.yml @@ -4,6 +4,9 @@ imports: - { resource: config_test.yml } +framework: + router: { resource: '%kernel.project_dir%/app/config/routing_test_cached.yml' } + doctrine: orm: entity_managers: diff --git a/composer.json b/composer.json index ee84ddc3cf..f30a53ed67 100644 --- a/composer.json +++ b/composer.json @@ -38,10 +38,11 @@ "friends-of-behat/suite-settings-extension": "^1.0", "friends-of-behat/symfony-extension": "^1.2.1", "friends-of-behat/variadic-extension": "^1.1", - "lchrusciel/api-test-case": "^3.0", "lakion/mink-debug-extension": "^1.2.3", + "lchrusciel/api-test-case": "^3.0", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", + "stripe/stripe-php": "^6.28", "sylius-labs/coding-standard": "^2.0" }, "prefer-stable": true, diff --git a/composer.lock b/composer.lock index 583fb936d9..5d0e1e2347 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9e38debc3e564dd5a366202c8ac47e3b", + "content-hash": "eeca4e3c95d532e1074624c3fa91d610", "packages": [ { "name": "behat/transliterator", @@ -8070,6 +8070,7 @@ } ], "description": "Allows to declare and use contexts services in scenario scoped container.", + "abandoned": "friends-of-behat/symfony-extension", "time": "2018-02-13T18:49:22+00:00" }, { @@ -8118,6 +8119,7 @@ } ], "description": "Makes possible to inject services and parameters from other containers.", + "abandoned": "friends-of-behat/symfony-extension", "time": "2018-02-13T17:55:39+00:00" }, { @@ -10713,6 +10715,62 @@ ], "time": "2018-12-19T23:57:18+00:00" }, + { + "name": "stripe/stripe-php", + "version": "v6.28.1", + "source": { + "type": "git", + "url": "https://github.com/stripe/stripe-php.git", + "reference": "59902d9066045744904e682999d2fef62830d037" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/59902d9066045744904e682999d2fef62830d037", + "reference": "59902d9066045744904e682999d2fef62830d037", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "1.*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0", + "symfony/process": "~2.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "Stripe\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stripe and contributors", + "homepage": "https://github.com/stripe/stripe-php/contributors" + } + ], + "description": "Stripe PHP Library", + "homepage": "https://stripe.com/", + "keywords": [ + "api", + "payment processing", + "stripe" + ], + "time": "2019-01-21T12:33:00+00:00" + }, { "name": "sylius-labs/coding-standard", "version": "v2.0.0",