diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 6eec3513f..a1697376d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -4,7 +4,7 @@ on:
     branches: "*"
   pull_request:
 env:
-  php-version: 8.3
+  php-version: 8.4
   cache-version: 1
 jobs:
   platform-check:
@@ -147,7 +147,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        versions: [{php: "5.6", wordpress: "4.9"}, {php: "5.6", wordpress: "5.9"}, {php: "5.6", wordpress: "6.2"}, {php: "7.4", wordpress: "latest"}, {php: "8.3", wordpress: "latest"}]
+        versions: [{php: "5.6", wordpress: "4.9"}, {php: "5.6", wordpress: "5.9"}, {php: "5.6", wordpress: "6.2"}, {php: "7.4", wordpress: "latest"}, {php: "8.4", wordpress: "latest"}]
     services:
       mysql:
         image: mysql:5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 17b9c0853..2c8d0b6c8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
     tags:
       - "*"
 env:
-  php-version: 8.3
+  php-version: 8.4
   cache-version: 1
 jobs:
   build:
diff --git a/phpcs.xml b/phpcs.xml
index cdc1d0da1..e53cf515e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -70,6 +70,7 @@
 		<exclude name="SlevomatCodingStandard.Arrays.DisallowPartiallyKeyed.DisallowedPartiallyKeyed"/>
 		<exclude name="SlevomatCodingStandard.Classes.RequireSingleLineMethodSignature.RequiredSingleLineSignature"/>
 		<exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix"/>
+		<exclude name="SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses.UsedWithParentheses"/>
 		<exclude name="SlevomatCodingStandard.ControlStructures.NewWithoutParentheses.UselessParentheses"/>
 		<exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse.MissingTrailingComma"/>
 		<exclude name="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration.MissingTrailingComma"/>
diff --git a/src/php/frontend/class-video-proxy.php b/src/php/frontend/class-video-proxy.php
index 63b46c581..3ed07b90b 100644
--- a/src/php/frontend/class-video-proxy.php
+++ b/src/php/frontend/class-video-proxy.php
@@ -57,7 +57,7 @@ public static function ajax_handler_body() {
 
 		if ( false === $transient ) {
 			http_response_code( 404 );
-			die;
+			exit();
 		}
 
 		header( 'Accept-Ranges: bytes' );
@@ -87,7 +87,7 @@ public static function ajax_handler_body() {
 
 		if ( is_null( $stream ) ) {
 			http_response_code( 500 );
-			die;
+			exit();
 		}
 
 		ob_end_clean();
@@ -116,7 +116,7 @@ private static function resolve_range( $size ) {
 
 		if ( 2 !== count( $limits ) ) {
 			http_response_code( 416 );
-			die;
+			exit();
 		}
 
 		$raw_start = $limits[0];
@@ -134,7 +134,7 @@ private static function resolve_range( $size ) {
 
 		if ( $start > $end ) {
 			http_response_code( 416 );
-			die;
+			exit();
 		}
 
 		return array( $start, $end );
@@ -152,7 +152,7 @@ private static function resolve_range( $size ) {
 	private static function check_range_header( $header ) {
 		if ( ! str_starts_with( $header, 'bytes=' ) ) {
 			http_response_code( 416 );
-			die;
+			exit();
 		}
 
 		$header = substr( $header, 6 );
@@ -160,7 +160,7 @@ private static function check_range_header( $header ) {
 		// Multipart range requests are not supported.
 		if ( str_contains( $header, ',' ) ) {
 			http_response_code( 416 );
-			die;
+			exit();
 		}
 
 		return $header;