Merge branch '1.4'

* 1.4: Update configuration.rst Update configuration.rst Include PHP 7.3 in the build
Shasthojoy · Jan 28, 2019 · 76cf03a · 76cf03a
2 parents 0109f63 + 849ac8f
commit 76cf03a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,17 +13,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
         -
@@ -34,6 +64,7 @@ matrix:
             services:
                 - memcached
         -
+            if: type IN (cron, api) OR tag IS present
             php: 7.2
             env:
                 - SYLIUS_SUITE="packages"
@@ -42,22 +73,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"
+                - SYLIUS_SUITE="packages"
                 - SYMFONY_VERSION="4.2.*"
-            services:
-                - docker
             addons:
                 apt:
                     packages:

diff --git a/composer.json b/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",

diff --git 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"
     },
@@ -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"
     },