mirror of
https://codeberg.org/icewind/SMB.git
synced 2026-06-03 09:14:06 +02:00
Merge pull request #131 from nickvergessen/PHP-8.4
feat: Add PHP 8.4 support
This commit is contained in:
commit
e6904cbe75
4 changed files with 13 additions and 8 deletions
11
.github/workflows/ci.yaml
vendored
11
.github/workflows/ci.yaml
vendored
|
|
@ -35,6 +35,10 @@ jobs:
|
|||
- "7.3"
|
||||
- "7.4"
|
||||
- "8.0"
|
||||
- "8.1"
|
||||
- "8.2"
|
||||
- "8.3"
|
||||
- "8.4"
|
||||
|
||||
services:
|
||||
samba:
|
||||
|
|
@ -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
|
||||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ use Throwable;
|
|||
* @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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue