From d6dd1a5a963c86bde7078a7fa325aa775f1e6132 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:22:40 +0100 Subject: [PATCH] Prepare const visibility --- Account/AccountStatus.php | 8 +- Account/AccountType.php | 4 +- Account/GroupStatus.php | 6 +- Algorithm/AlgorithmType.php | 2 +- Asset/AssetType.php | 6 +- Auth/LoginReturnType.php | 20 +- DataStorage/Cache/CacheStatus.php | 6 +- DataStorage/Cache/CacheType.php | 14 +- DataStorage/Cache/FileCache.php | 2 +- DataStorage/Database/DatabaseStatus.php | 12 +- DataStorage/Database/DatabaseType.php | 10 +- DataStorage/Database/Query/Builder.php | 2 +- DataStorage/Database/Query/JoinType.php | 22 +- DataStorage/Database/Query/QueryType.php | 12 +- DataStorage/Database/RelationType.php | 6 +- DataStorage/Database/Schema/QueryType.php | 8 +- Datatypes/AddressType.php | 10 +- Datatypes/Enum.php | 2 +- Datatypes/PhoneType.php | 8 +- Datatypes/SmartDateTime.php | 4 +- Html/TagType.php | 18 +- Localization/ISO3166CharEnum.php | 498 ++--- Localization/ISO3166NameEnum.php | 500 ++--- Localization/ISO3166NumEnum.php | 498 ++--- Localization/ISO3166TwoEnum.php | 500 ++--- Localization/ISO4217CharEnum.php | 228 +- Localization/ISO4217DecimalEnum.php | 356 +-- Localization/ISO4217Enum.php | 228 +- Localization/ISO4217NumEnum.php | 356 +-- Localization/ISO4217SubUnitEnum.php | 308 +-- Localization/ISO4217SymbolEnum.php | 218 +- Localization/ISO639Enum.php | 368 +-- Localization/ISO639x1Enum.php | 342 +-- Localization/ISO639x2Enum.php | 368 +-- Localization/Money.php | 2 +- Localization/PhoneEnum.php | 458 ++-- Log/FileLogger.php | 6 +- Log/LogLevel.php | 16 +- Math/Differential/FiniteDifference.php | 2 +- .../Forecasting/ClassicalDecomposition.php | 4 +- Math/Matrix/InverseType.php | 2 +- Math/Number/NumberType.php | 18 +- Math/Optimization/TSP/BruteForce.php | 2 +- Math/Optimization/TSP/GA.php | 6 +- Math/Statistic/Average.php | 22 +- .../Forecast/ForecastIntervalMultiplier.php | 28 +- .../Distribution/ChiSquaredDistribution.php | 2 +- Message/Http/BrowserType.php | 22 +- Message/Http/OSType.php | 46 +- Message/Http/RequestMethod.php | 12 +- Message/Http/RequestStatus.php | 110 +- Message/Mail/MailType.php | 10 +- Message/RequestSource.php | 6 +- Message/ResponseType.php | 8 +- Module/ModuleAbstract.php | 6 +- Module/ModuleManager.php | 2 +- Router/RouteVerb.php | 10 +- Socket/Packets/PacketType.php | 22 +- Socket/SocketType.php | 6 +- Stdlib/Map/KeyType.php | 4 +- Stdlib/Map/OrderType.php | 4 +- Stdlib/Queue/PriorityMode.php | 12 +- System/File/ContentPutMode.php | 8 +- System/MimeType.php | 1972 ++++++++--------- System/SystemType.php | 8 +- Uri/UriScheme.php | 30 +- Utils/Barcode/OrientationType.php | 4 +- Utils/Converter/AngleType.php | 20 +- Utils/Converter/AreaType.php | 26 +- Utils/Converter/EnergyPowerType.php | 18 +- Utils/Converter/FileSizeType.php | 20 +- Utils/Converter/Ip.php | 4 +- Utils/Converter/LengthType.php | 42 +- Utils/Converter/Numeric.php | 2 +- Utils/Converter/PressureType.php | 26 +- Utils/Converter/SpeedType.php | 68 +- Utils/Converter/TemperatureType.php | 16 +- Utils/Converter/TimeType.php | 18 +- Utils/Converter/VolumeType.php | 76 +- Utils/Converter/WeightType.php | 28 +- Utils/Encoding/Caesar.php | 4 +- Utils/Parser/Php/ClassParser.php | 2 +- Utils/Parser/Php/ClassType.php | 6 +- Utils/Parser/Php/Visibility.php | 8 +- Utils/RnG/DistributionType.php | 4 +- Validation/Base/IbanEnum.php | 164 +- Validation/Base/IbanErrorType.php | 10 +- Views/ViewLayout.php | 24 +- 88 files changed, 4203 insertions(+), 4203 deletions(-) diff --git a/Account/AccountStatus.php b/Account/AccountStatus.php index 93bc0d90c..b10692dc0 100644 --- a/Account/AccountStatus.php +++ b/Account/AccountStatus.php @@ -30,8 +30,8 @@ use phpOMS\Datatypes\Enum; */ abstract class AccountStatus extends Enum { - const ACTIVE = 1; - const INACTIVE = 2; - const TIMEOUT = 3; - const BANNED = 4; + /* public */ const ACTIVE = 1; + /* public */ const INACTIVE = 2; + /* public */ const TIMEOUT = 3; + /* public */ const BANNED = 4; } diff --git a/Account/AccountType.php b/Account/AccountType.php index 4c65e6392..ef866b602 100644 --- a/Account/AccountType.php +++ b/Account/AccountType.php @@ -30,6 +30,6 @@ use phpOMS\Datatypes\Enum; */ abstract class AccountType extends Enum { - const USER = 0; - const GROUP = 1; + /* public */ const USER = 0; + /* public */ const GROUP = 1; } diff --git a/Account/GroupStatus.php b/Account/GroupStatus.php index 8699f72c8..7b8328214 100644 --- a/Account/GroupStatus.php +++ b/Account/GroupStatus.php @@ -30,9 +30,9 @@ use phpOMS\Datatypes\Enum; */ abstract class GroupStatus extends Enum { - const ACTIVE = 1; + /* public */ const ACTIVE = 1; - const INACTIVE = 2; + /* public */ const INACTIVE = 2; - const HIDDEN = 4; + /* public */ const HIDDEN = 4; } diff --git a/Algorithm/AlgorithmType.php b/Algorithm/AlgorithmType.php index 5d9d7bf0e..e2d642da1 100644 --- a/Algorithm/AlgorithmType.php +++ b/Algorithm/AlgorithmType.php @@ -30,5 +30,5 @@ use phpOMS\Datatypes\Enum; */ abstract class AlgorithmType extends Enum { - const BRUTEFORCE = 0; + /* public */ const BRUTEFORCE = 0; } diff --git a/Asset/AssetType.php b/Asset/AssetType.php index e7313c97c..3c9c1fbbf 100644 --- a/Asset/AssetType.php +++ b/Asset/AssetType.php @@ -30,7 +30,7 @@ use phpOMS\Datatypes\Enum; */ abstract class AssetType extends Enum { - const CSS = 'css'; - const JS = 'js'; - const JSLATE = 'jslate'; + /* public */ const CSS = 'css'; + /* public */ const JS = 'js'; + /* public */ const JSLATE = 'jslate'; } diff --git a/Auth/LoginReturnType.php b/Auth/LoginReturnType.php index dc5a886af..2cb2efc0f 100644 --- a/Auth/LoginReturnType.php +++ b/Auth/LoginReturnType.php @@ -32,14 +32,14 @@ use phpOMS\Datatypes\Enum; */ abstract class LoginReturnType extends Enum { - const OK = 0; /* Everything is ok and the user got authed */ - const FAILURE = 1; /* Authentication resulted in a unexpected failure */ - const WRONG_PASSWORD = 2; /* Authentication with wrong password */ - const WRONG_USERNAME = 3; /* Authentication with unknown user */ - const WRONG_PERMISSION = 4; /* User doesn't have permission to authenticate */ - const NOT_ACTIVATED = 5; /* The user is not activated yet */ - const WRONG_INPUT_EXCEEDED = 6; /* Too many wrong logins recently */ - const TIMEOUTED = 7; /* User received a timeout and can not log in until a certain date */ - const BANNED = 8; /* User is banned */ - const INACTIVE = 9; /* User is inactive */ + /* public */ const OK = 0; /* Everything is ok and the user got authed */ + /* public */ const FAILURE = 1; /* Authentication resulted in a unexpected failure */ + /* public */ const WRONG_PASSWORD = 2; /* Authentication with wrong password */ + /* public */ const WRONG_USERNAME = 3; /* Authentication with unknown user */ + /* public */ const WRONG_PERMISSION = 4; /* User doesn't have permission to authenticate */ + /* public */ const NOT_ACTIVATED = 5; /* The user is not activated yet */ + /* public */ const WRONG_INPUT_EXCEEDED = 6; /* Too many wrong logins recently */ + /* public */ const TIMEOUTED = 7; /* User received a timeout and can not log in until a certain date */ + /* public */ const BANNED = 8; /* User is banned */ + /* public */ const INACTIVE = 9; /* User is inactive */ } diff --git a/DataStorage/Cache/CacheStatus.php b/DataStorage/Cache/CacheStatus.php index 527f2c584..bc9cab7c7 100644 --- a/DataStorage/Cache/CacheStatus.php +++ b/DataStorage/Cache/CacheStatus.php @@ -32,7 +32,7 @@ use phpOMS\Datatypes\Enum; */ abstract class CacheStatus extends Enum { - const ACTIVE = 0; - const INACTIVE = 1; - const ERROR = 2; + /* public */ const ACTIVE = 0; + /* public */ const INACTIVE = 1; + /* public */ const ERROR = 2; } diff --git a/DataStorage/Cache/CacheType.php b/DataStorage/Cache/CacheType.php index 36960335e..e2c6c2258 100644 --- a/DataStorage/Cache/CacheType.php +++ b/DataStorage/Cache/CacheType.php @@ -32,11 +32,11 @@ use phpOMS\Datatypes\Enum; */ abstract class CacheType extends Enum { - const _INT = 0; /* Data is integer */ - const _STRING = 1; /* Data is string */ - const _ARRAY = 2; /* Data is array */ - const _SERIALIZABLE = 3; /* Data is object */ - const _JSONSERIALIZABLE = 6; - const _FLOAT = 4; /* Data is float */ - const _BOOL = 5; /* Data is float */ + /* public */ const _INT = 0; /* Data is integer */ + /* public */ const _STRING = 1; /* Data is string */ + /* public */ const _ARRAY = 2; /* Data is array */ + /* public */ const _SERIALIZABLE = 3; /* Data is object */ + /* public */ const _JSONSERIALIZABLE = 6; + /* public */ const _FLOAT = 4; /* Data is float */ + /* public */ const _BOOL = 5; /* Data is float */ } diff --git a/DataStorage/Cache/FileCache.php b/DataStorage/Cache/FileCache.php index cef68a849..5941b020a 100644 --- a/DataStorage/Cache/FileCache.php +++ b/DataStorage/Cache/FileCache.php @@ -41,7 +41,7 @@ class FileCache implements CacheInterface * @var string * @since 1.0.0 */ - const DELIM = '$'; + /* public */ const DELIM = '$'; /** * Cache path. diff --git a/DataStorage/Database/DatabaseStatus.php b/DataStorage/Database/DatabaseStatus.php index bdb324fa6..d851f0bb6 100644 --- a/DataStorage/Database/DatabaseStatus.php +++ b/DataStorage/Database/DatabaseStatus.php @@ -32,10 +32,10 @@ use phpOMS\Datatypes\Enum; */ abstract class DatabaseStatus extends Enum { - const OK = 0; /* Database connection successful */ - const MISSING_DATABASE = 1; /* Couldn't find database */ - const MISSING_TABLE = 2; /* One of the core tables couldn't be found */ - const FAILURE = 3; /* Unknown failure */ - const READONLY = 4; /* Database connection is in readonly (but ok) */ - const CLOSED = 5; /* Database connection closed */ + /* public */ const OK = 0; /* Database connection successful */ + /* public */ const MISSING_DATABASE = 1; /* Couldn't find database */ + /* public */ const MISSING_TABLE = 2; /* One of the core tables couldn't be found */ + /* public */ const FAILURE = 3; /* Unknown failure */ + /* public */ const READONLY = 4; /* Database connection is in readonly (but ok) */ + /* public */ const CLOSED = 5; /* Database connection closed */ } diff --git a/DataStorage/Database/DatabaseType.php b/DataStorage/Database/DatabaseType.php index d1b163cf6..3d7c0c121 100644 --- a/DataStorage/Database/DatabaseType.php +++ b/DataStorage/Database/DatabaseType.php @@ -32,9 +32,9 @@ use phpOMS\Datatypes\Enum; */ abstract class DatabaseType extends Enum { - const MYSQL = 0; /* MySQL */ - const SQLITE = 1; /* SQLITE */ - const PGSQL = 2; /* PostgreSQL */ - const ORACLE = 3; /* Oracle */ - const SQLSRV = 4; /* Microsoft SQL Server */ + /* public */ const MYSQL = 0; /* MySQL */ + /* public */ const SQLITE = 1; /* SQLITE */ + /* public */ const PGSQL = 2; /* PostgreSQL */ + /* public */ const ORACLE = 3; /* Oracle */ + /* public */ const SQLSRV = 4; /* Microsoft SQL Server */ } diff --git a/DataStorage/Database/Query/Builder.php b/DataStorage/Database/Query/Builder.php index 2ed7e587e..92b6a09d2 100644 --- a/DataStorage/Database/Query/Builder.php +++ b/DataStorage/Database/Query/Builder.php @@ -173,7 +173,7 @@ class Builder extends BuilderAbstract * @var string[] * @since 1.0.0 */ - const operators = [ + /* public */ const operators = [ '=', '<', '>', diff --git a/DataStorage/Database/Query/JoinType.php b/DataStorage/Database/Query/JoinType.php index 6704e0f9d..e972996a9 100644 --- a/DataStorage/Database/Query/JoinType.php +++ b/DataStorage/Database/Query/JoinType.php @@ -30,15 +30,15 @@ use phpOMS\Datatypes\Enum; */ abstract class JoinType extends Enum { - const JOIN = 'JOIN'; - const LEFT_JOIN = 'LEFT JOIN'; - const LEFT_OUTER_JOIN = 'LEFT OUTER JOIN'; - const LEFT_INNER_JOIN = 'LEFT INNER JOIN'; - const RIGHT_JOIN = 'RIGHT JOIN'; - const RIGHT_OUTER_JOIN = 'RIGHT OUTER JOIN'; - const RIGHT_INNER_JOIN = 'RIGHT INNER JOIN'; - const OUTER_JOIN = 'OUTER JOIN'; - const INNER_JOIN = 'INNER JOIN'; - const CROSS_JOIN = 'CROSS JOIN'; - const FULL_OUTER_JOIN = 'FULL OUTER JOIN'; + /* public */ const JOIN = 'JOIN'; + /* public */ const LEFT_JOIN = 'LEFT JOIN'; + /* public */ const LEFT_OUTER_JOIN = 'LEFT OUTER JOIN'; + /* public */ const LEFT_INNER_JOIN = 'LEFT INNER JOIN'; + /* public */ const RIGHT_JOIN = 'RIGHT JOIN'; + /* public */ const RIGHT_OUTER_JOIN = 'RIGHT OUTER JOIN'; + /* public */ const RIGHT_INNER_JOIN = 'RIGHT INNER JOIN'; + /* public */ const OUTER_JOIN = 'OUTER JOIN'; + /* public */ const INNER_JOIN = 'INNER JOIN'; + /* public */ const CROSS_JOIN = 'CROSS JOIN'; + /* public */ const FULL_OUTER_JOIN = 'FULL OUTER JOIN'; } diff --git a/DataStorage/Database/Query/QueryType.php b/DataStorage/Database/Query/QueryType.php index 6c6c373d0..fde16f1aa 100644 --- a/DataStorage/Database/Query/QueryType.php +++ b/DataStorage/Database/Query/QueryType.php @@ -30,10 +30,10 @@ use phpOMS\Datatypes\Enum; */ abstract class QueryType extends Enum { - const SELECT = 0; - const INSERT = 1; - const UPDATE = 2; - const DELETE = 3; - const RANDOM = 4; - const RAW = 5; + /* public */ const SELECT = 0; + /* public */ const INSERT = 1; + /* public */ const UPDATE = 2; + /* public */ const DELETE = 3; + /* public */ const RANDOM = 4; + /* public */ const RAW = 5; } diff --git a/DataStorage/Database/RelationType.php b/DataStorage/Database/RelationType.php index bf37831c7..45f32fd0e 100644 --- a/DataStorage/Database/RelationType.php +++ b/DataStorage/Database/RelationType.php @@ -32,7 +32,7 @@ use phpOMS\Datatypes\Enum; */ abstract class RelationType extends Enum { - const NONE = 0; - const NEWEST = 1; - const ALL = 2; + /* public */ const NONE = 0; + /* public */ const NEWEST = 1; + /* public */ const ALL = 2; } diff --git a/DataStorage/Database/Schema/QueryType.php b/DataStorage/Database/Schema/QueryType.php index 2a72296f7..091558084 100644 --- a/DataStorage/Database/Schema/QueryType.php +++ b/DataStorage/Database/Schema/QueryType.php @@ -32,8 +32,8 @@ use phpOMS\Datatypes\Enum; */ abstract class QueryType extends Enum { - const SELECT = 0; - const CREATE = 1; - const DROP = 2; - const ALTER = 3; + /* public */ const SELECT = 0; + /* public */ const CREATE = 1; + /* public */ const DROP = 2; + /* public */ const ALTER = 3; } diff --git a/Datatypes/AddressType.php b/Datatypes/AddressType.php index 17541eb58..08d4feb95 100644 --- a/Datatypes/AddressType.php +++ b/Datatypes/AddressType.php @@ -28,9 +28,9 @@ namespace phpOMS\Datatypes; */ abstract class AddressType extends Enum { - const HOME = 1; - const BUSINESS = 2; - const SHIPPING = 3; - const BILLING = 4; - const WORK = 5; + /* public */ const HOME = 1; + /* public */ const BUSINESS = 2; + /* public */ const SHIPPING = 3; + /* public */ const BILLING = 4; + /* public */ const WORK = 5; } diff --git a/Datatypes/Enum.php b/Datatypes/Enum.php index 5f7a0a8d1..623b5f8e5 100644 --- a/Datatypes/Enum.php +++ b/Datatypes/Enum.php @@ -124,7 +124,7 @@ abstract class Enum /** * Checking enum name. * - * Checking if a certain const name exists (case sensitive) + * Checking if a certain /* public */ const name exists (case sensitive) * * @param string $name Name of the value (case sensitive) * diff --git a/Datatypes/PhoneType.php b/Datatypes/PhoneType.php index e505d07bb..f0ed9fc07 100644 --- a/Datatypes/PhoneType.php +++ b/Datatypes/PhoneType.php @@ -28,8 +28,8 @@ namespace phpOMS\Datatypes; */ abstract class PhoneType extends Enum { - const HOME = 1; - const BUSINESS = 2; - const MOBILE = 3; - const WORK = 4; + /* public */ const HOME = 1; + /* public */ const BUSINESS = 2; + /* public */ const MOBILE = 3; + /* public */ const WORK = 4; } diff --git a/Datatypes/SmartDateTime.php b/Datatypes/SmartDateTime.php index edd8e4b53..4a5728194 100644 --- a/Datatypes/SmartDateTime.php +++ b/Datatypes/SmartDateTime.php @@ -36,7 +36,7 @@ class SmartDateTime extends \DateTime * @var string * @since 1.0.0 */ - const FORMAT = 'Y-m-d hh:mm:ss'; + /* public */ const FORMAT = 'Y-m-d hh:mm:ss'; /** * Default timezone @@ -44,7 +44,7 @@ class SmartDateTime extends \DateTime * @var string * @since 1.0.0 */ - const TIMEZONE = 'UTC'; + /* public */ const TIMEZONE = 'UTC'; /** * {@inheritdoc} diff --git a/Html/TagType.php b/Html/TagType.php index cd8263136..c28b96746 100644 --- a/Html/TagType.php +++ b/Html/TagType.php @@ -30,13 +30,13 @@ use phpOMS\Datatypes\Enum; */ abstract class TagType extends Enum { - const INPUT = 0; /* */ - const BUTTON = 1; /*