Skip to content

Commit

Permalink
minor #9914 Include PHP 7.3 in the build (pamil)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.3 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.3
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | based on #9929 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.2 or 1.3 branch (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->

Commits
-------

c8caf43 Include PHP 7.3 in the build
  • Loading branch information
pamil authored Jan 25, 2019
2 parents 631febe + c8caf43 commit bbb2401
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 19 deletions.
52 changes: 36 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
-
Expand All @@ -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"
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions symfony.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"akeneo/phpspec-skip-example-extension": {
"version": "v3.0.0"
},
"behat/behat": {
"version": "v3.5.0"
},
Expand Down Expand Up @@ -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"
},
Expand Down

0 comments on commit bbb2401

Please sign in to comment.