Skip to content

Commit

Permalink
Merge pull request #1798 from nextcloud/chore/php-8_1-main
Browse files Browse the repository at this point in the history
fix: Upgrade PHP requirement to 8.1
  • Loading branch information
nickvergessen authored Apr 8, 2024
2 parents fe17c41 + 272ce42 commit fbef1b5
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: [ '8.0', '8.1', '8.2', '8.3' ]
php-versions: [ '8.1', '8.2', '8.3' ]

name: php-lint

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
"php": "8.0.2"
"php": "8.1.0"
},
"sort-packages": true,
"allow-plugins": {
"cweagans/composer-patches": true
}
},
"require": {
"php": "^8.0",
"php": "^8.1",
"aws/aws-sdk-php": "^3.240",
"bantu/ini-get-wrapper": "v1.0.1",
"cweagans/composer-patches": "^1.7",
Expand Down
56 changes: 37 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 'nextcloud/3rdparty',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '0be1f7e31b14364f82dfdb5cd6c072479c176866',
'reference' => 'fe17c4147f7aa5ae661c99e6a52a5cf5e1a994bb',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
Expand Down Expand Up @@ -319,7 +319,7 @@
'nextcloud/3rdparty' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '0be1f7e31b14364f82dfdb5cd6c072479c176866',
'reference' => 'fe17c4147f7aa5ae661c99e6a52a5cf5e1a994bb',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
Expand Down
4 changes: 2 additions & 2 deletions composer/platform_check.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

$issues = array();

if (!(PHP_VERSION_ID >= 80002)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 8.0.2". You are running ' . PHP_VERSION . '.';
if (!(PHP_VERSION_ID >= 80100)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 8.1.0". You are running ' . PHP_VERSION . '.';
}

if ($issues) {
Expand Down

0 comments on commit fbef1b5

Please sign in to comment.