Merge branch '1.3' into 1.4

* 1.3:
  Update configuration.rst
  Update configuration.rst
  Include PHP 7.3 in the build

.travis.yml

@@ -13,51 +13,71 @@ 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
-            php: 7.2
-            env:
-                - SYLIUS_SUITE="application"
-                - SYMFONY_VERSION="4.1.*"
-            services:
-                - memcached
         -
-            php: 7.2
+            if: type IN (cron, api) OR tag IS present
+            php: 7.3
             env:
                 - SYLIUS_SUITE="application"
                 - SYMFONY_VERSION="4.2.*"
             services:
                 - memcached
         -
-            php: 7.2
-            env:
-                - SYLIUS_SUITE="packages"
-                - SYMFONY_VERSION="3.4.*"
-            addons:
-                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
+            php: 7.3
             env:
                 - SYLIUS_SUITE="docs packages"
-                - SYMFONY_VERSION="4.2.*"
+                - 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="3.4.*"
+            services:
+                - memcached
+        -
+            php: 7.2
+            env:
+                - SYLIUS_SUITE="application"
+                - SYMFONY_VERSION="4.2.*"
+            services:
+                - memcached
+        -
+            if: type IN (cron, api) OR tag IS present
+            php: 7.2
+            env:
+                - SYLIUS_SUITE="packages"
+                - SYMFONY_VERSION="3.4.*"
+            addons:
+                apt:
+                    packages:
+                        - parallel
+        -
+            php: 7.2
+            env:
+                - SYLIUS_SUITE="packages"
+                - SYMFONY_VERSION="4.2.*"
             addons:
                 apt:
                     packages:

composer.json

@@ -107,6 +107,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",

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]

symfony.lock

@@ -1,7 +1,4 @@
 {
-    "akeneo/phpspec-skip-example-extension": {
-        "version": "v3.0.0"
-    },
     "behat/behat": {
         "version": "v3.5.0"
     },
@@ -317,6 +314,9 @@
     "pagerfanta/pagerfanta": {
         "version": "v2.0.1"
     },
+    "pamil/phpspec-skip-example-extension": {
+        "version": "v4.0.0"
+    },
     "pamil/prophecy-common": {
         "version": "v0.1.0"
     },