From bea45f9f127b117a8b586b402317d5bf71902f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B2=D0=B4=D0=B5=D0=B5=D0=B2=20=D0=9C=D0=B0=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D0=BC?= Date: Mon, 20 Mar 2023 12:36:22 +0000 Subject: [PATCH] BH-15288. Update some dependencies for php 8.2 --- composer.json | 12 ++--- .../validators/HostnameValidator.php | 3 +- src/LTDBeget/dns/enums/eErrorCode.php | 46 ++++++++++--------- .../dns/enums/eRecordNotification.php | 6 ++- src/LTDBeget/dns/enums/eRecordType.php | 24 +++++----- 5 files changed, 49 insertions(+), 42 deletions(-) diff --git a/composer.json b/composer.json index 95c1e8a..017bee2 100755 --- a/composer.json +++ b/composer.json @@ -14,14 +14,14 @@ } ], "require": { - "php": ">=7.0", - "marc-mabe/php-enum" : "~2.2", - "zendframework/zend-validator" : "~2.7", - "ltd-beget/dns-zone-tokenizer": "~0.0.6" + "php": ">=8.0", + "marc-mabe/php-enum" : "^4.7.0", + "laminas/laminas-validator" : "^2.30.1", + "ltd-beget/dns-zone-tokenizer": "~0.0.6 | dev-BH-15288", + "laminas/laminas-stdlib": "^3.14" }, "require-dev": { - "theseer/phpdox": "~0.8", - "phpunit/phpunit": "~7.3", + "phpunit/phpunit": "~8.5.33", "tideways/profiler": "~2.0" }, "autoload": { diff --git a/src/LTDBeget/dns/configurator/validators/HostnameValidator.php b/src/LTDBeget/dns/configurator/validators/HostnameValidator.php index d9b3daf..88ea098 100644 --- a/src/LTDBeget/dns/configurator/validators/HostnameValidator.php +++ b/src/LTDBeget/dns/configurator/validators/HostnameValidator.php @@ -7,7 +7,8 @@ namespace LTDBeget\dns\configurator\validators; -use Zend\Validator\Hostname; + +use Laminas\Validator\Hostname; /** * Class HostnameValidator diff --git a/src/LTDBeget/dns/enums/eErrorCode.php b/src/LTDBeget/dns/enums/eErrorCode.php index 11927eb..5201229 100644 --- a/src/LTDBeget/dns/enums/eErrorCode.php +++ b/src/LTDBeget/dns/enums/eErrorCode.php @@ -13,28 +13,30 @@ * Class ErrorCode * * @package beget\lib\dns\lib\errors - * @method static eErrorCode WRONG_ORIGIN() - * @method static eErrorCode WRONG_NODE_NAME() - * @method static eErrorCode CONFLICT_RECORD_TYPES_ERROR() - * @method static eErrorCode SOA_ERROR() - * @method static eErrorCode WRONG_NS_IN_ROOT() - * @method static eErrorCode SOA_RECORD_NOT_IN_ROOT() - * @method static eErrorCode MULTIPLE_CNAME_ERROR() - * @method static eErrorCode NO_NS_IN_ROOT() - * @method static eErrorCode WRONG_TTL() - * @method static eErrorCode WRONG_IP_V4() - * @method static eErrorCode WRONG_IP_V6() - * @method static eErrorCode WRONG_DOMAIN_NAME() - * @method static eErrorCode WRONG_INT16() - * @method static eErrorCode WRONG_PTR_NAME() - * @method static eErrorCode EMPTY_TXT() - * @method static eErrorCode WRONG_INT32() - * @method static eErrorCode CONTAINS_CONTROL_SYMBOLS() - * @method static eErrorCode OUT_OF_ZONE_DATE() - * @method static eErrorCode INCORRECT_ESCAPING() - * @method static eErrorCode WRONG_CAA_VALUE() - * @method static eErrorCode WRONG_CAA_FLAGS() - * @method static eErrorCode WRONG_CAA_TAG() + * @method static static WRONG_ORIGIN() + * @method static static WRONG_NODE_NAME() + * @method static static CONFLICT_RECORD_TYPES_ERROR() + * @method static static SOA_ERROR() + * @method static static WRONG_NS_IN_ROOT() + * @method static static SOA_RECORD_NOT_IN_ROOT() + * @method static static MULTIPLE_CNAME_ERROR() + * @method static static NO_NS_IN_ROOT() + * @method static static WRONG_TTL() + * @method static static WRONG_IP_V4() + * @method static static WRONG_IP_V6() + * @method static static WRONG_DOMAIN_NAME() + * @method static static WRONG_INT16() + * @method static static WRONG_PTR_NAME() + * @method static static EMPTY_TXT() + * @method static static WRONG_INT32() + * @method static static CONTAINS_CONTROL_SYMBOLS() + * @method static static OUT_OF_ZONE_DATE() + * @method static static INCORRECT_ESCAPING() + * @method static static WRONG_CAA_VALUE() + * @method static static WRONG_CAA_FLAGS() + * @method static static WRONG_CAA_TAG() + * @method integer getValue() + * @psalm-immutable */ class eErrorCode extends Enum { diff --git a/src/LTDBeget/dns/enums/eRecordNotification.php b/src/LTDBeget/dns/enums/eRecordNotification.php index 45100f8..33601c1 100644 --- a/src/LTDBeget/dns/enums/eRecordNotification.php +++ b/src/LTDBeget/dns/enums/eRecordNotification.php @@ -13,8 +13,10 @@ * Class eRecordNotification * * @package LTDBeget\dns\enums - * @method static eRecordNotification ADD() - * @method static eRecordNotification REMOVE() + * @method static static ADD() + * @method static static REMOVE() + * @method string getValue() + * @psalm-immutable */ class eRecordNotification extends Enum { diff --git a/src/LTDBeget/dns/enums/eRecordType.php b/src/LTDBeget/dns/enums/eRecordType.php index 22a0933..cd7818e 100644 --- a/src/LTDBeget/dns/enums/eRecordType.php +++ b/src/LTDBeget/dns/enums/eRecordType.php @@ -13,17 +13,19 @@ * Class eRecord * * @package LTDBeget\dns\enums - * @method static eRecordType SOA() - * @method static eRecordType A() - * @method static eRecordType AAAA() - * @method static eRecordType CNAME() - * @method static eRecordType MX() - * @method static eRecordType NS() - * @method static eRecordType PTR() - * @method static eRecordType TXT() - * @method static eRecordType SRV() - * @method static eRecordType CAA() - * @method static eRecordType NAPTR() + * @method static static SOA() + * @method static static A() + * @method static static AAAA() + * @method static static CNAME() + * @method static static MX() + * @method static static NS() + * @method static static PTR() + * @method static static TXT() + * @method static static SRV() + * @method static static CAA() + * @method static static NAPTR() + * @method string getValue() + * @psalm-immutable */ class eRecordType extends Enum {