Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump minimum version to PHP 7.1 for Symfony 4 #22733

Merged
merged 3 commits into from May 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 11 additions & 21 deletions .travis.yml
Expand Up @@ -14,19 +14,13 @@ addons:

env:
global:
- MIN_PHP=5.5.9
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
- MIN_PHP=7.1.3
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/7.1/bin/php

matrix:
include:
# Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
- php: hhvm-3.18
sudo: required
dist: trusty
group: edge
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1.3
- php: 7.1
env: deps=high
- php: 7.1
env: deps=low
Expand Down Expand Up @@ -83,11 +77,10 @@ before_install:
echo extension = ldap.so >> $INI
echo extension = redis.so >> $INI
echo extension = memcached.so >> $INI
[[ $PHP = 5.* ]] && echo extension = mongo.so >> $INI
[[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
#echo extension = mongodb.so >> $INI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the test suite does not pass yet with mongodb - but this is not master specific so should be handled on a lower branch


# Matrix lines for intermediate PHP versions are skipped for pull requests
if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
if [[ ! $deps && ! $PHP = $MIN_PHP && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
deps=skip
skip=1
else
Expand All @@ -96,17 +89,14 @@ before_install:

- |
# Install sigchild-enabled PHP to test the Process component on the lowest PHP matrix line
if [[ ! $deps && $PHP = ${MIN_PHP%.*} && ! -d php-$MIN_PHP/sapi ]]; then
wget http://museum.php.net/php5/php-$MIN_PHP.tar.bz2 -O - | tar -xj &&
if [[ ! $deps && $PHP = $MIN_PHP && ! -d php-$MIN_PHP/sapi ]]; then
wget http://php.net/get/php-$MIN_PHP.tar.bz2/from/this/mirror -O - | tar -xj &&
(cd php-$MIN_PHP && ./configure --enable-sigchild --enable-pcntl && make -j2)
fi

- |
# Install extra PHP extensions
if [[ ! $skip && $PHP = 5.* ]]; then
([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI") &&
tfold ext.apcu4 'echo yes | pecl install -f apcu-4.0.11'
elif [[ ! $skip && $PHP = 7.* ]]; then
if [[ ! $skip && $PHP = 7.* ]]; then
tfold ext.apcu5 'echo yes | pecl install -f apcu-5.1.6'
fi

Expand Down Expand Up @@ -172,8 +162,8 @@ install:
else
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
tfold tty-group $PHPUNIT --group tty
if [[ $PHP = ${MIN_PHP%.*} ]]; then
echo -e "1\\n0" | xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} SYMFONY_DEPRECATIONS_HELPER=weak ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/"
if [[ $PHP = $MIN_PHP ]]; then
echo -e "1\\n0" | xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} SYMFONY_DEPRECATIONS_HELPER=weak ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php ./phpunit --colors=always src/Symfony/Component/Process/"
fi
fi
}
Expand Down
21 changes: 5 additions & 16 deletions appveyor.yml
Expand Up @@ -11,20 +11,15 @@ init:
- SET COMPOSER_NO_INTERACTION=1
- SET SYMFONY_DEPRECATIONS_HELPER=strict
- SET ANSICON=121x90 (121x90)
- SET SYMFONY_PHPUNIT_VERSION=4.8
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f

install:
- mkdir c:\php && cd c:\php
- appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.5.9-nts-Win32-VC11-x86.zip
- 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x64.zip
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
- 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul
- cd ext
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-4.0.10-5.5-nts-vc11-x86.zip
- 7z x php_apcu-4.0.10-5.5-nts-vc11-x86.zip -y >nul
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_memcache-3.0.8-5.5-nts-vc11-x86.zip
- 7z x php_memcache-3.0.8-5.5-nts-vc11-x86.zip -y >nul
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.8-7.1-ts-vc14-x86.zip
- 7z x php_apcu-5.1.8-7.1-ts-vc14-x86.zip -y >nul
- cd ..
- copy /Y php.ini-development php.ini-min
- echo serialize_precision=14 >> php.ini-min
Expand All @@ -37,13 +32,11 @@ install:
- echo extension=php_openssl.dll >> php.ini-max
- echo extension=php_apcu.dll >> php.ini-max
- echo apc.enable_cli=1 >> php.ini-max
- echo extension=php_memcache.dll >> php.ini-max
- echo extension=php_intl.dll >> php.ini-max
- echo extension=php_mbstring.dll >> php.ini-max
- echo extension=php_fileinfo.dll >> php.ini-max
- echo extension=php_pdo_sqlite.dll >> php.ini-max
- echo extension=php_curl.dll >> php.ini-max
- echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
- copy /Y php.ini-max php.ini
- cd c:\projects\symfony
- IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.3.0/composer.phar)
Expand All @@ -56,12 +49,8 @@ install:

test_script:
- SET X=0
- cd c:\php && 7z x php-7.1.3-Win32-VC14-x64.zip -y >nul && copy /Y php.ini-min php.ini
- cd c:\projects\symfony
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
- cd c:\php && 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul && copy /Y php.ini-min php.ini
- cd c:\projects\symfony
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
- copy /Y c:\php\php.ini-min c:\php\php.ini
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
- copy /Y c:\php\php.ini-max c:\php\php.ini
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
Expand Down
7 changes: 2 additions & 5 deletions composer.json
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=5.5.9",
"php": "^7.1.3",
"doctrine/common": "~2.4",
"fig/link-util": "^1.0",
"twig/twig": "~1.32|~2.2",
Expand All @@ -26,10 +26,7 @@
"psr/log": "~1.0",
"psr/simple-cache": "^1.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php56": "~1.0",
"symfony/polyfill-php70": "~1.0",
"symfony/polyfill-util": "~1.0"
"symfony/polyfill-mbstring": "~1.0"
},
"replace": {
"symfony/asset": "self.version",
Expand Down
26 changes: 13 additions & 13 deletions src/Symfony/Bridge/Doctrine/composer.json
Expand Up @@ -16,29 +16,29 @@
}
],
"require": {
"php": ">=5.5.9",
"php": "^7.1.3",
"doctrine/common": "~2.4",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"symfony/stopwatch": "~2.8|~3.0|~4.0.0",
"symfony/dependency-injection": "~3.3|~4.0.0",
"symfony/form": "^3.2.5|~4.0.0",
"symfony/http-kernel": "~2.8|~3.0|~4.0.0",
"symfony/property-access": "~2.8|~3.0|~4.0.0",
"symfony/property-info": "~2.8|3.0|~4.0.0",
"symfony/proxy-manager-bridge": "~2.8|~3.0|~4.0.0",
"symfony/security": "~2.8|~3.0|~4.0.0",
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
"symfony/validator": "^2.8.18|^3.2.5|~4.0.0",
"symfony/translation": "~2.8|~3.0|~4.0.0",
"symfony/stopwatch": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/form": "~3.4|~4.0",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/property-access": "~3.4|~4.0",
"symfony/property-info": "~3.4|~4.0",
"symfony/proxy-manager-bridge": "~3.4|~4.0",
"symfony/security": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/validator": "~3.4|~4.0",
"symfony/translation": "~3.4|~4.0",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4",
"doctrine/orm": "^2.4.5"
},
"conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/dependency-injection": "<3.3"
"symfony/dependency-injection": "<3.4"
},
"suggest": {
"symfony/form": "",
Expand Down
12 changes: 6 additions & 6 deletions src/Symfony/Bridge/Monolog/composer.json
Expand Up @@ -16,17 +16,17 @@
}
],
"require": {
"php": ">=5.5.9",
"php": "^7.1.3",
"monolog/monolog": "~1.19",
"symfony/http-kernel": "~2.8|~3.0|~4.0.0"
"symfony/http-kernel": "~3.4|~4.0"
},
"require-dev": {
"symfony/console": "~2.8|~3.0|~4.0.0",
"symfony/event-dispatcher": "~2.8|~3.0|~4.0.0",
"symfony/var-dumper": "~3.3|~4.0.0"
"symfony/console": "~3.4|~4.0",
"symfony/event-dispatcher": "~3.4|~4.0",
"symfony/var-dumper": "~3.4|~4.0"
},
"conflict": {
"symfony/http-foundation": "<3.3"
"symfony/http-foundation": "<3.4"
},
"suggest": {
"symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Bridge/ProxyManager/composer.json
Expand Up @@ -16,12 +16,12 @@
}
],
"require": {
"php": ">=5.5.9",
"symfony/dependency-injection": "~2.8|~3.0|~4.0.0",
"php": "^7.1.3",
"symfony/dependency-injection": "~3.4|~4.0",
"ocramius/proxy-manager": "~0.4|~1.0|~2.0"
},
"require-dev": {
"symfony/config": "~2.8|~3.0|~4.0.0"
"symfony/config": "~3.4|~4.0"
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },
Expand Down
30 changes: 15 additions & 15 deletions src/Symfony/Bridge/Twig/composer.json
Expand Up @@ -16,27 +16,27 @@
}
],
"require": {
"php": ">=5.5.9",
"php": "^7.1.3",
"twig/twig": "~1.28|~2.0"
},
"require-dev": {
"fig/link-util": "^1.0",
"symfony/asset": "~2.8|~3.0|~4.0.0",
"symfony/finder": "~2.8|~3.0|~4.0.0",
"symfony/form": "^3.2.7|~4.0.0",
"symfony/http-kernel": "~3.2|~4.0.0",
"symfony/asset": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0",
"symfony/form": "~3.4|~4.0",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.8|~3.0|~4.0.0",
"symfony/templating": "~2.8|~3.0|~4.0.0",
"symfony/translation": "~2.8|~3.0|~4.0.0",
"symfony/yaml": "~2.8|~3.0|~4.0.0",
"symfony/security": "~2.8|~3.0|~4.0.0",
"symfony/routing": "~3.4|~4.0",
"symfony/templating": "~3.4|~4.0",
"symfony/translation": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0",
"symfony/security": "~3.4|~4.0",
"symfony/security-acl": "~2.8|~3.0",
"symfony/stopwatch": "~2.8|~3.0|~4.0.0",
"symfony/console": "~2.8|~3.0|~4.0.0",
"symfony/var-dumper": "~2.8.10|~3.1.4|~3.2|~4.0.0",
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
"symfony/web-link": "~3.3|~4.0.0"
"symfony/stopwatch": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/var-dumper": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/web-link": "~3.4|~4.0"
},
"suggest": {
"symfony/finder": "",
Expand Down
14 changes: 7 additions & 7 deletions src/Symfony/Bundle/DebugBundle/composer.json
Expand Up @@ -16,15 +16,15 @@
}
],
"require": {
"php": ">=5.5.9",
"symfony/http-kernel": "~2.8|~3.0|~4.0.0",
"symfony/twig-bridge": "~2.8|~3.0|~4.0.0",
"symfony/var-dumper": "~2.8|~3.0|~4.0.0"
"php": "^7.1.3",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/twig-bridge": "~3.4|~4.0",
"symfony/var-dumper": "~3.4|~4.0"
},
"require-dev": {
"symfony/config": "~3.3|~4.0.0",
"symfony/dependency-injection": "~3.3|~4.0.0",
"symfony/web-profiler-bundle": "~2.8|~3.0|~4.0.0"
"symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
"symfony/web-profiler-bundle": "~3.4|~4.0"
},
"suggest": {
"symfony/config": "For service container configuration",
Expand Down
78 changes: 39 additions & 39 deletions src/Symfony/Bundle/FrameworkBundle/composer.json
Expand Up @@ -16,44 +16,44 @@
}
],
"require": {
"php": ">=5.5.9",
"php": "^7.1.3",
"ext-xml": "*",
"symfony/cache": "~3.3|~4.0.0",
"symfony/class-loader": "~3.2",
"symfony/dependency-injection": "~3.3-beta2|~4.0.0",
"symfony/config": "~3.3|~4.0.0",
"symfony/event-dispatcher": "~3.3|~4.0.0",
"symfony/http-foundation": "~3.3|~4.0.0",
"symfony/http-kernel": "~3.3|~4.0.0",
"symfony/cache": "~3.4|~4.0",
"symfony/class-loader": "~3.4|~4.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ClassLoader component won't have a 4.0 release.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, but the requirement will be dropped entirely when removing deprecated code anyway (only the BC layer requires it), so it is fine for now

"symfony/dependency-injection": "~3.4|~4.0",
"symfony/config": "~3.4|~4.0",
"symfony/event-dispatcher": "~3.4|~4.0",
"symfony/http-foundation": "~3.4|~4.0",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "~2.8|~3.0|~4.0.0",
"symfony/finder": "~2.8|~3.0|~4.0.0",
"symfony/routing": "~3.3|~4.0.0",
"symfony/stopwatch": "~2.8|~3.0|~4.0.0",
"symfony/filesystem": "~3.4|~4.0",
"symfony/finder": "~3.4|~4.0",
"symfony/routing": "~3.4|~4.0",
"symfony/stopwatch": "~3.4|~4.0",
"doctrine/cache": "~1.0"
},
"require-dev": {
"fig/link-util": "^1.0",
"symfony/asset": "~3.3|~4.0.0",
"symfony/browser-kit": "~2.8|~3.0|~4.0.0",
"symfony/console": "~3.3|~4.0.0",
"symfony/css-selector": "~2.8|~3.0|~4.0.0",
"symfony/dom-crawler": "~2.8|~3.0|~4.0.0",
"symfony/asset": "~3.4|~4.0",
"symfony/browser-kit": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/css-selector": "~3.4|~4.0",
"symfony/dom-crawler": "~3.4|~4.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/security": "~2.8|~3.0|~4.0.0",
"symfony/form": "~3.3|~4.0.0",
"symfony/expression-language": "~2.8|~3.0|~4.0.0",
"symfony/process": "~2.8|~3.0|~4.0.0",
"symfony/security-core": "~3.2|~4.0.0",
"symfony/security-csrf": "~2.8|~3.0|~4.0.0",
"symfony/serializer": "~3.3|~4.0.0",
"symfony/translation": "~3.2|~4.0.0",
"symfony/templating": "~2.8|~3.0|~4.0.0",
"symfony/validator": "~3.3|~4.0.0",
"symfony/workflow": "~3.3|~4.0.0",
"symfony/yaml": "~3.2|~4.0.0",
"symfony/property-info": "~3.3|~4.0.0",
"symfony/web-link": "~3.3|~4.0.0",
"symfony/security": "~3.4|~4.0",
"symfony/form": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0",
"symfony/process": "~3.4|~4.0",
"symfony/security-core": "~3.4|~4.0",
"symfony/security-csrf": "~3.4|~4.0",
"symfony/serializer": "~3.4|~4.0",
"symfony/translation": "~3.4|~4.0",
"symfony/templating": "~3.4|~4.0",
"symfony/validator": "~3.4|~4.0",
"symfony/workflow": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0",
"symfony/property-info": "~3.4|~4.0",
"symfony/web-link": "~3.4|~4.0",
"doctrine/annotations": "~1.0",
"phpdocumentor/reflection-docblock": "^3.0",
"twig/twig": "~1.26|~2.0",
Expand All @@ -63,14 +63,14 @@
"phpdocumentor/reflection-docblock": "<3.0",
"phpdocumentor/type-resolver": "<0.2.0",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/asset": "<3.3",
"symfony/console": "<3.3",
"symfony/form": "<3.3",
"symfony/property-info": "<3.3",
"symfony/serializer": "<3.3",
"symfony/translation": "<3.2",
"symfony/validator": "<3.3",
"symfony/workflow": "<3.3"
"symfony/asset": "<3.4",
"symfony/console": "<3.4",
"symfony/form": "<3.4",
"symfony/property-info": "<3.4",
"symfony/serializer": "<3.4",
"symfony/translation": "<3.4",
"symfony/validator": "<3.4",
"symfony/workflow": "<3.4"
},
"suggest": {
"ext-apcu": "For best performance of the system caches",
Expand Down