From c8caf4310e853fe63f885789fa159b61f6e3a485 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Thu, 15 Nov 2018 16:48:54 +0100 Subject: [PATCH 1/3] Include PHP 7.3 in the build --- .travis.yml | 52 +++++++++++++++++++++++++++++++++++---------------- composer.json | 1 + symfony.lock | 6 +++--- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8308c5f0e5f..40ba878286a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,17 +12,47 @@ env: matrix: include: - - php: 7.2 + php: 7.3 env: - SYLIUS_SUITE="application" - SYMFONY_VERSION="3.4.*" services: - memcached - - if: type IN (cron, api) OR tag IS present + - + if: type IN (cron, api) OR tag IS present + php: 7.3 + env: + - SYLIUS_SUITE="application" + - SYMFONY_VERSION="4.2.*" + services: + - memcached + - + php: 7.3 + env: + - SYLIUS_SUITE="docs packages" + - SYMFONY_VERSION="3.4.*" + services: + - docker + addons: + apt: + packages: + - parallel + - + if: type IN (cron, api) OR tag IS present + php: 7.3 + env: + - SYLIUS_SUITE="packages" + - SYMFONY_VERSION="4.2.*" + addons: + apt: + packages: + - parallel + - + if: type IN (cron, api) OR tag IS present php: 7.2 env: - SYLIUS_SUITE="application" - - SYMFONY_VERSION="4.1.*" + - SYMFONY_VERSION="3.4.*" services: - memcached - @@ -32,7 +62,8 @@ matrix: - SYMFONY_VERSION="4.2.*" services: - memcached - - + - + if: type IN (cron, api) OR tag IS present php: 7.2 env: - SYLIUS_SUITE="packages" @@ -41,22 +72,11 @@ matrix: apt: packages: - parallel - - if: type IN (cron, api) OR tag IS present + - php: 7.2 env: - SYLIUS_SUITE="packages" - - SYMFONY_VERSION="4.1.*" - addons: - apt: - packages: - - parallel - - - php: 7.2 - env: - - SYLIUS_SUITE="docs packages" - SYMFONY_VERSION="4.2.*" - services: - - docker addons: apt: packages: diff --git a/composer.json b/composer.json index 6531598b546..3c4e98872ae 100644 --- a/composer.json +++ b/composer.json @@ -109,6 +109,7 @@ "matthiasnoback/symfony-config-test": "^3.0", "matthiasnoback/symfony-dependency-injection-test": "^2.0", "mikey179/vfsStream": "^1.6", + "pamil/phpspec-skip-example-extension": "^4.0", "pamil/prophecy-common": "^0.1", "phpspec/phpspec": "^5.0", "phpstan/phpstan-doctrine": "^0.10", diff --git a/symfony.lock b/symfony.lock index 6313345b86b..6442f2a192d 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,7 +1,4 @@ { - "akeneo/phpspec-skip-example-extension": { - "version": "v3.0.0" - }, "behat/behat": { "version": "v3.5.0" }, @@ -320,6 +317,9 @@ "pagerfanta/pagerfanta": { "version": "v2.0.1" }, + "pamil/phpspec-skip-example-extension": { + "version": "v4.0.0" + }, "pamil/prophecy-common": { "version": "v0.1.0" }, From 0b69c258e7e189ddcdd2026981fcfe26561229e1 Mon Sep 17 00:00:00 2001 From: Stephane DECOCK Date: Fri, 25 Jan 2019 14:56:32 +0100 Subject: [PATCH 2/3] Update configuration.rst This is mentioned in 2.3 of the doc, but should be also said here. --- .../bundles/SyliusGridBundle/configuration.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst b/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst index c7590aa5653..ac8cb80e49c 100644 --- a/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst +++ b/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst @@ -12,6 +12,10 @@ Here you will find all configuration options of ``sylius_grid``. name: doctrine/orm options: class: "%app.model.user%" + repository: + method: myCustomMethod + arguments: + id: resource.id sorting: name: asc limits: [10, 25, 50, 100] From a8aa217b6447e5473ed8cf2f7b003cccc95964f8 Mon Sep 17 00:00:00 2001 From: Stephane DECOCK Date: Fri, 25 Jan 2019 16:25:02 +0100 Subject: [PATCH 3/3] Update configuration.rst --- .../bundles/SyliusGridBundle/configuration.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst b/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst index ac8cb80e49c..d8afee90b69 100644 --- a/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst +++ b/docs/components_and_bundles/bundles/SyliusGridBundle/configuration.rst @@ -13,9 +13,9 @@ Here you will find all configuration options of ``sylius_grid``. options: class: "%app.model.user%" repository: - method: myCustomMethod - arguments: - id: resource.id + method: myCustomMethod + arguments: + id: resource.id sorting: name: asc limits: [10, 25, 50, 100]