Revert composer.json changes, CS fixes

Author: alecpl

composer.json

@@ -3,36 +3,28 @@
     "description": "The Roundcube Webmail suite",
     "license": "GPL-3.0-or-later",
     "require": {
-        "php": ">=7.3.0 <=8.5",
-        "pear/pear-core-minimal": "^1.10",
-        "pear/auth_sasl": "~1.1.0",
-        "pear/mail_mime": "~1.10.12",
-        "pear/net_smtp": "~1.10.0",
-        "pear/crypt_gpg": "*",
-        "pear/net_ldap2": "~2.2.0",
-        "pear/net_sieve": "*",
-        "roundcube/plugin-installer": "^0.3",
-        "masterminds/html5": "~2.8.0",
-        "firebase/php-jwt": "~5.0.0",
-        "pear/http_request2": "~2.5.0",
+        "php": ">=7.3 <8.5",
         "bacon/bacon-qr-code": "^2.0.8 || ^3.0.0",
         "guzzlehttp/guzzle": "^7.9.2",
         "guzzlehttp/promises": "^2.0",
-        "sabre/vobject": "~4.5.1",
-        "roundcube/rtf-html-php": "~2.1",
-        "kolab/net_ldap3": "~1.1.5",
-        "endroid/qr-code": "~1.6.5",
-        "spomky-labs/otphp": "~10.0.3"
+        "masterminds/html5": "~2.8.0 || ~2.9.0",
+        "pear/auth_sasl": "~1.1.0 || ~1.2.0",
+        "pear/crypt_gpg": "~1.6.3",
+        "pear/mail_mime": "~1.10.11",
+        "pear/net_sieve": "~1.4.7",
+        "pear/net_smtp": "~1.12.0",
+        "pear/pear-core-minimal": "~1.10.1",
+        "roundcube/plugin-installer": "~0.3.5",
+        "roundcube/rtf-html-php": "^2.1"
     },
     "require-dev": {
-        "laravel/dusk": "^7.9",
         "ergebnis/composer-normalize": "^2.13",
         "ergebnis/phpunit-slow-test-detector": "^2.11",
         "friendsofphp/php-cs-fixer": "^3.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.2",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpunit/phpunit": "^9.6.20",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpunit/phpunit": "^9.6.20 || ^10.0 || ^11.0",
         "roundcube/acl": "*",
         "roundcube/additional_message_headers": "*",
         "roundcube/archive": "*",

public_html/static.php

@@ -66,7 +66,6 @@
 
 serveStaticFile($path);
 
-
 /**
  * Validate that the file exists and can be served
  *
@@ -135,7 +134,7 @@ function serveStaticFile($path): void
     }
 
     $size = filesize($path);
-    $fp = fopen($path, 'rb');
+    $fp = fopen($path, 'r');
     $range = [0, $size - 1];
 
     if (isset($_SERVER['HTTP_RANGE'])) {
@@ -159,8 +158,7 @@ function serveStaticFile($path): void
         if ($range[0] >= 0 && ($range[1] <= $size - 1) && $range[0] <= $range[1]) {
             header('HTTP/1.1 206 Partial Content', true, 206);
             header('Content-Range: bytes ' . sprintf('%u-%u/%u', $range[0], $range[1], $size));
-        }
-        else {
+        } else {
             header('HTTP/1.1 416 Requested Range Not Satisfiable', true, 416);
             header('Content-Range: bytes */' . $size);
             return;
@@ -180,7 +178,7 @@ function serveStaticFile($path): void
     ];
 
     foreach ($headers as $k => $v) {
-        header("$k: $v", true);
+        header("{$k}: {$v}", true);
     }
 
     if ($range[0] > 0) {