From ce64888b81c247df8fc7515f830368364f3b74b8 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 22 Oct 2024 15:29:55 +0200 Subject: [PATCH] Fix const visibility --- application/forms/SyncPropertyForm.php | 2 +- library/Director/Auth/Restriction.php | 2 +- .../CustomVariable/CustomVariableNumber.php | 2 +- .../Director/Data/Db/IcingaObjectQuery.php | 2 +- .../Data/Db/ServiceSetQueryBuilder.php | 8 +-- library/Director/Data/Json.php | 2 +- library/Director/Db/Branch/Branch.php | 2 +- library/Director/Db/Branch/BranchActivity.php | 8 +-- library/Director/Db/Branch/BranchSettings.php | 10 +-- library/Director/Db/Branch/BranchStore.php | 4 +- library/Director/Db/Branch/BranchSupport.php | 67 ++++++++++--------- .../Director/Db/IcingaObjectFilterHelper.php | 6 +- .../DirectorObject/Automation/Basket.php | 6 +- .../Director/Objects/DirectorActivityLog.php | 8 +-- library/Director/Objects/IcingaArguments.php | 2 +- library/Director/Objects/IcingaObject.php | 4 +- library/Director/PlainObjectRenderer.php | 2 +- .../PropertyModifier/PropertyModifierTrim.php | 2 +- .../Director/Web/Form/DirectorObjectForm.php | 20 +++--- .../Web/Form/Element/StoredPassword.php | 2 +- library/Director/Web/Form/QuickForm.php | 4 +- .../Web/Form/Validate/IsDataListEntry.php | 2 +- .../Web/Form/Validate/NamePattern.php | 2 +- .../Director/Web/Widget/SyncRunDetails.php | 2 +- .../HostGroupMembershipResolverTest.php | 4 +- 25 files changed, 88 insertions(+), 87 deletions(-) diff --git a/application/forms/SyncPropertyForm.php b/application/forms/SyncPropertyForm.php index 720237e9..476c2f2c 100644 --- a/application/forms/SyncPropertyForm.php +++ b/application/forms/SyncPropertyForm.php @@ -25,7 +25,7 @@ class SyncPropertyForm extends DirectorObjectForm private $dummyObject; - const EXPRESSION = '__EXPRESSION__'; + public const EXPRESSION = '__EXPRESSION__'; /** * @throws \Zend_Form_Exception diff --git a/library/Director/Auth/Restriction.php b/library/Director/Auth/Restriction.php index 3394dccd..a95db068 100644 --- a/library/Director/Auth/Restriction.php +++ b/library/Director/Auth/Restriction.php @@ -13,5 +13,5 @@ class Restriction public const SCHEDULED_DOWNTIME_APPLY_FILTER_BY_NAME = 'director/scheduled-downtime/apply/filter-by-name'; public const SERVICE_APPLY_FILTER_BY_NAME = 'director/service/apply/filter-by-name'; public const SERVICE_SET_FILTER_BY_NAME = 'director/service_set/filter-by-name'; - const DB_RESOURCE = 'director/db_resource'; + public const DB_RESOURCE = 'director/db_resource'; } diff --git a/library/Director/CustomVariable/CustomVariableNumber.php b/library/Director/CustomVariable/CustomVariableNumber.php index 7b0c3e91..b7cd3171 100644 --- a/library/Director/CustomVariable/CustomVariableNumber.php +++ b/library/Director/CustomVariable/CustomVariableNumber.php @@ -7,7 +7,7 @@ use Icinga\Exception\ProgrammingError; class CustomVariableNumber extends CustomVariable { // Hint: 'F' is intentional, this MUST NOT respect locales - const PRECISION = '%.9F'; + public const PRECISION = '%.9F'; public function equals(CustomVariable $var) { diff --git a/library/Director/Data/Db/IcingaObjectQuery.php b/library/Director/Data/Db/IcingaObjectQuery.php index 4556ba71..5d50b8e7 100644 --- a/library/Director/Data/Db/IcingaObjectQuery.php +++ b/library/Director/Data/Db/IcingaObjectQuery.php @@ -12,7 +12,7 @@ use Zend_Db_Select as ZfDbSelect; class IcingaObjectQuery { - const BASE_ALIAS = 'o'; + public const BASE_ALIAS = 'o'; /** @var Db */ protected $connection; diff --git a/library/Director/Data/Db/ServiceSetQueryBuilder.php b/library/Director/Data/Db/ServiceSetQueryBuilder.php index 1c7e288e..782d6b5e 100644 --- a/library/Director/Data/Db/ServiceSetQueryBuilder.php +++ b/library/Director/Data/Db/ServiceSetQueryBuilder.php @@ -16,10 +16,10 @@ class ServiceSetQueryBuilder { use TableWithBranchSupport; - const TABLE = BranchSupport::TABLE_ICINGA_SERVICE; - const BRANCHED_TABLE = BranchSupport::BRANCHED_TABLE_ICINGA_SERVICE; - const SET_TABLE = BranchSupport::TABLE_ICINGA_SERVICE_SET; - const BRANCHED_SET_TABLE = BranchSupport::BRANCHED_TABLE_ICINGA_SERVICE_SET; + public const TABLE = BranchSupport::TABLE_ICINGA_SERVICE; + public const BRANCHED_TABLE = BranchSupport::BRANCHED_TABLE_ICINGA_SERVICE; + public const SET_TABLE = BranchSupport::TABLE_ICINGA_SERVICE_SET; + public const BRANCHED_SET_TABLE = BranchSupport::BRANCHED_TABLE_ICINGA_SERVICE_SET; /** @var Db */ protected $connection; diff --git a/library/Director/Data/Json.php b/library/Director/Data/Json.php index d882dd71..4cd9f6b9 100644 --- a/library/Director/Data/Json.php +++ b/library/Director/Data/Json.php @@ -10,7 +10,7 @@ use function json_last_error; class Json { - const DEFAULT_FLAGS = JSON_PRESERVE_ZERO_FRACTION | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE; + public const DEFAULT_FLAGS = JSON_PRESERVE_ZERO_FRACTION | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE; /** * Encode with well-known flags, as we require the result to be reproducible diff --git a/library/Director/Db/Branch/Branch.php b/library/Director/Db/Branch/Branch.php index 49a5021c..a8662d6d 100644 --- a/library/Director/Db/Branch/Branch.php +++ b/library/Director/Db/Branch/Branch.php @@ -18,7 +18,7 @@ use stdClass; */ class Branch { - const PREFIX_SYNC_PREVIEW = '/syncpreview'; + public const PREFIX_SYNC_PREVIEW = '/syncpreview'; /** @var UuidInterface|null */ protected $branchUuid; diff --git a/library/Director/Db/Branch/BranchActivity.php b/library/Director/Db/Branch/BranchActivity.php index c877273e..b9b2b18b 100644 --- a/library/Director/Db/Branch/BranchActivity.php +++ b/library/Director/Db/Branch/BranchActivity.php @@ -18,11 +18,11 @@ use RuntimeException; class BranchActivity { - const DB_TABLE = 'director_branch_activity'; + public const DB_TABLE = 'director_branch_activity'; - const ACTION_CREATE = DirectorActivityLog::ACTION_CREATE; - const ACTION_MODIFY = DirectorActivityLog::ACTION_MODIFY; - const ACTION_DELETE = DirectorActivityLog::ACTION_DELETE; + public const ACTION_CREATE = DirectorActivityLog::ACTION_CREATE; + public const ACTION_MODIFY = DirectorActivityLog::ACTION_MODIFY; + public const ACTION_DELETE = DirectorActivityLog::ACTION_DELETE; /** @var int */ protected $timestampNs; diff --git a/library/Director/Db/Branch/BranchSettings.php b/library/Director/Db/Branch/BranchSettings.php index 6b157c54..882a91b5 100644 --- a/library/Director/Db/Branch/BranchSettings.php +++ b/library/Director/Db/Branch/BranchSettings.php @@ -12,11 +12,11 @@ use function in_array; class BranchSettings { // TODO: Ranges is weird. key = scheduled_downtime_id, range_type, range_key - const ENCODED_ARRAYS = ['imports', 'groups', 'ranges', 'users', 'usergroups']; + public const ENCODED_ARRAYS = ['imports', 'groups', 'ranges', 'users', 'usergroups']; - const ENCODED_DICTIONARIES = ['vars', 'arguments']; + public const ENCODED_DICTIONARIES = ['vars', 'arguments']; - const BRANCH_SPECIFIC_PROPERTIES = [ + public const BRANCH_SPECIFIC_PROPERTIES = [ 'uuid', 'branch_uuid', 'branch_created', @@ -24,12 +24,12 @@ class BranchSettings 'set_null', ]; - const BRANCH_BOOLEANS = [ + public const BRANCH_BOOLEANS = [ 'branch_created', 'branch_deleted', ]; - const RELATED_SETS = [ + public const RELATED_SETS = [ 'types', 'states', ]; diff --git a/library/Director/Db/Branch/BranchStore.php b/library/Director/Db/Branch/BranchStore.php index 13971b99..99b845f6 100644 --- a/library/Director/Db/Branch/BranchStore.php +++ b/library/Director/Db/Branch/BranchStore.php @@ -9,8 +9,8 @@ use Ramsey\Uuid\UuidInterface; class BranchStore { - const TABLE = 'director_branch'; - const TABLE_ACTIVITY = 'director_branch_activity'; + public const TABLE = 'director_branch'; + public const TABLE_ACTIVITY = 'director_branch_activity'; protected $connection; diff --git a/library/Director/Db/Branch/BranchSupport.php b/library/Director/Db/Branch/BranchSupport.php index c0494ae9..80ff374f 100644 --- a/library/Director/Db/Branch/BranchSupport.php +++ b/library/Director/Db/Branch/BranchSupport.php @@ -7,41 +7,42 @@ use Icinga\Module\Director\Objects\SyncRule; class BranchSupport { - const BRANCHED_TABLE_PREFIX = 'branched_'; + public const BRANCHED_TABLE_PREFIX = 'branched_'; - const TABLE_ICINGA_APIUSER = 'icinga_apiuser'; - const TABLE_ICINGA_COMMAND = 'icinga_command'; - const TABLE_ICINGA_DEPENDENCY = 'icinga_dependency'; - const TABLE_ICINGA_ENDPOINT = 'icinga_endpoint'; - const TABLE_ICINGA_HOST = 'icinga_host'; - const TABLE_ICINGA_HOSTGROUP = 'icinga_hostgroup'; - const TABLE_ICINGA_NOTIFICATION = 'icinga_notification'; - const TABLE_ICINGA_SCHEDULED_DOWNTIME = 'icinga_scheduled_downtime'; - const TABLE_ICINGA_SERVICE = 'icinga_service'; - const TABLE_ICINGA_SERVICEGROUP = 'icinga_servicegroup'; - const TABLE_ICINGA_SERVICE_SET = 'icinga_service_set'; - const TABLE_ICINGA_TIMEPERIOD = 'icinga_timeperiod'; - const TABLE_ICINGA_USER = 'icinga_user'; - const TABLE_ICINGA_USERGROUP = 'icinga_usergroup'; - const TABLE_ICINGA_ZONE = 'icinga_zone'; + public const TABLE_ICINGA_APIUSER = 'icinga_apiuser'; + public const TABLE_ICINGA_COMMAND = 'icinga_command'; + public const TABLE_ICINGA_DEPENDENCY = 'icinga_dependency'; + public const TABLE_ICINGA_ENDPOINT = 'icinga_endpoint'; + public const TABLE_ICINGA_HOST = 'icinga_host'; + public const TABLE_ICINGA_HOSTGROUP = 'icinga_hostgroup'; + public const TABLE_ICINGA_NOTIFICATION = 'icinga_notification'; + public const TABLE_ICINGA_SCHEDULED_DOWNTIME = 'icinga_scheduled_downtime'; + public const TABLE_ICINGA_SERVICE = 'icinga_service'; + public const TABLE_ICINGA_SERVICEGROUP = 'icinga_servicegroup'; + public const TABLE_ICINGA_SERVICE_SET = 'icinga_service_set'; + public const TABLE_ICINGA_TIMEPERIOD = 'icinga_timeperiod'; + public const TABLE_ICINGA_USER = 'icinga_user'; + public const TABLE_ICINGA_USERGROUP = 'icinga_usergroup'; + public const TABLE_ICINGA_ZONE = 'icinga_zone'; - const BRANCHED_TABLE_ICINGA_APIUSER = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_APIUSER; - const BRANCHED_TABLE_ICINGA_COMMAND = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_COMMAND; - const BRANCHED_TABLE_ICINGA_DEPENDENCY = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_DEPENDENCY; - const BRANCHED_TABLE_ICINGA_ENDPOINT = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_ENDPOINT; - const BRANCHED_TABLE_ICINGA_HOST = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_HOST; - const BRANCHED_TABLE_ICINGA_HOSTGROUP = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_HOSTGROUP; - const BRANCHED_TABLE_ICINGA_NOTIFICATION = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_NOTIFICATION; - const BRANCHED_TABLE_ICINGA_SCHEDULED_DOWNTIME = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SCHEDULED_DOWNTIME; - const BRANCHED_TABLE_ICINGA_SERVICE = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SERVICE; - const BRANCHED_TABLE_ICINGA_SERVICEGROUP = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SERVICEGROUP; - const BRANCHED_TABLE_ICINGA_SERVICE_SET = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SERVICE_SET; - const BRANCHED_TABLE_ICINGA_TIMEPERIOD = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_TIMEPERIOD; - const BRANCHED_TABLE_ICINGA_USER = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_USER; - const BRANCHED_TABLE_ICINGA_USERGROUP = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_USERGROUP; - const BRANCHED_TABLE_ICINGA_ZONE = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_ZONE; + public const BRANCHED_TABLE_ICINGA_APIUSER = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_APIUSER; + public const BRANCHED_TABLE_ICINGA_COMMAND = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_COMMAND; + public const BRANCHED_TABLE_ICINGA_DEPENDENCY = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_DEPENDENCY; + public const BRANCHED_TABLE_ICINGA_ENDPOINT = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_ENDPOINT; + public const BRANCHED_TABLE_ICINGA_HOST = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_HOST; + public const BRANCHED_TABLE_ICINGA_HOSTGROUP = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_HOSTGROUP; + public const BRANCHED_TABLE_ICINGA_NOTIFICATION = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_NOTIFICATION; + public const BRANCHED_TABLE_ICINGA_SCHEDULED_DOWNTIME = + self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SCHEDULED_DOWNTIME; + public const BRANCHED_TABLE_ICINGA_SERVICE = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SERVICE; + public const BRANCHED_TABLE_ICINGA_SERVICEGROUP = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SERVICEGROUP; + public const BRANCHED_TABLE_ICINGA_SERVICE_SET = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_SERVICE_SET; + public const BRANCHED_TABLE_ICINGA_TIMEPERIOD = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_TIMEPERIOD; + public const BRANCHED_TABLE_ICINGA_USER = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_USER; + public const BRANCHED_TABLE_ICINGA_USERGROUP = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_USERGROUP; + public const BRANCHED_TABLE_ICINGA_ZONE = self::BRANCHED_TABLE_PREFIX . self::TABLE_ICINGA_ZONE; - const OBJECT_TABLES = [ + public const OBJECT_TABLES = [ self::TABLE_ICINGA_APIUSER, self::TABLE_ICINGA_COMMAND, self::TABLE_ICINGA_DEPENDENCY, @@ -59,7 +60,7 @@ class BranchSupport self::TABLE_ICINGA_ZONE, ]; - const BRANCHED_TABLES = [ + public const BRANCHED_TABLES = [ self::BRANCHED_TABLE_ICINGA_APIUSER, self::BRANCHED_TABLE_ICINGA_COMMAND, self::BRANCHED_TABLE_ICINGA_DEPENDENCY, diff --git a/library/Director/Db/IcingaObjectFilterHelper.php b/library/Director/Db/IcingaObjectFilterHelper.php index 07320e1a..27b14ee8 100644 --- a/library/Director/Db/IcingaObjectFilterHelper.php +++ b/library/Director/Db/IcingaObjectFilterHelper.php @@ -11,9 +11,9 @@ use Zend_Db_Select as ZfSelect; class IcingaObjectFilterHelper { - const INHERIT_DIRECT = 'direct'; - const INHERIT_INDIRECT = 'indirect'; - const INHERIT_DIRECT_OR_INDIRECT = 'total'; + public const INHERIT_DIRECT = 'direct'; + public const INHERIT_INDIRECT = 'indirect'; + public const INHERIT_DIRECT_OR_INDIRECT = 'total'; /** * @param IcingaObject|int|string $id diff --git a/library/Director/DirectorObject/Automation/Basket.php b/library/Director/DirectorObject/Automation/Basket.php index 81ae107e..403ce293 100644 --- a/library/Director/DirectorObject/Automation/Basket.php +++ b/library/Director/DirectorObject/Automation/Basket.php @@ -13,9 +13,9 @@ use Icinga\Module\Director\Data\Db\DbObject; */ class Basket extends DbObject implements ExportInterface { - const SELECTION_ALL = 'ALL'; - const SELECTION_NONE = 'IGNORE'; - const SELECTION_CUSTOM = '[]'; + public const SELECTION_ALL = 'ALL'; + public const SELECTION_NONE = 'IGNORE'; + public const SELECTION_CUSTOM = '[]'; protected $table = 'director_basket'; diff --git a/library/Director/Objects/DirectorActivityLog.php b/library/Director/Objects/DirectorActivityLog.php index 2cecc2ee..ddb2b50a 100644 --- a/library/Director/Objects/DirectorActivityLog.php +++ b/library/Director/Objects/DirectorActivityLog.php @@ -11,12 +11,12 @@ use stdClass; class DirectorActivityLog extends DbObject { - const ACTION_CREATE = 'create'; - const ACTION_DELETE = 'delete'; - const ACTION_MODIFY = 'modify'; + public const ACTION_CREATE = 'create'; + public const ACTION_DELETE = 'delete'; + public const ACTION_MODIFY = 'modify'; /** @deprecated */ - const AUDIT_REMOVE = 'remove'; + public const AUDIT_REMOVE = 'remove'; protected $table = 'director_activity_log'; diff --git a/library/Director/Objects/IcingaArguments.php b/library/Director/Objects/IcingaArguments.php index de5a6e37..3cec7f48 100644 --- a/library/Director/Objects/IcingaArguments.php +++ b/library/Director/Objects/IcingaArguments.php @@ -11,7 +11,7 @@ use Iterator; class IcingaArguments implements Iterator, Countable, IcingaConfigRenderer { - const COMMENT_DSL_UNSUPPORTED = '/* Icinga 2 does not export DSL function bodies via API */'; + public const COMMENT_DSL_UNSUPPORTED = '/* Icinga 2 does not export DSL function bodies via API */'; /** @var IcingaCommandArgument[] */ protected $storedArguments = []; diff --git a/library/Director/Objects/IcingaObject.php b/library/Director/Objects/IcingaObject.php index fec1dde2..432730bc 100644 --- a/library/Director/Objects/IcingaObject.php +++ b/library/Director/Objects/IcingaObject.php @@ -26,8 +26,8 @@ use RuntimeException; abstract class IcingaObject extends DbObject implements IcingaConfigRenderer { - const RESOLVE_ERROR = '(unable to resolve)'; - const ALL_NON_GLOBAL_ZONES = '(all non-global zones)'; + public const RESOLVE_ERROR = '(unable to resolve)'; + public const ALL_NON_GLOBAL_ZONES = '(all non-global zones)'; protected $keyName = 'object_name'; diff --git a/library/Director/PlainObjectRenderer.php b/library/Director/PlainObjectRenderer.php index e613f1f9..4beeeb8c 100644 --- a/library/Director/PlainObjectRenderer.php +++ b/library/Director/PlainObjectRenderer.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Director; class PlainObjectRenderer { - const INDENTATION = ' '; + public const INDENTATION = ' '; public static function render($object) { diff --git a/library/Director/PropertyModifier/PropertyModifierTrim.php b/library/Director/PropertyModifier/PropertyModifierTrim.php index 64a655bd..59f052ef 100644 --- a/library/Director/PropertyModifier/PropertyModifierTrim.php +++ b/library/Director/PropertyModifier/PropertyModifierTrim.php @@ -8,7 +8,7 @@ use InvalidArgumentException; class PropertyModifierTrim extends PropertyModifierHook { - const VALID_METHODS = ['trim', 'ltrim', 'rtrim']; + public const VALID_METHODS = ['trim', 'ltrim', 'rtrim']; public static function addSettingsFormFields(QuickForm $form) { diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php index abbd4f09..62e539ce 100644 --- a/library/Director/Web/Form/DirectorObjectForm.php +++ b/library/Director/Web/Form/DirectorObjectForm.php @@ -26,16 +26,16 @@ use Zend_Form_Element_Select as ZfSelect; abstract class DirectorObjectForm extends DirectorForm { - const GROUP_ORDER_OBJECT_DEFINITION = 20; - const GROUP_ORDER_RELATED_OBJECTS = 25; - const GROUP_ORDER_ASSIGN = 30; - const GROUP_ORDER_CHECK_EXECUTION = 40; - const GROUP_ORDER_CUSTOM_FIELDS = 50; - const GROUP_ORDER_CUSTOM_FIELD_CATEGORIES = 60; - const GROUP_ORDER_EVENT_FILTERS = 700; - const GROUP_ORDER_EXTRA_INFO = 750; - const GROUP_ORDER_CLUSTERING = 800; - const GROUP_ORDER_BUTTONS = 1000; + public const GROUP_ORDER_OBJECT_DEFINITION = 20; + public const GROUP_ORDER_RELATED_OBJECTS = 25; + public const GROUP_ORDER_ASSIGN = 30; + public const GROUP_ORDER_CHECK_EXECUTION = 40; + public const GROUP_ORDER_CUSTOM_FIELDS = 50; + public const GROUP_ORDER_CUSTOM_FIELD_CATEGORIES = 60; + public const GROUP_ORDER_EVENT_FILTERS = 700; + public const GROUP_ORDER_EXTRA_INFO = 750; + public const GROUP_ORDER_CLUSTERING = 800; + public const GROUP_ORDER_BUTTONS = 1000; /** @var IcingaObject */ protected $object; diff --git a/library/Director/Web/Form/Element/StoredPassword.php b/library/Director/Web/Form/Element/StoredPassword.php index 4fc13de6..1fd28af6 100644 --- a/library/Director/Web/Form/Element/StoredPassword.php +++ b/library/Director/Web/Form/Element/StoredPassword.php @@ -31,7 +31,7 @@ use Zend_Form_Element_Text as ZfText; */ class StoredPassword extends ZfText { - const UNCHANGED = '__UNCHANGED_VALUE__'; + public const UNCHANGED = '__UNCHANGED_VALUE__'; public $helper = 'formStoredPassword'; diff --git a/library/Director/Web/Form/QuickForm.php b/library/Director/Web/Form/QuickForm.php index 4a36422b..74a860d0 100644 --- a/library/Director/Web/Form/QuickForm.php +++ b/library/Director/Web/Form/QuickForm.php @@ -16,9 +16,9 @@ use RuntimeException; */ abstract class QuickForm extends QuickBaseForm { - const ID = '__FORM_NAME'; + public const ID = '__FORM_NAME'; - const CSRF = '__FORM_CSRF'; + public const CSRF = '__FORM_CSRF'; /** * The name of this form diff --git a/library/Director/Web/Form/Validate/IsDataListEntry.php b/library/Director/Web/Form/Validate/IsDataListEntry.php index 5762d2ea..5fed1f96 100644 --- a/library/Director/Web/Form/Validate/IsDataListEntry.php +++ b/library/Director/Web/Form/Validate/IsDataListEntry.php @@ -8,7 +8,7 @@ use Zend_Validate_Abstract; class IsDataListEntry extends Zend_Validate_Abstract { - const INVALID = 'intInvalid'; + public const INVALID = 'intInvalid'; /** @var Db */ private $db; diff --git a/library/Director/Web/Form/Validate/NamePattern.php b/library/Director/Web/Form/Validate/NamePattern.php index fac44d97..946cd024 100644 --- a/library/Director/Web/Form/Validate/NamePattern.php +++ b/library/Director/Web/Form/Validate/NamePattern.php @@ -7,7 +7,7 @@ use Zend_Validate_Abstract; class NamePattern extends Zend_Validate_Abstract { - const INVALID = 'intInvalid'; + public const INVALID = 'intInvalid'; private $filter; diff --git a/library/Director/Web/Widget/SyncRunDetails.php b/library/Director/Web/Widget/SyncRunDetails.php index 5273f997..1ea19967 100644 --- a/library/Director/Web/Widget/SyncRunDetails.php +++ b/library/Director/Web/Widget/SyncRunDetails.php @@ -16,7 +16,7 @@ class SyncRunDetails extends NameValueTable { use TranslationHelper; - const URL_ACTIVITIES = 'director/config/activities'; + public const URL_ACTIVITIES = 'director/config/activities'; /** @var SyncRun */ protected $run; diff --git a/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php b/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php index df4b24ce..a4945a70 100644 --- a/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php +++ b/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php @@ -12,8 +12,8 @@ use Icinga\Module\Director\Test\BaseTestCase; class HostGroupMembershipResolverTest extends BaseTestCase { - const PREFIX = '__groupmembership'; - const TYPE = 'host'; + public const PREFIX = '__groupmembership'; + public const TYPE = 'host'; public function setUp(): void {