Bump minimum PHP version to 8.1 and update packages

This commit is contained in:
Igor Scheller 2022-12-10 18:28:23 +01:00 committed by Michael Weimann
parent 2d454ca8ae
commit 6c4e92baf2
5 changed files with 635 additions and 954 deletions

View File

@ -15,7 +15,7 @@ Please read the [CONTRIBUTING.md](CONTRIBUTING.md) and [DEVELOPMENT.md](DEVELOPM
The Engelsystem may be installed manually or by using the provided [docker setup](#docker). The Engelsystem may be installed manually or by using the provided [docker setup](#docker).
### Requirements ### Requirements
* PHP >= 7.4 * PHP >= 8.1
* Required modules: * Required modules:
* dom * dom
* json * json

View File

@ -19,7 +19,7 @@
"phpstan": "phpstan" "phpstan": "phpstan"
}, },
"require": { "require": {
"php": ">=7.4.0", "php": ">=8.1.0",
"ext-json": "*", "ext-json": "*",
"ext-libxml": "*", "ext-libxml": "*",
"ext-mbstring": "*", "ext-mbstring": "*",

1579
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
parameters: parameters:
phpVersion: 70400 phpVersion: 80100
level: 1 level: 1
paths: paths:
- config - config

View File

@ -42,6 +42,10 @@ trait ChecksArrivalsAndDepartures
return true; // since optional value return true; // since optional value
} }
if (is_null($arrival_carbon)) {
return false; // Will be false any ways
}
return $departure_carbon->greaterThanOrEqualTo($arrival_carbon) && return $departure_carbon->greaterThanOrEqualTo($arrival_carbon) &&
!$this->isBeforeBuildup($departure_carbon) && !$this->isAfterTeardown($departure_carbon); !$this->isBeforeBuildup($departure_carbon) && !$this->isAfterTeardown($departure_carbon);
} }