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

Drop PHP7.3 #29286

Merged
merged 6 commits into from
Feb 1, 2022
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
148 changes: 69 additions & 79 deletions .drone.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.3', '7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1']
name: php${{ matrix.php-versions }} lint
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: [ '7.3', '7.4', '8.0', '8.1']
php-versions: [ '7.4', '8.0', '8.1']
databases: [ 'oci' ]

name: php${{ matrix.php-versions }}-${{ matrix.databases }}
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/CommentsContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public function asLoadloadAllTheCommentsOfTheFileNamedItShouldReturn($user, $fil
if ($res->getStatusCode() === 207) {
$service = new Sabre\Xml\Service();
$this->response = $service->parse($res->getBody()->getContents());
$this->commentId = (int)$this->response[0]['value'][2]['value'][0]['value'][0]['value'];
$this->commentId = (int) ($this->response[0]['value'][2]['value'][0]['value'][0]['value'] ?? 0);
}
}

Expand Down
4 changes: 2 additions & 2 deletions build/integration/features/bootstrap/Sharing.php
Original file line number Diff line number Diff line change
Expand Up @@ -679,14 +679,14 @@ public function asRemoveAllSharesFromTheFileNamed($user, $fileName) {
* @When save last share id
*/
public function saveLastShareId() {
$this->savedShareId = $this->lastShareData['data']['id'];
$this->savedShareId = ($this->lastShareData['data']['id'] ?? null);
}

/**
* @Then share ids should match
*/
public function shareIdsShouldMatch() {
if ($this->savedShareId !== $this->lastShareData['data']['id']) {
if ($this->savedShareId !== ($this->lastShareData['data']['id'] ?? null)) {
throw new \Exception('Expected the same link share to be returned');
}
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"optimize-autoloader": true,
"sort-packages": true,
"platform": {
"php": "7.3"
"php": "7.4"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

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

6 changes: 3 additions & 3 deletions lib/versioncheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
// Show warning if a PHP version below 7.3 is used,
if (PHP_VERSION_ID < 70300) {
// Show warning if a PHP version below 7.4 is used,
if (PHP_VERSION_ID < 70400) {
http_response_code(500);
echo 'This version of Nextcloud requires at least PHP 7.3<br/>';
echo 'This version of Nextcloud requires at least PHP 7.4<br/>';
echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
exit(1);
}
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/cs-fixer/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"config": {
"platform": {
"php": "7.3"
"php": "7.4"
}
},
"require": {
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/cs-fixer/composer.lock

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

2 changes: 1 addition & 1 deletion vendor-bin/psalm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"config": {
"platform": {
"php": "7.3"
"php": "7.4"
},
"allow-plugins": {
"composer/package-versions-deprecated": true
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/psalm/composer.lock

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