Merge pull request #131 from nickvergessen/PHP-8.4

feat: Add PHP 8.4 support
This commit is contained in:
Robin Appelman 2024-11-11 15:08:34 +01:00 committed by GitHub
commit e6904cbe75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 8 deletions

View file

@ -35,6 +35,10 @@ jobs:
- "7.3" - "7.3"
- "7.4" - "7.4"
- "8.0" - "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"
services: services:
samba: samba:
@ -50,7 +54,7 @@ jobs:
steps: steps:
- name: Install packages - name: Install packages
run: | run: |
sudo apt-get install smbclient sudo apt-get install smbclient libsmbclient-dev
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
@ -222,17 +226,18 @@ jobs:
- "8.0" - "8.0"
- "8.1" - "8.1"
- "8.2" - "8.2"
- "8.3"
steps: steps:
- name: krb5-dev - name: krb5-dev
run: sudo apt-get install -y libkrb5-dev run: sudo apt-get install -y libkrb5-dev libsmbclient-dev
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Set up php - name: Set up php
uses: shivammathur/setup-php@master uses: shivammathur/setup-php@master
with: with:
php-version: "${{ matrix.php-version }}" php-version: "${{ matrix.php-version }}"
tools: composer:v1 tools: composer:v2
coverage: none coverage: none
extensions: apcu, smbclient, krb5 extensions: apcu, smbclient, krb5
env: env:

View file

@ -12,7 +12,7 @@ use Throwable;
* @psalm-consistent-constructor * @psalm-consistent-constructor
*/ */
class Exception extends \Exception { class Exception extends \Exception {
public function __construct(string $message = "", int $code = 0, Throwable $previous = null) { public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null) {
parent::__construct($message, $code, $previous); parent::__construct($message, $code, $previous);
} }

View file

@ -12,7 +12,7 @@ class InvalidRequestException extends Exception {
*/ */
protected $path; protected $path;
public function __construct(string $path = "", int $code = 0, \Throwable $previous = null) { public function __construct(string $path = "", int $code = 0, ?\Throwable $previous = null) {
$class = get_class($this); $class = get_class($this);
$parts = explode('\\', $class); $parts = explode('\\', $class);
$baseName = array_pop($parts); $baseName = array_pop($parts);

View file

@ -33,9 +33,9 @@ class ServerFactory {
* @param ITimeZoneProvider|null $timeZoneProvider * @param ITimeZoneProvider|null $timeZoneProvider
*/ */
public function __construct( public function __construct(
IOptions $options = null, ?IOptions $options = null,
ISystem $system = null, ?ISystem $system = null,
ITimeZoneProvider $timeZoneProvider = null ?ITimeZoneProvider $timeZoneProvider = null
) { ) {
if (is_null($options)) { if (is_null($options)) {
$options = new Options(); $options = new Options();