Merge pull request #29286 from nextcloud/enhancement/drop-php-7-3

Drop PHP7.3
nextcloud · Feb 1, 2022 · d635d58 · d635d58
2 parents 16521e9 + 910e1aa
commit d635d58
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 94 deletions.
diff --git a/.drone.yml b/.drone.yml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -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

diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
@@ -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 }}

diff --git a/build/integration/features/bootstrap/CommentsContext.php b/build/integration/features/bootstrap/CommentsContext.php
@@ -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);
 		}
 	}
 

diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php
@@ -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');
 		}
 	}

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
 		"optimize-autoloader": true,
 		"sort-packages": true,
 		"platform": {
-			"php": "7.3"
+			"php": "7.4"
 		},
 		"allow-plugins": {
 			"bamarni/composer-bin-plugin": true

diff --git a/composer.lock b/composer.lock
diff --git a/lib/versioncheck.php b/lib/versioncheck.php
@@ -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);
 }

diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json
@@ -1,7 +1,7 @@
 {
 	"config": {
 		"platform": {
-			"php": "7.3"
+			"php": "7.4"
 		}
 	},
 	"require": {

diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -4,7 +4,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.3"
+            "php": "7.4"
         },
         "allow-plugins": {
             "composer/package-versions-deprecated": true

diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock