Skip to content

Bump Symfony 6 to PHP 8 #41282

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

Merged
merged 1 commit into from
May 19, 2021
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
build: false
clone_depth: 2
clone_folder: c:\projects\symfony
image: Visual Studio 2019

cache:
- composer.phar
Expand All @@ -17,11 +18,11 @@ init:

install:
- mkdir c:\php && cd c:\php
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.2.5-Win32-VC15-x86.zip
- 7z x php-7.2.5-Win32-VC15-x86.zip -y >nul
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.0.2-Win32-vs16-x86.zip
- 7z x php-8.0.2-Win32-vs16-x86.zip -y >nul
- cd ext
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.17-7.2-ts-vc15-x86.zip
- 7z x php_apcu-5.1.17-7.2-ts-vc15-x86.zip -y >nul
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.20-8.0-ts-vs16-x86.zip
- 7z x php_apcu-5.1.20-8.0-ts-vs16-x86.zip -y >nul
- cd ..
- copy /Y php.ini-development php.ini-min
- echo memory_limit=-1 >> php.ini-min
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/intl-data-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
coverage: "none"
extensions: "zip,intl-${{env.SYMFONY_ICU_VERSION}}"
ini-values: "memory_limit=-1"
php-version: "7.4"
php-version: "8.0"

- name: Configure composer
run: |
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
php: ['7.2', '7.4']
php: ['8.0']

services:
postgres:
Expand Down Expand Up @@ -216,8 +216,6 @@ jobs:

- name: Install dependencies
run: |
echo "::group::fake PHP version"
composer config platform.php 8.0.99
Copy link
Member

Choose a reason for hiding this comment

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

We still need this, actually.

Copy link
Member

Choose a reason for hiding this comment

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

echo "::group::composer update"
composer update --no-progress --ansi
echo "::endgroup::"
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ addons:

env:
global:
- SYMFONY_VERSION=5.x
- MIN_PHP=7.2.5
- SYMFONY_VERSION=5.4
- MIN_PHP=8.0.2
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
- SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1

matrix:
include:
- php: 7.2
env: php_extra="7.3 8.0"
- php: 7.4
- php: 8.0
env: php_extra=""
- php: 8.0
env: deps=high
- php: 8.0
env: deps=low
Expand Down Expand Up @@ -219,7 +219,7 @@ install:
- |
# Install symfony/flex
if [[ $deps = low ]]; then
export SYMFONY_REQUIRE='>=3.4'
export SYMFONY_REQUIRE='>=4.4'
else
export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
fi
Expand Down
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"symfony/translation-implementation": "2.3"
},
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"ext-xml": "*",
"friendsofphp/proxy-manager-lts": "^1.0.2",
"doctrine/event-manager": "~1.0",
Expand All @@ -50,8 +50,6 @@
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-intl-normalizer": "~1.0",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.11",
"symfony/polyfill-php80": "^1.15",
"symfony/polyfill-uuid": "^1.15",
"symfony/runtime": "self.version"
},
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bridge/Doctrine/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"doctrine/event-manager": "~1.0",
"doctrine/persistence": "^2",
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php80": "^1.15",
"symfony/service-contracts": "^1.1|^2"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Monolog/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"monolog/monolog": "^1.25.1|^2",
"symfony/service-contracts": "^1.1|^2",
"symfony/http-kernel": "^5.3",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/ProxyManager/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"composer/package-versions-deprecated": "^1.8",
"friendsofphp/proxy-manager-lts": "^1.0.2",
"symfony/dependency-injection": "^5.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bridge/Twig/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"symfony/polyfill-php80": "^1.15",
"php": ">=8.0.2",
"symfony/translation-contracts": "^1.1|^2",
"twig/twig": "^2.13|^3.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/DebugBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"ext-xml": "*",
"symfony/http-kernel": "^4.4|^5.0",
"symfony/twig-bridge": "^4.4|^5.0",
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bundle/FrameworkBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"ext-xml": "*",
"symfony/cache": "^5.2",
"symfony/config": "^5.3",
Expand All @@ -27,7 +27,6 @@
"symfony/http-foundation": "^5.3",
"symfony/http-kernel": "^5.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php80": "^1.15",
"symfony/filesystem": "^4.4|^5.0",
"symfony/finder": "^4.4|^5.0",
"symfony/routing": "^5.3"
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bundle/SecurityBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"ext-xml": "*",
"symfony/config": "^4.4|^5.0",
"symfony/dependency-injection": "^5.3",
Expand All @@ -25,7 +25,6 @@
"symfony/http-kernel": "^5.3",
"symfony/http-foundation": "^5.3",
"symfony/password-hasher": "^5.3",
"symfony/polyfill-php80": "^1.15",
"symfony/security-core": "^5.3",
"symfony/security-csrf": "^4.4|^5.0",
"symfony/security-guard": "^5.3",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/TwigBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/config": "^4.4|^5.0",
"symfony/twig-bridge": "^5.3",
"symfony/http-foundation": "^4.4|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/WebProfilerBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/config": "^4.4|^5.0",
"symfony/framework-bundle": "^5.3",
"symfony/http-kernel": "^5.3",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Asset/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1"
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/BrowserKit/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/dom-crawler": "^4.4|^5.0"
},
"require-dev": {
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/Cache/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
"symfony/cache-implementation": "1.0|2.0"
},
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"psr/cache": "^1.0|^2.0",
"psr/log": "^1.1",
"symfony/cache-contracts": "^1.1.7|^2",
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-php80": "^1.15",
"symfony/service-contracts": "^1.1|^2",
"symfony/var-exporter": "^4.4|^5.0"
},
Expand Down
5 changes: 2 additions & 3 deletions src/Symfony/Component/Config/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1",
"symfony/filesystem": "^4.4|^5.0",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-php80": "^1.15"
"symfony/polyfill-ctype": "~1.8"
},
"require-dev": {
"symfony/event-dispatcher": "^4.4|^5.0",
Expand Down
4 changes: 1 addition & 3 deletions src/Symfony/Component/Console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.8",
"symfony/polyfill-php80": "^1.15",
"symfony/service-contracts": "^1.1|^2",
"symfony/string": "^5.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/CssSelector/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
],
"require": {
"php": ">=7.2.5"
"php": ">=8.0.2"
},
"autoload": {
"psr-4": { "Symfony\\Component\\CssSelector\\": "" },
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/DependencyInjection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"psr/container": "^1.1.1",
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-php80": "^1.15",
"symfony/service-contracts": "^1.1.6|^2"
},
"require-dev": {
Expand Down
5 changes: 2 additions & 3 deletions src/Symfony/Component/DomCrawler/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php80": "^1.15"
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"symfony/css-selector": "^4.4|^5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Dotenv/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1"
},
"require-dev": {
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/ErrorHandler/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"psr/log": "^1.0",
"symfony/polyfill-php80": "^1.15",
"symfony/var-dumper": "^4.4|^5.0"
},
"require-dev": {
Expand Down
5 changes: 2 additions & 3 deletions src/Symfony/Component/EventDispatcher/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1",
"symfony/event-dispatcher-contracts": "^2",
"symfony/polyfill-php80": "^1.15"
"symfony/event-dispatcher-contracts": "^2"
},
"require-dev": {
"symfony/dependency-injection": "^4.4|^5.0",
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/ExpressionLanguage/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/cache": "^4.4|^5.0",
"symfony/polyfill-php80": "^1.15",
"symfony/service-contracts": "^1.1|^2"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Filesystem/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/polyfill-ctype": "~1.8"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Finder/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": ">=7.2.5"
"php": ">=8.0.2"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Finder\\": "" },
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/Form/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
}
],
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"symfony/deprecation-contracts": "^2.1",
"symfony/event-dispatcher": "^4.4|^5.0",
"symfony/options-resolver": "^5.1",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-icu": "^1.21",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php80": "^1.15",
"symfony/property-access": "^5.0.8",
"symfony/service-contracts": "^1.1|^2"
},
Expand Down
4 changes: 1 addition & 3 deletions src/Symfony/Component/HttpClient/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@
"symfony/http-client-implementation": "2.4"
},
"require": {
"php": ">=7.2.5",
"php": ">=8.0.2",
"psr/log": "^1.0",
"symfony/deprecation-contracts": "^2.1",
"symfony/http-client-contracts": "^2.4",
"symfony/polyfill-php73": "^1.11",
"symfony/polyfill-php80": "^1.15",
"symfony/service-contracts": "^1.0|^2"
},
"require-dev": {
Expand Down
Loading