Skip to content

Commit

Permalink
Merge pull request #131 from nickvergessen/PHP-8.4
Browse files Browse the repository at this point in the history
feat: Add PHP 8.4 support
  • Loading branch information
icewind1991 authored Nov 11, 2024
2 parents 35b33f0 + 81610a3 commit e6904cb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"

services:
samba:
Expand All @@ -50,7 +54,7 @@ jobs:
steps:
- name: Install packages
run: |
sudo apt-get install smbclient
sudo apt-get install smbclient libsmbclient-dev
- uses: actions/checkout@v3
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -222,17 +226,18 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"

steps:
- name: krb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get install -y libkrb5-dev libsmbclient-dev
- name: Checkout
uses: actions/checkout@v3
- name: Set up php
uses: shivammathur/setup-php@master
with:
php-version: "${{ matrix.php-version }}"
tools: composer:v1
tools: composer:v2
coverage: none
extensions: apcu, smbclient, krb5
env:
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* @psalm-consistent-constructor
*/
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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Exception/InvalidRequestException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class InvalidRequestException extends Exception {
*/
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);
$parts = explode('\\', $class);
$baseName = array_pop($parts);
Expand Down
6 changes: 3 additions & 3 deletions src/ServerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class ServerFactory {
* @param ITimeZoneProvider|null $timeZoneProvider
*/
public function __construct(
IOptions $options = null,
ISystem $system = null,
ITimeZoneProvider $timeZoneProvider = null
?IOptions $options = null,
?ISystem $system = null,
?ITimeZoneProvider $timeZoneProvider = null
) {
if (is_null($options)) {
$options = new Options();
Expand Down

0 comments on commit e6904cb

Please sign in to comment.