Skip to content

Commit

Permalink
[FEATURE] Add support for PHP 7.4
Browse files Browse the repository at this point in the history
Also only run the CI tasks that do not depend on the PHP version
(i.e., everything except for the PHP linting and the unit tests)
on PHP 7.3 only to avoid problems with PHP 7.4.

Also ignore the platform reqs for PHP 7.3 and 7.4 during composer update
for the time being.

Fixes #819
  • Loading branch information
oliverklee committed Dec 25, 2019
1 parent 33c699a commit a9037c9
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 16 deletions.
42 changes: 27 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ sudo: false
language: php

php:
- "7.0"
- "7.1"
#- "7.0"
#- "7.1"
- "7.2"
- "7.3"
- "7.4"

cache:
directories:
Expand All @@ -23,13 +24,16 @@ before_install:

install:
- >
export IGNORE_PLATFORM_REQS="$(composer php:version |grep -q '^7.3' && printf -- --ignore-platform-reqs)";
export IGNORE_PLATFORM_REQS="$(composer php:version | grep -q '^7\.[34]' && printf -- --ignore-platform-reqs)";
echo;
echo "Updating the dependencies";
composer update $IGNORE_PLATFORM_REQS --with-dependencies $DEPENDENCIES;
composer show;
script:
- >
export IS_PHP_73="$(composer php:version | grep -q '^7\.3')";
- >
echo;
echo "Validating the composer.json";
Expand All @@ -46,21 +50,29 @@ script:
composer ci:tests:unit;
- >
echo;
echo "Running PHPMD";
composer ci:php:md;
if $IS_PHP_73; then
echo;
echo "Running PHPMD";
composer ci:php:md;
fi;
- >
echo;
echo "Running Psalm";
composer ci:php:psalm;
if $IS_PHP_73; then
echo;
echo "Running Psalm";
composer ci:php:psalm;
fi;
- >
echo;
echo "Running PHP_CodeSniffer";
composer ci:php:sniff;
if $IS_PHP_73; then
echo;
echo "Running PHP_CodeSniffer";
composer ci:php:sniff;
fi;
- >
echo;
echo "Running PHP-CS-Fixer";
composer ci:php:fixer;
if $IS_PHP_73; then
echo;
echo "Running PHP-CS-Fixer";
composer ci:php:fixer;
fi;
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
## x.y.z

### Added
- Add support for PHP 7.4
([#821](https://github.com/MyIntervals/emogrifier/pull/821))
- Disable php-cs-fixer Yoda conditions
([#791](https://github.com/MyIntervals/emogrifier/issues/791),
[#794](https://github.com/MyIntervals/emogrifier/pull/794))
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"source": "https://github.com/MyIntervals/emogrifier"
},
"require": {
"php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
"php": "~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
"ext-dom": "*",
"ext-libxml": "*",
"symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
Expand Down

0 comments on commit a9037c9

Please sign in to comment.