diff --git a/Account/Account.php b/Account/Account.php index 06f5c4fe4..ebbbaff97 100755 --- a/Account/Account.php +++ b/Account/Account.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\Validation\Network\Email; * information. This model is not comparable to a profile which contains much more information. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/AccountManager.php b/Account/AccountManager.php index 65ad61385..273daf428 100755 --- a/Account/AccountManager.php +++ b/Account/AccountManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Session\SessionInterface; * The account manager is used to manage accounts. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/AccountStatus.php b/Account/AccountStatus.php index f61266acb..32c63f0dc 100755 --- a/Account/AccountStatus.php +++ b/Account/AccountStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Account status enum. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/AccountType.php b/Account/AccountType.php index b4e1a4877..29bca1be4 100755 --- a/Account/AccountType.php +++ b/Account/AccountType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Account type enum. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/Group.php b/Account/Group.php index 0bc186cc3..6572fbc65 100755 --- a/Account/Group.php +++ b/Account/Group.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * Account group class. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/GroupStatus.php b/Account/GroupStatus.php index 08bdcb465..d0bcbb880 100755 --- a/Account/GroupStatus.php +++ b/Account/GroupStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Group status enum. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/NullAccount.php b/Account/NullAccount.php index 9504760b0..471fb8e4a 100755 --- a/Account/NullAccount.php +++ b/Account/NullAccount.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Account; * Null account class. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/NullGroup.php b/Account/NullGroup.php index a3a92f093..a6864fbe9 100755 --- a/Account/NullGroup.php +++ b/Account/NullGroup.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Account; * Null group class. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/PermissionAbstract.php b/Account/PermissionAbstract.php index cbf61f127..b970c2c89 100755 --- a/Account/PermissionAbstract.php +++ b/Account/PermissionAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\Account; * abstract class and can be used directly if needed. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/PermissionHandlingTrait.php b/Account/PermissionHandlingTrait.php index 593817320..2d8846802 100755 --- a/Account/PermissionHandlingTrait.php +++ b/Account/PermissionHandlingTrait.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Account; * Permission handling trait. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/PermissionOwner.php b/Account/PermissionOwner.php index 31a7f1913..32e772b5d 100755 --- a/Account/PermissionOwner.php +++ b/Account/PermissionOwner.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * A permission can be long to a group or an account. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Account/PermissionType.php b/Account/PermissionType.php index a46afc38a..6756e486c 100755 --- a/Account/PermissionType.php +++ b/Account/PermissionType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Account * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Permission type enum. * * @package phpOMS\Account - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Ai/NeuralNetwork/Neuron.php b/Ai/NeuralNetwork/Neuron.php index d1057fda5..24d7d8e46 100755 --- a/Ai/NeuralNetwork/Neuron.php +++ b/Ai/NeuralNetwork/Neuron.php @@ -6,7 +6,7 @@ * * @package phpOMS\Ai\NeuralNetwork * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Ai\NeuralNetwork; * Neuron * * @package phpOMS\Ai\NeuralNetwork - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Ai/Ocr/BasicOcr.php b/Ai/Ocr/BasicOcr.php index d32c6e111..f98f72a32 100755 --- a/Ai/Ocr/BasicOcr.php +++ b/Ai/Ocr/BasicOcr.php @@ -6,7 +6,7 @@ * * @package phpOMS\Ai\Ocr * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\System\File\PathException; * Basic OCR implementation for MNIST data * * @package phpOMS\Ai\Ocr - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Ai/Ocr/Tesseract/TesseractOcr.php b/Ai/Ocr/Tesseract/TesseractOcr.php index 29e77da2d..a25a43c46 100755 --- a/Ai/Ocr/Tesseract/TesseractOcr.php +++ b/Ai/Ocr/Tesseract/TesseractOcr.php @@ -6,7 +6,7 @@ * * @package phpOMS\Ai\Ocr\Tesseract * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\System\SystemUtils; * Tesseract api * * @package phpOMS\Ai\Ocr\Tesseract - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Clustering/Kmeans.php b/Algorithm/Clustering/Kmeans.php index a068d9926..65cb37def 100755 --- a/Algorithm/Clustering/Kmeans.php +++ b/Algorithm/Clustering/Kmeans.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Clustering * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Clustering; * Clustering points * * @package phpOMS\Algorithm\Clustering - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Clustering/Point.php b/Algorithm/Clustering/Point.php index d946c8552..13a3f4086 100755 --- a/Algorithm/Clustering/Point.php +++ b/Algorithm/Clustering/Point.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Clustering * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Clustering; * Point for clustering * * @package phpOMS\Algorithm\Clustering - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Clustering/PointInterface.php b/Algorithm/Clustering/PointInterface.php index 8118af2d1..767852d1d 100755 --- a/Algorithm/Clustering/PointInterface.php +++ b/Algorithm/Clustering/PointInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Clustering * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ namespace phpOMS\Algorithm\Clustering; * @property string $name Name * * @package phpOMS\Algorithm\Clustering; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/CoinMatching/MinimumCoinProblem.php b/Algorithm/CoinMatching/MinimumCoinProblem.php index 1b0096eb3..466e0cd7f 100755 --- a/Algorithm/CoinMatching/MinimumCoinProblem.php +++ b/Algorithm/CoinMatching/MinimumCoinProblem.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\CoinMatching * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\CoinMatching; * Matching a value with a set of coins * * @package phpOMS\Algorithm\CoinMatching - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Graph/DependencyResolver.php b/Algorithm/Graph/DependencyResolver.php index cb8dbeb05..c9cd1181e 100755 --- a/Algorithm/Graph/DependencyResolver.php +++ b/Algorithm/Graph/DependencyResolver.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Graph; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Graph; * Dependency resolver class. * * @package phpOMS\Algorithm\Graph; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/JobScheduling/Job.php b/Algorithm/JobScheduling/Job.php index fdc295cde..92b86cb89 100755 --- a/Algorithm/JobScheduling/Job.php +++ b/Algorithm/JobScheduling/Job.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\JobScheduling * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\JobScheduling; * Job for scheduling * * @package phpOMS\Algorithm\JobScheduling - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/JobScheduling/JobInterface.php b/Algorithm/JobScheduling/JobInterface.php index 819b71699..193b2e33f 100755 --- a/Algorithm/JobScheduling/JobInterface.php +++ b/Algorithm/JobScheduling/JobInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\JobScheduling * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,7 +19,7 @@ namespace phpOMS\Algorithm\JobScheduling; * Job interface. * * @package phpOMS\Algorithm\JobScheduling; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/JobScheduling/Weighted.php b/Algorithm/JobScheduling/Weighted.php index 79121fad1..6ce4cd5df 100755 --- a/Algorithm/JobScheduling/Weighted.php +++ b/Algorithm/JobScheduling/Weighted.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\JobScheduling * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\JobScheduling; * Job scheduling algorithm with no overlapping jobs * * @package phpOMS\Algorithm\JobScheduling - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Knapsack/Backpack.php b/Algorithm/Knapsack/Backpack.php index 5cb68b437..6e374f083 100755 --- a/Algorithm/Knapsack/Backpack.php +++ b/Algorithm/Knapsack/Backpack.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Knapsack * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,7 +19,7 @@ namespace phpOMS\Algorithm\Knapsack; * Backpack for the Knapsack problem * * @package phpOMS\Algorithm\Knapsack - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Knapsack/BackpackInterface.php b/Algorithm/Knapsack/BackpackInterface.php index d6b8334bf..1ae83f592 100755 --- a/Algorithm/Knapsack/BackpackInterface.php +++ b/Algorithm/Knapsack/BackpackInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Knapsack * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,7 +19,7 @@ namespace phpOMS\Algorithm\Knapsack; * Backpack interface. * * @package phpOMS\Algorithm\Knapsack; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Knapsack/Bounded.php b/Algorithm/Knapsack/Bounded.php index d5f15e2ea..94d433661 100755 --- a/Algorithm/Knapsack/Bounded.php +++ b/Algorithm/Knapsack/Bounded.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Knapsack * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\Algorithm\Knapsack; * This algorithm only works for integer cost, values and quantities! * * @package phpOMS\Algorithm\Knapsack - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Knapsack/Continuous.php b/Algorithm/Knapsack/Continuous.php index b1f052a8c..0468a7a51 100755 --- a/Algorithm/Knapsack/Continuous.php +++ b/Algorithm/Knapsack/Continuous.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Knapsack * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,7 +19,7 @@ namespace phpOMS\Algorithm\Knapsack; * Continuous knapsack algorithm * * @package phpOMS\Algorithm\Knapsack - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Knapsack/Item.php b/Algorithm/Knapsack/Item.php index e9c8e926f..def34d742 100755 --- a/Algorithm/Knapsack/Item.php +++ b/Algorithm/Knapsack/Item.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Knapsack * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Knapsack; * Item in the Knapsack * * @package phpOMS\Algorithm\Knapsack - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Knapsack/ItemInterface.php b/Algorithm/Knapsack/ItemInterface.php index 7f23172c9..320c9a9bf 100755 --- a/Algorithm/Knapsack/ItemInterface.php +++ b/Algorithm/Knapsack/ItemInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Knapsack * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,7 +19,7 @@ namespace phpOMS\Algorithm\Knapsack; * Item interface. * * @package phpOMS\Algorithm\Knapsack; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Maze/MazeGenerator.php b/Algorithm/Maze/MazeGenerator.php index e23573046..1fa57f51a 100755 --- a/Algorithm/Maze/MazeGenerator.php +++ b/Algorithm/Maze/MazeGenerator.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Maze * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,7 +19,7 @@ namespace phpOMS\Algorithm\Maze; * Maze generator * * @package phpOMS\Algorithm\Maze - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/AStar.php b/Algorithm/PathFinding/AStar.php index 05e51fc86..bd8af12b6 100755 --- a/Algorithm/PathFinding/AStar.php +++ b/Algorithm/PathFinding/AStar.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app * @@ -25,7 +25,7 @@ use phpOMS\Stdlib\Base\Heap; * Perform path finding. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/AStarNode.php b/Algorithm/PathFinding/AStarNode.php index efeaa3ed2..e29e15ea2 100755 --- a/Algorithm/PathFinding/AStarNode.php +++ b/Algorithm/PathFinding/AStarNode.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\PathFinding; * Node on grid. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/Grid.php b/Algorithm/PathFinding/Grid.php index 86af51953..08966ae8d 100755 --- a/Algorithm/PathFinding/Grid.php +++ b/Algorithm/PathFinding/Grid.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app * @@ -23,7 +23,7 @@ namespace phpOMS\Algorithm\PathFinding; * Grid of nodes. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/Heuristic.php b/Algorithm/PathFinding/Heuristic.php index d3c202462..d73373b0d 100755 --- a/Algorithm/PathFinding/Heuristic.php +++ b/Algorithm/PathFinding/Heuristic.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Topology\Metrics2D; * Node on grid. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/HeuristicType.php b/Algorithm/PathFinding/HeuristicType.php index 6afc7ff60..7c4bde9c3 100755 --- a/Algorithm/PathFinding/HeuristicType.php +++ b/Algorithm/PathFinding/HeuristicType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Heuristic type enum. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/JumpPointNode.php b/Algorithm/PathFinding/JumpPointNode.php index 575595c43..2f7785bcc 100755 --- a/Algorithm/PathFinding/JumpPointNode.php +++ b/Algorithm/PathFinding/JumpPointNode.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\PathFinding; * Node on grid. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/JumpPointSearch.php b/Algorithm/PathFinding/JumpPointSearch.php index ed8561e4a..51348fd38 100755 --- a/Algorithm/PathFinding/JumpPointSearch.php +++ b/Algorithm/PathFinding/JumpPointSearch.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app * @@ -25,7 +25,7 @@ use phpOMS\Stdlib\Base\Heap; * Perform path finding. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/MovementType.php b/Algorithm/PathFinding/MovementType.php index 5d54e51d8..34f09ac30 100755 --- a/Algorithm/PathFinding/MovementType.php +++ b/Algorithm/PathFinding/MovementType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Movement type enum. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/Node.php b/Algorithm/PathFinding/Node.php index 2d550ddda..38260d2ec 100755 --- a/Algorithm/PathFinding/Node.php +++ b/Algorithm/PathFinding/Node.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\HeapItemInterface; * Node on grid. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/NullJumpPointNode.php b/Algorithm/PathFinding/NullJumpPointNode.php index dd9e1a81e..ba2c6923b 100755 --- a/Algorithm/PathFinding/NullJumpPointNode.php +++ b/Algorithm/PathFinding/NullJumpPointNode.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\PathFinding; * Null node. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/NullNode.php b/Algorithm/PathFinding/NullNode.php index a5f521547..7dc3ae13f 100755 --- a/Algorithm/PathFinding/NullNode.php +++ b/Algorithm/PathFinding/NullNode.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\PathFinding; * Null node. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/Path.php b/Algorithm/PathFinding/Path.php index 733bf71ae..3ce1ac430 100755 --- a/Algorithm/PathFinding/Path.php +++ b/Algorithm/PathFinding/Path.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app * @@ -23,7 +23,7 @@ namespace phpOMS\Algorithm\PathFinding; * Path in grids. * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/PathFinding/PathFinderInterface.php b/Algorithm/PathFinding/PathFinderInterface.php index 8f08f7b24..98f8941c6 100755 --- a/Algorithm/PathFinding/PathFinderInterface.php +++ b/Algorithm/PathFinding/PathFinderInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\PathFinding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\PathFinding; * Path finder interface * * @package phpOMS\Algorithm\PathFinding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/BitonicSort.php b/Algorithm/Sort/BitonicSort.php index b120e3ff0..65806e27b 100755 --- a/Algorithm/Sort/BitonicSort.php +++ b/Algorithm/Sort/BitonicSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * BitonicSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/BubbleSort.php b/Algorithm/Sort/BubbleSort.php index 53b7ac30e..d85c60138 100755 --- a/Algorithm/Sort/BubbleSort.php +++ b/Algorithm/Sort/BubbleSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * Bubblesort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/BucketSort.php b/Algorithm/Sort/BucketSort.php index 79d861e82..fc4125cf3 100755 --- a/Algorithm/Sort/BucketSort.php +++ b/Algorithm/Sort/BucketSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * Bucketsort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/CocktailShakerSort.php b/Algorithm/Sort/CocktailShakerSort.php index e5792123c..66f63b539 100755 --- a/Algorithm/Sort/CocktailShakerSort.php +++ b/Algorithm/Sort/CocktailShakerSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * CocktailShakerSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/CombSort.php b/Algorithm/Sort/CombSort.php index 99077c1b2..e03ff4f86 100755 --- a/Algorithm/Sort/CombSort.php +++ b/Algorithm/Sort/CombSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * CombSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/CycleSort.php b/Algorithm/Sort/CycleSort.php index 28bcbb49c..0f5f08b3a 100755 --- a/Algorithm/Sort/CycleSort.php +++ b/Algorithm/Sort/CycleSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * CycleSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/GnomeSort.php b/Algorithm/Sort/GnomeSort.php index c6510b0cb..bd5d62d26 100755 --- a/Algorithm/Sort/GnomeSort.php +++ b/Algorithm/Sort/GnomeSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * GnomeSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/HeapSort.php b/Algorithm/Sort/HeapSort.php index a942e4cba..3a584a8de 100755 --- a/Algorithm/Sort/HeapSort.php +++ b/Algorithm/Sort/HeapSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * HeapSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/InsertionSort.php b/Algorithm/Sort/InsertionSort.php index 65da97708..6bf5c5c6f 100755 --- a/Algorithm/Sort/InsertionSort.php +++ b/Algorithm/Sort/InsertionSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * InsertionSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/IntroSort.php b/Algorithm/Sort/IntroSort.php index ebf49997f..209ad3f2f 100755 --- a/Algorithm/Sort/IntroSort.php +++ b/Algorithm/Sort/IntroSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * IntroSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/MergeSort.php b/Algorithm/Sort/MergeSort.php index eb98e9cc9..195172f40 100755 --- a/Algorithm/Sort/MergeSort.php +++ b/Algorithm/Sort/MergeSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * MergeSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/OddEvenSort.php b/Algorithm/Sort/OddEvenSort.php index 510ee9987..22cb5800c 100755 --- a/Algorithm/Sort/OddEvenSort.php +++ b/Algorithm/Sort/OddEvenSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * OddEvenSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/PancakeSort.php b/Algorithm/Sort/PancakeSort.php index 0c8d9b30e..cf7c898ca 100755 --- a/Algorithm/Sort/PancakeSort.php +++ b/Algorithm/Sort/PancakeSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * PancakeSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/QuickSort.php b/Algorithm/Sort/QuickSort.php index df8b803f3..57fe5813e 100755 --- a/Algorithm/Sort/QuickSort.php +++ b/Algorithm/Sort/QuickSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * QuickSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/SelectionSort.php b/Algorithm/Sort/SelectionSort.php index e1cf0a1bb..8cdad30c2 100755 --- a/Algorithm/Sort/SelectionSort.php +++ b/Algorithm/Sort/SelectionSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * SelectionSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/ShellSort.php b/Algorithm/Sort/ShellSort.php index 72b4666bd..fa880b06c 100755 --- a/Algorithm/Sort/ShellSort.php +++ b/Algorithm/Sort/ShellSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * ShellSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/SortInterface.php b/Algorithm/Sort/SortInterface.php index d08570079..001a40cab 100755 --- a/Algorithm/Sort/SortInterface.php +++ b/Algorithm/Sort/SortInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * SortInterface class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/SortOrder.php b/Algorithm/Sort/SortOrder.php index a3894dbe3..4cd2de07f 100755 --- a/Algorithm/Sort/SortOrder.php +++ b/Algorithm/Sort/SortOrder.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * SortOrder enum. * * @package phpOMS\Algorithm\Sort - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/SortableInterface.php b/Algorithm/Sort/SortableInterface.php index 05f13af22..d5cd99e39 100755 --- a/Algorithm/Sort/SortableInterface.php +++ b/Algorithm/Sort/SortableInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * SortableInterface class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/StoogeSort.php b/Algorithm/Sort/StoogeSort.php index 3f8a373f1..19e4ea6f8 100755 --- a/Algorithm/Sort/StoogeSort.php +++ b/Algorithm/Sort/StoogeSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * StoogeSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Algorithm/Sort/TimSort.php b/Algorithm/Sort/TimSort.php index 6f149d264..13972f754 100755 --- a/Algorithm/Sort/TimSort.php +++ b/Algorithm/Sort/TimSort.php @@ -6,7 +6,7 @@ * * @package phpOMS\Algorithm\Sort; * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Algorithm\Sort; * TimSort class. * * @package phpOMS\Algorithm\Sort; - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Api/EUVAT/EUVATBffOnline.php b/Api/EUVAT/EUVATBffOnline.php index de116f3ee..d104b1f4e 100644 --- a/Api/EUVAT/EUVATBffOnline.php +++ b/Api/EUVAT/EUVATBffOnline.php @@ -6,7 +6,7 @@ * * @package phpOMS\Api\EUVAT * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Uri\HttpUri; * Check EU VAT. * * @package phpOMS\Api\EUVAT - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -42,34 +42,50 @@ final class EUVATBffOnline implements EUVATInterface /** * {@inheritdoc} */ - public static function validate(string $ownVAT, string $otherVAT) : int + public static function validate(string $otherVAT, string $ownVAT = '') : array { $request = new HttpRequest(new HttpUri('https://evatr.bff-online.de/evatrRPC?UstId_1=' . $ownVAT . '&UstId_2=' . $otherVAT)); $request->setMethod(RequestMethod::GET); + $result = [ + 'status' => -1, + 'vat' => 'C', + 'name' => '', + 'city' => '', + 'postal' => '', + 'address' => '', + 'body' => '', + ]; + $matches = []; try { $body = Rest::request($request)->getBody(); - + $result['body'] = $body; \preg_match('/ErrorCode.*?(\d+)/s', $body, $matches); - if ((int) ($matches[1] ?? 1) === 200) { - return 0; + switch ((int) ($matches[1] ?? 1)) { + case 200: + $result['vat'] = 'A'; + break; + default: + $result['vat'] = 'B'; } + + $result['status'] = 0; } catch (\Throwable $t) { - return -1; + return $result; } - return (int) ($matches[1] ?? 1); + return $result; } /** * {@inheritdoc} */ public static function validateQualified( - string $ownVAT, string $otherVAT, + string $ownVAT, string $otherName, string $otherCity, string $otherPostal, @@ -78,56 +94,57 @@ final class EUVATBffOnline implements EUVATInterface { $result = [ 'status' => -1, - 'name' => false, - 'city' => false, - 'postal' => false, - 'street' => false, - 'response' => '', + 'vat' => 'C', + 'name' => 'C', + 'city' => 'C', + 'postal' => 'C', + 'address' => 'C', + 'body' => '', ]; if (empty($ownVAT)) { return $result; } - $request = new HttpRequest(new HttpUri('https://evatr.bff-online.de/evatrRPC?UstId_1=' . $ownVAT . '&UstId_2=' . $otherVAT . '&Firmenname=' . \urlencode($otherName) . '&Ort=' . \urlencode($otherCity) . '&PLZ=' . \urlencode($otherPostal) . '&Strasse=' . \urlencode($otherStreet))); + $request = new HttpRequest(new HttpUri( + 'https://evatr.bff-online.de/evatrRPC?UstId_1=' . $ownVAT . '&UstId_2=' . $otherVAT . '&Firmenname=' . \urlencode($otherName) . '&Ort=' . \urlencode($otherCity) . '&PLZ=' . \urlencode($otherPostal) . '&Strasse=' . \urlencode($otherStreet)) + ); $request->setMethod(RequestMethod::GET); try { $body = Rest::request($request)->getBody(); - - $result['response'] = $body; + $result['body'] = $body; $matches = []; \preg_match('/ErrorCode.*?(\d+)/s', $body, $matches); - if ((int) ($matches[1] ?? 1) === 200) { - $result['status'] = 0; + + switch ((int) ($matches[1] ?? 1)) { + case 200: + $result['vat'] = 'A'; + break; + default: + $result['vat'] = 'B'; } $matches = []; \preg_match('/Erg_PLZ.*?(A|B|C|D)/s', $body, $matches); - if (($matches[1] ?? 'B') === 'A' || ($matches[1] ?? 'B') === 'D') { - $result['postal'] = true; - } + $result['postal'] = $matches[1] ?? 'B'; $matches = []; \preg_match('/Erg_Ort.*?(A|B|C|D)/s', $body, $matches); - if (($matches[1] ?? 'B') === 'A' || ($matches[1] ?? 'B') === 'D') { - $result['city'] = true; - } + $result['city'] = $matches[1] ?? 'B'; $matches = []; \preg_match('/Erg_Str.*?(A|B|C|D)/s', $body, $matches); - if (($matches[1] ?? 'B') === 'A' || ($matches[1] ?? 'B') === 'D') { - $result['street'] = true; - } + $result['address'] = $matches[1] ?? 'B'; $matches = []; \preg_match('/Erg_Name.*?(A|B|C|D)/s', $body, $matches); - if (($matches[1] ?? 'B') === 'A' || ($matches[1] ?? 'B') === 'D') { - $result['street'] = true; - } + $result['name'] = $matches[1] ?? 'B'; + + $result['status'] = 0; } catch (\Throwable $t) { - return []; + return $result; } return $result; diff --git a/Api/EUVAT/EUVATInterface.php b/Api/EUVAT/EUVATInterface.php index 37423e9c0..5f4cfd480 100644 --- a/Api/EUVAT/EUVATInterface.php +++ b/Api/EUVAT/EUVATInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Api\EUVAT * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -14,27 +14,35 @@ declare(strict_types=1); namespace phpOMS\Api\EUVAT; +/** + * EU VAT validation interface + * + * @package phpOMS\Api\EUVAT + * @license OMS License 2.0 + * @link https://jingga.app + * @since 1.0.0 + */ interface EUVATInterface { /** * Validate VAT * - * @param string $ownVAT Valid own EU VAT * @param string $otherVAT EU VAT to validate (VAT in own country not possible) + * @param string $ownVAT Valid own EU VAT * - * @return int + * @return array * * @since 1.0.0 */ - public static function validate(string $ownVAT, string $otherVAT) : int; + public static function validate(string $otherVAT, string $ownVAT = '') : array; /** * Qualified VAT validation * * The qualified validation is very strict, even one wrong character will result in a failure (e.g. street abbreviations) * - * @param string $ownVAT Valid own EU VAT * @param string $otherVAT EU VAT to validate (VAT in own country not possible) + * @param string $ownVAT Valid own EU VAT * @param string $otherName Company name to validate * @param string $otherCity City to validate * @param string $otherPostal Zip to validate @@ -44,5 +52,5 @@ interface EUVATInterface * * @since 1.0.0 */ - public static function validateQualified(string $ownVAT, string $otherVAT, string $otherName, string $otherCity, string $otherPostal, string $otherStreet) : array; + public static function validateQualified(string $otherVAT, string $ownVAT, string $otherName, string $otherCity, string $otherPostal, string $otherStreet) : array; } diff --git a/Api/EUVAT/EUVATVies.php b/Api/EUVAT/EUVATVies.php new file mode 100644 index 000000000..6a46dc24e --- /dev/null +++ b/Api/EUVAT/EUVATVies.php @@ -0,0 +1,204 @@ +setMethod(RequestMethod::GET); + + $result = [ + 'status' => -1, + 'vat' => 'C', + 'name' => '', + 'city' => '', + 'postal' => '', + 'address' => '', + 'body' => '', + ]; + + try { + $body = Rest::request($request)->getBody(); + $result['body'] = $body; + + $json = \json_decode($body, true); + $result = \array_merge($result, self::parseResponse($json)); + + $result['status'] = $json['userError'] === 'VALID' ? 0 : -1; + } catch (\Throwable $t) { + return $result; + } + + return $result; + } + + /** + * {@inheritdoc} + */ + public static function validateQualified( + string $otherVAT, + string $ownVAT, + string $otherName, + string $otherCity, + string $otherPostal, + string $otherStreet + ) : array + { + $result = [ + 'status' => -1, + 'vat' => 'C', + 'name' => 'C', + 'city' => 'C', + 'postal' => 'C', + 'address' => 'C', + 'body' => '', + ]; + + $request = new HttpRequest( + new HttpUri( + 'https://ec.europa.eu/taxation_customs/vies/rest-api/ms/' . \substr($otherVAT, 0, 2) . '/vat/' . \substr($otherVAT, 2) . ( + $ownVAT !== '' ? '?requesterMemberStateCode=' . \substr($ownVAT, 0, 2) . '&requesterNumber=' . \substr($ownVAT, 2) : '' + ) + ) + ); + $request->setMethod(RequestMethod::GET); + + try { + $body = Rest::request($request)->getBody(); + $result['body'] = $body; + + $json = \json_decode($body, true); + $result = \array_merge($result, self::parseResponse($json)); + + if ($otherName === '') { + $result['name'] = 'D'; + } elseif (\stripos($result['name'], $otherName) !== false && \strlen($otherName) / \strlen($result['name']) > 0.8 || \levenshtein($otherName, $result['name']) / \strlen($result['name']) < 0.2) { + $result['name'] = 'A'; + } elseif ($result['name'] === '') { + $result['name'] = 'C'; + } else { + $result['name'] = 'C'; + } + + if ($otherCity === '') { + $result['city'] = 'D'; + } elseif (\stripos($result['city'], $otherCity) !== false) { + $result['city'] = 'A'; + } elseif ($result['city'] === '') { + $result['city'] = 'C'; + } else { + $result['city'] = 'C'; + } + + if ($otherPostal === '') { + $result['postal'] = 'D'; + } elseif (\stripos($result['postal'], $otherPostal) !== false) { + $result['postal'] = 'A'; + } elseif ($result['postal'] === '') { + $result['postal'] = 'C'; + } else { + $result['postal'] = 'C'; + } + + if ($otherStreet === '') { + $result['address'] = 'D'; + } elseif (\stripos($result['address'], $otherStreet) !== false && \levenshtein($otherStreet, $result['address'], insertion_cost: 0) / \strlen($result['address']) < 0.2) { + $result['address'] = 'A'; + } elseif ($result['address'] === '') { + $result['address'] = 'C'; + } else { + $result['address'] = 'C'; + } + + $result['status'] = $json['userError'] === 'VALID' ? 0 : -1; + } catch (\Throwable $t) { + return $result; + } + + return $result; + } + + private static function parseResponse(array $json) : array + { + $result = [ + 'vat' => '', + 'name' => '', + 'city' => '', + 'postal' => '', + 'address' => '', + ]; + + $result['vat'] = $json['isValid'] ? 'A' : 'B'; + $result['name'] = $json['isValid']; + + $result['city'] = \stripos($json['address'], "\n") !== false + ? \substr($json['address'], \stripos($json['address'], "\n") + 1) + : ''; + + $result['postal'] = \stripos($json['address'], "\n") !== false + ? \substr( + $json['address'], + \stripos($json['address'], "\n") + 1, + \stripos($json['address'], ' ', \stripos($json['address'], "\n")) - \stripos($json['address'], "\n") - 1 + ) + : ''; + + $result['address'] = \stripos($json['address'], "\n") !== false + ? \substr($json['address'], 0, \stripos($json['address'], "\n") - 1) + : $json['address']; + + + $result['name'] = $result['name'] === '---' ? '' : $result['name']; + $result['city'] = $result['city'] === '---' ? '' : $result['city']; + $result['postal'] = $result['postal'] === '---' ? '' : $result['postal']; + $result['address'] = $result['address'] === '---' ? '' : $result['address']; + + return $result; + } +} diff --git a/Api/Payment/Charge.php b/Api/Payment/Charge.php index a513ceec9..91b1c550e 100644 --- a/Api/Payment/Charge.php +++ b/Api/Payment/Charge.php @@ -6,7 +6,7 @@ * * @package phpOMS\Api\Payment * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Api\Payment; * Payment charge. * * @package phpOMS\Api\Payment - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Api/Payment/PaymentAbstract.php b/Api/Payment/PaymentAbstract.php index 9a840db8b..9277b9605 100644 --- a/Api/Payment/PaymentAbstract.php +++ b/Api/Payment/PaymentAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Api\Payment * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Api\Payment; * Abstract payment. * * @package phpOMS\Api\Payment - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Api/Payment/PaymentFactory.php b/Api/Payment/PaymentFactory.php index 8a893242d..44718f89e 100644 --- a/Api/Payment/PaymentFactory.php +++ b/Api/Payment/PaymentFactory.php @@ -6,7 +6,7 @@ * * @package phpOMS\Api\Payment * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Api\Payment; * Create a payment. * * @package phpOMS\Api\Payment - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Api/Payment/Stripe.php b/Api/Payment/Stripe.php index 5791470b7..09d52da0b 100644 --- a/Api/Payment/Stripe.php +++ b/Api/Payment/Stripe.php @@ -6,7 +6,7 @@ * * @package phpOMS\Api\Payment * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use Stripe\StripeClient; * Strip generator. * * @package phpOMS\Api\Payment - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/ApplicationAbstract.php b/Application/ApplicationAbstract.php index 7417387e2..89b3944dd 100755 --- a/Application/ApplicationAbstract.php +++ b/Application/ApplicationAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -52,7 +52,7 @@ use phpOMS\Router\RouterInterface; * @property \phpOMS\Log\FileLogger $logger * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/ApplicationInfo.php b/Application/ApplicationInfo.php index 90ae0df59..d5c304bf0 100755 --- a/Application/ApplicationInfo.php +++ b/Application/ApplicationInfo.php @@ -6,7 +6,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Utils\ArrayUtils; * Handling the info files for modules * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/ApplicationManager.php b/Application/ApplicationManager.php index 1482e72a8..c8c21d2e7 100755 --- a/Application/ApplicationManager.php +++ b/Application/ApplicationManager.php @@ -7,7 +7,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\System\File\PathException; * General application managing functionality. * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/ApplicationStatus.php b/Application/ApplicationStatus.php index e9241b313..4cc7c95a2 100755 --- a/Application/ApplicationStatus.php +++ b/Application/ApplicationStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * App status enum. * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/ApplicationType.php b/Application/ApplicationType.php index 00df8d925..e0f735487 100644 --- a/Application/ApplicationType.php +++ b/Application/ApplicationType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * App status enum. * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/InstallerAbstract.php b/Application/InstallerAbstract.php index 28793ad43..381e137b9 100755 --- a/Application/InstallerAbstract.php +++ b/Application/InstallerAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\System\File\Local\Directory; * Installer abstract class. * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/StatusAbstract.php b/Application/StatusAbstract.php index 38fa1fc73..4793ef252 100755 --- a/Application/StatusAbstract.php +++ b/Application/StatusAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Utils\Parser\Php\ArrayParser; * This abstraction can be used by modules in order to manipulate their basic status/state. * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Application/UninstallerAbstract.php b/Application/UninstallerAbstract.php index bf1516a3d..6d25e1b3e 100755 --- a/Application/UninstallerAbstract.php +++ b/Application/UninstallerAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Application * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder; * Uninstaller abstract class. * * @package phpOMS\Application - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Asset/AssetManager.php b/Asset/AssetManager.php index 7a531db59..02fc5d2fc 100755 --- a/Asset/AssetManager.php +++ b/Asset/AssetManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Asset * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Asset; * Asset manager class. * * @package phpOMS\Asset - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Asset/AssetType.php b/Asset/AssetType.php index d7c89cd79..41e24aaae 100755 --- a/Asset/AssetType.php +++ b/Asset/AssetType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Asset * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Asset types enum. * * @package phpOMS\Asset - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Auth/Auth.php b/Auth/Auth.php index 134d9870b..c2e83e20c 100755 --- a/Auth/Auth.php +++ b/Auth/Auth.php @@ -6,7 +6,7 @@ * * @package phpOMS\Auth * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Session\SessionInterface; * Responsible for authenticating and initializing the connection * * @package phpOMS\Auth - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Auth/LoginReturnType.php b/Auth/LoginReturnType.php index 1967252c4..85c9a62da 100755 --- a/Auth/LoginReturnType.php +++ b/Auth/LoginReturnType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Auth * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * These are possible answers to authentications. * * @package phpOMS\Auth - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/AutoloadException.php b/AutoloadException.php index ee730a84c..4ee0d1aab 100755 --- a/AutoloadException.php +++ b/AutoloadException.php @@ -6,7 +6,7 @@ * * @package phpOMS * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS; * This exception is thrown if a file couldn't be autoloaded * * @package phpOMS - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Autoloader.php b/Autoloader.php index 9dedff7b7..1bb0827e1 100755 --- a/Autoloader.php +++ b/Autoloader.php @@ -6,7 +6,7 @@ * * @package phpOMS * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS; * Autoloader class. * * @package phpOMS - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Finance/Depreciation.php b/Business/Finance/Depreciation.php index 6333e89d0..6d8a95feb 100755 --- a/Business/Finance/Depreciation.php +++ b/Business/Finance/Depreciation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Business\Finance; * Depreciation class. * * @package phpOMS\Business\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Finance/FinanceFormulas.php b/Business/Finance/FinanceFormulas.php index 1e56b90cc..5215faf7a 100755 --- a/Business/Finance/FinanceFormulas.php +++ b/Business/Finance/FinanceFormulas.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Statistic\Average; * Finance class. * * @package phpOMS\Business\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Business/Finance/Forensics.php b/Business/Finance/Forensics.php new file mode 100644 index 000000000..3885a0d47 --- /dev/null +++ b/Business/Finance/Forensics.php @@ -0,0 +1,64 @@ + $count) { + $results[$digit] = $count / $size; + } + + return $results; + } + + public static function expectedBenfordDistribution() : array + { + $expected = []; + for ($i = 1; $i <= 9; ++$i) { + $expected[$i] = \log10(1 + 1 / $i); + } + + return $expected; + } +} diff --git a/Business/Finance/Loan.php b/Business/Finance/Loan.php index a7a1a47d8..60885343f 100755 --- a/Business/Finance/Loan.php +++ b/Business/Finance/Loan.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Business\Finance; * Finance class. * * @package phpOMS\Business\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Business/Finance/Lorenzkurve.php b/Business/Finance/Lorenzkurve.php index f19f4a9d8..31a551447 100755 --- a/Business/Finance/Lorenzkurve.php +++ b/Business/Finance/Lorenzkurve.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Business\Finance; * Finance class. * * @package phpOMS\Business\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Finance/StockBonds.php b/Business/Finance/StockBonds.php index 5f75181cd..824c82928 100755 --- a/Business/Finance/StockBonds.php +++ b/Business/Finance/StockBonds.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Business\Finance; * Finance class. * * @package phpOMS\Business\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Business/Marketing/ArticleCorrelationAffinity.php b/Business/Marketing/ArticleCorrelationAffinity.php index 5246155f7..0e19b0443 100755 --- a/Business/Marketing/ArticleCorrelationAffinity.php +++ b/Business/Marketing/ArticleCorrelationAffinity.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Marketing * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Math\Statistic\Correlation; * This class provided basic marketing metric calculations * * @package phpOMS\Business\Marketing - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Marketing/CustomerValue.php b/Business/Marketing/CustomerValue.php index 3ed47dedc..eea566ac0 100755 --- a/Business/Marketing/CustomerValue.php +++ b/Business/Marketing/CustomerValue.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Marketing * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Business\Marketing; * Marketing CustomerValue * * @package phpOMS\Business\Marketing - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Marketing/Metrics.php b/Business/Marketing/Metrics.php index 8c74a8cce..81c780be6 100755 --- a/Business/Marketing/Metrics.php +++ b/Business/Marketing/Metrics.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Marketing * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Math\Matrix\Vector; * This class provided basic marketing metric calculations * * @package phpOMS\Business\Marketing - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Marketing/NetPromoterScore.php b/Business/Marketing/NetPromoterScore.php index 1ef7687ef..c6bddbf6c 100755 --- a/Business/Marketing/NetPromoterScore.php +++ b/Business/Marketing/NetPromoterScore.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Marketing * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\Business\Marketing; * Instead of customers the NPS can also be transferred to non-customers. * * @package phpOMS\Business\Marketing - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Marketing/PageRank.php b/Business/Marketing/PageRank.php index 92fcc57c2..d3dcbbafc 100755 --- a/Business/Marketing/PageRank.php +++ b/Business/Marketing/PageRank.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Marketing * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Business\Marketing; * PageRank algorithm * * @package phpOMS\Business\Marketing - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Programming/Metrics.php b/Business/Programming/Metrics.php index c3a3ae880..31f27b588 100755 --- a/Business/Programming/Metrics.php +++ b/Business/Programming/Metrics.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Programming * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Business\Programming; * This class provides basic programming metric calculations. * * @package phpOMS\Business\Programming - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Business/Sales/MarketShareEstimation.php b/Business/Sales/MarketShareEstimation.php index 77f241bb2..9d96f085b 100755 --- a/Business/Sales/MarketShareEstimation.php +++ b/Business/Sales/MarketShareEstimation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Business\Sales * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\Business\Sales; * the rank based on a marketshare in a Zipf distributed market. * * @package phpOMS\Business\Sales - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Config/OptionsInterface.php b/Config/OptionsInterface.php index 23218a59a..2de176da3 100755 --- a/Config/OptionsInterface.php +++ b/Config/OptionsInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Config * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Config; * Options class. * * @package phpOMS\Config - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Config/OptionsTrait.php b/Config/OptionsTrait.php index 3f309ceb4..6d86574e6 100755 --- a/Config/OptionsTrait.php +++ b/Config/OptionsTrait.php @@ -6,7 +6,7 @@ * * @package phpOMS\Config * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Config; * This trait basically implements the OptionsInterface * * @package phpOMS\Config - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Config/SettingsInterface.php b/Config/SettingsInterface.php index bfa9d7dcb..3f7ac1804 100755 --- a/Config/SettingsInterface.php +++ b/Config/SettingsInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Config * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Config; * Options class. * * @package phpOMS\Config - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Contract/ArrayableInterface.php b/Contract/ArrayableInterface.php index 4c413ce25..ff6818ee6 100755 --- a/Contract/ArrayableInterface.php +++ b/Contract/ArrayableInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Contract * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Contract; * This can be helpful for \JsonSerializable classes or classes which need to be represented as array. * * @package phpOMS\Contract - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Contract/RenderableInterface.php b/Contract/RenderableInterface.php index 48535787c..fe91d84b2 100755 --- a/Contract/RenderableInterface.php +++ b/Contract/RenderableInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Contract * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\Contract; * that get rendered. * * @package phpOMS\Contract - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Contract/SerializableInterface.php b/Contract/SerializableInterface.php index 8dd4578a7..4d852660c 100755 --- a/Contract/SerializableInterface.php +++ b/Contract/SerializableInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Contract * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\Contract; * that get rendered. * * @package phpOMS\Contract - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Contract/StreamInterface.php b/Contract/StreamInterface.php index f9d57e7f5..1ddf61f08 100755 --- a/Contract/StreamInterface.php +++ b/Contract/StreamInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Contract * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Contract; * Make a class streamable. * * @package phpOMS\Contract - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/CachePool.php b/DataStorage/Cache/CachePool.php index e973e5c48..6048aa2fc 100755 --- a/DataStorage/Cache/CachePool.php +++ b/DataStorage/Cache/CachePool.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\DataStorage\DataStoragePoolInterface; * Responsible for storing cache implementation. * * @package phpOMS\DataStorage\Cache - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/CacheStatus.php b/DataStorage/Cache/CacheStatus.php index 65bce1ee5..e5694e043 100755 --- a/DataStorage/Cache/CacheStatus.php +++ b/DataStorage/Cache/CacheStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Possible caching status * * @package phpOMS\DataStorage\Cache - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/CacheType.php b/DataStorage/Cache/CacheType.php index 1783f6b78..1ff9553cc 100755 --- a/DataStorage/Cache/CacheType.php +++ b/DataStorage/Cache/CacheType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Cache types that are supported by the application * * @package phpOMS\DataStorage\Cache - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/CacheValueType.php b/DataStorage/Cache/Connection/CacheValueType.php index 800fcdd82..c91e709c6 100755 --- a/DataStorage/Cache/Connection/CacheValueType.php +++ b/DataStorage/Cache/Connection/CacheValueType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Possible caching types * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/ConnectionAbstract.php b/DataStorage/Cache/Connection/ConnectionAbstract.php index bb03002c6..d3f7fcd1a 100755 --- a/DataStorage/Cache/Connection/ConnectionAbstract.php +++ b/DataStorage/Cache/Connection/ConnectionAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\DataStorage\Cache\CacheType; * Implementing wrapper functions for multiple caches is planned (far away). * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/ConnectionFactory.php b/DataStorage/Cache/Connection/ConnectionFactory.php index 94124870c..3432db28f 100755 --- a/DataStorage/Cache/Connection/ConnectionFactory.php +++ b/DataStorage/Cache/Connection/ConnectionFactory.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Cache\CacheType; * Cache connection factory. * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/ConnectionInterface.php b/DataStorage/Cache/Connection/ConnectionInterface.php index 526468601..8b081c13b 100755 --- a/DataStorage/Cache/Connection/ConnectionInterface.php +++ b/DataStorage/Cache/Connection/ConnectionInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\DataStorageConnectionInterface; * Cache interface. * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/FileCache.php b/DataStorage/Cache/Connection/FileCache.php index d9d5875e6..39e0265db 100755 --- a/DataStorage/Cache/Connection/FileCache.php +++ b/DataStorage/Cache/Connection/FileCache.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -36,7 +36,7 @@ use phpOMS\System\File\Local\File; * data (n bytes) * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/MemCached.php b/DataStorage/Cache/Connection/MemCached.php index 2e7f7e809..d3249de4f 100755 --- a/DataStorage/Cache/Connection/MemCached.php +++ b/DataStorage/Cache/Connection/MemCached.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Cache\Exception\InvalidConnectionConfigException; * Memcache class. * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/NullCache.php b/DataStorage/Cache/Connection/NullCache.php index e09ab73b4..5962dff79 100755 --- a/DataStorage/Cache/Connection/NullCache.php +++ b/DataStorage/Cache/Connection/NullCache.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Cache\Connection; * Null cache class. * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Connection/RedisCache.php b/DataStorage/Cache/Connection/RedisCache.php index 12387d4d0..27bd57437 100755 --- a/DataStorage/Cache/Connection/RedisCache.php +++ b/DataStorage/Cache/Connection/RedisCache.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * RedisCache class. * * @package phpOMS\DataStorage\Cache\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cache/Exception/InvalidConnectionConfigException.php b/DataStorage/Cache/Exception/InvalidConnectionConfigException.php index ae0a7a3db..f6aceb044 100755 --- a/DataStorage/Cache/Exception/InvalidConnectionConfigException.php +++ b/DataStorage/Cache/Exception/InvalidConnectionConfigException.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cache\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Cache\Exception; * Invalid cache config exception class. * * @package phpOMS\DataStorage\Cache\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Cookie/CookieJar.php b/DataStorage/Cookie/CookieJar.php index c1697e6ae..f5fd98365 100755 --- a/DataStorage/Cookie/CookieJar.php +++ b/DataStorage/Cookie/CookieJar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Cookie * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\LockException; * CookieJar class * * @package phpOMS\DataStorage\Cookie - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/DataMapperInterface.php b/DataStorage/DataMapperInterface.php index 0251bfcb0..e8edda2fe 100755 --- a/DataStorage/DataMapperInterface.php +++ b/DataStorage/DataMapperInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\DataStorage; * This interface is used for DB, Cache & Session implementations * * @package phpOMS\DataStorage - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/DataStorageConnectionInterface.php b/DataStorage/DataStorageConnectionInterface.php index 40a9a9421..5e624f390 100755 --- a/DataStorage/DataStorageConnectionInterface.php +++ b/DataStorage/DataStorageConnectionInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage; * Database connection interface. * * @package phpOMS\DataStorage - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/DataStoragePoolInterface.php b/DataStorage/DataStoragePoolInterface.php index 06792d021..6038e3f3a 100755 --- a/DataStorage/DataStoragePoolInterface.php +++ b/DataStorage/DataStoragePoolInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\DataStorage; * DB, Cache, Session * * @package phpOMS\DataStorage - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/BuilderAbstract.php b/DataStorage/Database/BuilderAbstract.php index 64a095d84..250c6505b 100755 --- a/DataStorage/Database/BuilderAbstract.php +++ b/DataStorage/Database/BuilderAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Query\QueryType; * Database query builder. * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/ConnectionAbstract.php b/DataStorage/Database/Connection/ConnectionAbstract.php index 28cd96c83..2f15d9a43 100755 --- a/DataStorage/Database/Connection/ConnectionAbstract.php +++ b/DataStorage/Database/Connection/ConnectionAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -28,7 +28,7 @@ use phpOMS\DataStorage\Database\Schema\Grammar\Grammar as SchemaGrammar; * @property \PDO $con * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/ConnectionFactory.php b/DataStorage/Database/Connection/ConnectionFactory.php index 3c22cdb27..be306b706 100755 --- a/DataStorage/Database/Connection/ConnectionFactory.php +++ b/DataStorage/Database/Connection/ConnectionFactory.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\DatabaseType; * Database connection factory. * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/ConnectionInterface.php b/DataStorage/Database/Connection/ConnectionInterface.php index b2c00afaa..8f12c0cf3 100755 --- a/DataStorage/Database/Connection/ConnectionInterface.php +++ b/DataStorage/Database/Connection/ConnectionInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\DataStorageConnectionInterface; * Database connection interface. * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/MysqlConnection.php b/DataStorage/Database/Connection/MysqlConnection.php index 9ccdda045..5381a2f78 100755 --- a/DataStorage/Database/Connection/MysqlConnection.php +++ b/DataStorage/Database/Connection/MysqlConnection.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\DataStorage\Database\Schema\Grammar\MysqlGrammar as MysqlSchemaGramma * Implementing wrapper functions for multiple databases is planned (far away). * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/NullConnection.php b/DataStorage/Database/Connection/NullConnection.php index 67e29a7d8..0cab828ce 100755 --- a/DataStorage/Database/Connection/NullConnection.php +++ b/DataStorage/Database/Connection/NullConnection.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Connection; * Database handler. * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/NullPDO.php b/DataStorage/Database/Connection/NullPDO.php index 8f031947c..12705414f 100755 --- a/DataStorage/Database/Connection/NullPDO.php +++ b/DataStorage/Database/Connection/NullPDO.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Connection; * Null implementation of PDO. * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/PostgresConnection.php b/DataStorage/Database/Connection/PostgresConnection.php index f54c8066f..cb0818377 100755 --- a/DataStorage/Database/Connection/PostgresConnection.php +++ b/DataStorage/Database/Connection/PostgresConnection.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\Schema\Grammar\PostgresGrammar as PostgresSchema * Implementing wrapper functions for multiple databases is planned (far away). * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/SQLiteConnection.php b/DataStorage/Database/Connection/SQLiteConnection.php index 6def03df0..0d1ddc241 100755 --- a/DataStorage/Database/Connection/SQLiteConnection.php +++ b/DataStorage/Database/Connection/SQLiteConnection.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\Schema\Grammar\SQLiteGrammar as SQLiteSchemaGram * Implementing wrapper functions for multiple databases is planned (far away). * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Connection/SqlServerConnection.php b/DataStorage/Database/Connection/SqlServerConnection.php index 26208005f..6daeee484 100755 --- a/DataStorage/Database/Connection/SqlServerConnection.php +++ b/DataStorage/Database/Connection/SqlServerConnection.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Connection * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\Schema\Grammar\SqlServerGrammar as SqlServerSche * Implementing wrapper functions for multiple databases is planned (far away). * * @package phpOMS\DataStorage\Database\Connection - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/DatabasePool.php b/DataStorage/Database/DatabasePool.php index 5648adef5..135e5b936 100755 --- a/DataStorage/Database/DatabasePool.php +++ b/DataStorage/Database/DatabasePool.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\DataStorage\DataStoragePoolInterface; * Database pool handler. * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/DatabaseStatus.php b/DataStorage/Database/DatabaseStatus.php index a19b72e7b..f50670e3c 100755 --- a/DataStorage/Database/DatabaseStatus.php +++ b/DataStorage/Database/DatabaseStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Possible database connection status * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/DatabaseType.php b/DataStorage/Database/DatabaseType.php index 5086b0c03..bb69d3bd8 100755 --- a/DataStorage/Database/DatabaseType.php +++ b/DataStorage/Database/DatabaseType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Database types that are supported by the application * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Exception/InvalidConnectionConfigException.php b/DataStorage/Database/Exception/InvalidConnectionConfigException.php index 97c7b4507..fd577bc6c 100755 --- a/DataStorage/Database/Exception/InvalidConnectionConfigException.php +++ b/DataStorage/Database/Exception/InvalidConnectionConfigException.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Exception; * Permission exception class. * * @package phpOMS\DataStorage\Database\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Exception/InvalidDatabaseTypeException.php b/DataStorage/Database/Exception/InvalidDatabaseTypeException.php index a776c4d9b..57c6e64f8 100755 --- a/DataStorage/Database/Exception/InvalidDatabaseTypeException.php +++ b/DataStorage/Database/Exception/InvalidDatabaseTypeException.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Exception; * Permission exception class. * * @package phpOMS\DataStorage\Database\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Exception/InvalidMapperException.php b/DataStorage/Database/Exception/InvalidMapperException.php index b706d5471..a654f3152 100755 --- a/DataStorage/Database/Exception/InvalidMapperException.php +++ b/DataStorage/Database/Exception/InvalidMapperException.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Exception; * Permission exception class. * * @package phpOMS\DataStorage\Database\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/GrammarAbstract.php b/DataStorage/Database/GrammarAbstract.php index b2d9a6ce6..823599d38 100755 --- a/DataStorage/Database/GrammarAbstract.php +++ b/DataStorage/Database/GrammarAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Query\QueryType; * Grammar. * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Mapper/DataMapperAbstract.php b/DataStorage/Database/Mapper/DataMapperAbstract.php index 069f6c266..d492b7833 100755 --- a/DataStorage/Database/Mapper/DataMapperAbstract.php +++ b/DataStorage/Database/Mapper/DataMapperAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Mapper * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Query\OrderType; * Mapper abstract. * * @package phpOMS\DataStorage\Database\Mapper - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Mapper/DataMapperFactory.php b/DataStorage/Database/Mapper/DataMapperFactory.php index c1eaff4da..d424772e5 100755 --- a/DataStorage/Database/Mapper/DataMapperFactory.php +++ b/DataStorage/Database/Mapper/DataMapperFactory.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Mapper * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Query\Where; * Mapper factory. * * @package phpOMS\DataStorage\Database\Mapper - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Mapper/DeleteMapper.php b/DataStorage/Database/Mapper/DeleteMapper.php index 8d3b344aa..aa495f114 100755 --- a/DataStorage/Database/Mapper/DeleteMapper.php +++ b/DataStorage/Database/Mapper/DeleteMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Mapper * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Query\Builder; * Delete mapper (DELETE). * * @package phpOMS\DataStorage\Database\Mapper - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Mapper/MapperType.php b/DataStorage/Database/Mapper/MapperType.php index d88264bab..1476e346c 100755 --- a/DataStorage/Database/Mapper/MapperType.php +++ b/DataStorage/Database/Mapper/MapperType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Mapper * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Mapper type enum. * * @package phpOMS\DataStorage\Database\Mapper - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php index e281ebd3d..006062275 100755 --- a/DataStorage/Database/Mapper/ReadMapper.php +++ b/DataStorage/Database/Mapper/ReadMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Mapper * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Utils\ArrayUtils; * Read mapper (SELECTS). * * @package phpOMS\DataStorage\Database\Mapper - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -166,7 +166,6 @@ final class ReadMapper extends DataMapperAbstract * * @return object|array * - * @todo: consider to always return an array, this way we could remove executeGetAll * @since 1.0.0 */ public function executeGet(Builder $query = null) : mixed diff --git a/DataStorage/Database/Mapper/UpdateMapper.php b/DataStorage/Database/Mapper/UpdateMapper.php index 34589e957..378e15079 100755 --- a/DataStorage/Database/Mapper/UpdateMapper.php +++ b/DataStorage/Database/Mapper/UpdateMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Mapper * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Utils\ArrayUtils; * Update mapper (CREATE). * * @package phpOMS\DataStorage\Database\Mapper - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Mapper/WriteMapper.php b/DataStorage/Database/Mapper/WriteMapper.php index 7388506e6..1aad150fb 100755 --- a/DataStorage/Database/Mapper/WriteMapper.php +++ b/DataStorage/Database/Mapper/WriteMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Mapper * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Utils\ArrayUtils; * Write mapper (CREATE). * * @package phpOMS\DataStorage\Database\Mapper - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Builder.php b/DataStorage/Database/Query/Builder.php index 3cc10f24e..7fcc94fe6 100755 --- a/DataStorage/Database/Query/Builder.php +++ b/DataStorage/Database/Query/Builder.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Connection\ConnectionAbstract; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -846,7 +846,7 @@ class Builder extends BuilderAbstract public function count(string $table = '*') : self { /** - * @todo Karaka/phpOMS#??? [p:low] [t:optimization] [d:medium] + * @todo * Don't do this as a string, create a new object $this->select(new Count($table)). * The parser should be able to handle this much better */ diff --git a/DataStorage/Database/Query/Column.php b/DataStorage/Database/Query/Column.php index f19e4e4b1..f8fe8e29b 100755 --- a/DataStorage/Database/Query/Column.php +++ b/DataStorage/Database/Query/Column.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Count.php b/DataStorage/Database/Query/Count.php index 204a3769e..d0589511f 100755 --- a/DataStorage/Database/Query/Count.php +++ b/DataStorage/Database/Query/Count.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Expression.php b/DataStorage/Database/Query/Expression.php index 25875d8c8..3339e0d11 100755 --- a/DataStorage/Database/Query/Expression.php +++ b/DataStorage/Database/Query/Expression.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/From.php b/DataStorage/Database/Query/From.php index f09cfc920..3b18b6afe 100755 --- a/DataStorage/Database/Query/From.php +++ b/DataStorage/Database/Query/From.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Grammar/Grammar.php b/DataStorage/Database/Query/Grammar/Grammar.php index 950e44332..c1b4ddd82 100755 --- a/DataStorage/Database/Query/Grammar/Grammar.php +++ b/DataStorage/Database/Query/Grammar/Grammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\Query\Where; * Database query grammar. * * @package phpOMS\DataStorage\Database\Query\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/DataStorage/Database/Query/Grammar/GrammarInterface.php b/DataStorage/Database/Query/Grammar/GrammarInterface.php index 9718b1d6d..08b45b68c 100755 --- a/DataStorage/Database/Query/Grammar/GrammarInterface.php +++ b/DataStorage/Database/Query/Grammar/GrammarInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query\Grammar; * Grammar interface. * * @package phpOMS\DataStorage\Database\Query\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Grammar/MysqlGrammar.php b/DataStorage/Database/Query/Grammar/MysqlGrammar.php index 0b5e9e932..53a25f0ed 100755 --- a/DataStorage/Database/Query/Grammar/MysqlGrammar.php +++ b/DataStorage/Database/Query/Grammar/MysqlGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Query\Builder; * Grammar class. * * @package phpOMS\DataStorage\Database\Query\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Grammar/OracleGrammar.php b/DataStorage/Database/Query/Grammar/OracleGrammar.php index 1aea000da..03fd771f7 100755 --- a/DataStorage/Database/Query/Grammar/OracleGrammar.php +++ b/DataStorage/Database/Query/Grammar/OracleGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Query\Builder; * Grammar class. * * @package phpOMS\DataStorage\Database\Query\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Grammar/PostgresGrammar.php b/DataStorage/Database/Query/Grammar/PostgresGrammar.php index dbf186616..b62ac3357 100755 --- a/DataStorage/Database/Query/Grammar/PostgresGrammar.php +++ b/DataStorage/Database/Query/Grammar/PostgresGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Query\Builder; * Grammar class. * * @package phpOMS\DataStorage\Database\Query\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Grammar/SQLiteGrammar.php b/DataStorage/Database/Query/Grammar/SQLiteGrammar.php index 34ed78184..12c5c7a89 100755 --- a/DataStorage/Database/Query/Grammar/SQLiteGrammar.php +++ b/DataStorage/Database/Query/Grammar/SQLiteGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Query\Builder; * Grammar class. * * @package phpOMS\DataStorage\Database\Query\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Grammar/SqlServerGrammar.php b/DataStorage/Database/Query/Grammar/SqlServerGrammar.php index 873d287fc..e6bdb505d 100755 --- a/DataStorage/Database/Query/Grammar/SqlServerGrammar.php +++ b/DataStorage/Database/Query/Grammar/SqlServerGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Query\Builder; * Grammar class. * * @package phpOMS\DataStorage\Database\Query\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Into.php b/DataStorage/Database/Query/Into.php index d713a78c3..453df9424 100755 --- a/DataStorage/Database/Query/Into.php +++ b/DataStorage/Database/Query/Into.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/JoinType.php b/DataStorage/Database/Query/JoinType.php index 82f87bc79..3e641f952 100755 --- a/DataStorage/Database/Query/JoinType.php +++ b/DataStorage/Database/Query/JoinType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Query type enum. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/OrderType.php b/DataStorage/Database/Query/OrderType.php index 4c0a33c72..1fce2a0b7 100755 --- a/DataStorage/Database/Query/OrderType.php +++ b/DataStorage/Database/Query/OrderType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Query type enum. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Parameter.php b/DataStorage/Database/Query/Parameter.php index cd40dd789..899d175d7 100755 --- a/DataStorage/Database/Query/Parameter.php +++ b/DataStorage/Database/Query/Parameter.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/QueryType.php b/DataStorage/Database/Query/QueryType.php index ce1adcabc..f788a41c2 100755 --- a/DataStorage/Database/Query/QueryType.php +++ b/DataStorage/Database/Query/QueryType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Query type enum. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Select.php b/DataStorage/Database/Query/Select.php index 8ebb415f6..9ed3d92e2 100755 --- a/DataStorage/Database/Query/Select.php +++ b/DataStorage/Database/Query/Select.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Query; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Query/Where.php b/DataStorage/Database/Query/Where.php index 241ffbf25..a9a4b234d 100755 --- a/DataStorage/Database/Query/Where.php +++ b/DataStorage/Database/Query/Where.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Query * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Connection\ConnectionAbstract; * Database query builder. * * @package phpOMS\DataStorage\Database\Query - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/RelationType.php b/DataStorage/Database/RelationType.php index ffe30c240..688ae4b98 100755 --- a/DataStorage/Database/RelationType.php +++ b/DataStorage/Database/RelationType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Relations which can be used in order to specifiy how the DataMapper is supposed to work (level of detail) * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Builder.php b/DataStorage/Database/Schema/Builder.php index b4f679a80..87be0303c 100755 --- a/DataStorage/Database/Schema/Builder.php +++ b/DataStorage/Database/Schema/Builder.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Query\Builder as QueryBuilder; * Database query builder. * * @package phpOMS\DataStorage\Database\Schema - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Field.php b/DataStorage/Database/Schema/Field.php index 3a837cf6c..b70263588 100755 --- a/DataStorage/Database/Schema/Field.php +++ b/DataStorage/Database/Schema/Field.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Schema; * Database table * * @package phpOMS\DataStorage\Database\Schema - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Grammar/Grammar.php b/DataStorage/Database/Schema/Grammar/Grammar.php index aad9c857c..d89ed1b0b 100755 --- a/DataStorage/Database/Schema/Grammar/Grammar.php +++ b/DataStorage/Database/Schema/Grammar/Grammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Schema\QueryType; * Database query grammar. * * @package phpOMS\DataStorage\Database\Schema\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Grammar/GrammarInterface.php b/DataStorage/Database/Schema/Grammar/GrammarInterface.php index cdaae0470..b05f0001f 100755 --- a/DataStorage/Database/Schema/Grammar/GrammarInterface.php +++ b/DataStorage/Database/Schema/Grammar/GrammarInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Schema\Grammar; * Grammar interface. * * @package phpOMS\DataStorage\Database\Schema\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Grammar/MysqlGrammar.php b/DataStorage/Database/Schema/Grammar/MysqlGrammar.php index b35a0b993..df155a8c1 100755 --- a/DataStorage/Database/Schema/Grammar/MysqlGrammar.php +++ b/DataStorage/Database/Schema/Grammar/MysqlGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Query\Builder; * Database query grammar. * * @package phpOMS\DataStorage\Database\Schema\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Grammar/OracleGrammar.php b/DataStorage/Database/Schema/Grammar/OracleGrammar.php index 4249a0c82..17dca3cdf 100755 --- a/DataStorage/Database/Schema/Grammar/OracleGrammar.php +++ b/DataStorage/Database/Schema/Grammar/OracleGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Schema\Grammar; * Database query grammar. * * @package phpOMS\DataStorage\Database\Schema\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Grammar/PostgresGrammar.php b/DataStorage/Database/Schema/Grammar/PostgresGrammar.php index 6c56c7f2e..ef1ce46fb 100755 --- a/DataStorage/Database/Schema/Grammar/PostgresGrammar.php +++ b/DataStorage/Database/Schema/Grammar/PostgresGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Schema\Grammar; * Database query grammar. * * @package phpOMS\DataStorage\Database\Schema\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Grammar/SQLiteGrammar.php b/DataStorage/Database/Schema/Grammar/SQLiteGrammar.php index e69025c39..6558e5c7f 100755 --- a/DataStorage/Database/Schema/Grammar/SQLiteGrammar.php +++ b/DataStorage/Database/Schema/Grammar/SQLiteGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Schema\Grammar; * Database query grammar. * * @package phpOMS\DataStorage\Database\Schema\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Grammar/SqlServerGrammar.php b/DataStorage/Database/Schema/Grammar/SqlServerGrammar.php index bf3d6ec20..4d2c229c5 100755 --- a/DataStorage/Database/Schema/Grammar/SqlServerGrammar.php +++ b/DataStorage/Database/Schema/Grammar/SqlServerGrammar.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema\Grammar * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Schema\Grammar; * Database query grammar. * * @package phpOMS\DataStorage\Database\Schema\Grammar - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/QueryType.php b/DataStorage/Database/Schema/QueryType.php index 376d7b015..a20445864 100755 --- a/DataStorage/Database/Schema/QueryType.php +++ b/DataStorage/Database/Schema/QueryType.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Query\QueryType as DefaultQueryType; * Types used by the schema grammar in order to build the correct query. * * @package phpOMS\DataStorage\Database\Schema - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/Schema/Table.php b/DataStorage/Database/Schema/Table.php index 9ea8a9b36..9ae9e78b4 100755 --- a/DataStorage/Database/Schema/Table.php +++ b/DataStorage/Database/Schema/Table.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\DataStorage\Database\Schema; * Database table * * @package phpOMS\DataStorage\Database\Schema - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Database/SchemaMapper.php b/DataStorage/Database/SchemaMapper.php index 0ce6896cd..cad61543f 100755 --- a/DataStorage/Database/SchemaMapper.php +++ b/DataStorage/Database/SchemaMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Schema\Table; * Database schema mapper. * * @package phpOMS\DataStorage\Database - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/LockException.php b/DataStorage/LockException.php index acda2f460..75eefe543 100755 --- a/DataStorage/LockException.php +++ b/DataStorage/LockException.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\DataStorage; * header manipulation etc. are no longer allowed/possible. * * @package phpOMS\DataStorage - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/DataStorage/Session/CacheSessionHandler.php b/DataStorage/Session/CacheSessionHandler.php index 33f58bcef..6394198f5 100644 --- a/DataStorage/Session/CacheSessionHandler.php +++ b/DataStorage/Session/CacheSessionHandler.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Session * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\DataStorage\Cache\Connection\ConnectionAbstract; * Cache session handler. * * @package phpOMS\DataStorage\Session - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/DataStorage/Session/HttpSession.php b/DataStorage/Session/HttpSession.php index 9a239dc2c..d5d88dc4f 100755 --- a/DataStorage/Session/HttpSession.php +++ b/DataStorage/Session/HttpSession.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Session * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Uri\UriFactory; * Http session class. * * @package phpOMS\DataStorage\Session - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/DataStorage/Session/SessionInterface.php b/DataStorage/Session/SessionInterface.php index 1cc010c9e..42a5e68f8 100755 --- a/DataStorage/Session/SessionInterface.php +++ b/DataStorage/Session/SessionInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Session * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\DataStorage\Session; * Sessions can be used by http requests, console interaction and socket connections * * @package phpOMS\DataStorage\Session - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Dispatcher/Dispatcher.php b/Dispatcher/Dispatcher.php index 680a07ce2..c8c16d736 100755 --- a/Dispatcher/Dispatcher.php +++ b/Dispatcher/Dispatcher.php @@ -6,7 +6,7 @@ * * @package phpOMS\Dispatcher * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\System\File\PathException; * Dispatcher class. * * @package phpOMS\Dispatcher - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -78,6 +78,9 @@ final class Dispatcher implements DispatcherInterface $controller = $controller['dest']; } + // Php void functions always return null. + // In a different language the Api functions would reguire a return type + // If null is returned (i.e. void functions) these get ignored later in the response renderer as null is not "rendered" if (\is_string($controller)) { $views += $this->dispatchString($controller, $data); } elseif (\is_array($controller)) { diff --git a/Dispatcher/DispatcherInterface.php b/Dispatcher/DispatcherInterface.php index c29a7ace5..2c314db70 100755 --- a/Dispatcher/DispatcherInterface.php +++ b/Dispatcher/DispatcherInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Dispatcher * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Dispatcher; * Dispatcher interface * * @package phpOMS\Dispatcher - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Event/EventManager.php b/Event/EventManager.php index 6e746d96e..ad2bcb29d 100755 --- a/Event/EventManager.php +++ b/Event/EventManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Event * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\Dispatcher\DispatcherInterface; * What happens after triggering an event (removing the callback, resetting the sub-conditions etc.) depends on the setup. * * @package phpOMS\Event - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Image/Kernel.php b/Image/Kernel.php index 5c16ddedd..9a829a283 100755 --- a/Image/Kernel.php +++ b/Image/Kernel.php @@ -6,7 +6,7 @@ * * @package phpOMS\Image * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Utils\NumericUtils; * Kernel - image sharpening/blurring * * @package phpOMS\Image - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Image/Skew.php b/Image/Skew.php index edf70c177..4ae1f3051 100755 --- a/Image/Skew.php +++ b/Image/Skew.php @@ -6,7 +6,7 @@ * * @package phpOMS\Image * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Image; * Skew image * * @package phpOMS\Image - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Image/Thresholding.php b/Image/Thresholding.php index ae15dd68b..d519769f1 100755 --- a/Image/Thresholding.php +++ b/Image/Thresholding.php @@ -6,7 +6,7 @@ * * @package phpOMS\Image * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Utils\ImageUtils; * Image thresholding * * @package phpOMS\Image - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/BaseStringL11n.php b/Localization/BaseStringL11n.php index 85c5c182a..7a7652b14 100644 --- a/Localization/BaseStringL11n.php +++ b/Localization/BaseStringL11n.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\ISO3166TwoEnum; * String l11n class. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/City.php b/Localization/Defaults/City.php index 32b1cce03..90f5bcd9c 100755 --- a/Localization/Defaults/City.php +++ b/Localization/Defaults/City.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * City class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/CityMapper.php b/Localization/Defaults/CityMapper.php index a2b20e2b1..15a95e6ba 100755 --- a/Localization/Defaults/CityMapper.php +++ b/Localization/Defaults/CityMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Mapper class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/Country.php b/Localization/Defaults/Country.php index 9f9c18f7f..517972458 100755 --- a/Localization/Defaults/Country.php +++ b/Localization/Defaults/Country.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * Country class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/CountryMapper.php b/Localization/Defaults/CountryMapper.php index 1260896aa..0f6704f0a 100755 --- a/Localization/Defaults/CountryMapper.php +++ b/Localization/Defaults/CountryMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Mapper class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/Currency.php b/Localization/Defaults/Currency.php index 0a4dba314..221b63c3c 100755 --- a/Localization/Defaults/Currency.php +++ b/Localization/Defaults/Currency.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * Currency class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/CurrencyMapper.php b/Localization/Defaults/CurrencyMapper.php index e0d5291bc..74371b036 100755 --- a/Localization/Defaults/CurrencyMapper.php +++ b/Localization/Defaults/CurrencyMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Mapper class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/Iban.php b/Localization/Defaults/Iban.php index dd3c59e0b..a027bf9f0 100755 --- a/Localization/Defaults/Iban.php +++ b/Localization/Defaults/Iban.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * iban class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/IbanMapper.php b/Localization/Defaults/IbanMapper.php index 4a0e08911..ce568b5d9 100755 --- a/Localization/Defaults/IbanMapper.php +++ b/Localization/Defaults/IbanMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Mapper class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/Language.php b/Localization/Defaults/Language.php index c443eec2a..3fd08a359 100755 --- a/Localization/Defaults/Language.php +++ b/Localization/Defaults/Language.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * Language class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/LanguageMapper.php b/Localization/Defaults/LanguageMapper.php index 49314d289..bf2380aef 100755 --- a/Localization/Defaults/LanguageMapper.php +++ b/Localization/Defaults/LanguageMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Mapper class. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/NullCity.php b/Localization/Defaults/NullCity.php index db0707130..a79a02334 100755 --- a/Localization/Defaults/NullCity.php +++ b/Localization/Defaults/NullCity.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * City. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/NullCountry.php b/Localization/Defaults/NullCountry.php index 3cee8c825..85b172605 100755 --- a/Localization/Defaults/NullCountry.php +++ b/Localization/Defaults/NullCountry.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * Country. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/NullCurrency.php b/Localization/Defaults/NullCurrency.php index 8f2eb88f9..ab25c7aa6 100755 --- a/Localization/Defaults/NullCurrency.php +++ b/Localization/Defaults/NullCurrency.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * Currency. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/NullIban.php b/Localization/Defaults/NullIban.php index f73b7b8be..e5435a3d3 100755 --- a/Localization/Defaults/NullIban.php +++ b/Localization/Defaults/NullIban.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * Iban. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Defaults/NullLanguage.php b/Localization/Defaults/NullLanguage.php index 1067f0b0f..71b83d042 100755 --- a/Localization/Defaults/NullLanguage.php +++ b/Localization/Defaults/NullLanguage.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization\Defaults * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization\Defaults; * Language. * * @package phpOMS\Localization\Defaults - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO3166CharEnum.php b/Localization/ISO3166CharEnum.php index d4c06c252..e2ecd0922 100755 --- a/Localization/ISO3166CharEnum.php +++ b/Localization/ISO3166CharEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Country codes ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -524,6 +524,8 @@ class ISO3166CharEnum extends Enum public const _ZWE = 'ZWE'; + public const _XXK = 'XXK'; + public const _XXX = 'XXX'; use ISO3166RegionTrait; diff --git a/Localization/ISO3166NameEnum.php b/Localization/ISO3166NameEnum.php index bd9992fe8..6eb569502 100755 --- a/Localization/ISO3166NameEnum.php +++ b/Localization/ISO3166NameEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Country names ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -524,7 +524,7 @@ class ISO3166NameEnum extends Enum public const _ZWE = 'Zimbabwe'; - public const _XKK = 'Kosovo'; + public const _XXK = 'Kosovo'; public const _XXX = 'XXX'; } diff --git a/Localization/ISO3166NumEnum.php b/Localization/ISO3166NumEnum.php index fae1664bd..c016a4118 100755 --- a/Localization/ISO3166NumEnum.php +++ b/Localization/ISO3166NumEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -17,10 +17,10 @@ namespace phpOMS\Localization; use phpOMS\Stdlib\Base\Enum; /** - * Country codes ISO list. + * Country codes ISO 3166-1 list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -524,6 +524,8 @@ class ISO3166NumEnum extends Enum public const _ZWE = '716'; + public const _XXK = '688'; // Same as Serbia, since there is no code for Kosovo + public const _XXX = '000'; use ISO3166RegionTrait; diff --git a/Localization/ISO3166RegionTrait.php b/Localization/ISO3166RegionTrait.php index 009637d3b..27d8a38e9 100644 --- a/Localization/ISO3166RegionTrait.php +++ b/Localization/ISO3166RegionTrait.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -14,8 +14,25 @@ declare(strict_types=1); namespace phpOMS\Localization; +/** + * ISO 3166 regional grouping + * + * @package phpOMS\Localization + * @license OMS License 2.0 + * @link https://jingga.app + * @since 1.0.0 + */ trait ISO3166RegionTrait { + /** + * Get countries in a region + * + * @param string $region Region name + * + * @return array + * + * @since 1.0.0 + */ public static function getRegion(string $region) : array { $region = \strtolower($region); @@ -85,7 +102,7 @@ trait ISO3166RegionTrait case 'south-europe': return [ self::_ALB, self::_AND, self::_BIH, self::_HRV, self::_GIB, - self::_GRC, self::_ITA, self::_XKK, self::_MLT, self::_MNE, + self::_GRC, self::_ITA, self::_XXK, self::_MLT, self::_MNE, self::_MKD, self::_PRT, self::_SMR, self::_SRB, self::_SVN, self::_ESP, self::_VAT, ]; diff --git a/Localization/ISO3166TwoEnum.php b/Localization/ISO3166TwoEnum.php index 8e2553663..e672e067c 100755 --- a/Localization/ISO3166TwoEnum.php +++ b/Localization/ISO3166TwoEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Country codes ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -524,7 +524,7 @@ class ISO3166TwoEnum extends Enum public const _ZWE = 'ZW'; - public const _XKK = 'XK'; + public const _XXK = 'XK'; public const _XXX = 'XX'; diff --git a/Localization/ISO4217CharEnum.php b/Localization/ISO4217CharEnum.php index 577bf28d2..6289f7daa 100755 --- a/Localization/ISO4217CharEnum.php +++ b/Localization/ISO4217CharEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Currency codes ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO4217DecimalEnum.php b/Localization/ISO4217DecimalEnum.php index e53480e06..194521ae2 100755 --- a/Localization/ISO4217DecimalEnum.php +++ b/Localization/ISO4217DecimalEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Currency decimals ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO4217Enum.php b/Localization/ISO4217Enum.php index 520e7dbb7..dd2a99446 100755 --- a/Localization/ISO4217Enum.php +++ b/Localization/ISO4217Enum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Currency names ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO4217NumEnum.php b/Localization/ISO4217NumEnum.php index 450e9266b..03e8be289 100755 --- a/Localization/ISO4217NumEnum.php +++ b/Localization/ISO4217NumEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Currency codes ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO4217SubUnitEnum.php b/Localization/ISO4217SubUnitEnum.php index 4cdd464a6..0ce007f69 100755 --- a/Localization/ISO4217SubUnitEnum.php +++ b/Localization/ISO4217SubUnitEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Currency sub units ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO4217SymbolEnum.php b/Localization/ISO4217SymbolEnum.php index 496e68d30..23871f1de 100755 --- a/Localization/ISO4217SymbolEnum.php +++ b/Localization/ISO4217SymbolEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Country symbols ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO639Enum.php b/Localization/ISO639Enum.php index 83e987148..d50518cdd 100755 --- a/Localization/ISO639Enum.php +++ b/Localization/ISO639Enum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Language name ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO639x1Enum.php b/Localization/ISO639x1Enum.php index 9499207f5..3cf845109 100755 --- a/Localization/ISO639x1Enum.php +++ b/Localization/ISO639x1Enum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Language codes ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO639x2Enum.php b/Localization/ISO639x2Enum.php index 50cbcaafd..e401c0965 100755 --- a/Localization/ISO639x2Enum.php +++ b/Localization/ISO639x2Enum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Language codes ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/ISO8601EnumArray.php b/Localization/ISO8601EnumArray.php index 9cf52b5d8..086de9f49 100755 --- a/Localization/ISO8601EnumArray.php +++ b/Localization/ISO8601EnumArray.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Stdlib\Base\EnumArray; * contain all plausible datetime strings. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/L11nManager.php b/Localization/L11nManager.php index 0deb2ade9..19996a480 100755 --- a/Localization/L11nManager.php +++ b/Localization/L11nManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Module\ModuleAbstract; * Localization class. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -36,24 +36,6 @@ final class L11nManager */ private array $language = []; - /** - * App Name. - * - * @var string - * @since 1.0.0 - */ - private string $appName; - - /** - * Construct. - * - * @since 1.0.0 - */ - public function __construct(string $appName) - { - $this->appName = $appName; - } - /** * Verify if language is loaded. * @@ -168,10 +150,10 @@ final class L11nManager /** * Get translation. * - * @param string $code Language code - * @param string $module Module name - * @param string $theme Theme - * @param string $translation Text + * @param string $code Language code + * @param string $module Module name + * @param string $theme Theme + * @param string $translation Text * * @return string In case the language element couldn't be found 'ERROR' will be returned * @@ -294,8 +276,8 @@ final class L11nManager } } - $money = new Money( - (int) ($currency / $divide), + $money = new Money((int) ($currency / $divide)); + $money->setLocalization( $l11n->getThousands(), $l11n->getDecimal(), $symbol, diff --git a/Localization/LanguageDetection/Language.php b/Localization/LanguageDetection/Language.php index 42287fbdb..d87d399d3 100644 --- a/Localization/LanguageDetection/Language.php +++ b/Localization/LanguageDetection/Language.php @@ -1,52 +1,65 @@ + * @copyright Patrick Schur + * @license https://opensource.org/licenses/mit-license.html MIT + * @link https://github.com/patrickschur/language-detection + */ declare(strict_types = 1); namespace phpOMS\Localization\LanguageDetection; /** - * Class Language + * Langauge detection class * - * @copyright Patrick Schur + * @package phpOMS\Localization\LanguageDetection * @license https://opensource.org/licenses/mit-license.html MIT - * @author Patrick Schur - * @package LanguageDetection + * @link https://github.com/patrickschur/language-detection + * @since 1.0.0 */ class Language extends NgramParser { /** + * Tokens + * * @var array + * @since 1.0.0 */ - protected $tokens = []; + protected array $tokens = []; /** - * Loads all language files + * Constructor. * - * @param array $lang List of ISO 639-1 codes, that should be used in the detection phase + * @param array $lang List of ISO 639-1 codes, that should be used in the detection phase * @param string $dirname Name of the directory where the translations files are located + * + * @since 1.0.0 */ public function __construct(array $lang = [], string $dirname = '') { - if (empty($dirname)) - { + if (empty($dirname)) { $dirname = __DIR__ . '/resources/*/*.php'; - } - else if (!\is_dir($dirname) || !\is_readable($dirname)) - { + } elseif (!\is_dir($dirname) || !\is_readable($dirname)) { throw new \InvalidArgumentException('Provided directory could not be found or is not readable'); - } - else - { - $dirname = \rtrim($dirname, '/'); + } else { + $dirname = \rtrim($dirname, '/'); $dirname .= '/*/*.php'; } $isEmpty = empty($lang); - foreach (\glob($dirname) as $file) - { - if ($isEmpty || \in_array(\basename($file, '.php'), $lang)) - { + $files = \glob($dirname); + if ($files === false) { + $files = []; + } + + foreach ($files as $file) { + if ($isEmpty || \in_array(\basename($file, '.php'), $lang)) { $this->tokens += require $file; } } @@ -55,30 +68,28 @@ class Language extends NgramParser /** * Detects the language from a given text string * - * @param string $str + * @param string $str String to use for detection + * * @return LanguageResult + * + * @since 1.0.0 */ public function detect(string $str): LanguageResult { - $str = \mb_strtolower($str); - + $str = \mb_strtolower($str); $samples = $this->getNgrams($str); + $result = []; - $result = []; - - if (\count($samples) > 0) - { - foreach ($this->tokens as $lang => $value) - { - $index = $sum = 0; + if (\count($samples) > 0) { + foreach ($this->tokens as $lang => $value) { + $index = 0; + $sum = 0; $value = \array_flip($value); - foreach ($samples as $v) - { - if (isset($value[$v])) - { - $x = $index++ - $value[$v]; - $y = $x >> (PHP_INT_SIZE * 8); + foreach ($samples as $v) { + if (isset($value[$v])) { + $x = $index++ - $value[$v]; + $y = $x >> (\PHP_INT_SIZE * 8); $sum += ($x + $y) ^ $y; continue; } @@ -90,7 +101,7 @@ class Language extends NgramParser $result[$lang] = 1 - ($sum / ($this->maxNgrams * $index)); } - \arsort($result, SORT_NUMERIC); + \arsort($result, \SORT_NUMERIC); } return new LanguageResult($result); diff --git a/Localization/LanguageDetection/LanguageResult.php b/Localization/LanguageDetection/LanguageResult.php index b85096c7e..4b3856bc2 100644 --- a/Localization/LanguageDetection/LanguageResult.php +++ b/Localization/LanguageDetection/LanguageResult.php @@ -1,29 +1,51 @@ + * @copyright Patrick Schur + * @license https://opensource.org/licenses/mit-license.html MIT + * @link https://github.com/patrickschur/language-detection + */ declare(strict_types = 1); namespace phpOMS\Localization\LanguageDetection; /** - * Class LanguageResult + * Langauge match result * - * @copyright Patrick Schur + * @package phpOMS\Localization\LanguageDetection * @license https://opensource.org/licenses/mit-license.html MIT - * @author Patrick Schur - * @package LanguageDetection + * @link https://github.com/patrickschur/language-detection + * @since 1.0.0 */ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAccess { - const THRESHOLD = .025; - /** - * @var array + * Match threshold + * + * @var int + * @since 1.0.0 */ - private $result = []; + private const THRESHOLD = .025; /** - * LanguageResult constructor. - * @param array $result + * Match values per language + * + * @var float[] + * @sicne 1.0.0 + */ + private array $result = []; + + /** + * Constructor. + * + * @param array $result Langauge match results + * + * @since 1.0.0 */ public function __construct(array $result = []) { @@ -31,8 +53,7 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @param mixed $offset - * @return bool + * {@inheritdoc} */ public function offsetExists($offset): bool { @@ -40,8 +61,7 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @param mixed $offset - * @return mixed|null + * {@inheritdoc} */ public function offsetGet($offset): ?float { @@ -49,9 +69,7 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @param mixed $offset - * @param mixed $value - * @return void + * {@inheritdoc} */ public function offsetSet($offset, $value): void { @@ -63,7 +81,7 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @param mixed $offset + * {@inheritdoc} */ public function offsetUnset($offset): void { @@ -71,7 +89,7 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @return array + * {@inheritdoc} */ public function jsonSerialize(): array { @@ -79,7 +97,11 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** + * Stringify + * * @return string + * + * @since 1.0.0 */ public function __toString(): string { @@ -87,8 +109,13 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @param \string[] ...$whitelist + * Only return whitelisted results + * + * @param \string[] ...$whitelist List of whitelisted languages + * * @return LanguageResult + * + * @since 1.0.0 */ public function whitelist(string ...$whitelist): LanguageResult { @@ -96,8 +123,13 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @param \string[] ...$blacklist + * Remove blacklisted languages + * + * @param \string[] ...$blacklist List of blacklist languages + * * @return LanguageResult + * + * @since 1.0.0 */ public function blacklist(string ...$blacklist): LanguageResult { @@ -105,7 +137,11 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** + * Get languages results + * * @return array + * + * @since 1.0.0 */ public function close(): array { @@ -113,12 +149,15 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** + * Get results based on internally defined threshold + * * @return LanguageResult + * + * @since 1.0.0 */ public function bestResults(): LanguageResult { - if (!\count($this->result)) - { + if (!\count($this->result)) { return new LanguageResult; } @@ -130,7 +169,7 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @return \ArrayIterator + * {@inheritdoc} */ public function getIterator(): \ArrayIterator { @@ -138,9 +177,14 @@ class LanguageResult implements \JsonSerializable, \IteratorAggregate, \ArrayAcc } /** - * @param int $offset - * @param int|null $length + * Get results A to B + * + * @param int $offset Zero indexed start value + * @param null|int $length Number of results + * * @return LanguageResult + * + * @since 1.0.0 */ public function limit(int $offset, int $length = null): LanguageResult { diff --git a/Localization/LanguageDetection/NgramParser.php b/Localization/LanguageDetection/NgramParser.php index c2a45b132..878923eb8 100644 --- a/Localization/LanguageDetection/NgramParser.php +++ b/Localization/LanguageDetection/NgramParser.php @@ -1,102 +1,75 @@ + * @copyright Patrick Schur + * @license https://opensource.org/licenses/mit-license.html MIT + * @link https://github.com/patrickschur/language-detection + */ declare(strict_types = 1); namespace phpOMS\Localization\LanguageDetection; -use phpOMS\Localization\LanguageDetection\Tokenizer\TokenizerInterface; use phpOMS\Localization\LanguageDetection\Tokenizer\WhitespaceTokenizer; /** - * Class NgramParser + * Ngram parser class * - * @copyright Patrick Schur + * @package phpOMS\Localization\LanguageDetection * @license https://opensource.org/licenses/mit-license.html MIT - * @author Patrick Schur - * @package LanguageDetection + * @link https://github.com/patrickschur/language-detection + * @since 1.0.0 */ abstract class NgramParser { /** - * @var int - */ - protected $minLength = 1; - - /** - * @var int - */ - protected $maxLength = 3; - - /** - * @var int - */ - protected $maxNgrams = 310; - - /** - * @var TokenizerInterface - */ - protected $tokenizer = null; - - /** - * @param int $minLength - * @throws \LengthException - */ - public function setMinLength(int $minLength) - { - if ($minLength <= 0 || $minLength >= $this->maxLength) - { - throw new \LengthException('$minLength must be greater than zero and less than $this->maxLength.'); - } - - $this->minLength = $minLength; - } - - /** - * @param int $maxLength - * @throws \LengthException - */ - public function setMaxLength(int $maxLength) - { - if ($maxLength <= $this->minLength) - { - throw new \LengthException('$maxLength must be greater than $this->minLength.'); - } - - $this->maxLength = $maxLength; - } - - /** - * @param int $maxNgrams - * @throws \LengthException - */ - public function setMaxNgrams(int $maxNgrams) - { - if ($maxNgrams <= 0) - { - throw new \LengthException('$maxNgrams must be greater than zero.'); - } - - $this->maxNgrams = $maxNgrams; - } - - /** - * Sets the tokenizer + * Minimum length * - * @param TokenizerInterface $tokenizer + * @var int + * @since 1.0.0 */ - public function setTokenizer(TokenizerInterface $tokenizer) - { - $this->tokenizer = $tokenizer; - } + public int $minLength = 1; /** - * @param string $str - * @return array + * Maximum length + * + * @var int + * @since 1.0.0 */ - private function tokenize(string $str) + public int $maxLength = 3; + + /** + * Maximum amount of ngrams + * + * @var int + * @since 1.0.0 + */ + public int $maxNgrams = 310; + + /** + * Tokenizer to use + * + * @var null|WhitespaceTokenizer + * @since 1.0.0 + */ + public ?WhitespaceTokenizer $tokenizer = null; + + /** + * Tokenize string + * + * @param string $str String to tokenize + * + * @return array + * + * @since 1.0.0 + */ + private function tokenize(string $str) : array { - if (null === $this->tokenizer) - { + if ($this->tokenizer === null) { $this->tokenizer = new WhitespaceTokenizer(); } @@ -104,39 +77,38 @@ abstract class NgramParser } /** - * @param string $str + * Get ngrams + * + * @param string $str String to parse + * * @return array + * + * @since 1.0.0 */ protected function getNgrams(string $str): array { $tokens = []; - foreach ($this->tokenize($str) as $word) - { - $l = \mb_strlen($word); + foreach ($this->tokenize($str) as $word) { + $l = \mb_strlen($word); $tmp = 0; - for ($i = $this->minLength; $i <= $this->maxLength; ++$i) - { - for ($j = 0; ($i + $j - 1) < $l; ++$j, ++$tmp) - { + for ($i = $this->minLength; $i <= $this->maxLength; ++$i) { + for ($j = 0; ($i + $j - 1) < $l; ++$j, ++$tmp) { $tmp = &$tokens[$i][\mb_substr($word, $j, $i)]; } } } - foreach ($tokens as $i => $token) - { + foreach ($tokens as $i => $token) { $sum = \array_sum($token); - foreach ($token as $j => $value) - { + foreach ($token as $j => $value) { $tokens[$i][$j] = $value / $sum; } } - if (!\count($tokens)) - { + if (!\count($tokens)) { return []; } diff --git a/Localization/LanguageDetection/Tokenizer/TokenizerInterface.php b/Localization/LanguageDetection/Tokenizer/TokenizerInterface.php deleted file mode 100644 index 2909b1a75..000000000 --- a/Localization/LanguageDetection/Tokenizer/TokenizerInterface.php +++ /dev/null @@ -1,18 +0,0 @@ - - * @package LanguageDetection - */ -interface TokenizerInterface -{ - public function tokenize(string $str): array; -} \ No newline at end of file diff --git a/Localization/LanguageDetection/Tokenizer/WhitespaceTokenizer.php b/Localization/LanguageDetection/Tokenizer/WhitespaceTokenizer.php index 794b70139..722a10ca0 100644 --- a/Localization/LanguageDetection/Tokenizer/WhitespaceTokenizer.php +++ b/Localization/LanguageDetection/Tokenizer/WhitespaceTokenizer.php @@ -1,29 +1,45 @@ + * @copyright Patrick Schur + * @license https://opensource.org/licenses/mit-license.html MIT + * @link https://github.com/patrickschur/language-detection + */ declare(strict_types = 1); namespace phpOMS\Localization\LanguageDetection\Tokenizer; /** - * Class WhitespaceTokenizer + * Whitespace tokenizer * - * @copyright Patrick Schur + * @package phpOMS\Localization\LanguageDetection\Tokenizer * @license https://opensource.org/licenses/mit-license.html MIT - * @author Patrick Schur - * @package LanguageDetection + * @link https://github.com/patrickschur/language-detection + * @since 1.0.0 */ -class WhitespaceTokenizer implements TokenizerInterface +class WhitespaceTokenizer { /** - * @param string $str + * Tokenize string + * + * @param string $str String to tokenize + * * @return array + * + * @since 1.0.0 */ public function tokenize(string $str): array { - return \array_map(function ($word) { + return \array_map( + function ($word) { return "_{$word}_"; }, \preg_split('/[^\pL]+(? + * @copyright Patrick Schur + * @license https://opensource.org/licenses/mit-license.html MIT + * @link https://github.com/patrickschur/language-detection + */ declare(strict_types = 1); namespace phpOMS\Localization\LanguageDetection; /** - * Class Trainer + * Langauge training class * - * @copyright Patrick Schur + * @package phpOMS\Localization\LanguageDetection * @license https://opensource.org/licenses/mit-license.html MIT - * @author Patrick Schur - * @package LanguageDetection + * @link https://github.com/patrickschur/language-detection + * @since 1.0.0 */ class Trainer extends NgramParser { @@ -18,28 +28,30 @@ class Trainer extends NgramParser * Generates language profiles for all language files * * @param string $dirname Name of the directory where the translations files are located + * * @return void + * + * @since 1.0.0 */ public function learn(string $dirname = '') { - if (empty($dirname)) - { + if (empty($dirname)) { $dirname = __DIR__ . '/resources/*/*.txt'; - } - else if (!\is_dir($dirname) || !\is_readable($dirname)) - { + } elseif (!\is_dir($dirname) || !\is_readable($dirname)) { throw new \InvalidArgumentException('Provided directory could not be found or is not readable'); - } - else - { - $dirname = \rtrim($dirname, '/'); + } else { + $dirname = \rtrim($dirname, '/'); $dirname .= '/*/*.txt'; } /** @var \GlobIterator $txt */ - foreach (new \GlobIterator($dirname) as $txt) - { - $content = \mb_strtolower(\file_get_contents($txt->getPathname())); + foreach (new \GlobIterator($dirname) as $txt) { + $content = \file_get_contents($txt->getPathname()); + if ($content === false) { + break; + } + + $content = \mb_strtolower($content); \file_put_contents( \substr_replace($txt->getPathname(), 'php', -3), diff --git a/Localization/LegalEntityType.php b/Localization/LegalEntityType.php index 5b38c630e..51ee80b16 100755 --- a/Localization/LegalEntityType.php +++ b/Localization/LegalEntityType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Legal entity types. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Localization.php b/Localization/Localization.php index 8749d9140..7e58e65a2 100755 --- a/Localization/Localization.php +++ b/Localization/Localization.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Utils\Converter\TemperatureType; * Localization class. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/Money.php b/Localization/Money.php index fc4ada6d1..76dc71f7b 100755 --- a/Localization/Money.php +++ b/Localization/Money.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\FloatInt; * Money class. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -42,22 +42,6 @@ final class Money extends FloatInt */ private string $symbol = ISO4217SymbolEnum::_USD; - /** - * Constructor. - * - * @param int|float|string $value Value - * @param string $thousands Thousands separator - * @param string $decimal Decimal separator - * @param string $symbol Currency symbol - * @param int $position Symbol position - * - * @since 1.0.0 - */ - public function __construct(int | float | string $value = 0, string $thousands = ',', string $decimal = '.') - { - parent::__construct($value, $thousands, $decimal); - } - /** * Set localization. * @@ -93,7 +77,7 @@ final class Money extends FloatInt { return (($position ?? $this->position) === 0 && !empty($symbol ?? $this->symbol) ? ($symbol ?? $this->symbol) . ' ' : '' ) . $this->getAmount($decimals) - . (($position ?? $this->position) === 1 && !empty($symbol ?? $this->symbol) ? ' ' . ($smbol ?? $this->symbol) : ''); + . (($position ?? $this->position) === 1 && !empty($symbol ?? $this->symbol) ? ' ' . ($symbol ?? $this->symbol) : ''); } /** diff --git a/Localization/NullBaseStringL11n.php b/Localization/NullBaseStringL11n.php index b25f607d0..c0cd988e7 100644 --- a/Localization/NullBaseStringL11n.php +++ b/Localization/NullBaseStringL11n.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization; * Null model * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/NullLocalization.php b/Localization/NullLocalization.php index 131eee5b5..1e9afe8b6 100755 --- a/Localization/NullLocalization.php +++ b/Localization/NullLocalization.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Localization; * Localization. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/PhoneEnum.php b/Localization/PhoneEnum.php index d64ecb73a..1d1ee516b 100755 --- a/Localization/PhoneEnum.php +++ b/Localization/PhoneEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Country codes ISO list. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Localization/TimeZoneEnumArray.php b/Localization/TimeZoneEnumArray.php index ade27f510..16acfb24d 100755 --- a/Localization/TimeZoneEnumArray.php +++ b/Localization/TimeZoneEnumArray.php @@ -6,7 +6,7 @@ * * @package phpOMS\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\EnumArray; * PHP Time zones. * * @package phpOMS\Localization - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Log/FileLogger.php b/Log/FileLogger.php index cdc24a6f1..7be384019 100755 --- a/Log/FileLogger.php +++ b/Log/FileLogger.php @@ -6,7 +6,7 @@ * * @package phpOMS\Log * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\System\File\Local\File; * Logging class. * * @package phpOMS\Log - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Log/LogLevel.php b/Log/LogLevel.php index 0bd44e144..b81aeb4f3 100755 --- a/Log/LogLevel.php +++ b/Log/LogLevel.php @@ -6,7 +6,7 @@ * * @package phpOMS\Log * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Log level enum. * * @package phpOMS\Log - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Log/LoggerInterface.php b/Log/LoggerInterface.php index 03d76902d..4f4caddcd 100755 --- a/Log/LoggerInterface.php +++ b/Log/LoggerInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Log * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Log; * Logging interface. * * @package phpOMS\Log - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Exception/ZeroDivisionException.php b/Math/Exception/ZeroDivisionException.php index 82d766c73..b70a08391 100755 --- a/Math/Exception/ZeroDivisionException.php +++ b/Math/Exception/ZeroDivisionException.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Exception; * Zero division exception. * * @package phpOMS\Math\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Functions/Beta.php b/Math/Functions/Beta.php index b530a3e80..764fc9039 100755 --- a/Math/Functions/Beta.php +++ b/Math/Functions/Beta.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Functions * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Functions; * Beta function * * @package phpOMS\Math\Functions - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Functions/Fibonacci.php b/Math/Functions/Fibonacci.php index 3c2f9664c..231bfe3db 100755 --- a/Math/Functions/Fibonacci.php +++ b/Math/Functions/Fibonacci.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Functions * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Number\Numbers; * Well known functions class. * * @package phpOMS\Math\Functions - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Functions/Functions.php b/Math/Functions/Functions.php index 8bd13e090..6b66f3973 100755 --- a/Math/Functions/Functions.php +++ b/Math/Functions/Functions.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Functions * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Functions; * Well known functions and helpers class. * * @package phpOMS\Math\Functions - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Functions/Gamma.php b/Math/Functions/Gamma.php index fa868dcc7..dd73911c3 100755 --- a/Math/Functions/Gamma.php +++ b/Math/Functions/Gamma.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Functions * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Functions; * Gamma function * * @package phpOMS\Math\Functions - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/ConvexHull/MonotoneChain.php b/Math/Geometry/ConvexHull/MonotoneChain.php index 0f4cb6039..ae0460657 100755 --- a/Math/Geometry/ConvexHull/MonotoneChain.php +++ b/Math/Geometry/ConvexHull/MonotoneChain.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\ConvexHull * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\ConvexHull; * Andrew's monotone chain convex hull algorithm class. * * @package phpOMS\Math\Geometry\ConvexHull - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/Circle.php b/Math/Geometry/Shape/D2/Circle.php index 211bdb2a6..fbdbec4e6 100755 --- a/Math/Geometry/Shape/D2/Circle.php +++ b/Math/Geometry/Shape/D2/Circle.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D2 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D2; * Circle shape. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/D2ShapeInterface.php b/Math/Geometry/Shape/D2/D2ShapeInterface.php index 18f6ef3f7..024c06f4d 100755 --- a/Math/Geometry/Shape/D2/D2ShapeInterface.php +++ b/Math/Geometry/Shape/D2/D2ShapeInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D2 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Geometry\Shape\ShapeInterface; * Shape interface. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/Ellipse.php b/Math/Geometry/Shape/D2/Ellipse.php index 8a26fcd20..e6933197e 100755 --- a/Math/Geometry/Shape/D2/Ellipse.php +++ b/Math/Geometry/Shape/D2/Ellipse.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D2 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D2; * Ellipse shape. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/Polygon.php b/Math/Geometry/Shape/D2/Polygon.php index 0a6d3b879..9bdefadeb 100755 --- a/Math/Geometry/Shape/D2/Polygon.php +++ b/Math/Geometry/Shape/D2/Polygon.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D2 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D2; * Polygon class. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/Quadrilateral.php b/Math/Geometry/Shape/D2/Quadrilateral.php index b408a8b20..804fbaaae 100755 --- a/Math/Geometry/Shape/D2/Quadrilateral.php +++ b/Math/Geometry/Shape/D2/Quadrilateral.php @@ -6,7 +6,7 @@ * * @package TBD * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D2; * Quadrilateral shape. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/Rectangle.php b/Math/Geometry/Shape/D2/Rectangle.php index aa408e78a..ddde1b7ac 100755 --- a/Math/Geometry/Shape/D2/Rectangle.php +++ b/Math/Geometry/Shape/D2/Rectangle.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D2 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D2; * Rectangle shape. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/Trapezoid.php b/Math/Geometry/Shape/D2/Trapezoid.php index c438455d7..f1bcd87d1 100755 --- a/Math/Geometry/Shape/D2/Trapezoid.php +++ b/Math/Geometry/Shape/D2/Trapezoid.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D2 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D2; * Trapezoid shape. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D2/Triangle.php b/Math/Geometry/Shape/D2/Triangle.php index f8b9ddd8a..563a93aed 100755 --- a/Math/Geometry/Shape/D2/Triangle.php +++ b/Math/Geometry/Shape/D2/Triangle.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D2 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D2; * Triangle shape. * * @package phpOMS\Math\Geometry\Shape\D2 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/Cone.php b/Math/Geometry/Shape/D3/Cone.php index 009901320..d37fa17a2 100755 --- a/Math/Geometry/Shape/D3/Cone.php +++ b/Math/Geometry/Shape/D3/Cone.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D3; * Cone shape. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/Cuboid.php b/Math/Geometry/Shape/D3/Cuboid.php index 75f3fa083..f7c31a0fd 100755 --- a/Math/Geometry/Shape/D3/Cuboid.php +++ b/Math/Geometry/Shape/D3/Cuboid.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D3; * Cuboid shape. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/Cylinder.php b/Math/Geometry/Shape/D3/Cylinder.php index 74d47cf7b..dfde9e2ff 100755 --- a/Math/Geometry/Shape/D3/Cylinder.php +++ b/Math/Geometry/Shape/D3/Cylinder.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D3; * Cylinder shape. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/D3ShapeInterface.php b/Math/Geometry/Shape/D3/D3ShapeInterface.php index 7339e2e98..0909dacb4 100755 --- a/Math/Geometry/Shape/D3/D3ShapeInterface.php +++ b/Math/Geometry/Shape/D3/D3ShapeInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Geometry\Shape\ShapeInterface; * Shape interface. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/Prism.php b/Math/Geometry/Shape/D3/Prism.php index 6600cd352..ecd5a031f 100755 --- a/Math/Geometry/Shape/D3/Prism.php +++ b/Math/Geometry/Shape/D3/Prism.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Geometry\Shape\D2\Polygon; * Prism shape. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/RectangularPyramid.php b/Math/Geometry/Shape/D3/RectangularPyramid.php index 38768c040..877886eb5 100755 --- a/Math/Geometry/Shape/D3/RectangularPyramid.php +++ b/Math/Geometry/Shape/D3/RectangularPyramid.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D3; * Rectangular pyramid shape. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/Sphere.php b/Math/Geometry/Shape/D3/Sphere.php index 602a6d78f..6745b3966 100755 --- a/Math/Geometry/Shape/D3/Sphere.php +++ b/Math/Geometry/Shape/D3/Sphere.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D3; * Sphere shape. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/D3/Tetrahedron.php b/Math/Geometry/Shape/D3/Tetrahedron.php index 34cc91678..ed292ff62 100755 --- a/Math/Geometry/Shape/D3/Tetrahedron.php +++ b/Math/Geometry/Shape/D3/Tetrahedron.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape\D3 * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape\D3; * Tetraedron shape. * * @package phpOMS\Math\Geometry\Shape\D3 - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Geometry/Shape/ShapeInterface.php b/Math/Geometry/Shape/ShapeInterface.php index 46015cf5e..cf9d82ead 100755 --- a/Math/Geometry/Shape/ShapeInterface.php +++ b/Math/Geometry/Shape/ShapeInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Geometry\Shape * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Geometry\Shape; * Shape interface. * * @package phpOMS\Math\Geometry\Shape - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Matrix/CholeskyDecomposition.php b/Math/Matrix/CholeskyDecomposition.php index 6d9ce07d1..9917b30e7 100755 --- a/Math/Matrix/CholeskyDecomposition.php +++ b/Math/Matrix/CholeskyDecomposition.php @@ -7,7 +7,7 @@ * @package phpOMS\Math\Matrix * @copyright Dennis Eichhorn * @copyright JAMA - https://math.nist.gov/javanumerics/jama/ - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * A is syymetric, positive definite then A = L*L' * * @package phpOMS\Math\Matrix - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Matrix/EigenvalueDecomposition.php b/Math/Matrix/EigenvalueDecomposition.php index 86be6ebc5..6defd089f 100755 --- a/Math/Matrix/EigenvalueDecomposition.php +++ b/Math/Matrix/EigenvalueDecomposition.php @@ -7,7 +7,7 @@ * @package phpOMS\Math\Matrix * @copyright Dennis Eichhorn * @copyright JAMA - https://math.nist.gov/javanumerics/jama/ - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Math\Geometry\Shape\D2\Triangle; * A not symmetric then (potentially) A = V*D*inverse(V) * * @package phpOMS\Math\Matrix - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Matrix/Exception/InvalidDimensionException.php b/Math/Matrix/Exception/InvalidDimensionException.php index 2cf5ff47b..9c94546a3 100755 --- a/Math/Matrix/Exception/InvalidDimensionException.php +++ b/Math/Matrix/Exception/InvalidDimensionException.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Matrix\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Matrix\Exception; * Zero devision exception. * * @package phpOMS\Math\Matrix\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Matrix/IdentityMatrix.php b/Math/Matrix/IdentityMatrix.php index 59d307663..435747bda 100755 --- a/Math/Matrix/IdentityMatrix.php +++ b/Math/Matrix/IdentityMatrix.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Matrix * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Matrix; * Identity Matrix * * @package phpOMS\Math\Matrix - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Matrix/LUDecomposition.php b/Math/Matrix/LUDecomposition.php index 29e4dd6cc..052216a3f 100755 --- a/Math/Matrix/LUDecomposition.php +++ b/Math/Matrix/LUDecomposition.php @@ -7,7 +7,7 @@ * @package phpOMS\Math\Matrix * @copyright Dennis Eichhorn * @copyright JAMA - https://math.nist.gov/javanumerics/jama/ - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * A(piv,:) = L*U * * @package phpOMS\Math\Matrix - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Matrix/Matrix.php b/Math/Matrix/Matrix.php index 3b93f7102..43d9d6fb1 100755 --- a/Math/Matrix/Matrix.php +++ b/Math/Matrix/Matrix.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Matrix * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Matrix class * * @package phpOMS\Math\Matrix - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Math/Matrix/QRDecomposition.php b/Math/Matrix/QRDecomposition.php index bb60d9771..7e4221e6d 100755 --- a/Math/Matrix/QRDecomposition.php +++ b/Math/Matrix/QRDecomposition.php @@ -7,7 +7,7 @@ * @package phpOMS\Math\Matrix * @copyright Dennis Eichhorn * @copyright JAMA - https://math.nist.gov/javanumerics/jama/ - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * For every matrix A = Q*R * * @package phpOMS\Math\Matrix - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Matrix/Vector.php b/Math/Matrix/Vector.php index be481a597..a2a1a4c20 100755 --- a/Math/Matrix/Vector.php +++ b/Math/Matrix/Vector.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Matrix * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Matrix; * Vector class * * @package phpOMS\Math\Matrix - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Number/Complex.php b/Math/Number/Complex.php index 9b4ecd29e..18c9aaf6c 100755 --- a/Math/Number/Complex.php +++ b/Math/Number/Complex.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Number * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Number; * Complex number class. * * @package phpOMS\Math\Number - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Number/Integer.php b/Math/Number/Integer.php index f98153583..02ac9bc32 100755 --- a/Math/Number/Integer.php +++ b/Math/Number/Integer.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Number * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Number; * Integer class * * @package phpOMS\Math\Number - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Number/Natural.php b/Math/Number/Natural.php index 728ffccfd..9276b904f 100755 --- a/Math/Number/Natural.php +++ b/Math/Number/Natural.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Number * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Number; * Natura number class * * @package phpOMS\Math\Number - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Number/NumberType.php b/Math/Number/NumberType.php index 13844232b..50e3bca96 100755 --- a/Math/Number/NumberType.php +++ b/Math/Number/NumberType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Number * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Number type enum. * * @package phpOMS\Math\Number - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Number/Numbers.php b/Math/Number/Numbers.php index 72bb3d046..2abce63ff 100755 --- a/Math/Number/Numbers.php +++ b/Math/Number/Numbers.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Number * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Number; * Numbers class. * * @package phpOMS\Math\Number - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Number/OperationInterface.php b/Math/Number/OperationInterface.php index 4300c57ed..7ef207a49 100755 --- a/Math/Number/OperationInterface.php +++ b/Math/Number/OperationInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Number * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Number; * Basic operation interface. * * @package phpOMS\Math\Number - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Number/Prime.php b/Math/Number/Prime.php index 3f930468b..c55dec5c2 100755 --- a/Math/Number/Prime.php +++ b/Math/Number/Prime.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Number * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Number; * Well known functions class. * * @package phpOMS\Math\Number - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Numerics/Integration.php b/Math/Numerics/Integration.php index 9ea3af484..6b3a64edd 100755 --- a/Math/Numerics/Integration.php +++ b/Math/Numerics/Integration.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Numerics * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -19,7 +19,7 @@ namespace phpOMS\Math\Numerics; * Numerical integration. * * @package phpOMS\Math\Numerics - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Numerics/Interpolation/CubicSplineInterpolation.php b/Math/Numerics/Interpolation/CubicSplineInterpolation.php index 0b2510a5a..3d5cdd127 100755 --- a/Math/Numerics/Interpolation/CubicSplineInterpolation.php +++ b/Math/Numerics/Interpolation/CubicSplineInterpolation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Numerics\Interpolation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Matrix\Vector; * Cubic spline interpolation. * * @package phpOMS\Math\Numerics\Interpolation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Numerics/Interpolation/DerivativeType.php b/Math/Numerics/Interpolation/DerivativeType.php index 0ea4b43b5..a7a3c3b82 100755 --- a/Math/Numerics/Interpolation/DerivativeType.php +++ b/Math/Numerics/Interpolation/DerivativeType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Numerics\Interpolation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Derivative type enum. * * @package phpOMS\Math\Numerics\Interpolation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Numerics/Interpolation/InterpolationInterface.php b/Math/Numerics/Interpolation/InterpolationInterface.php index 4d66ed8bd..a894e136a 100755 --- a/Math/Numerics/Interpolation/InterpolationInterface.php +++ b/Math/Numerics/Interpolation/InterpolationInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Numerics\Interpolation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Numerics\Interpolation; * Interpolation interface. * * @package phpOMS\Math\Numerics\Interpolation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Numerics/Interpolation/LagrangeInterpolation.php b/Math/Numerics/Interpolation/LagrangeInterpolation.php index c94c4d9ab..342b3277c 100755 --- a/Math/Numerics/Interpolation/LagrangeInterpolation.php +++ b/Math/Numerics/Interpolation/LagrangeInterpolation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Numerics\Interpolation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Numerics\Interpolation; * Lagrange spline interpolation. * * @package phpOMS\Math\Numerics\Interpolation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Numerics/Interpolation/LinearInterpolation.php b/Math/Numerics/Interpolation/LinearInterpolation.php index c923444f9..27d804db3 100755 --- a/Math/Numerics/Interpolation/LinearInterpolation.php +++ b/Math/Numerics/Interpolation/LinearInterpolation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Numerics\Interpolation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Vector; * Linear spline interpolation. * * @package phpOMS\Math\Numerics\Interpolation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Parser/Evaluator.php b/Math/Parser/Evaluator.php index 15ece64c4..540069786 100755 --- a/Math/Parser/Evaluator.php +++ b/Math/Parser/Evaluator.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Parser * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Parser; * Basic math function evaluation. * * @package phpOMS\Math\Parser - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Average.php b/Math/Statistic/Average.php index c4fa13c7b..4738b8df5 100755 --- a/Math/Statistic/Average.php +++ b/Math/Statistic/Average.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Average class. * * @package phpOMS\Math\Statistic - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Basic.php b/Math/Statistic/Basic.php index 7f8d8401b..3d9c7e2b9 100755 --- a/Math/Statistic/Basic.php +++ b/Math/Statistic/Basic.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Statistic; * Basic statistic functions. * * @package phpOMS\Math\Statistic - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -50,7 +50,7 @@ final class Basic $freaquency = []; $sum = 1; - if (!($isArray = \is_array(\reset($values)))) { + if (!(\is_array(\reset($values)))) { $sum = \array_sum($values); } diff --git a/Math/Statistic/Correlation.php b/Math/Statistic/Correlation.php index d6b560408..862757b9e 100755 --- a/Math/Statistic/Correlation.php +++ b/Math/Statistic/Correlation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Statistic; * Correlation. * * @package phpOMS\Math\Statistic - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/ARIMA/ARIMA.php b/Math/Statistic/Forecast/ARIMA/ARIMA.php new file mode 100644 index 000000000..e69de29bb diff --git a/Math/Statistic/Forecast/ARIMA/SARIMA.php b/Math/Statistic/Forecast/ARIMA/SARIMA.php new file mode 100644 index 000000000..81faef502 --- /dev/null +++ b/Math/Statistic/Forecast/ARIMA/SARIMA.php @@ -0,0 +1,5 @@ + 0) { + $seasonalIndex[$i] /= $count; + $seasonalIndex[$i] /= $avg; + } + } + + // Forecast the next periods + $forecast = []; + for ($i = 1; $i <= $periods; $i++) { + $seasonalMultiplier = $seasonalIndex[($i - 1) % $seasonality]; + $forecast[] = $avg * $seasonalMultiplier + ($stdDeviation * $i); + } + + return $forecast; + } } diff --git a/Math/Statistic/Forecast/GradientBoostingMachines.php b/Math/Statistic/Forecast/GradientBoostingMachines.php new file mode 100644 index 000000000..e69de29bb diff --git a/Math/Statistic/Forecast/LongShortTermMemoryNetworks.php b/Math/Statistic/Forecast/LongShortTermMemoryNetworks.php new file mode 100644 index 000000000..e69de29bb diff --git a/Math/Statistic/Forecast/Prophet.php b/Math/Statistic/Forecast/Prophet.php new file mode 100644 index 000000000..e69de29bb diff --git a/Math/Statistic/Forecast/Regression/LevelLevelRegression.php b/Math/Statistic/Forecast/Regression/LevelLevelRegression.php index 085f685f2..64f9d9a94 100755 --- a/Math/Statistic/Forecast/Regression/LevelLevelRegression.php +++ b/Math/Statistic/Forecast/Regression/LevelLevelRegression.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic\Forecast\Regression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Statistic\Forecast\Regression; * Regression class. * * @package phpOMS\Math\Statistic\Forecast\Regression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/Regression/LevelLogRegression.php b/Math/Statistic/Forecast/Regression/LevelLogRegression.php index 23c33eb09..dd3acda61 100755 --- a/Math/Statistic/Forecast/Regression/LevelLogRegression.php +++ b/Math/Statistic/Forecast/Regression/LevelLogRegression.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic\Forecast\Regression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Regression class. * * @package phpOMS\Math\Statistic\Forecast\Regression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/Regression/LogLevelRegression.php b/Math/Statistic/Forecast/Regression/LogLevelRegression.php index 999be1f84..76bd04944 100755 --- a/Math/Statistic/Forecast/Regression/LogLevelRegression.php +++ b/Math/Statistic/Forecast/Regression/LogLevelRegression.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic\Forecast\Regression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Regression class. * * @package phpOMS\Math\Statistic\Forecast\Regression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/Regression/LogLogRegression.php b/Math/Statistic/Forecast/Regression/LogLogRegression.php index 5314a7cc4..edaee0eb2 100755 --- a/Math/Statistic/Forecast/Regression/LogLogRegression.php +++ b/Math/Statistic/Forecast/Regression/LogLogRegression.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic\Forecast\Regression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Regression class. * * @package phpOMS\Math\Statistic\Forecast\Regression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php b/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php index 17ce6a66c..6d0457893 100755 --- a/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php +++ b/Math/Statistic/Forecast/Regression/MultipleLinearRegression.php @@ -6,7 +6,7 @@ * * @package TBD * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Matrix; * Regression class. * * @package phpOMS\Math\Statistic\Forecast\Regression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/Regression/PolynomialRegression.php b/Math/Statistic/Forecast/Regression/PolynomialRegression.php index 42e62865c..ca5db98dc 100755 --- a/Math/Statistic/Forecast/Regression/PolynomialRegression.php +++ b/Math/Statistic/Forecast/Regression/PolynomialRegression.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic\Forecast\Regression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Statistic\Average; * Regression class. * * @package phpOMS\Math\Statistic\Forecast\Regression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/Regression/RegressionAbstract.php b/Math/Statistic/Forecast/Regression/RegressionAbstract.php index 9748efb7e..2c9d8ed71 100755 --- a/Math/Statistic/Forecast/Regression/RegressionAbstract.php +++ b/Math/Statistic/Forecast/Regression/RegressionAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic\Forecast\Regression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Statistic\Average; * Regression abstract class. * * @package phpOMS\Math\Statistic\Forecast\Regression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Statistic/Forecast/SeasonalTrendDecomposition.php b/Math/Statistic/Forecast/SeasonalTrendDecomposition.php new file mode 100644 index 000000000..e69de29bb diff --git a/Math/Statistic/Forecast/VectorAutoregression.php b/Math/Statistic/Forecast/VectorAutoregression.php new file mode 100644 index 000000000..e69de29bb diff --git a/Math/Statistic/MeasureOfDispersion.php b/Math/Statistic/MeasureOfDispersion.php index 64e63d31c..5b7576024 100755 --- a/Math/Statistic/MeasureOfDispersion.php +++ b/Math/Statistic/MeasureOfDispersion.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Statistic * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Measure of dispersion. * * @package phpOMS\Math\Statistic - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/BernoulliDistribution.php b/Math/Stochastic/Distribution/BernoulliDistribution.php index 794ca6292..606d9213c 100755 --- a/Math/Stochastic/Distribution/BernoulliDistribution.php +++ b/Math/Stochastic/Distribution/BernoulliDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Bernulli distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/BetaDistribution.php b/Math/Stochastic/Distribution/BetaDistribution.php index 376f6c23c..edc302670 100755 --- a/Math/Stochastic/Distribution/BetaDistribution.php +++ b/Math/Stochastic/Distribution/BetaDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Functions\Functions; * Beta distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/BinomialDistribution.php b/Math/Stochastic/Distribution/BinomialDistribution.php index 0a44e70d3..9cf1bba28 100755 --- a/Math/Stochastic/Distribution/BinomialDistribution.php +++ b/Math/Stochastic/Distribution/BinomialDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Functions; * Binomial distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/CauchyDistribution.php b/Math/Stochastic/Distribution/CauchyDistribution.php index b874769b4..82cf7a7a4 100755 --- a/Math/Stochastic/Distribution/CauchyDistribution.php +++ b/Math/Stochastic/Distribution/CauchyDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Cauchy distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/ChiSquaredDistribution.php b/Math/Stochastic/Distribution/ChiSquaredDistribution.php index 2904485be..4af9c96ea 100755 --- a/Math/Stochastic/Distribution/ChiSquaredDistribution.php +++ b/Math/Stochastic/Distribution/ChiSquaredDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Math\Functions\Gamma; * Test if two variables are similarly distributed (goodness fit, test dependency of variables) * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/ExponentialDistribution.php b/Math/Stochastic/Distribution/ExponentialDistribution.php index a04ae4f7e..8e99205f8 100755 --- a/Math/Stochastic/Distribution/ExponentialDistribution.php +++ b/Math/Stochastic/Distribution/ExponentialDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Exponential distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/FDistribution.php b/Math/Stochastic/Distribution/FDistribution.php index df70a9423..f206f7088 100755 --- a/Math/Stochastic/Distribution/FDistribution.php +++ b/Math/Stochastic/Distribution/FDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Beta; * F distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/GammaDistribution.php b/Math/Stochastic/Distribution/GammaDistribution.php index 9f5d42fda..4ac00a370 100755 --- a/Math/Stochastic/Distribution/GammaDistribution.php +++ b/Math/Stochastic/Distribution/GammaDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Gamma; * Gamma distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/GeometricDistribution.php b/Math/Stochastic/Distribution/GeometricDistribution.php index e09216e15..84bec5ece 100755 --- a/Math/Stochastic/Distribution/GeometricDistribution.php +++ b/Math/Stochastic/Distribution/GeometricDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Geometric distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/HypergeometricDistribution.php b/Math/Stochastic/Distribution/HypergeometricDistribution.php index 72d6dc017..e2cfc719a 100755 --- a/Math/Stochastic/Distribution/HypergeometricDistribution.php +++ b/Math/Stochastic/Distribution/HypergeometricDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Functions; * Hypergeometric distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/LaplaceDistribution.php b/Math/Stochastic/Distribution/LaplaceDistribution.php index 7978b92b7..c1f224ae0 100755 --- a/Math/Stochastic/Distribution/LaplaceDistribution.php +++ b/Math/Stochastic/Distribution/LaplaceDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Laplace distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/LogDistribution.php b/Math/Stochastic/Distribution/LogDistribution.php index da62a5e6f..f656c016d 100755 --- a/Math/Stochastic/Distribution/LogDistribution.php +++ b/Math/Stochastic/Distribution/LogDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Beta; * Log distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -37,6 +37,8 @@ final class LogDistribution /** * Get probability mass function. * + * @latex -\frac{1}{\log(1-p)} \cdot \frac{p^k}{k} + * * @param float $p Value p * @param int $k Value k * @@ -70,6 +72,8 @@ final class LogDistribution /** * Get expected value. * + * @latex -\frac{1}{\log(1-p)} \cdot \frac{p}{1-p} + * * @param float $p Value p * * @return float @@ -96,6 +100,8 @@ final class LogDistribution /** * Get variance. * + * @latex -\frac{p^2 + p\log(1-p)}{(1-p)^2\log(1-p)^2} + * * @param float $p Value p * * @return float @@ -111,6 +117,8 @@ final class LogDistribution /** * Get standard deviation. * + * @latex \sqrt{-\frac{p^2 + p\log(1-p)}{(1-p)^2\log(1-p)^2}} + * * @param float $p Value p * * @return float @@ -125,6 +133,8 @@ final class LogDistribution /** * Get moment generating function. * + * @latex \frac{\log(1-p\exp(t))}{\log(1-p)} + * * @param float $p Value p * @param float $t Value t * diff --git a/Math/Stochastic/Distribution/LogNormalDistribution.php b/Math/Stochastic/Distribution/LogNormalDistribution.php index d2b6ae1a0..1bd454e62 100755 --- a/Math/Stochastic/Distribution/LogNormalDistribution.php +++ b/Math/Stochastic/Distribution/LogNormalDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Functions; * Log-normal distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/LogisticDistribution.php b/Math/Stochastic/Distribution/LogisticDistribution.php index 7cb69fee4..5385a8664 100755 --- a/Math/Stochastic/Distribution/LogisticDistribution.php +++ b/Math/Stochastic/Distribution/LogisticDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Logistic distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/NormalDistribution.php b/Math/Stochastic/Distribution/NormalDistribution.php index 599913b0a..01a6ef8d3 100755 --- a/Math/Stochastic/Distribution/NormalDistribution.php +++ b/Math/Stochastic/Distribution/NormalDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Functions; * Normal distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/ParetoDistribution.php b/Math/Stochastic/Distribution/ParetoDistribution.php index badfb16a8..b15ecf298 100755 --- a/Math/Stochastic/Distribution/ParetoDistribution.php +++ b/Math/Stochastic/Distribution/ParetoDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Pareto distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/PoissonDistribution.php b/Math/Stochastic/Distribution/PoissonDistribution.php index 360cc2433..6bfa8a3fd 100755 --- a/Math/Stochastic/Distribution/PoissonDistribution.php +++ b/Math/Stochastic/Distribution/PoissonDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Functions\Gamma; * Well known functions class. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/TDistribution.php b/Math/Stochastic/Distribution/TDistribution.php index af38d50b6..4c4dd91a2 100755 --- a/Math/Stochastic/Distribution/TDistribution.php +++ b/Math/Stochastic/Distribution/TDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Test the similarity of two means * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/UniformDistributionContinuous.php b/Math/Stochastic/Distribution/UniformDistributionContinuous.php index 1ef56910c..b641840c8 100755 --- a/Math/Stochastic/Distribution/UniformDistributionContinuous.php +++ b/Math/Stochastic/Distribution/UniformDistributionContinuous.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Uniform (continuous) distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/UniformDistributionDiscrete.php b/Math/Stochastic/Distribution/UniformDistributionDiscrete.php index 94cfebf74..54c7dc58e 100755 --- a/Math/Stochastic/Distribution/UniformDistributionDiscrete.php +++ b/Math/Stochastic/Distribution/UniformDistributionDiscrete.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Math\Stochastic\Distribution; * Uniform (discrete) distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/WeibullDistribution.php b/Math/Stochastic/Distribution/WeibullDistribution.php index 0a9d7ad6b..133c96fa6 100755 --- a/Math/Stochastic/Distribution/WeibullDistribution.php +++ b/Math/Stochastic/Distribution/WeibullDistribution.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Functions\Gamma; * Weibull distribution. * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Stochastic/Distribution/ZTesting.php b/Math/Stochastic/Distribution/ZTesting.php index 881447783..5c93598c7 100755 --- a/Math/Stochastic/Distribution/ZTesting.php +++ b/Math/Stochastic/Distribution/ZTesting.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic\Distribution * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Math\Statistic\MeasureOfDispersion; * Test if the mean is the same as the population mean * * @package phpOMS\Math\Stochastic\Distribution - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Math/Stochastic/NaiveBayesClassifier.php b/Math/Stochastic/NaiveBayesClassifier.php index bf6a362a2..d0d195890 100755 --- a/Math/Stochastic/NaiveBayesClassifier.php +++ b/Math/Stochastic/NaiveBayesClassifier.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Stochastic * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Statistic\MeasureOfDispersion; * Naive bayes matching. * * @package phpOMS\Math\Stochastic - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Topology/Metrics2D.php b/Math/Topology/Metrics2D.php index c5b9feba7..8ca90d919 100755 --- a/Math/Topology/Metrics2D.php +++ b/Math/Topology/Metrics2D.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Topology * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Metrics. * * @package phpOMS\Math\Topology - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Math/Topology/MetricsND.php b/Math/Topology/MetricsND.php index 5ed3a7b6a..f08f8542f 100755 --- a/Math/Topology/MetricsND.php +++ b/Math/Topology/MetricsND.php @@ -6,7 +6,7 @@ * * @package phpOMS\Math\Topology * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Metrics. * * @package phpOMS\Math\Topology - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Cli/CliHeader.php b/Message/Cli/CliHeader.php index 75e248fd9..c21e88818 100644 --- a/Message/Cli/CliHeader.php +++ b/Message/Cli/CliHeader.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Cli * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Message\HeaderAbstract; * Response class. * * @package phpOMS\Message\Cli - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Message/Cli/CliRequest.php b/Message/Cli/CliRequest.php index c3bd3f6af..5d0f249bf 100644 --- a/Message/Cli/CliRequest.php +++ b/Message/Cli/CliRequest.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Cli * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\Utils\ArrayUtils; * Request class. * * @package phpOMS\Message\Cli - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Message/Cli/CliResponse.php b/Message/Cli/CliResponse.php index 1f0ed33a0..dcee7a9b7 100644 --- a/Message/Cli/CliResponse.php +++ b/Message/Cli/CliResponse.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Cli * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\Views\View; * Response class. * * @package phpOMS\Message\Cli - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/HeaderAbstract.php b/Message/HeaderAbstract.php index 6e92c0da7..64408c320 100755 --- a/Message/HeaderAbstract.php +++ b/Message/HeaderAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Localization\Localization; * Response class. * * @package phpOMS\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Http/BrowserType.php b/Message/Http/BrowserType.php index 03ae28056..56bdeffda 100755 --- a/Message/Http/BrowserType.php +++ b/Message/Http/BrowserType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Browser types can be used for statistics or in order to deliver browser specific content. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Http/HttpHeader.php b/Message/Http/HttpHeader.php index b5dde9e57..8b5de91e1 100755 --- a/Message/Http/HttpHeader.php +++ b/Message/Http/HttpHeader.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\System\MimeType; * Response class. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Message/Http/HttpRequest.php b/Message/Http/HttpRequest.php index a93e20576..d2294b13f 100755 --- a/Message/Http/HttpRequest.php +++ b/Message/Http/HttpRequest.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Uri\UriInterface; * Request class. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Message/Http/HttpResponse.php b/Message/Http/HttpResponse.php index 37a2be353..52a961ec0 100755 --- a/Message/Http/HttpResponse.php +++ b/Message/Http/HttpResponse.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -28,7 +28,7 @@ use phpOMS\Views\View; * @property \phpOMS\Message\Http\HttpHeader $header Http header * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -118,7 +118,11 @@ final class HttpResponse extends ResponseAbstract implements RenderableInterface } /** @var array{0:bool} $data */ - return $this->getRaw(\stripos($type ?? '', MimeType::M_HTML) !== false ? ($data[0] ?? false) : false); + return $this->getRaw( + \stripos($type ?? '', MimeType::M_HTML) !== false + ? ($data[0] ?? false) + : false + ); } /** @@ -136,6 +140,7 @@ final class HttpResponse extends ResponseAbstract implements RenderableInterface { $render = ''; foreach ($this->response as $response) { + // @note: Api functions return void -> null, this is where the null value is "ignored"/rendered as '' $render .= StringUtils::stringify($response); } diff --git a/Message/Http/OSType.php b/Message/Http/OSType.php index 3b568ef50..bd5ebae07 100755 --- a/Message/Http/OSType.php +++ b/Message/Http/OSType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * OS Types which could be useful in order to create statistics or deliver OS specific content. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Http/RequestMethod.php b/Message/Http/RequestMethod.php index 76e3f6c69..df0fb379a 100755 --- a/Message/Http/RequestMethod.php +++ b/Message/Http/RequestMethod.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Request method enum. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Http/RequestStatus.php b/Message/Http/RequestStatus.php index 6f6f77d7f..8cc0aa8a5 100755 --- a/Message/Http/RequestStatus.php +++ b/Message/Http/RequestStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Request status enum. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Http/RequestStatusCode.php b/Message/Http/RequestStatusCode.php index 46e9bd816..7a4a842d8 100755 --- a/Message/Http/RequestStatusCode.php +++ b/Message/Http/RequestStatusCode.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Request status enum. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Http/Rest.php b/Message/Http/Rest.php index 3b12b113f..453f33924 100755 --- a/Message/Http/Rest.php +++ b/Message/Http/Rest.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Http * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\System\MimeType; * Rest request class. * * @package phpOMS\Message\Http - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/DispositionType.php b/Message/Mail/DispositionType.php index fef6eb36b..23ce80191 100755 --- a/Message/Mail/DispositionType.php +++ b/Message/Mail/DispositionType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Disposition enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/DsnNotificationType.php b/Message/Mail/DsnNotificationType.php index de4551036..1b96c72a2 100755 --- a/Message/Mail/DsnNotificationType.php +++ b/Message/Mail/DsnNotificationType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Dsn notification types enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/Email.php b/Message/Mail/Email.php index b1b52f7cb..38265c5cd 100755 --- a/Message/Mail/Email.php +++ b/Message/Mail/Email.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app * @@ -30,7 +30,7 @@ use phpOMS\Validation\Network\Email as EmailValidator; * Mail class. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -84,14 +84,6 @@ class Email implements MessageInterface */ protected static string $LE = "\r\n"; - /** - * Mail id. - * - * @var string - * @since 1.0.0 - */ - protected string $id = ''; - /** * Message id. * @@ -129,18 +121,10 @@ class Email implements MessageInterface /** * Mail from. * - * @var string + * @var array * @since 1.0.0 */ - protected string $from = ''; - - /** - * Mail from. - * - * @var string - * @since 1.0.0 - */ - protected string $fromName = ''; + protected array $from = []; /** * Return path/bounce address @@ -428,18 +412,6 @@ class Email implements MessageInterface */ public string $dkimPrivateKey = ''; - /** - * Constructor. - * - * @param string $id Id - * - * @since 1.0.0 - */ - public function __construct(string $id = '') - { - $this->id = $id; - } - /** * Set the From and FromName. * @@ -459,8 +431,7 @@ class Email implements MessageInterface return false; } - $this->from = $address; - $this->fromName = $name; + $this->from = [$address, $name]; if (empty($this->sender)) { $this->sender = $address; @@ -471,10 +442,7 @@ class Email implements MessageInterface public function getFrom() : array { - return [ - $this->from, - $this->fromName, - ]; + return $this->from; } /** @@ -637,12 +605,12 @@ class Email implements MessageInterface ]; } } else { - list($name, $email) = \explode('<', $address); - $email = \trim(\str_replace('>', '', $email)); + $addr = \explode('<', $address); + $email = \trim(\str_replace('>', '', $addr[1])); if (EmailValidator::isValid($email)) { $addresses[] = [ - 'name' => \trim($name, '\'" '), + 'name' => \trim($addr[0], '\'" '), 'address' => $email, ]; } @@ -735,7 +703,7 @@ class Email implements MessageInterface : 'To: undisclosed-recipients:;' . self::$LE; } - $result .= $this->addrAppend('From', [[\trim($this->from), $this->fromName]]); + $result .= $this->addrAppend('From', [$this->from]); // sendmail and mail() extract Cc from the header before sending if (\count($this->cc) > 0) { @@ -790,7 +758,7 @@ class Email implements MessageInterface $result .= \trim($header[0]) . ': ' . $this->encodeHeader(\trim($header[1])) . self::$LE; } - if (!empty($this->signKeyFile)) { + if (empty($this->signKeyFile)) { $result .= 'MIME-Version: 1.0' . self::$LE; $result .= $this->getMailMime(); } @@ -966,9 +934,9 @@ class Email implements MessageInterface $body = ''; $this->uniqueid = $this->generateId(); - $this->boundary[1] = 'b1_' . $this->uniqueid; - $this->boundary[2] = 'b2_' . $this->uniqueid; - $this->boundary[3] = 'b3_' . $this->uniqueid; + $this->boundary[1] = 'b1=_' . $this->uniqueid; + $this->boundary[2] = 'b2=_' . $this->uniqueid; + $this->boundary[3] = 'b3=_' . $this->uniqueid; if (!empty($this->signKeyFile)) { $body .= $this->getMailMime() . self::$LE; @@ -1015,7 +983,7 @@ class Email implements MessageInterface } //Use this as a preamble in all multipart message types - $mimePre = 'This is a multi-part message in MIME format.' . self::$LE . self::$LE; + $mimePre = ''; switch ($this->messageType) { case 'inline': $body .= $mimePre; diff --git a/Message/Mail/EncodingType.php b/Message/Mail/EncodingType.php index d625076ae..560ce3414 100755 --- a/Message/Mail/EncodingType.php +++ b/Message/Mail/EncodingType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Encoding enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/EncryptionType.php b/Message/Mail/EncryptionType.php index 4c4132d39..396f8d105 100755 --- a/Message/Mail/EncryptionType.php +++ b/Message/Mail/EncryptionType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Encryption enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/HeaderContext.php b/Message/Mail/HeaderContext.php index 3d0be48a2..dc12d1549 100755 --- a/Message/Mail/HeaderContext.php +++ b/Message/Mail/HeaderContext.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Submit enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/ICALMethodType.php b/Message/Mail/ICALMethodType.php index f8f25ccba..907ada185 100755 --- a/Message/Mail/ICALMethodType.php +++ b/Message/Mail/ICALMethodType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Calendar message types enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/Imap.php b/Message/Mail/Imap.php index 5b8de0369..9c175e772 100755 --- a/Message/Mail/Imap.php +++ b/Message/Mail/Imap.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Message\Mail; * Imap mail class. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/MailBoxInterface.php b/Message/Mail/MailBoxInterface.php index bb7b115cb..7a4adeb55 100755 --- a/Message/Mail/MailBoxInterface.php +++ b/Message/Mail/MailBoxInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Message\Mail; * Message interface. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/MailHandler.php b/Message/Mail/MailHandler.php index 5d1e0ff04..5558f4873 100755 --- a/Message/Mail/MailHandler.php +++ b/Message/Mail/MailHandler.php @@ -116,14 +116,6 @@ class MailHandler */ public bool $useAutoTLS = true; - /** - * Use smtp auth - * - * @var bool - * @since 1.0.0 - */ - public bool $useSMTPAuth = false; - /** * Options passed when connecting via SMTP. * @@ -459,7 +451,7 @@ class MailHandler // Only send the DATA command if we have viable recipients if ((\count($mail->to) + \count($mail->cc) + \count($mail->bcc) > \count($badRcpt)) - && !$this->smtp->data($header . $mail->body, self::MAX_LINE_LENGTH) + && !$this->smtp->data($header . $mail->bodyMime, self::MAX_LINE_LENGTH) ) { return false; } @@ -576,10 +568,9 @@ class MailHandler $this->smtp->hello($hello); } - // @todo: is useSMTPAuth really necessary or can't we just check if smtp is defined? - return !($this->useSMTPAuth - && !$this->smtp->authenticate($this->username, $this->password, $this->authType, $this->oauth) - ); + return $this->smtp === null + ? false + : $this->smtp->authenticate($this->username, $this->password, $this->authType, $this->oauth); } } diff --git a/Message/Mail/MessageInterface.php b/Message/Mail/MessageInterface.php index 8516ffe87..b5ffd1608 100755 --- a/Message/Mail/MessageInterface.php +++ b/Message/Mail/MessageInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Message\Mail; * @property string $subject Subject * * @package phpOMS\Uri - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/Pop3.php b/Message/Mail/Pop3.php index d098377a1..3670e26be 100755 --- a/Message/Mail/Pop3.php +++ b/Message/Mail/Pop3.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Message\Mail; * Imap mail class. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/SMTPAuthType.php b/Message/Mail/SMTPAuthType.php index a28e0dc43..74a44af95 100755 --- a/Message/Mail/SMTPAuthType.php +++ b/Message/Mail/SMTPAuthType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * SMTP auth types enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/SmtpTransactionPattern.php b/Message/Mail/SmtpTransactionPattern.php index f728583a5..10c6e992a 100755 --- a/Message/Mail/SmtpTransactionPattern.php +++ b/Message/Mail/SmtpTransactionPattern.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Transaction types enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Mail/SubmitType.php b/Message/Mail/SubmitType.php index 638a4d7ef..9aef3d6e1 100755 --- a/Message/Mail/SubmitType.php +++ b/Message/Mail/SubmitType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Mail * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Submit enum. * * @package phpOMS\Message\Mail - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/MessageInterface.php b/Message/MessageInterface.php index d5bfd0736..55f76f7e8 100755 --- a/Message/MessageInterface.php +++ b/Message/MessageInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Message; * Message interface. * * @package phpOMS\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/NotificationLevel.php b/Message/NotificationLevel.php index ca66670db..5f8442e86 100755 --- a/Message/NotificationLevel.php +++ b/Message/NotificationLevel.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Notification level enum. * * @package phpOMS\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/RequestAbstract.php b/Message/RequestAbstract.php index 20a2b8f00..4cabaeef4 100755 --- a/Message/RequestAbstract.php +++ b/Message/RequestAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Uri\UriInterface; * Request class. * * @package phpOMS\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -97,7 +97,7 @@ abstract class RequestAbstract implements MessageInterface } if ($type === null) { - return $this->data[$key] ?? null; + return $this->data[$key]; } switch ($type) { @@ -110,12 +110,92 @@ abstract class RequestAbstract implements MessageInterface case 'bool': return (bool) $this->data[$key]; case 'DateTime': - return new \DateTime($this->data[$key]); + return new \DateTime((string) $this->data[$key]); default: return $this->data[$key]; } } + /** + * Get data. + * + * @param string $key Data key + * + * @return null|string + * + * @since 1.0.0 + */ + public function getDataString(string $key) : ?string + { + $key = \mb_strtolower($key); + + return isset($this->data[$key]) ? (string) $this->data[$key] : null; + } + + /** + * Get data. + * + * @param string $key Data key + * + * @return null|int + * + * @since 1.0.0 + */ + public function getDataInt(string $key) : ?int + { + $key = \mb_strtolower($key); + + return isset($this->data[$key]) ? (int) $this->data[$key] : null; + } + + /** + * Get data. + * + * @param string $key Data key + * + * @return null|float + * + * @since 1.0.0 + */ + public function getDataFloat(string $key) : ?float + { + $key = \mb_strtolower($key); + + return isset($this->data[$key]) ? (float) $this->data[$key] : null; + } + + /** + * Get data. + * + * @param string $key Data key + * + * @return null|bool + * + * @since 1.0.0 + */ + public function getDataBool(string $key) : ?bool + { + $key = \mb_strtolower($key); + + return isset($this->data[$key]) ? (bool) $this->data[$key] : null; + } + + /** + * Get data. + * + * @param string $key Data key + * + * @return null|\DateTime + * + * @since 1.0.0 + */ + public function getDataDateTime(string $key) : ?\DateTime + { + $key = \mb_strtolower($key); + + return !empty($this->data[$key] ?? null) ? new \DateTime((string) $this->data[$key]) : null; + } + /** * Get data. * @@ -202,7 +282,9 @@ abstract class RequestAbstract implements MessageInterface */ public function hasData(string $key) : bool { - return isset($this->data[$key]); + $key = \mb_strtolower($key); + + return isset($this->data[$key]) && !empty($this->data[$key]); } /** diff --git a/Message/ResponseAbstract.php b/Message/ResponseAbstract.php index 73ab0cf53..0d109152f 100755 --- a/Message/ResponseAbstract.php +++ b/Message/ResponseAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Localization\ISO639x1Enum; * Response abstract class. * * @package phpOMS\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Socket/PacketManager.php b/Message/Socket/PacketManager.php index 403567d9b..858a48a1f 100755 --- a/Message/Socket/PacketManager.php +++ b/Message/Socket/PacketManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Socket * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Router\SocketRouter; * Parsing/serializing arrays to and from php file * * @package phpOMS\Message\Socket - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Socket/PacketType.php b/Message/Socket/PacketType.php index d4da50507..b60488e9a 100755 --- a/Message/Socket/PacketType.php +++ b/Message/Socket/PacketType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Socket * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Packet type enum. * * @package phpOMS\Message\Socket - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Socket/SocketHeader.php b/Message/Socket/SocketHeader.php index daf4c6b22..c156af10f 100755 --- a/Message/Socket/SocketHeader.php +++ b/Message/Socket/SocketHeader.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Socket * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Message\HeaderAbstract; * Parsing/serializing arrays to and from php file * * @package phpOMS\Message\Socket - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Socket/SocketRequest.php b/Message/Socket/SocketRequest.php index ce99a399e..b1c2038da 100755 --- a/Message/Socket/SocketRequest.php +++ b/Message/Socket/SocketRequest.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Socket * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Router\RouteVerb; * Request class. * * @package phpOMS\Message\Socket - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/Socket/SocketResponse.php b/Message/Socket/SocketResponse.php index 6c8b8fe65..2dd4b85a9 100755 --- a/Message/Socket/SocketResponse.php +++ b/Message/Socket/SocketResponse.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message\Socket * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\Views\View; * Response class. * * @package phpOMS\Message\Socket - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Message/UploadedFileInterface.php b/Message/UploadedFileInterface.php index 4cd3aa1fb..9576bb847 100755 --- a/Message/UploadedFileInterface.php +++ b/Message/UploadedFileInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\StreamInterface; * Upload interface. * * @package phpOMS\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Html/FormElementGenerator.php b/Model/Html/FormElementGenerator.php index 1d6936b67..4015efd7d 100755 --- a/Model/Html/FormElementGenerator.php +++ b/Model/Html/FormElementGenerator.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Html * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\SmartDateTime; * Form element generator class. * * @package phpOMS\Model\Html - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Html/Head.php b/Model/Html/Head.php index bb49130a0..07cb0482b 100755 --- a/Model/Html/Head.php +++ b/Model/Html/Head.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Html * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Localization\ISO639x1Enum; * Responsible for handling everything that's going on in the * * @package phpOMS\Model\Html - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Html/Meta.php b/Model/Html/Meta.php index 64029b9b3..ce99b11e6 100755 --- a/Model/Html/Meta.php +++ b/Model/Html/Meta.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Html * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Views\ViewAbstract; * Meta class. * * @package phpOMS\Model\Html - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Message/Dom.php b/Model/Message/Dom.php index d4f7e86a9..3ced7b132 100755 --- a/Model/Message/Dom.php +++ b/Model/Message/Dom.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\SerializableInterface; * Dom class. * * @package phpOMS\Model\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Message/DomAction.php b/Model/Message/DomAction.php index b221af790..1da5121e9 100755 --- a/Model/Message/DomAction.php +++ b/Model/Message/DomAction.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * DomAction class. * * @package phpOMS\Model\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Message/DynamicList.php b/Model/Message/DynamicList.php index 2e66f6c7c..ad8c879c5 100755 --- a/Model/Message/DynamicList.php +++ b/Model/Message/DynamicList.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Model/Message/FormValidation.php b/Model/Message/FormValidation.php index e498eee2b..872eac3b5 100755 --- a/Model/Message/FormValidation.php +++ b/Model/Message/FormValidation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\SerializableInterface; * FormValidation class. * * @package phpOMS\Model\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Message/Notify.php b/Model/Message/Notify.php index a27de8b2f..96dfa6f70 100755 --- a/Model/Message/Notify.php +++ b/Model/Message/Notify.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\SerializableInterface; * Notify class. * * @package phpOMS\Model\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -69,7 +69,7 @@ final class Notify implements \JsonSerializable, SerializableInterface /** * Level or type. * - * @var int + * @var string * @since 1.0.0 */ public string $level = NotifyType::INFO; @@ -78,7 +78,7 @@ final class Notify implements \JsonSerializable, SerializableInterface * Constructor. * * @param string $msg Message - * @param int $level Message level + * @param string $level Message level * * @since 1.0.0 */ diff --git a/Model/Message/NotifyType.php b/Model/Message/NotifyType.php index 657334fb6..adc814d5f 100755 --- a/Model/Message/NotifyType.php +++ b/Model/Message/NotifyType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * NotifyType class. * * @package phpOMS\Model\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Message/Redirect.php b/Model/Message/Redirect.php index 80a143452..7ba889963 100755 --- a/Model/Message/Redirect.php +++ b/Model/Message/Redirect.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\SerializableInterface; * Redirect class. * * @package phpOMS\Model\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Model/Message/Reload.php b/Model/Message/Reload.php index 3e4b8a03d..a42dd5406 100755 --- a/Model/Message/Reload.php +++ b/Model/Message/Reload.php @@ -6,7 +6,7 @@ * * @package phpOMS\Model\Message * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\SerializableInterface; * Reload class. * * @package phpOMS\Model\Message - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/CliInterface.php b/Module/CliInterface.php index bb3d1d84e..d8cc094f8 100644 --- a/Module/CliInterface.php +++ b/Module/CliInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Module; * Cli module interface. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/Exception/InvalidModuleException.php b/Module/Exception/InvalidModuleException.php index c28ba38c8..f49e33d7c 100755 --- a/Module/Exception/InvalidModuleException.php +++ b/Module/Exception/InvalidModuleException.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Module\Exception; * Zero devision exception. * * @package phpOMS\Module\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/Exception/InvalidThemeException.php b/Module/Exception/InvalidThemeException.php index e845153c5..e0324bb59 100755 --- a/Module/Exception/InvalidThemeException.php +++ b/Module/Exception/InvalidThemeException.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Module\Exception; * Zero devision exception. * * @package phpOMS\Module\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/InstallerAbstract.php b/Module/InstallerAbstract.php index 0031bdfe6..6ce3b4b30 100755 --- a/Module/InstallerAbstract.php +++ b/Module/InstallerAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder; * Installer abstract class. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/ModuleAbstract.php b/Module/ModuleAbstract.php index 165839429..7b0264db3 100755 --- a/Module/ModuleAbstract.php +++ b/Module/ModuleAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\Utils\StringUtils; * @method __call(string $name, array $arguments) * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/ModuleInfo.php b/Module/ModuleInfo.php index 2147ff73b..96805133c 100755 --- a/Module/ModuleInfo.php +++ b/Module/ModuleInfo.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Utils\ArrayUtils; * Handling the info files for modules * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/ModuleManager.php b/Module/ModuleManager.php index 488494e14..71d64520e 100755 --- a/Module/ModuleManager.php +++ b/Module/ModuleManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\Module\Exception\InvalidModuleException; * General module functionality such as listings and initialization. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -41,16 +41,6 @@ final class ModuleManager */ private array $running = []; - /** - * All modules another module is providing for. - * - * This is important to inform other modules what kind of information they can receive from other modules. - * - * @var array - * @since 1.0.0 - */ - private array $providing = []; - /** * Application instance. * @@ -252,13 +242,14 @@ final class ModuleManager /** * Is module active * - * @param string $module Module name + * @param string $module Module name + * @param null|string $ctlName Controller name * * @return bool * * @since 1.0.0 */ - public function isRunning(string $module) : bool + public function isRunning(string $module, string $ctlName = null) : bool { $name = '\\Modules\\' . $module . '\\Controller\\' . ($ctlName ?? $this->app->appName) . 'Controller'; @@ -726,7 +717,7 @@ final class ModuleManager ) { try { /** @var ModuleAbstract $obj */ - $obj = new $class($this->app); + $obj = new $class($this->app); $this->running[$class] = $obj; } catch (\Throwable $e) { $this->running[$class] = new NullModule(); @@ -739,50 +730,6 @@ final class ModuleManager return $this->running[$class]; } - /** - * Load modules this module is requesting from - * - * @param ModuleAbstract $obj Current module - * - * @return void - * - * @since 1.0.0 - */ - private function registerRequesting(ModuleAbstract $obj) : void - { - $providings = $obj->getProviding(); - $name = ''; - - foreach ($providings as $providing) { - $name = '\\Modules\\' . $providing . '\\Controller\\' . $this->app->appName . 'Controller'; - - if (isset($this->running[$name])) { - $this->running[$name]->addReceiving($obj->getName()); - } else { - $this->providing[$name][] = $obj->getName(); - } - } - } - - /** - * Register modules this module is receiving from - * - * @param ModuleAbstract $obj Current module - * - * @return void - * - * @since 1.0.0 - */ - private function registerProvided(ModuleAbstract $obj) : void - { - $name = '\\Modules\\' . $obj->getName() . '\\Controller\\' . $this->app->appName . 'Controller'; - if (isset($this->providing[$name])) { - foreach ($this->providing[$name] as $providing) { - $obj->addReceiving($providing); - } - } - } - /** * Initialize all modules for a request. * diff --git a/Module/ModuleStatus.php b/Module/ModuleStatus.php index 558d62163..f78c23f78 100755 --- a/Module/ModuleStatus.php +++ b/Module/ModuleStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Module status enum. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/NullModule.php b/Module/NullModule.php index 32e193b25..dc4ffa0b3 100755 --- a/Module/NullModule.php +++ b/Module/NullModule.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Log\FileLogger; * Module abstraction class. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/PackageManager.php b/Module/PackageManager.php index 35ebbd872..378538dfe 100755 --- a/Module/PackageManager.php +++ b/Module/PackageManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -29,7 +29,7 @@ use phpOMS\Utils\StringUtils; * The package manager is responsible for handling installation and update packages for modules, frameworks and resources. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/SocketInterface.php b/Module/SocketInterface.php index 0e6304e28..47ebece3b 100755 --- a/Module/SocketInterface.php +++ b/Module/SocketInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Module; * Socket module interface. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/StatusAbstract.php b/Module/StatusAbstract.php index e5b4aa2d7..3c381094b 100755 --- a/Module/StatusAbstract.php +++ b/Module/StatusAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -29,7 +29,7 @@ use phpOMS\Utils\Parser\Php\ArrayParser; * This abstraction can be used by modules in order to manipulate their basic status/state. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/UninstallerAbstract.php b/Module/UninstallerAbstract.php index 3fdab7531..402c2b8d8 100755 --- a/Module/UninstallerAbstract.php +++ b/Module/UninstallerAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder; * Uninstaller abstract class. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/UpdaterAbstract.php b/Module/UpdaterAbstract.php index 4ad28a39d..2c9c371d4 100755 --- a/Module/UpdaterAbstract.php +++ b/Module/UpdaterAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\DatabasePool; * Updater abstract class. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Module/WebInterface.php b/Module/WebInterface.php index 539579614..866586276 100755 --- a/Module/WebInterface.php +++ b/Module/WebInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Module * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Module; * Web module interface. * * @package phpOMS\Module - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Preloader.php b/Preloader.php index 86b2e8da9..a04032955 100755 --- a/Preloader.php +++ b/Preloader.php @@ -6,7 +6,7 @@ * * @package phpOMS * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS; * Preloader class. * * @package phpOMS - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Router/RouteStatus.php b/Router/RouteStatus.php index b1ef059da..e8648170f 100644 --- a/Router/RouteStatus.php +++ b/Router/RouteStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\Router * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Route Status * * @package phpOMS\Router - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Router/RouteVerb.php b/Router/RouteVerb.php index b86e2ae0b..e4145195e 100755 --- a/Router/RouteVerb.php +++ b/Router/RouteVerb.php @@ -6,7 +6,7 @@ * * @package phpOMS\Router * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Route verb enum. * * @package phpOMS\Router - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Router/RouterInterface.php b/Router/RouterInterface.php index 38ff3e52c..cc4b1f7b1 100755 --- a/Router/RouterInterface.php +++ b/Router/RouterInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\DataStorage\Database\Schema * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Account\Account; * Router interface. * * @package phpOMS\Router - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Router/SocketRouter.php b/Router/SocketRouter.php index f03f480d1..db7ca35ac 100755 --- a/Router/SocketRouter.php +++ b/Router/SocketRouter.php @@ -6,7 +6,7 @@ * * @package phpOMS\Router * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Account\NullAccount; * Router class for socket routes. * * @package phpOMS\Router - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Router/WebRouter.php b/Router/WebRouter.php index f44514bb5..b5c07cd78 100755 --- a/Router/WebRouter.php +++ b/Router/WebRouter.php @@ -6,7 +6,7 @@ * * @package phpOMS\Router * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Account\NullAccount; * Router class for web routes. * * @package phpOMS\Router - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Security/EncryptionHelper.php b/Security/EncryptionHelper.php index 5156032cf..299f1f924 100644 --- a/Security/EncryptionHelper.php +++ b/Security/EncryptionHelper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Security * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Security; * Php encryption wrapper class. * * @package phpOMS\Security - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -42,7 +42,7 @@ final class EncryptionHelper * Encrypt a message with a shared key * * @param string $message Message to encrypt - * @param string $key Shared key used for encryption + * @param string $keyHex Shared key as hex string used for encryption * * @return string * diff --git a/Security/Guard.php b/Security/Guard.php index c49129120..92a980ada 100644 --- a/Security/Guard.php +++ b/Security/Guard.php @@ -6,7 +6,7 @@ * * @package phpOMS\Security * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\System\File\FileUtils; * This can be used to guard against certain vulnerabilities * * @package phpOMS\Security - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Security/PhpCode.php b/Security/PhpCode.php index 4e25ad40e..ccb8b6a97 100755 --- a/Security/PhpCode.php +++ b/Security/PhpCode.php @@ -6,7 +6,7 @@ * * @package phpOMS\Security * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ namespace phpOMS\Security; * Additionally this can also be used in order verify that the source code is not altered compared to some expected source code. * * @package phpOMS\Security - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -93,7 +93,7 @@ final class PhpCode public static function hasUnicode(string $source) : bool { return ((bool) \preg_match("/[\x01-\x7f]/", $source)) - || ((bool) \preg_match('/(0|\\)x([a-fA-F0-9]){2}/', $source)); + || ((bool) \preg_match("/(0|\\\)x([a-fA-F0-9]){2}/", $source)); } /** diff --git a/Socket/Client/Client.php b/Socket/Client/Client.php index d9b20888b..d5cdcd169 100755 --- a/Socket/Client/Client.php +++ b/Socket/Client/Client.php @@ -6,7 +6,7 @@ * * @package phpOMS\Socket\Client * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Socket\SocketAbstract; * Client socket class. * * @package phpOMS\Socket\Client - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Socket/Client/ClientConnection.php b/Socket/Client/ClientConnection.php index 70b3456a6..e0bf2521b 100755 --- a/Socket/Client/ClientConnection.php +++ b/Socket/Client/ClientConnection.php @@ -6,7 +6,7 @@ * * @package phpOMS\Socket\Client * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Account\Account; * Client socket class. * * @package phpOMS\Socket\Client - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Socket/Client/NullClientConnection.php b/Socket/Client/NullClientConnection.php index 2d98f2ffd..46daf97e4 100755 --- a/Socket/Client/NullClientConnection.php +++ b/Socket/Client/NullClientConnection.php @@ -6,7 +6,7 @@ * * @package phpOMS\Socket\Client * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Socket\Client; * Client socket class. * * @package phpOMS\Socket\Client - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Socket/Server/ClientManager.php b/Socket/Server/ClientManager.php index eb2d4dda9..d1e515c52 100755 --- a/Socket/Server/ClientManager.php +++ b/Socket/Server/ClientManager.php @@ -6,7 +6,7 @@ * * @package phpOMS\Socket\Server * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Socket\Client\NullClientConnection; * Client manager class. * * @package phpOMS\Socket\Server - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Socket/Server/Server.php b/Socket/Server/Server.php index 3d0aa5236..63e87e958 100755 --- a/Socket/Server/Server.php +++ b/Socket/Server/Server.php @@ -6,7 +6,7 @@ * * @package phpOMS\Socket\Server * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Socket\SocketAbstract; * Server class. * * @package phpOMS\Socket\Server - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Socket/SocketAbstract.php b/Socket/SocketAbstract.php index 26f72050f..df89b5b69 100755 --- a/Socket/SocketAbstract.php +++ b/Socket/SocketAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Socket * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Socket; * Socket class. * * @package phpOMS\Socket - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Socket/SocketInterface.php b/Socket/SocketInterface.php index 73780d1f4..83fcbb19f 100755 --- a/Socket/SocketInterface.php +++ b/Socket/SocketInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Socket * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Socket; * Socket class. * * @package phpOMS\Socket - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/Address.php b/Stdlib/Base/Address.php index 0f60d3c6b..dc1a16016 100755 --- a/Stdlib/Base/Address.php +++ b/Stdlib/Base/Address.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Base; * Address class. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/AddressType.php b/Stdlib/Base/AddressType.php index d5c432859..3ba3a5c62 100755 --- a/Stdlib/Base/AddressType.php +++ b/Stdlib/Base/AddressType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Base; * Address type enum. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/Enum.php b/Stdlib/Base/Enum.php index b482f1a3d..f4026e93a 100755 --- a/Stdlib/Base/Enum.php +++ b/Stdlib/Base/Enum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Stdlib\Base; * Replacing the SplEnum class and providing basic enum. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/EnumArray.php b/Stdlib/Base/EnumArray.php index 3d22fad6d..a6fa47a0c 100755 --- a/Stdlib/Base/EnumArray.php +++ b/Stdlib/Base/EnumArray.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Stdlib\Base; * Replacing the SplEnum class and providing basic enum. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/Exception/InvalidEnumName.php b/Stdlib/Base/Exception/InvalidEnumName.php index 6b5893bde..5a48c0e43 100755 --- a/Stdlib/Base/Exception/InvalidEnumName.php +++ b/Stdlib/Base/Exception/InvalidEnumName.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Stdlib\Base\Exception; * Performing operations on the file system * * @package phpOMS\Stdlib\Base\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/Exception/InvalidEnumValue.php b/Stdlib/Base/Exception/InvalidEnumValue.php index 68fa5e925..76acefaf9 100755 --- a/Stdlib/Base/Exception/InvalidEnumValue.php +++ b/Stdlib/Base/Exception/InvalidEnumValue.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base\Exception * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Stdlib\Base\Exception; * Performing operations on the file system * * @package phpOMS\Stdlib\Base\Exception - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/FloatInt.php b/Stdlib/Base/FloatInt.php index 64b06b0cc..58687e10a 100755 --- a/Stdlib/Base/FloatInt.php +++ b/Stdlib/Base/FloatInt.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\SerializableInterface; * FloatInt class. * * @package phpOMS\Stdlib - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/Heap.php b/Stdlib/Base/Heap.php index 29e9f66bd..ef6bf90a3 100755 --- a/Stdlib/Base/Heap.php +++ b/Stdlib/Base/Heap.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Base; * Heap class. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/HeapItemInterface.php b/Stdlib/Base/HeapItemInterface.php index 865977149..bfa5d7bb2 100755 --- a/Stdlib/Base/HeapItemInterface.php +++ b/Stdlib/Base/HeapItemInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Base; * Item interface * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/Iban.php b/Stdlib/Base/Iban.php index 6bb4e5b52..09fb3ce70 100755 --- a/Stdlib/Base/Iban.php +++ b/Stdlib/Base/Iban.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Validation\Finance\IbanEnum; * Iban class. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/Location.php b/Stdlib/Base/Location.php index 9353d7b48..27f96e3e6 100755 --- a/Stdlib/Base/Location.php +++ b/Stdlib/Base/Location.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Localization\ISO3166TwoEnum; * Location class. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/NullLocation.php b/Stdlib/Base/NullLocation.php index 8b271641f..35872d997 100755 --- a/Stdlib/Base/NullLocation.php +++ b/Stdlib/Base/NullLocation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Base; * Location class. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/PhoneType.php b/Stdlib/Base/PhoneType.php index f739bae6c..48c0f93ab 100755 --- a/Stdlib/Base/PhoneType.php +++ b/Stdlib/Base/PhoneType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Base; * Phone type enum. * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Base/SmartDateTime.php b/Stdlib/Base/SmartDateTime.php index 93a6b416e..c28cc0a9c 100755 --- a/Stdlib/Base/SmartDateTime.php +++ b/Stdlib/Base/SmartDateTime.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Math\Functions\Functions; * Providing smarter datetimes * * @package phpOMS\Stdlib\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Graph/Edge.php b/Stdlib/Graph/Edge.php index ec74115df..8aa47a5c2 100755 --- a/Stdlib/Graph/Edge.php +++ b/Stdlib/Graph/Edge.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Graph * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Graph; * Edge class. * * @package phpOMS\Stdlib\Graph - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -32,7 +32,7 @@ class Edge * @var Node * @since 1.0.0 */ - private Node $node1; + public Node $node1; /** * Node2. @@ -42,7 +42,7 @@ class Edge * @var Node * @since 1.0.0 */ - private Node $node2; + public Node $node2; /** * Is graph/edge directed @@ -50,7 +50,7 @@ class Edge * @var bool * @since 1.0.0 */ - private bool $isDirected = false; + public bool $isDirected = false; /** * Edge weight @@ -58,7 +58,7 @@ class Edge * @var float * @since 1.0.0 */ - private float $weight = 1.0; + public float $weight = 1.0; /** * Constructor. @@ -90,68 +90,6 @@ class Edge return [$this->node1, $this->node2]; } - /** - * Set weight - * - * @param float $weight Weight - * - * @return void - * - * @since 1.0.0 - */ - public function setWeight(float $weight) : void - { - $this->weight = $weight; - } - - /** - * Get node of the edge. - * - * @return Node - * - * @since 1.0.0 - */ - public function getNode1() : Node - { - return $this->node1; - } - - /** - * Get node of the edge. - * - * @return Node - * - * @since 1.0.0 - */ - public function getNode2() : Node - { - return $this->node2; - } - - /** - * Get weight - * - * @return float - * - * @since 1.0.0 - */ - public function getWeight() : float - { - return $this->weight; - } - - /** - * Is directed edge - * - * @return bool - * - * @since 1.0.0 - */ - public function isDirected() : bool - { - return $this->isDirected; - } - /** * Compare edge weights * @@ -164,6 +102,6 @@ class Edge */ public static function compare(self $e1, self $e2) : int { - return $e1->getWeight() <=> $e2->getWeight(); + return $e1->weight <=> $e2->weight; } } diff --git a/Stdlib/Graph/Graph.php b/Stdlib/Graph/Graph.php index c2f7ab1d9..75402db2f 100755 --- a/Stdlib/Graph/Graph.php +++ b/Stdlib/Graph/Graph.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Graph * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Graph; * Graph class. * * @package phpOMS\Stdlib\Graph - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -120,21 +120,16 @@ class Graph */ public function isDirected() : bool { - return $this->isDirected; - } + foreach ($this->nodes as $node) { + $edges = $node->getEdges(); + foreach ($edges as $edge) { + if ($edge->isDirected) { + return true; + } + } + } - /** - * Set graph directed - * - * @param bool $directed Is directed? - * - * @return void - * - * @since 1.0.0 - */ - public function setDirected(bool $directed) : void - { - $this->isDirected = $directed; + return false; } /** @@ -150,7 +145,7 @@ class Graph $costs = 0; foreach ($edges as $edge) { - $costs += $edge->getWeight(); + $costs += $edge->weight; } return $costs; @@ -171,10 +166,10 @@ class Graph $nodeEdges = $node->getEdges(); foreach ($nodeEdges as $edge) { - if (!isset($edges[$edge->getNode1()->getId() . ':' . $edge->getNode2()->getId()]) - && !isset($edges[$edge->getNode2()->getId() . ':' . $edge->getNode1()->getId()]) + if (!isset($edges[$edge->node1->getId() . ':' . $edge->node2->getId()]) + && !isset($edges[$edge->node2->getId() . ':' . $edge->node1->getId()]) ) { - $edges[$edge->getNode1()->getId() . ':' . $edge->getNode2()->getId()] = $edge; + $edges[$edge->node1->getId() . ':' . $edge->node2->getId()] = $edge; } } } @@ -202,8 +197,8 @@ class Graph $nodeEdges = $node->getEdges(); foreach ($nodeEdges as $edge) { - if (($edge->getNode1()->getId() === $id1 || $edge->getNode1()->getId() === $id2) - && ($edge->getNode2()->getId() === $id1 || $edge->getNode2()->getId() === $id2) + if (($edge->node1->getId() === $id1 || $edge->node1->getId() === $id2) + && ($edge->node2->getId() === $id1 || $edge->node2->getId() === $id2) ) { return $edge; } @@ -273,7 +268,7 @@ class Graph $edges = $this->nodes[$id]->getEdges(); foreach ($edges as $edge) { - $neighbor = !$edge->getNode1()->isEqual($node) ? $edge->getNode1() : $edge->getNode2(); + $neighbor = !$edge->node1->isEqual($node) ? $edge->node1 : $edge->node2; if (!isset($visited[$neighbor->getId()]) || !$visited[$neighbor->getId()]) { $parent[$neighbor->getId()] = $node; @@ -306,21 +301,21 @@ class Graph \usort($edges, Edge::class . '::compare'); foreach ($edges as $edge) { - if ($graph->hasNode($edge->getNode1()->getId()) - && $graph->hasNode($edge->getNode2()->getId()) + if ($graph->hasNode($edge->node1->getId()) + && $graph->hasNode($edge->node2->getId()) ) { continue; } /** @var Node $node1 */ - $node1 = $graph->hasNode($edge->getNode1()->getId()) - ? $graph->getNode($edge->getNode1()->getId()) - : clone $edge->getNode1(); + $node1 = $graph->hasNode($edge->node1->getId()) + ? $graph->getNode($edge->node1->getId()) + : clone $edge->node1; /** @var Node $node2 */ - $node2 = $graph->hasNode($edge->getNode2()->getId()) - ? $graph->getNode($edge->getNode2()->getId()) - : clone $edge->getNode2(); + $node2 = $graph->hasNode($edge->node2->getId()) + ? $graph->getNode($edge->node2->getId()) + : clone $edge->node2; if (!$graph->hasNode($node1->getId())) { $node1->removeEdges(); @@ -333,11 +328,10 @@ class Graph } $node1->setNodeRelative($node2) - ->setWeight($this->getEdge( + ->weight = $this->getEdge( $node1->getId(), $node2->getId() - )?->getWeight() ?? 0.0 - ); + )?->weight ?? 0.0; } return $graph; @@ -472,19 +466,53 @@ class Graph */ public function getFloydWarshallShortestPath() : array { - return []; - } + $distances = []; + foreach ($this->nodes as $k) { + foreach ($this->nodes as $i) { + foreach ($this->nodes as $j) { + if (!isset($distances[$i->getId()])) { + $distances[$i->getId()] = []; - /** - * Get shortest path using Dijkstra algorithm. - * - * @return array - * - * @since 1.0.0 - */ - public function getDijkstraShortestPath() : array - { - return []; + foreach ($this->nodes as $node) { + if ($i->isEqual($node)) { + $distances[$i->getId()][$node->getId()] = 0; + } else { + $edge = $i->getEdgeByNeighbor($node); + + $distances[$i->getId()][$node->getId()] = $edge === null + ? null + : $edge->weight; + } + } + } + + if (!isset($distances[$k->getId()])) { + $distances[$k->getId()] = []; + + foreach ($this->nodes as $node) { + if ($k->isEqual($node)) { + $distances[$k->getId()][$node->getId()] = 0; + } else { + $edge = $k->getEdgeByNeighbor($node); + + $distances[$k->getId()][$node->getId()] = $edge === null + ? null + : $edge->weight; + } + } + } + + if ($distances[$i->getId()][$k->getId()] !== null + && $distances[$k->getId()][$j->getId()] !== null + && $distances[$i->getId()][$j->getId()] > $distances[$i->getId()][$k->getId()] + $distances[$k->getId()][$j->getId()] + ) { + $distances[$i->getId()][$j->getId()] = $distances[$i->getId()][$k->getId()] + $distances[$k->getId()][$j->getId()]; + } + } + } + } + + return $distances; } /** @@ -500,7 +528,7 @@ class Graph * * @since 1.0.0 */ - private function depthFirstTraversal( + private function pathBetweenNodesDfs( Node $node1, Node $node2 = null, array &$visited, @@ -518,7 +546,7 @@ class Graph foreach ($neighbors as $neighbor) { if (!isset($visited[$neighbor->getId()]) || !$visited[$neighbor->getId()]) { $path[] = $neighbor; - $this->depthFirstTraversal($neighbor, $node2, $visited, $path, $paths); + $this->pathBetweenNodesDfs($neighbor, $node2, $visited, $path, $paths); \array_pop($path); } } @@ -537,7 +565,7 @@ class Graph * * @since 1.0.0 */ - public function findAllReachableNodesDFS(int | string | Node $node1) : array + public function findAllReachableNodesDfs(int | string | Node $node1) : array { $nodes = []; @@ -593,7 +621,40 @@ class Graph */ public function longestPath() : array { - return []; + $longestPath = []; + $visited = []; + $path = []; + + foreach ($this->nodes as $node) { + $visited[$node->getId()] = false; + $this->longestPathDfs($node, $visited, $path, $longestPath); + } + + return $longestPath; + } + + private function longestPathDfs(Node $node, &$visited, &$path, &$longestPath) + { + $visited[$node->getId()] = true; + $path[] = $node; + + $edges = $node->getEdges(); + foreach ($edges as $edge) { + $adj = $edge->node1->isEqual($node) + ? $edge->node2 + : $edge->node1; + + if (!$visited[$adj->getId()]) { + $this->longestPathDfs($adj, $visited, $path, $longestPath); + } + } + + if (\count($path) > \count($longestPath)) { + $longestPath = $path; + } + + \array_pop($path); + $visited[$node->getId()] = false; } /** @@ -625,7 +686,7 @@ class Graph $paths = []; $visited = []; - $this->depthFirstTraversal($node1, $node2, $visited, $path, $paths); + $this->pathBetweenNodesDfs($node1, $node2, $visited, $path, $paths); return $paths; } @@ -685,7 +746,7 @@ class Graph continue; } - $edges[$key] += $node1->getEdgeByNeighbor($node)->getWeight(); + $edges[$key] += $node1->getEdgeByNeighbor($node)->weight; ++$nodeCount; } @@ -741,7 +802,7 @@ class Graph continue; } - $edges[$key] += $node1->getEdgeByNeighbor($node)->getWeight(); + $edges[$key] += $node1->getEdgeByNeighbor($node)->weight; ++$nodeCount; } @@ -827,7 +888,37 @@ class Graph */ public function getGirth() : int { - return 0; + $girth = \PHP_INT_MAX; + + foreach ($this->nodes as $i) { + $stack = [$i]; + + foreach ($this->nodes as $node) { + $distances[$node->getId()] = \PHP_INT_MAX; + } + + $distances[$i->getId()] = 0; + + while (!empty($stack)) { + $current = \array_shift($queue); + + foreach ($this->nodes as $j) { + // Has neighbour + if ($this->nodes[$current->getId()]->hasNeighbor($j)) { + if ($distances[$j->getId()] === \PHP_INT_MAX) { + $distances[$j->getId()] = $distances[$current->getId()] + 1; + $stack[] = $j; + } elseif (!$j->isEqual($i) && !$j->isEqual($current) + && $distances[$j->getId()] >= $distances[$current->getId()] + ) { + $girs = \min($girth, $distances[$current->getId()] + $distances[$j->getId()] + 1); + } + } + } + } + } + + return $girth; } /** @@ -839,31 +930,56 @@ class Graph */ public function getCircuitRank() : int { - return 0; + $adjMatrix = []; + foreach ($this->nodes as $node) { + $adjMatrix[$node->getId()] = $node->getEdges(); + } + + $rank = 0; + foreach ($this->nodes as $i) { + $visited = []; + foreach ($this->nodes as $node) { + $visited[$node->getId()] = false; + } + + if ($this->cycleDfs($adjMatrix, $i, null, $visited)) { + ++$rank; + } + } + + return $rank; } - /** - * Get the graph node connectivity - * - * @return int - * - * @since 1.0.0 - */ - public function getNodeConnectivity() : int + private function cycleDfs(array $adjMatrix, Node $current, ?Node $previous, &$visited) : bool { - return 0; - } + $visited[$current->getId()] = true; + foreach ($adjMatrix[$current->getId()] as $edge) { + if ($edge->isDirected) { + if ($edge->node2->isEqual(($current))) { + continue; + } - /** - * Get the graph edge connectivity - * - * @return int - * - * @since 1.0.0 - */ - public function getEdgeConnectivity() : int - { - return 0; + $next = $edge->node2; + } else { + $next = $edge->node1->isEqual($current) + ? $edge->node2 + : $edge->node1; + } + + if ($next->isEqual($previous)) { + continue; + } + + if ($visited[$next->getId()]) { + return true; + } + + if ($this->cycleDfs($adjMatrix, $next, $current, $visited)) { + return true; + } + } + + return false; } /** @@ -873,15 +989,173 @@ class Graph * * @since 1.0.0 */ - public function isConnected() : bool + public function isConnected(int | string | Node $node1 = null, int | string | Node $node2 = null) : bool { if (empty($this->nodes)) { return true; } - $nodes = $this->findAllReachableNodesDFS(\reset($this->nodes)); + if ($node1 === null || $node2 === null) { + $visited = []; + foreach ($this->nodes as $node) { + $visited[] = false; + } - return \count($nodes) === \count($this->nodes); + $node = \reset($this->nodes); + $visited[$node->getId()] = true; + $stack = [$node]; + + while (!empty($stack)) { + $node = \array_pop($stack); + + $edges = $node->getEdges(); + foreach ($edges as $edge) { + if ($edge->isDirected) { + if ($edge->node2->isEqual(($node))) { + continue; + } + + $adj = $edge->node2; + } else { + $adj = $edge->node1->isEqual($node) + ? $edge->node2 + : $edge->node1; + } + + if (!$visited[$adj->getId()]) { + $visited[$adj->getId()] = true; + + $stack[] = $adj; + } + } + } + + return !\in_array(false, $visited); + } + + $visited = []; + foreach ($this->nodes as $node) { + $visited[$node->getId()] = false; + } + + $stack = [$node1]; + while (!empty($stack)) { + $node = \array_shift($stack); + + if ($node->isEqual($node2)) { + return true; + } + + if (!$visited[$node->getId()]) { + $visited[$node->getId()] = true; + + $edges = $node->getEdges(); + foreach ($edges as $edge) { + if ($edge->isDirected) { + if ($edge->node2->isEqual(($node))) { + continue; + } + + $stack[] = $edge->node2; + } else { + $stack = $edge->node1->isEqual($node) + ? $edge->node2 + : $edge->node1; + } + } + } + } + + return false; + } + + /** + * Is the graph strongly connected? + * + * @return bool + * + * @since 1.0.0 + */ + public function isStronglyConnected() + { + $visited = []; + foreach ($this->nodes as $node) { + $visited[] = false; + } + + $node = \reset($this->nodes); + $visited[$node->getId()] = true; + $stack = [$node]; + + while (!empty($stack)) { + $node = \array_pop($stack); + + $edges = $node->getEdges(); + foreach ($edges as $edge) { + if ($edge->isDirected) { + if ($edge->node2->isEqual(($node))) { + continue; + } + + $adj = $edge->node2; + } else { + $adj = $edge->node1->isEqual($node) + ? $edge->node2 + : $edge->node1; + } + + if (!$visited[$adj->getId()]) { + $visited[$adj->getId()] = true; + + $stack[] = $adj; + } + } + } + + if (\in_array(false, $visited)) { + return false; + } + + if (!$this->isDirected) { + return true; + } + + // Test connectivity in reverse + $visited = []; + foreach ($this->nodes as $node) { + $visited[] = false; + } + + $node = \reset($this->nodes); + $visited[$node->getId()] = true; + $stack = [$node]; + + while (!empty($stack)) { + $node = \array_pop($stack); + + $edges = $node->getEdges(); + foreach ($edges as $edge) { + if ($edge->isDirected) { + if (!$edge->node2->isEqual(($node))) { + continue; + } + + $adj = $edge->node1; + } else { + $adj = $edge->node1->isEqual($node) + ? $edge->node2 + : $edge->node1; + } + + if (!$visited[$adj->getId()]) { + $visited[$adj->getId()] = true; + + $stack[] = $adj; + } + } + } + + return !\in_array(false, $visited); } /** @@ -891,8 +1165,39 @@ class Graph * * @since 1.0.0 */ - public function isBipartite() : bool + public function isBipartite(int | string | Node $node1) : bool { + if (!($node1 instanceof Node)) { + $node1 = $this->getNode($node1); + } + + foreach ($this->nodes as $node) { + $colors[$node->getId()] = 0; + } + + $colors[$node1->getId()] = 1; + + $stack = []; + \array_push($stack, $node1); + + while (!empty($stack)) { + $node = \array_pop($stack); + + $edges = $node->getEdges(); + foreach ($edges as $edge) { + $adj = $edge->node1->isEqual($node) + ? $edge->node2 + : $edge->node1; + + if ($colors[$adj->getId()] === -1) { + $colors[$adj->getId()] = 1 - $colors[$node->getId()]; + \array_push($stack, $adj); + } elseif ($colors[$adj->getId()] === $colors[$node->getId()]) { + return false; + } + } + } + return true; } @@ -903,8 +1208,20 @@ class Graph * * @since 1.0.0 */ - public function isTriangleFree() : bool + public function hasTriangles() : bool { - return true; + foreach ($this->nodes as $i) { + foreach ($this->nodes as $j) { + if ($this->getEdge($i->getId(), $j->getId()) !== null) { + foreach ($this->nodes as $k) { + if ($this->getEdge($j->getId(), $k->getId()) && $this->getEdge($k->getId(), $i->getId())) { + return true; + } + } + } + } + } + + return false; } } diff --git a/Stdlib/Graph/Node.php b/Stdlib/Graph/Node.php index b8e9b4886..fd6829379 100755 --- a/Stdlib/Graph/Node.php +++ b/Stdlib/Graph/Node.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Graph * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Stdlib\Graph; * Node class. * * @package phpOMS\Stdlib\Graph - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -130,7 +130,7 @@ class Node $edge = new Edge($this, $node, 0.0, $isDirected); $this->setEdge($edge, $key); - if (!$edge->isDirected()) { + if (!$edge->isDirected) { $node->setEdge($edge); } @@ -172,6 +172,17 @@ class Node return $this->edges[$key] ?? null; } + public function hasNeighbor(self $node) : bool + { + foreach ($this->edges as $edge) { + if ($edge->node1->isEqual($node) || $edge->node2->isEqual($node)) { + return true; + } + } + + return false; + } + /** * Get graph edge by neighbor. * @@ -184,7 +195,7 @@ class Node public function getEdgeByNeighbor(self $node) : ?Edge { foreach ($this->edges as $edge) { - if ($edge->getNode1()->isEqual($node) || $edge->getNode2()->isEqual($node)) { + if ($edge->node1->isEqual($node) || $edge->node2->isEqual($node)) { return $edge; } } diff --git a/Stdlib/Map/KeyType.php b/Stdlib/Map/KeyType.php index afc820e72..ec6276617 100755 --- a/Stdlib/Map/KeyType.php +++ b/Stdlib/Map/KeyType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Map * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * These keys specify how the multi map works. * * @package phpOMS\Stdlib\Map - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Map/MultiMap.php b/Stdlib/Map/MultiMap.php index d68519405..9d384756f 100755 --- a/Stdlib/Map/MultiMap.php +++ b/Stdlib/Map/MultiMap.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Map * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Utils\Permutation; * Multimap utils. * * @package phpOMS\Stdlib\Map - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Map/OrderType.php b/Stdlib/Map/OrderType.php index fa320cf00..c26140f39 100755 --- a/Stdlib/Map/OrderType.php +++ b/Stdlib/Map/OrderType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Map * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Specifies if keys in the map can be ordered in any way or need to match the exact order. * * @package phpOMS\Stdlib\Map - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Queue/PriorityMode.php b/Stdlib/Queue/PriorityMode.php index b6da2c4b0..d1bc06f40 100755 --- a/Stdlib/Queue/PriorityMode.php +++ b/Stdlib/Queue/PriorityMode.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Queue * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Defines the different priorities in which elements from the queue can be extracted. * * @package phpOMS\Stdlib\Queue - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Stdlib/Queue/PriorityQueue.php b/Stdlib/Queue/PriorityQueue.php index 673370594..4bd4691de 100755 --- a/Stdlib/Queue/PriorityQueue.php +++ b/Stdlib/Queue/PriorityQueue.php @@ -6,7 +6,7 @@ * * @package phpOMS\Stdlib\Queue * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * Priority queue class. * * @package phpOMS\Stdlib\Queue - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -115,9 +115,9 @@ class PriorityQueue implements \Countable, SerializableInterface { switch($this->type) { case PriorityMode::FIFO: - return $this->getInsertFIFO($priority); + return $this->getInsertFIFO(); case PriorityMode::LIFO: - return $this->getInsertLIFO($priority); + return $this->getInsertLIFO(); case PriorityMode::HIGHEST: return $this->getInsertHighest($priority); case PriorityMode::LOWEST: @@ -130,13 +130,11 @@ class PriorityQueue implements \Countable, SerializableInterface /** * Get insert position * - * @param float $priority Priority of new element - * * @return int * * @since 1.0.0 */ - private function getInsertFIFO(float $priority) : int + private function getInsertFIFO() : int { return 0; } @@ -144,13 +142,11 @@ class PriorityQueue implements \Countable, SerializableInterface /** * Get insert position * - * @param float $priority Priority of new element - * * @return int * * @since 1.0.0 */ - private function getInsertLIFO(float $priority) : int + private function getInsertLIFO() : int { return \count($this->queue); } diff --git a/System/CharsetType.php b/System/CharsetType.php index b75cd0089..a3c003425 100755 --- a/System/CharsetType.php +++ b/System/CharsetType.php @@ -6,7 +6,7 @@ * * @package phpOMS\System * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Charset enum. * * @package phpOMS\System - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/ContainerInterface.php b/System/File/ContainerInterface.php index 6f89879a2..575cc65ec 100755 --- a/System/File/ContainerInterface.php +++ b/System/File/ContainerInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\System\File; * Performing operations on the file system * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/ContentPutMode.php b/System/File/ContentPutMode.php index 965d90d81..fb5299ebe 100755 --- a/System/File/ContentPutMode.php +++ b/System/File/ContentPutMode.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Defines how the content manipulation should be handled. * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/DirectoryInterface.php b/System/File/DirectoryInterface.php index 2647f417e..a56830784 100755 --- a/System/File/DirectoryInterface.php +++ b/System/File/DirectoryInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\System\File; * Performing operations on the file system * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/System/File/ExtensionType.php b/System/File/ExtensionType.php index 8e5cbb64e..b6821bc97 100755 --- a/System/File/ExtensionType.php +++ b/System/File/ExtensionType.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Defines what kind of category a file belongs to. * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/FileInterface.php b/System/File/FileInterface.php index ff742ef5d..4684d7842 100755 --- a/System/File/FileInterface.php +++ b/System/File/FileInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\System\File; * Performing operations on the file system * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/FileUtils.php b/System/File/FileUtils.php index 46acc7c54..0f03913fd 100755 --- a/System/File/FileUtils.php +++ b/System/File/FileUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\System\File; * Path exception class. * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Ftp/Directory.php b/System/File/Ftp/Directory.php index 31a7ddd31..bcd019d8f 100755 --- a/System/File/Ftp/Directory.php +++ b/System/File/Ftp/Directory.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Ftp * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -28,7 +28,7 @@ use phpOMS\Utils\StringUtils; * Performing operations on the file system * * @package phpOMS\System\File\Ftp - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Ftp/File.php b/System/File/Ftp/File.php index 1cbbffab4..248aa3dd4 100755 --- a/System/File/Ftp/File.php +++ b/System/File/Ftp/File.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Ftp * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -30,7 +30,7 @@ use phpOMS\Uri\HttpUri; * All static implementations require a path/uri in the following form: ftp://user:pass@domain.com/path/subpath... * * @package phpOMS\System\File\Ftp - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Ftp/FileAbstract.php b/System/File/Ftp/FileAbstract.php index 5c413fab4..eefcbf314 100755 --- a/System/File/Ftp/FileAbstract.php +++ b/System/File/Ftp/FileAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Ftp * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Uri\HttpUri; * Performing operations on the file system * * @package phpOMS\System\File\Ftp - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Ftp/FtpContainerInterface.php b/System/File/Ftp/FtpContainerInterface.php index 25fe89921..6d9521698 100755 --- a/System/File/Ftp/FtpContainerInterface.php +++ b/System/File/Ftp/FtpContainerInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\System\File\ContainerInterface; * Performing operations on the file system * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Ftp/FtpStorage.php b/System/File/Ftp/FtpStorage.php index 86ad332bf..94c62c47d 100755 --- a/System/File/Ftp/FtpStorage.php +++ b/System/File/Ftp/FtpStorage.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Ftp * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\System\File\StorageAbstract; * Performing operations on the file system * * @package phpOMS\System\File\Ftp - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Local/Directory.php b/System/File/Local/Directory.php index dabbb3ebf..ce8c49151 100755 --- a/System/File/Local/Directory.php +++ b/System/File/Local/Directory.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Local * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\Utils\StringUtils; * Performing operations on the file system * * @package phpOMS\System\File\Local - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Local/File.php b/System/File/Local/File.php index 71d3fb67d..ef20f2278 100755 --- a/System/File/Local/File.php +++ b/System/File/Local/File.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Local * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\System\File\PathException; * Performing operations on the file system * * @package phpOMS\System\File\Local - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Local/FileAbstract.php b/System/File/Local/FileAbstract.php index e2db4976a..4ec370010 100755 --- a/System/File/Local/FileAbstract.php +++ b/System/File/Local/FileAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Local * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\System\File\PathException; * Performing operations on the file system * * @package phpOMS\System\File\Local - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Local/LocalContainerInterface.php b/System/File/Local/LocalContainerInterface.php index 3d6774963..756a9b75c 100755 --- a/System/File/Local/LocalContainerInterface.php +++ b/System/File/Local/LocalContainerInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\System\File\ContainerInterface; * Performing operations on the file system * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Local/LocalStorage.php b/System/File/Local/LocalStorage.php index 7a9b4bd72..f7a185149 100755 --- a/System/File/Local/LocalStorage.php +++ b/System/File/Local/LocalStorage.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File\Local * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\System\File\StorageAbstract; * Performing operations on the file system * * @package phpOMS\System\File\Local - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/PathException.php b/System/File/PathException.php index 77320ef3b..b39b2930e 100755 --- a/System/File/PathException.php +++ b/System/File/PathException.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\System\File; * Path exception class. * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/PermissionException.php b/System/File/PermissionException.php index 451241d06..4ac0a914b 100755 --- a/System/File/PermissionException.php +++ b/System/File/PermissionException.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\System\File; * Permission exception class. * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/Storage.php b/System/File/Storage.php index dcd13c418..6bca9523a 100755 --- a/System/File/Storage.php +++ b/System/File/Storage.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\System\File; * Performing operations on the file system * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/File/StorageAbstract.php b/System/File/StorageAbstract.php index e7530c1a5..e5cae11b5 100755 --- a/System/File/StorageAbstract.php +++ b/System/File/StorageAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\File * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\System\File; * Performing operations on the file system * * @package phpOMS\System\File - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/MimeType.php b/System/MimeType.php index 87dd50f9e..42f99a0b2 100755 --- a/System/MimeType.php +++ b/System/MimeType.php @@ -6,7 +6,7 @@ * * @package phpOMS\System * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Stdlib\Base\Enum; * Common mime types which can be helpful for responses where a specific mime needs to be set. * * @package phpOMS\System - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/OperatingSystem.php b/System/OperatingSystem.php index 288e43bb2..58bc0c669 100755 --- a/System/OperatingSystem.php +++ b/System/OperatingSystem.php @@ -6,7 +6,7 @@ * * @package phpOMS\System * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\System; * Operating system class. * * @package phpOMS\System - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/Search/StringSearch.php b/System/Search/StringSearch.php index 41d2a619b..e044405c2 100755 --- a/System/Search/StringSearch.php +++ b/System/Search/StringSearch.php @@ -6,7 +6,7 @@ * * @package phpOMS\System\Search * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\System\Search; * Basic string search algorithms. * * @package phpOMS\System\Search - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/SystemType.php b/System/SystemType.php index c7b689bab..cb29986dd 100755 --- a/System/SystemType.php +++ b/System/SystemType.php @@ -6,7 +6,7 @@ * * @package phpOMS\System * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Operating system type enum. * * @package phpOMS\System - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/System/SystemUtils.php b/System/SystemUtils.php index feda801f5..d66917dba 100755 --- a/System/SystemUtils.php +++ b/System/SystemUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\System * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\System; * System utils * * @package phpOMS\System - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/UnhandledHandler.php b/UnhandledHandler.php index 9bc2828fc..89a8ce061 100755 --- a/UnhandledHandler.php +++ b/UnhandledHandler.php @@ -6,7 +6,7 @@ * * @package phpOMS * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Log\FileLogger; * Default exception and error handler. * * @package phpOMS - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -93,13 +93,15 @@ final class UnhandledHandler $e = \error_get_last(); \error_clear_last(); - if ($e !== null) { - $logger = FileLogger::getInstance(__DIR__ . '/../Logs'); - $logger->warning(FileLogger::MSG_FULL, [ - 'message' => $e['message'], - 'line' => $e['line'], - 'file' => $e['file'], - ]); + if ($e === null) { + return; } + + $logger = FileLogger::getInstance(__DIR__ . '/../Logs'); + $logger->warning(FileLogger::MSG_FULL, [ + 'message' => $e['message'], + 'line' => $e['line'], + 'file' => $e['file'], + ]); } } diff --git a/Uri/Argument.php b/Uri/Argument.php index 55da2a55a..d3493c710 100755 --- a/Uri/Argument.php +++ b/Uri/Argument.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Uri; * Considers arguments used in ca CLI as uri * * @package phpOMS\Uri - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Uri/HttpUri.php b/Uri/HttpUri.php index 7e9f53263..d4f904606 100755 --- a/Uri/HttpUri.php +++ b/Uri/HttpUri.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\Utils\StringUtils; * Uri used for http requests (incoming & outgoing) * * @package phpOMS\Uri - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Uri/InvalidUriException.php b/Uri/InvalidUriException.php index 0fb484836..aff0e7134 100755 --- a/Uri/InvalidUriException.php +++ b/Uri/InvalidUriException.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Uri; * Uri exception. * * @package phpOMS\Uri - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Uri/UriFactory.php b/Uri/UriFactory.php index 94b99d3ae..f297407d1 100755 --- a/Uri/UriFactory.php +++ b/Uri/UriFactory.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Uri; * Used in order to create a uri * * @package phpOMS\Uri - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -58,6 +58,20 @@ final class UriFactory return self::$uri[$key] ?? null; } + /** + * Has query replacement. + * + * @param string $key Replacement key + * + * @return bool + * + * @since 1.0.0 + */ + public static function hasQuery(string $key) : bool + { + return isset(self::$uri[$key]); + } + /** * Cleanup * @@ -116,7 +130,7 @@ final class UriFactory self::setQuery('/scheme', $uri->scheme); self::setQuery('/host', $uri->host); self::setQuery('/port', (string) $uri->port); - self::setQuery('/base', \rtrim($uri->getBase(), '/')); + self::setQuery('/tld', \rtrim($uri->getBase(), '/')); self::setQuery('/rootPath', $uri->getRootPath()); self::setQuery('?', '?' . $uri->getQuery()); self::setQuery('%', $uri->__toString()); diff --git a/Uri/UriInterface.php b/Uri/UriInterface.php index c46fd0fbc..1b30fda5b 100755 --- a/Uri/UriInterface.php +++ b/Uri/UriInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ namespace phpOMS\Uri; * @property string $pass Password * * @package phpOMS\Uri - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Uri/UriScheme.php b/Uri/UriScheme.php index 922d419e7..da6af7e1b 100755 --- a/Uri/UriScheme.php +++ b/Uri/UriScheme.php @@ -6,7 +6,7 @@ * * @package phpOMS\Uri * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Uri scheme. * * @package phpOMS\Uri - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/ArrayUtils.php b/Utils/ArrayUtils.php index a2e8c9c62..7ad4b3340 100755 --- a/Utils/ArrayUtils.php +++ b/Utils/ArrayUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Math\Matrix\Exception\InvalidDimensionException; * Array utils. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Barcode/Aztec.php b/Utils/Barcode/Aztec.php index cfd725d50..fac83646d 100755 --- a/Utils/Barcode/Aztec.php +++ b/Utils/Barcode/Aztec.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Barcode; * Aztec class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Barcode/C128Abstract.php b/Utils/Barcode/BarAbstract.php old mode 100755 new mode 100644 similarity index 53% rename from Utils/Barcode/C128Abstract.php rename to Utils/Barcode/BarAbstract.php index 0ab732c6c..86305bc8a --- a/Utils/Barcode/C128Abstract.php +++ b/Utils/Barcode/BarAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,14 +20,14 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; * Code 128 abstract class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * * @SuppressWarnings(PHPMD.CamelCasePropertyName) * @SuppressWarnings(PHPMD.CamelCaseVariableName) */ -abstract class C128Abstract +abstract class BarAbstract extends CodeAbstract { /** * Checksum. @@ -61,38 +61,6 @@ abstract class C128Abstract */ protected static string $CODE_END = ''; - /** - * Orientation. - * - * @var int - * @since 1.0.0 - */ - protected int $orientation = 0; - - /** - * Barcode dimension. - * - * @var int[] - * @since 1.0.0 - */ - protected array $dimension = ['width' => 0, 'height' => 0]; - - /** - * Barcode dimension. - * - * @var int - * @since 1.0.0 - */ - protected int $margin = 10; - - /** - * Content to encrypt. - * - * @var string - * @since 1.0.0 - */ - protected string $content = ''; - /** * Show text below barcode. * @@ -102,126 +70,7 @@ abstract class C128Abstract protected bool $showText = true; /** - * Background color. - * - * @var int[] - * @since 1.0.0 - */ - protected array $background = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]; - - /** - * Front color. - * - * @var int[] - * @since 1.0.0 - */ - protected array $front = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]; - - /** - * Constructor - * - * @param string $content Content to encrypt - * @param int $width Barcode width - * @param int $height Barcode height - * @param int $orientation Orientation of the barcode - * - * @since 1.0.0 - */ - public function __construct(string $content = '', int $width = 100, int $height = 20, int $orientation = OrientationType::HORIZONTAL) - { - $this->setContent($content); - $this->setDimension($width, $height); - $this->setOrientation($orientation); - } - - /** - * Set barcode dimensions - * - * @param int $width Barcode width - * @param int $height Barcode height - * - * @return void - * - * @since 1.0.0 - */ - public function setDimension(int $width, int $height) : void - { - if ($width < 0) { - throw new \OutOfBoundsException((string) $width); - } - - if ($height < 0) { - throw new \OutOfBoundsException((string) $height); - } - - $this->dimension['width'] = $width; - $this->dimension['height'] = $height; - } - - /** - * Set barcode margins - * - * @param int $margin Barcode margin - * - * @return void - * - * @since 1.0.0 - */ - public function setMargin(int $margin) : void - { - $this->margin = $margin; - } - - /** - * Set barcode orientation - * - * @param int $orientation Barcode orientation - * - * @return void - * - * @since 1.0.0 - */ - public function setOrientation(int $orientation) : void - { - if (!OrientationType::isValidValue($orientation)) { - throw new InvalidEnumValue($orientation); - } - - $this->orientation = $orientation; - } - - /** - * Get content - * - * @return string Returns the string representation of the code - * - * @since 1.0.0 - */ - public function getContent() : string - { - return $this->content; - } - - /** - * Set content to encrypt - * - * @param string $content Barcode content - * - * @return void - * - * @since 1.0.0 - */ - public function setContent(string $content) : void - { - $this->content = $content; - } - - /** - * Get image reference - * - * @return \GdImage - * - * @since 1.0.0 + * {@inheritdoc} */ public function get() : mixed { @@ -230,40 +79,6 @@ abstract class C128Abstract return $this->createImage($codeString); } - /** - * Save to file - * - * @param string $file File path/name - * - * @return void - * - * @since 1.0.0 - */ - public function saveToPngFile(string $file) : void - { - $res = $this->get(); - - \imagepng($res, $file); - \imagedestroy($res); - } - - /** - * Save to file - * - * @param string $file File path/name - * - * @return void - * - * @since 1.0.0 - */ - public function saveToJpgFile(string $file) : void - { - $res = $this->get(); - - \imagejpeg($res, $file); - \imagedestroy($res); - } - /** * Validate the barcode string * @@ -295,21 +110,22 @@ abstract class C128Abstract */ protected function generateCodeString() : string { - $keys = \array_keys(static::$CODEARRAY); - $values = \array_flip($keys); - $codeString = ''; - $length = \strlen($this->content); - $checksum = static::$CHECKSUM; + if ($this->codestring === '') { + $keys = \array_keys(static::$CODEARRAY); + $values = \array_flip($keys); + $length = \strlen($this->content); + $checksum = static::$CHECKSUM; - for ($pos = 1; $pos <= $length; ++$pos) { - $activeKey = \substr($this->content, ($pos - 1), 1); - $codeString .= static::$CODEARRAY[$activeKey]; - $checksum += $values[$activeKey] * $pos; + for ($pos = 1; $pos <= $length; ++$pos) { + $activeKey = \substr($this->content, ($pos - 1), 1); + $this->codestring .= static::$CODEARRAY[$activeKey]; + $checksum += $values[$activeKey] * $pos; + } + + $this->codestring .= static::$CODEARRAY[$keys[($checksum - ((int) ($checksum / 103) * 103))]]; } - $codeString .= static::$CODEARRAY[$keys[($checksum - ((int) ($checksum / 103) * 103))]]; - - return $codeString; + return $this->codestring; } /** @@ -332,8 +148,6 @@ abstract class C128Abstract $black = \imagecolorallocate($image, 0, 0, 0); $white = \imagecolorallocate($image, 255, 255, 255); - $location = 0; - $length = \strlen($codeString); if ($white === false || $black === false) { throw new \Exception(); // @codeCoverageIgnore @@ -341,6 +155,9 @@ abstract class C128Abstract \imagefill($image, 0, 0, $white); + $location = 0; + $length = \strlen($codeString); + for ($position = 1; $position <= $length; ++$position) { $cur_size = $location + (int) (\substr($codeString, ($position - 1), 1)); @@ -351,7 +168,7 @@ abstract class C128Abstract 0 + $this->margin, $cur_size + $this->margin, $dimensions['height'] - $this->margin - 1, - ($position % 2 == 0 ? $white : $black) + ($position % 2 === 0 ? $white : $black) ); } else { \imagefilledrectangle( @@ -360,7 +177,7 @@ abstract class C128Abstract $location + $this->margin, $dimensions['width'] - $this->margin - 1, $cur_size + $this->margin, - ($position % 2 == 0 ? $white : $black) + ($position % 2 === 0 ? $white : $black) ); } diff --git a/Utils/Barcode/C128a.php b/Utils/Barcode/C128a.php index 8ced0e4c3..14cab0b0b 100755 --- a/Utils/Barcode/C128a.php +++ b/Utils/Barcode/C128a.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,14 +18,14 @@ namespace phpOMS\Utils\Barcode; * Code 128a class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * * @SuppressWarnings(PHPMD.CamelCasePropertyName) * @SuppressWarnings(PHPMD.CamelCaseVariableName) */ -class C128a extends C128Abstract +class C128a extends BarAbstract { /** * Checksum. diff --git a/Utils/Barcode/C128b.php b/Utils/Barcode/C128b.php index f24a5a3fb..302634062 100755 --- a/Utils/Barcode/C128b.php +++ b/Utils/Barcode/C128b.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,14 +18,14 @@ namespace phpOMS\Utils\Barcode; * Code 128b class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * * @SuppressWarnings(PHPMD.CamelCasePropertyName) * @SuppressWarnings(PHPMD.CamelCaseVariableName) */ -class C128b extends C128Abstract +class C128b extends BarAbstract { /** * Checksum. diff --git a/Utils/Barcode/C128c.php b/Utils/Barcode/C128c.php index 4bd6b2444..0882d66f6 100755 --- a/Utils/Barcode/C128c.php +++ b/Utils/Barcode/C128c.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,14 +18,14 @@ namespace phpOMS\Utils\Barcode; * Code 128c class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * * @SuppressWarnings(PHPMD.CamelCasePropertyName) * @SuppressWarnings(PHPMD.CamelCaseVariableName) */ -class C128c extends C128Abstract +class C128c extends BarAbstract { /** * Checksum. diff --git a/Utils/Barcode/C25.php b/Utils/Barcode/C25.php index 28bf77c77..00f67a120 100755 --- a/Utils/Barcode/C25.php +++ b/Utils/Barcode/C25.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,14 +18,14 @@ namespace phpOMS\Utils\Barcode; * Code 25 class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * * @SuppressWarnings(PHPMD.CamelCasePropertyName) * @SuppressWarnings(PHPMD.CamelCaseVariableName) */ -class C25 extends C128Abstract +class C25 extends BarAbstract { /** * Char array. diff --git a/Utils/Barcode/C39.php b/Utils/Barcode/C39.php index eb584150f..bfc277bde 100755 --- a/Utils/Barcode/C39.php +++ b/Utils/Barcode/C39.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,14 +18,14 @@ namespace phpOMS\Utils\Barcode; * Code 39 class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * * @SuppressWarnings(PHPMD.CamelCasePropertyName) * @SuppressWarnings(PHPMD.CamelCaseVariableName) */ -class C39 extends C128Abstract +class C39 extends BarAbstract { /** * Char weighted array. diff --git a/Utils/Barcode/CodeAbstract.php b/Utils/Barcode/CodeAbstract.php new file mode 100644 index 000000000..fc10a4fad --- /dev/null +++ b/Utils/Barcode/CodeAbstract.php @@ -0,0 +1,246 @@ +> + * @since 1.0.0 + */ + protected array $codearray = [[]]; + + /** + * Orientation. + * + * @var int + * @since 1.0.0 + */ + protected int $orientation = 0; + + /** + * Barcode dimension. + * + * @var int[] + * @since 1.0.0 + */ + protected array $dimension = ['width' => 0, 'height' => 0]; + + /** + * Barcode dimension. + * + * @var int + * @since 1.0.0 + */ + protected int $margin = 10; + + /** + * Content to encrypt. + * + * @var string + * @since 1.0.0 + */ + protected string $content = ''; + + /** + * Background color. + * + * @var int[] + * @since 1.0.0 + */ + protected array $background = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]; + + /** + * Front color. + * + * @var int[] + * @since 1.0.0 + */ + protected array $front = ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]; + + /** + * Constructor + * + * @param string $content Content to encrypt + * @param int $width Barcode width + * @param int $height Barcode height + * @param int $orientation Orientation of the barcode + * + * @since 1.0.0 + */ + public function __construct(string $content = '', int $width = 100, int $height = 20, int $orientation = OrientationType::HORIZONTAL) + { + $this->setContent($content); + $this->setDimension($width, $height); + $this->setOrientation($orientation); + } + + /** + * Set barcode dimensions + * + * @param int $width Barcode width + * @param int $height Barcode height + * + * @return void + * + * @since 1.0.0 + */ + public function setDimension(int $width, int $height) : void + { + if ($width < 0) { + throw new \OutOfBoundsException((string) $width); + } + + if ($height < 0) { + throw new \OutOfBoundsException((string) $height); + } + + $this->dimension['width'] = $width; + $this->dimension['height'] = $height; + } + + /** + * Set barcode margins + * + * @param int $margin Barcode margin + * + * @return void + * + * @since 1.0.0 + */ + public function setMargin(int $margin) : void + { + $this->margin = $margin; + } + + /** + * Set barcode orientation + * + * @param int $orientation Barcode orientation + * + * @return void + * + * @since 1.0.0 + */ + public function setOrientation(int $orientation) : void + { + if (!OrientationType::isValidValue($orientation)) { + throw new InvalidEnumValue($orientation); + } + + $this->orientation = $orientation; + } + + /** + * Get content + * + * @return string Returns the string representation of the code + * + * @since 1.0.0 + */ + public function getContent() : string + { + return $this->content; + } + + /** + * Set content to encrypt + * + * @param string $content Barcode content + * + * @return void + * + * @since 1.0.0 + */ + public function setContent(string $content) : void + { + $this->content = $content; + + $this->codestring = ''; + $this->codearray = []; + } + + /** + * Save to file + * + * @param string $file File path/name + * + * @return void + * + * @since 1.0.0 + */ + public function saveToPngFile(string $file) : void + { + $res = $this->get(); + + \imagepng($res, $file); + \imagedestroy($res); + } + + /** + * Save to file + * + * @param string $file File path/name + * + * @return void + * + * @since 1.0.0 + */ + public function saveToJpgFile(string $file) : void + { + $res = $this->get(); + + \imagejpeg($res, $file); + \imagedestroy($res); + } + + /** + * Get image reference + * + * @return \GdImage + * + * @since 1.0.0 + */ + abstract public function get() : mixed; +} diff --git a/Utils/Barcode/Codebar.php b/Utils/Barcode/Codebar.php index b4b9f72a9..36ee90ca3 100755 --- a/Utils/Barcode/Codebar.php +++ b/Utils/Barcode/Codebar.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,14 +18,14 @@ namespace phpOMS\Utils\Barcode; * Codebar class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * * @SuppressWarnings(PHPMD.CamelCasePropertyName) * @SuppressWarnings(PHPMD.CamelCaseVariableName) */ -class Codebar extends C128Abstract +class Codebar extends BarAbstract { /** * Char array. diff --git a/Utils/Barcode/Datamatrix.php b/Utils/Barcode/Datamatrix.php index bbfdac27f..416101c82 100755 --- a/Utils/Barcode/Datamatrix.php +++ b/Utils/Barcode/Datamatrix.php @@ -5,8 +5,9 @@ * PHP Version 8.1 * * @package phpOMS\Utils\Barcode - * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @author Nicola Asuni - Tecnick.com LTD - www.tecnick.com + * @copyright Copyright (C) 2010 - 2014 Nicola Asuni - Tecnick.com LTD + * @license GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) * @version 1.0.0 * @link https://jingga.app */ @@ -18,10 +19,1150 @@ namespace phpOMS\Utils\Barcode; * Datamatrix class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) * @link https://jingga.app * @since 1.0.0 */ -class Datamatrix +class Datamatrix extends TwoDAbstract { + private const ENC_ASCII = 0; + + private const ENC_C40 = 1; + + private const ENC_TXT = 2; + + private const ENC_X12 = 3; + + private const ENC_EDF = 4; + + private const ENC_BASE256 = 5; + + private const ENC_ASCII_EXT = 6; + + private const ENC_ASCII_NUM = 7; + + private const ECC_200_SYMBOL_ATTR = [ + // square form --------------------------------------------------------------------------------------- + [0x00a, 0x00a, 0x008, 0x008, 0x00a, 0x00a, 0x008, 0x008, 0x001, 0x001, 0x001, 0x003, 0x005, 0x001, 0x003, 0x005], // 10x10 + [0x00c, 0x00c, 0x00a, 0x00a, 0x00c, 0x00c, 0x00a, 0x00a, 0x001, 0x001, 0x001, 0x005, 0x007, 0x001, 0x005, 0x007], // 12x12 + [0x00e, 0x00e, 0x00c, 0x00c, 0x00e, 0x00e, 0x00c, 0x00c, 0x001, 0x001, 0x001, 0x008, 0x00a, 0x001, 0x008, 0x00a], // 14x14 + [0x010, 0x010, 0x00e, 0x00e, 0x010, 0x010, 0x00e, 0x00e, 0x001, 0x001, 0x001, 0x00c, 0x00c, 0x001, 0x00c, 0x00c], // 16x16 + [0x012, 0x012, 0x010, 0x010, 0x012, 0x012, 0x010, 0x010, 0x001, 0x001, 0x001, 0x012, 0x00e, 0x001, 0x012, 0x00e], // 18x18 + [0x014, 0x014, 0x012, 0x012, 0x014, 0x014, 0x012, 0x012, 0x001, 0x001, 0x001, 0x016, 0x012, 0x001, 0x016, 0x012], // 20x20 + [0x016, 0x016, 0x014, 0x014, 0x016, 0x016, 0x014, 0x014, 0x001, 0x001, 0x001, 0x01e, 0x014, 0x001, 0x01e, 0x014], // 22x22 + [0x018, 0x018, 0x016, 0x016, 0x018, 0x018, 0x016, 0x016, 0x001, 0x001, 0x001, 0x024, 0x018, 0x001, 0x024, 0x018], // 24x24 + [0x01a, 0x01a, 0x018, 0x018, 0x01a, 0x01a, 0x018, 0x018, 0x001, 0x001, 0x001, 0x02c, 0x01c, 0x001, 0x02c, 0x01c], // 26x26 + [0x020, 0x020, 0x01c, 0x01c, 0x010, 0x010, 0x00e, 0x00e, 0x002, 0x002, 0x004, 0x03e, 0x024, 0x001, 0x03e, 0x024], // 32x32 + [0x024, 0x024, 0x020, 0x020, 0x012, 0x012, 0x010, 0x010, 0x002, 0x002, 0x004, 0x056, 0x02a, 0x001, 0x056, 0x02a], // 36x36 + [0x028, 0x028, 0x024, 0x024, 0x014, 0x014, 0x012, 0x012, 0x002, 0x002, 0x004, 0x072, 0x030, 0x001, 0x072, 0x030], // 40x40 + [0x02c, 0x02c, 0x028, 0x028, 0x016, 0x016, 0x014, 0x014, 0x002, 0x002, 0x004, 0x090, 0x038, 0x001, 0x090, 0x038], // 44x44 + [0x030, 0x030, 0x02c, 0x02c, 0x018, 0x018, 0x016, 0x016, 0x002, 0x002, 0x004, 0x0ae, 0x044, 0x001, 0x0ae, 0x044], // 48x48 + [0x034, 0x034, 0x030, 0x030, 0x01a, 0x01a, 0x018, 0x018, 0x002, 0x002, 0x004, 0x0cc, 0x054, 0x002, 0x066, 0x02a], // 52x52 + [0x040, 0x040, 0x038, 0x038, 0x010, 0x010, 0x00e, 0x00e, 0x004, 0x004, 0x010, 0x118, 0x070, 0x002, 0x08c, 0x038], // 64x64 + [0x048, 0x048, 0x040, 0x040, 0x012, 0x012, 0x010, 0x010, 0x004, 0x004, 0x010, 0x170, 0x090, 0x004, 0x05c, 0x024], // 72x72 + [0x050, 0x050, 0x048, 0x048, 0x014, 0x014, 0x012, 0x012, 0x004, 0x004, 0x010, 0x1c8, 0x0c0, 0x004, 0x072, 0x030], // 80x80 + [0x058, 0x058, 0x050, 0x050, 0x016, 0x016, 0x014, 0x014, 0x004, 0x004, 0x010, 0x240, 0x0e0, 0x004, 0x090, 0x038], // 88x88 + [0x060, 0x060, 0x058, 0x058, 0x018, 0x018, 0x016, 0x016, 0x004, 0x004, 0x010, 0x2b8, 0x110, 0x004, 0x0ae, 0x044], // 96x96 + [0x068, 0x068, 0x060, 0x060, 0x01a, 0x01a, 0x018, 0x018, 0x004, 0x004, 0x010, 0x330, 0x150, 0x006, 0x088, 0x038], // 104x104 + [0x078, 0x078, 0x06c, 0x06c, 0x014, 0x014, 0x012, 0x012, 0x006, 0x006, 0x024, 0x41a, 0x198, 0x006, 0x0af, 0x044], // 120x120 + [0x084, 0x084, 0x078, 0x078, 0x016, 0x016, 0x014, 0x014, 0x006, 0x006, 0x024, 0x518, 0x1f0, 0x008, 0x0a3, 0x03e], // 132x132 + [0x090, 0x090, 0x084, 0x084, 0x018, 0x018, 0x016, 0x016, 0x006, 0x006, 0x024, 0x616, 0x26c, 0x00a, 0x09c, 0x03e], // 144x144 + // rectangular form (currently unused) --------------------------------------------------------------------------- + [0x008, 0x012, 0x006, 0x010, 0x008, 0x012, 0x006, 0x010, 0x001, 0x001, 0x001, 0x005, 0x007, 0x001, 0x005, 0x007], // 8x18 + [0x008, 0x020, 0x006, 0x01c, 0x008, 0x010, 0x006, 0x00e, 0x001, 0x002, 0x002, 0x00a, 0x00b, 0x001, 0x00a, 0x00b], // 8x32 + [0x00c, 0x01a, 0x00a, 0x018, 0x00c, 0x01a, 0x00a, 0x018, 0x001, 0x001, 0x001, 0x010, 0x00e, 0x001, 0x010, 0x00e], // 12x26 + [0x00c, 0x024, 0x00a, 0x020, 0x00c, 0x012, 0x00a, 0x010, 0x001, 0x002, 0x002, 0x00c, 0x012, 0x001, 0x00c, 0x012], // 12x36 + [0x010, 0x024, 0x00e, 0x020, 0x010, 0x012, 0x00e, 0x010, 0x001, 0x002, 0x002, 0x020, 0x018, 0x001, 0x020, 0x018], // 16x36 + [0x010, 0x030, 0x00e, 0x02c, 0x010, 0x018, 0x00e, 0x016, 0x001, 0x002, 0x002, 0x031, 0x01c, 0x001, 0x031, 0x01c], // 16x48 + ]; + + private const CHARSET = [ + self::ENC_C40 => [ // Basic set for C40 ---------------------------------------------------------------------------- + 'S1' => 0x00, 'S2' => 0x01, 'S3' => 0x02, 0x20 => 0x03, 0x30 => 0x04, 0x31 => 0x05, 0x32 => 0x06, 0x33 => 0x07, 0x34 => 0x08, 0x35 => 0x09, + 0x36 => 0x0a, 0x37 => 0x0b, 0x38 => 0x0c, 0x39 => 0x0d, 0x41 => 0x0e, 0x42 => 0x0f, 0x43 => 0x10, 0x44 => 0x11, 0x45 => 0x12, 0x46 => 0x13, + 0x47 => 0x14, 0x48 => 0x15, 0x49 => 0x16, 0x4a => 0x17, 0x4b => 0x18, 0x4c => 0x19, 0x4d => 0x1a, 0x4e => 0x1b, 0x4f => 0x1c, 0x50 => 0x1d, + 0x51 => 0x1e, 0x52 => 0x1f, 0x53 => 0x20, 0x54 => 0x21, 0x55 => 0x22, 0x56 => 0x23, 0x57 => 0x24, 0x58 => 0x25, 0x59 => 0x26, 0x5a => 0x27, + ], + self::ENC_TXT => [ // Basic set for TEXT --------------------------------------------------------------------------- + 'S1' => 0x00, 'S2' => 0x01, 'S3' => 0x02, 0x20 => 0x03, 0x30 => 0x04, 0x31 => 0x05, 0x32 => 0x06, 0x33 => 0x07, 0x34 => 0x08, 0x35 => 0x09, + 0x36 => 0x0a, 0x37 => 0x0b, 0x38 => 0x0c, 0x39 => 0x0d, 0x61 => 0x0e, 0x62 => 0x0f, 0x63 => 0x10, 0x64 => 0x11, 0x65 => 0x12, 0x66 => 0x13, + 0x67 => 0x14, 0x68 => 0x15, 0x69 => 0x16, 0x6a => 0x17, 0x6b => 0x18, 0x6c => 0x19, 0x6d => 0x1a, 0x6e => 0x1b, 0x6f => 0x1c, 0x70 => 0x1d, + 0x71 => 0x1e, 0x72 => 0x1f, 0x73 => 0x20, 0x74 => 0x21, 0x75 => 0x22, 0x76 => 0x23, 0x77 => 0x24, 0x78 => 0x25, 0x79 => 0x26, 0x7a => 0x27, + ], + 'SH1' => [ // Shift 1 set ---------------------------------------------------------------------------------- + 0x00 => 0x00, 0x01 => 0x01, 0x02 => 0x02, 0x03 => 0x03, 0x04 => 0x04, 0x05 => 0x05, 0x06 => 0x06, 0x07 => 0x07, 0x08 => 0x08, 0x09 => 0x09, + 0x0a => 0x0a, 0x0b => 0x0b, 0x0c => 0x0c, 0x0d => 0x0d, 0x0e => 0x0e, 0x0f => 0x0f, 0x10 => 0x10, 0x11 => 0x11, 0x12 => 0x12, 0x13 => 0x13, + 0x14 => 0x14, 0x15 => 0x15, 0x16 => 0x16, 0x17 => 0x17, 0x18 => 0x18, 0x19 => 0x19, 0x1a => 0x1a, 0x1b => 0x1b, 0x1c => 0x1c, 0x1d => 0x1d, + 0x1e => 0x1e, 0x1f => 0x1f, + ], + 'SH2' => [ // Shift 2 set ---------------------------------------------------------------------------------- + 0x21 => 0x00, 0x22 => 0x01, 0x23 => 0x02, 0x24 => 0x03, 0x25 => 0x04, 0x26 => 0x05, 0x27 => 0x06, 0x28 => 0x07, 0x29 => 0x08, 0x2a => 0x09, + 0x2b => 0x0a, 0x2c => 0x0b, 0x2d => 0x0c, 0x2e => 0x0d, 0x2f => 0x0e, 0x3a => 0x0f, 0x3b => 0x10, 0x3c => 0x11, 0x3d => 0x12, 0x3e => 0x13, + 0x3f => 0x14, 0x40 => 0x15, 0x5b => 0x16, 0x5c => 0x17, 0x5d => 0x18, 0x5e => 0x19, 0x5f => 0x1a, 'F1' => 0x1b, 'US' => 0x1e, + ], + 'S3C' => [ // Shift 3 set for C40 -------------------------------------------------------------------------- + 0x60 => 0x00, 0x61 => 0x01, 0x62 => 0x02, 0x63 => 0x03, 0x64 => 0x04, 0x65 => 0x05, 0x66 => 0x06, 0x67 => 0x07, 0x68 => 0x08, 0x69 => 0x09, + 0x6a => 0x0a, 0x6b => 0x0b, 0x6c => 0x0c, 0x6d => 0x0d, 0x6e => 0x0e, 0x6f => 0x0f, 0x70 => 0x10, 0x71 => 0x11, 0x72 => 0x12, 0x73 => 0x13, + 0x74 => 0x14, 0x75 => 0x15, 0x76 => 0x16, 0x77 => 0x17, 0x78 => 0x18, 0x79 => 0x19, 0x7a => 0x1a, 0x7b => 0x1b, 0x7c => 0x1c, 0x7d => 0x1d, + 0x7e => 0x1e, 0x7f => 0x1f, + ], + 'S3T' => [ // Shift 3 set for TEXT ------------------------------------------------------------------------- + 0x60 => 0x00, 0x41 => 0x01, 0x42 => 0x02, 0x43 => 0x03, 0x44 => 0x04, 0x45 => 0x05, 0x46 => 0x06, 0x47 => 0x07, 0x48 => 0x08, 0x49 => 0x09, + 0x4a => 0x0a, 0x4b => 0x0b, 0x4c => 0x0c, 0x4d => 0x0d, 0x4e => 0x0e, 0x4f => 0x0f, 0x50 => 0x10, 0x51 => 0x11, 0x52 => 0x12, 0x53 => 0x13, + 0x54 => 0x14, 0x55 => 0x15, 0x56 => 0x16, 0x57 => 0x17, 0x58 => 0x18, 0x59 => 0x19, 0x5a => 0x1a, 0x7b => 0x1b, 0x7c => 0x1c, 0x7d => 0x1d, + 0x7e => 0x1e, 0x7f => 0x1f, + ], + self::ENC_X12 => [ // Set for X12 ---------------------------------------------------------------------------------- + 0x0d => 0x00, 0x2a => 0x01, 0x3e => 0x02, 0x20 => 0x03, 0x30 => 0x04, 0x31 => 0x05, 0x32 => 0x06, 0x33 => 0x07, 0x34 => 0x08, 0x35 => 0x09, + 0x36 => 0x0a, 0x37 => 0x0b, 0x38 => 0x0c, 0x39 => 0x0d, 0x41 => 0x0e, 0x42 => 0x0f, 0x43 => 0x10, 0x44 => 0x11, 0x45 => 0x12, 0x46 => 0x13, + 0x47 => 0x14, 0x48 => 0x15, 0x49 => 0x16, 0x4a => 0x17, 0x4b => 0x18, 0x4c => 0x19, 0x4d => 0x1a, 0x4e => 0x1b, 0x4f => 0x1c, 0x50 => 0x1d, + 0x51 => 0x1e, 0x52 => 0x1f, 0x53 => 0x20, 0x54 => 0x21, 0x55 => 0x22, 0x56 => 0x23, 0x57 => 0x24, 0x58 => 0x25, 0x59 => 0x26, 0x5a => 0x27, + ], + ]; + + public int $encoding = self::ENC_ASCII; + + public function generateCodeArray() : array + { + $this->codearray = []; + + // get data codewords + $cw = $this->getHighLevelEncoding($this->content); + + // number of data codewords + $nd = \count($cw); + + // check size + if ($nd > 1558) { + return []; + } + + // get minimum required matrix size. + foreach (self::ECC_200_SYMBOL_ATTR as $params) { + if ($params[11] >= $nd) { + break; + } + } + + if ($params[11] < $nd) { + // too much data + return []; + } elseif ($params[11] > $nd) { + // add padding + if ((($params[11] - $nd) > 1) && ($cw[($nd - 1)] !== 254)) { + if ($this->encoding === self::ENC_EDF) { + // switch to ASCII encoding + $cw[] = 124; + ++$nd; + } elseif (($this->encoding !== self::ENC_ASCII) && ($this->encoding !== self::ENC_BASE256)) { + // switch to ASCII encoding + $cw[] = 254; + ++$nd; + } + } + + if ($params[11] > $nd) { + // add first pad + $cw[] = 129; + ++$nd; + + // add remaining pads + for ($i = $nd; $i < $params[11]; ++$i) { + $cw[] = $this->get253StateCodeword(129, $i); + } + } + } + + // add error correction codewords + $cw = $this->getErrorCorrection($cw, $params[13], $params[14], $params[15]); + + // initialize empty arrays + //$this->codearray = \array_fill(0, ($params[2] * $params[3]), 0); + for ($i = 0; $i < $params[2]; ++$i) { + $this->codearray[$i] = \array_fill(0, $params[3], false); + } + + // get placement map + $places = $this->getPlacementMap($params[2], $params[3]); + + // fill the grid with data + $i = 0; + + // region data row max index + $rdri = ($params[4] - 1); + + // region data column max index + $rdci = ($params[5] - 1); + + // for each vertical region + for ($vr = 0; $vr < $params[9]; ++$vr) { + // for each row on region + for ($r = 0; $r < $params[4]; ++$r) { + // get row + $row = (($vr * $params[4]) + $r); + + // for each horizontal region + for ($hr = 0; $hr < $params[8]; ++$hr) { + // for each column on region + for ($c = 0; $c < $params[5]; ++$c) { + // get column + $col = (($hr * $params[5]) + $c); + + // braw bits by case + if ($r === 0) { + // top finder pattern + if ($c % 2) { + $this->codearray[$row][$col] = false; + } else { + $this->codearray[$row][$col] = true; + } + } elseif ($r === $rdri) { + // bottom finder pattern + $this->codearray[$row][$col] = true; + } elseif ($c === 0) { + // left finder pattern + $this->codearray[$row][$col] = true; + } elseif ($c === $rdci) { + // right finder pattern + if ($r % 2) { + $this->codearray[$row][$col] = true; + } else { + $this->codearray[$row][$col] = false; + } + } else { // data bit + if ($places[$i] < 2) { + $this->codearray[$row][$col] = (bool) $places[$i]; + } else { + // codeword ID + $cw_id = (\floor($places[$i] / 10) - 1); + // codeword BIT mask + $cw_bit = \pow(2, (8 - ($places[$i] % 10))); + $this->codearray[$row][$col] = (($cw[$cw_id] & $cw_bit) === 0) ? false : true; + } + + ++$i; + } + } + } + } + } + + return $this->codearray; + } + + /** + * Product of two numbers in a Power-of-Two Galois Field + */ + protected function getGFProduct(int $a, int $b, array $log, array $alog, int $gf) : int + { + if (($a === 0) || ($b === 0)) { + return 0; + } + + return $alog[($log[$a] + $log[$b]) % ($gf - 1)]; + } + + /** + * Add error correction codewords to data codewords array (ANNEX E). + */ + protected function getErrorCorrection(array $wd, int $nb, int $nd, int $nc, int $gf = 256, int $pp = 301) : array + { + // generate the log ($log) and antilog ($alog) tables + $log[0] = 0; + $alog[0] = 1; + + for ($i = 1; $i < $gf; ++$i) { + $alog[$i] = ($alog[($i - 1)] * 2); + + if ($alog[$i] >= $gf) { + $alog[$i] ^= $pp; + } + + $log[$alog[$i]] = $i; + } + + \ksort($log); + + // generate the polynomial coefficients (c) + $c = \array_fill(0, ($nc + 1), 0); + $c[0] = 1; + + for ($i = 1; $i <= $nc; ++$i) { + $c[$i] = $c[($i - 1)]; + + for ($j = ($i - 1); $j >= 1; --$j) { + $c[$j] = $c[($j - 1)] ^ $this->getGFProduct($c[$j], $alog[$i], $log, $alog, $gf); + } + + $c[0] = $this->getGFProduct($c[0], $alog[$i], $log, $alog, $gf); + } + + \ksort($c); + + // total number of data codewords + $num_wd = ($nb * $nd); + + // total number of error codewords + $num_we = ($nb * $nc); + + // for each block + for ($b = 0; $b < $nb; ++$b) { + // create interleaved data block + $block = []; + for ($n = $b; $n < $num_wd; $n += $nb) { + $block[] = $wd[$n]; + } + + // initialize error codewords + $we = \array_fill(0, ($nc + 1), 0); + + // calculate error correction codewords for this block + for ($i = 0; $i < $nd; ++$i) { + $k = ($we[0] ^ $block[$i]); + + for ($j = 0; $j < $nc; ++$j) { + $we[$j] = ($we[($j + 1)] ^ $this->getGFProduct($k, $c[($nc - $j - 1)], $log, $alog, $gf)); + } + } + + // add error codewords at the end of data codewords + $j = 0; + for ($i = $b; $i < $num_we; $i += $nb) { + $wd[($num_wd + $i)] = $we[$j]; + ++$j; + } + } + + // reorder codewords + \ksort($wd); + + return $wd; + } + + /** + * Return the 253-state codeword + */ + protected function get253StateCodeword(int $cwpad, int $cwpos) : int + { + $pad = ($cwpad + (((149 * $cwpos) % 253) + 1)); + + if ($pad > 254) { + $pad -= 254; + } + + return $pad; + } + + /** + * Return the 255-state codeword + */ + protected function get255StateCodeword(int $cwpad, int $cwpos) : int + { + $pad = ($cwpad + (((149 * $cwpos) % 255) + 1)); + + if ($pad > 255) { + $pad -= 256; + } + + return $pad; + } + + /** + * Returns true if the char belongs to the selected mode + */ + protected function isCharMode(int $chr, int $mode) : bool + { + switch ($mode) { + case self::ENC_ASCII: + // ASCII character 0 to 127 + return (($chr >= 0) && ($chr <= 127)); + case self::ENC_C40: + // Upper-case alphanumeric + return (($chr === 32) || (($chr >= 48) && ($chr <= 57)) || (($chr >= 65) && ($chr <= 90))); + case self::ENC_TXT: + // Lower-case alphanumeric + return (($chr === 32) || (($chr >= 48) && ($chr <= 57)) || (($chr >= 97) && ($chr <= 122))); + case self::ENC_X12: + // ANSI X12 + return (($chr === 13) || ($chr === 42) || ($chr === 62)); + case self::ENC_EDF: + // ASCII character 32 to 94 + return (($chr >= 32) && ($chr <= 94)); + case self::ENC_BASE256: + // Function character (FNC1, Structured Append, Reader Program, or Code Page) + return (($chr === 232) || ($chr === 233) || ($chr === 234) || ($chr === 241)); + case self::ENC_ASCII_EXT: + // ASCII character 128 to 255 + return (($chr >= 128) && ($chr <= 255)); + case self::ENC_ASCII_NUM: + // ASCII digits + return (($chr >= 48) && ($chr <= 57)); + } + + return false; + } + + /** + * The look-ahead test scans the data to be encoded to find the best mode (Annex P - steps from J to S). + */ + protected function lookAheadTest(string $data, int $pos, int $mode) : int + { + $data_length = \strlen($data); + + if ($pos >= $data_length) { + return $mode; + } + + $charscount = 0; // \count processed chars + + // STEP J + if ($mode === self::ENC_ASCII) { + $numch = [0, 1, 1, 1, 1, 1.25]; + } else { + $numch = [1, 2, 2, 2, 2, 2.25]; + $numch[$mode] = 0; + } + + while (true) { + // STEP K + if (($pos + $charscount) === $data_length) { + if ($numch[self::ENC_ASCII] <= \ceil(\min( + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_X12], + $numch[self::ENC_EDF], + $numch[self::ENC_BASE256] + )) + ) { + return self::ENC_ASCII; + } + + if ($numch[self::ENC_BASE256] < \ceil(\min( + $numch[self::ENC_ASCII], + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_X12], + $numch[self::ENC_EDF] + )) + ) { + return self::ENC_BASE256; + } + + if ($numch[self::ENC_EDF] < \ceil(\min( + $numch[self::ENC_ASCII], + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_X12], + $numch[self::ENC_BASE256] + )) + ) { + return self::ENC_EDF; + } + + if ($numch[self::ENC_TXT] < \ceil(\min( + $numch[self::ENC_ASCII], + $numch[self::ENC_C40], + $numch[self::ENC_X12], + $numch[self::ENC_EDF], + $numch[self::ENC_BASE256] + )) + ) { + return self::ENC_TXT; + } + + if ($numch[self::ENC_X12] < \ceil(\min( + $numch[self::ENC_ASCII], + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_EDF], + $numch[self::ENC_BASE256] + )) + ) { + return self::ENC_X12; + } + + return self::ENC_C40; + } + + // get char + $chr = \ord($data[$pos + $charscount]); + $charscount++; + + // STEP L + if ($this->isCharMode($chr, self::ENC_ASCII_NUM)) { + $numch[self::ENC_ASCII] += (1 / 2); + } elseif ($this->isCharMode($chr, self::ENC_ASCII_EXT)) { + $numch[self::ENC_ASCII] = \ceil($numch[self::ENC_ASCII]); + $numch[self::ENC_ASCII] += 2; + } else { + $numch[self::ENC_ASCII] = \ceil($numch[self::ENC_ASCII]); + $numch[self::ENC_ASCII] += 1; + } + + // STEP M + if ($this->isCharMode($chr, self::ENC_C40)) { + $numch[self::ENC_C40] += (2 / 3); + } elseif ($this->isCharMode($chr, self::ENC_ASCII_EXT)) { + $numch[self::ENC_C40] += (8 / 3); + } else { + $numch[self::ENC_C40] += (4 / 3); + } + + // STEP N + if ($this->isCharMode($chr, self::ENC_TXT)) { + $numch[self::ENC_TXT] += (2 / 3); + } elseif ($this->isCharMode($chr, self::ENC_ASCII_EXT)) { + $numch[self::ENC_TXT] += (8 / 3); + } else { + $numch[self::ENC_TXT] += (4 / 3); + } + + // STEP O + if ($this->isCharMode($chr, self::ENC_X12) || $this->isCharMode($chr, self::ENC_C40)) { + $numch[self::ENC_X12] += (2 / 3); + } elseif ($this->isCharMode($chr, self::ENC_ASCII_EXT)) { + $numch[self::ENC_X12] += (13 / 3); + } else { + $numch[self::ENC_X12] += (10 / 3); + } + + // STEP P + if ($this->isCharMode($chr, self::ENC_EDF)) { + $numch[self::ENC_EDF] += (3 / 4); + } elseif ($this->isCharMode($chr, self::ENC_ASCII_EXT)) { + $numch[self::ENC_EDF] += (17 / 4); + } else { + $numch[self::ENC_EDF] += (13 / 4); + } + + // STEP Q + if ($this->isCharMode($chr, self::ENC_BASE256)) { + $numch[self::ENC_BASE256] += 4; + } else { + $numch[self::ENC_BASE256] += 1; + } + + // STEP R + if ($charscount >= 4) { + if (($numch[self::ENC_ASCII] + 1) <= \min( + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_X12], + $numch[self::ENC_EDF], + $numch[self::ENC_BASE256] + ) + ) { + return self::ENC_ASCII; + } + + if ((($numch[self::ENC_BASE256] + 1) <= $numch[self::ENC_ASCII]) + || ($numch[self::ENC_BASE256] + 1) < \min( + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_X12], + $numch[self::ENC_EDF] + ) + ) { + return self::ENC_BASE256; + } + + if (($numch[self::ENC_EDF] + 1) < \min( + $numch[self::ENC_ASCII], + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_X12], + $numch[self::ENC_BASE256] + ) + ) { + return self::ENC_EDF; + } + + if (($numch[self::ENC_TXT] + 1) < \min( + $numch[self::ENC_ASCII], + $numch[self::ENC_C40], + $numch[self::ENC_X12], + $numch[self::ENC_EDF], + $numch[self::ENC_BASE256] + ) + ) { + return self::ENC_TXT; + } + + if (($numch[self::ENC_X12] + 1) < \min( + $numch[self::ENC_ASCII], + $numch[self::ENC_C40], + $numch[self::ENC_TXT], + $numch[self::ENC_EDF], + $numch[self::ENC_BASE256] + ) + ) { + return self::ENC_X12; + } + + if (($numch[self::ENC_C40] + 1) < \min( + $numch[self::ENC_ASCII], + $numch[self::ENC_TXT], + $numch[self::ENC_EDF], + $numch[self::ENC_BASE256] + ) + ) { + if ($numch[self::ENC_C40] < $numch[self::ENC_X12]) { + return self::ENC_C40; + } + + if ($numch[self::ENC_C40] === $numch[self::ENC_X12]) { + $k = ($pos + $charscount + 1); + + while ($k < $data_length) { + $tmpchr = \ord($data[$k]); + + if ($this->isCharMode($tmpchr, self::ENC_X12)) { + return self::ENC_X12; + } elseif (!($this->isCharMode($tmpchr, self::ENC_X12) + || $this->isCharMode($tmpchr, self::ENC_C40)) + ) { + break; + } + + ++$k; + } + + return self::ENC_C40; + } + } + } + } + } + + /** + * Get the switching codeword to a new encoding mode (latch codeword) + */ + protected function getSwitchEncodingCodeword(int $mode) : int + { + switch ($mode) { + case self::ENC_ASCII: + if ($this->encoding === self::ENC_EDF) { + return 124; + } + + return 254; + case self::ENC_C40: + return 230; + case self::ENC_TXT: + return 239; + case self::ENC_X12: + return 238; + case self::ENC_EDF: + return 240; + case self::ENC_BASE256: + return 231; + } + + return 254; + } + + /** + * Choose the minimum matrix size and return the max number of data codewords. + */ + protected function getMaxDataCodewords(int $numcw) : int + { + foreach (self::ECC_200_SYMBOL_ATTR as $matrix) { + if ($matrix[11] >= $numcw) { + return $matrix[11]; + } + } + + return 0; + } + + /** + * Get high level encoding using the minimum symbol data characters for ECC 200 + */ + protected function getHighLevelEncoding(string $data) : array + { + // STEP A. Start in ASCII encodation. + $enc = self::ENC_ASCII; // current encoding mode + $pos = 0; // current position + $cw = []; // array of codewords to be returned + $cw_num = 0; // number of data codewords + $data_length = \strlen($data); // number of chars + + while ($pos < $data_length) { + $this->encoding = $enc; + + switch ($enc) { + case self::ENC_ASCII: + // STEP B. While in ASCII encodation + if ($data_length > 1 && $pos < ($data_length - 1) + && ($this->isCharMode(\ord($data[$pos]), self::ENC_ASCII_NUM) + && $this->isCharMode(\ord($data[$pos + 1]), self::ENC_ASCII_NUM)) + ) { + // 1. If the next data sequence is at least 2 consecutive digits, encode the next two digits as a double digit in ASCII mode. + $cw[] = (intval(substr($data, $pos, 2)) + 130); + ++$cw_num; + $pos += 2; + } else { + // 2. If the look-ahead test (starting at step J) indicates another mode, switch to that mode. + $newenc = $this->lookAheadTest($data, $pos, $enc); + + if ($newenc !== $enc) { + $enc = $newenc; + $cw[] = $this->getSwitchEncodingCodeword($enc); + ++$cw_num; + } else { + // get new byte + $chr = \ord($data[$pos]); + ++$pos; + + if ($this->isCharMode($chr, self::ENC_ASCII_EXT)) { + // 3. If the next data character is extended ASCII (greater than 127) encode it in ASCII mode first using the Upper Shift (value 235) character. + $cw[] = 235; + $cw[] = ($chr - 127); + $cw_num += 2; + } else { + // 4. Otherwise process the next data character in ASCII encodation. + $cw[] = ($chr + 1); + ++$cw_num; + } + } + } + + break; + case self::ENC_C40: + // Upper-case alphanumeric + case self::ENC_TXT: + // Lower-case alphanumeric + case self::ENC_X12: + // ANSI X12 + $temp_cw = []; + $p = 0; + $epos = $pos; + + // get basic charset for current encoding + $charset = self::CHARSET[$enc]; + + do { + // 2. process the next character in C40 encodation. + $chr = \ord($data[$epos]); + ++$epos; + + // check for extended character + if ($chr & 0x80) { + if ($enc === self::ENC_X12) { + return false; + } + + $chr = ($chr & 0x7f); + $temp_cw[] = 1; // shift 2 + $temp_cw[] = 30; // upper shift + $p += 2; + } + + if (isset($charset[$chr])) { + $temp_cw[] = $charset[$chr]; + ++$p; + } else { + if (isset(self::CHARSET['SH1'][$chr])) { + $temp_cw[] = 0; // shift 1 + $shiftset = self::CHARSET['SH1']; + } elseif (isset($chr, self::CHARSET['SH2'][$chr])) { + $temp_cw[] = 1; // shift 2 + $shiftset = self::CHARSET['SH2']; + } elseif (($enc === self::ENC_C40) && isset(self::CHARSET['S3C'][$chr])) { + $temp_cw[] = 2; // shift 3 + $shiftset = self::CHARSET['S3C']; + } elseif (($enc === self::ENC_TXT) && isset(self::CHARSET['S3T'][$chr])) { + $temp_cw[] = 2; // shift 3 + $shiftset = self::CHARSET['S3T']; + } else { + return false; + } + + $temp_cw[] = $shiftset[$chr]; + $p += 2; + } + + if ($p >= 3) { + $c1 = \array_shift($temp_cw); + $c2 = \array_shift($temp_cw); + $c3 = \array_shift($temp_cw); + $p -= 3; + $tmp = ((1600 * $c1) + (40 * $c2) + $c3 + 1); + $cw[] = ($tmp >> 8); + $cw[] = ($tmp % 256); + $cw_num += 2; + $pos = $epos; + + // 1. If the C40 encoding is at the point of starting a new double symbol character and if the look-ahead test (starting at step J) indicates another mode, switch to that mode. + $newenc = $this->lookAheadTest($data, $pos, $enc); + if ($newenc !== $enc) { + $enc = $newenc; + if ($enc !== self::ENC_ASCII) { + // set unlatch character + $cw[] = $this->getSwitchEncodingCodeword(self::ENC_ASCII); + ++$cw_num; + } + + ++$cw_num; + + $cw[] = $this->getSwitchEncodingCodeword($enc); + $pos -= $p; + $p = 0; + + break; + } + } + } while (($p > 0) && ($epos < $data_length)); + + // process last data (if any) + if ($p > 0) { + // get remaining number of data symbols + $cwr = ($this->getMaxDataCodewords($cw_num) - $cw_num); + + if (($cwr === 1) && ($p === 1)) { + // d. If one symbol character remains and one C40 value (data character) remains to be encoded + $c1 = \array_shift($temp_cw); + --$p; + ++$cw_num; + + $cw[] = ($chr + 1); + $pos = $epos; + $enc = self::ENC_ASCII; + $this->encoding = $enc; + } elseif (($cwr === 2) && ($p === 1)) { + // c. If two symbol characters remain and only one C40 value (data character) remains to be encoded + --$p; + + $c1 = \array_shift($temp_cw); + $cw[] = 254; + $cw[] = ($chr + 1); + $cw_num += 2; + $pos = $epos; + $enc = self::ENC_ASCII; + $this->encoding = $enc; + } elseif (($cwr === 2) && ($p === 2)) { + // b. If two symbol characters remain and two C40 values remain to be encoded + $c1 = \array_shift($temp_cw); + $c2 = \array_shift($temp_cw); + $p -= 2; + $tmp = ((1600 * $c1) + (40 * $c2) + 1); + $cw[] = ($tmp >> 8); + $cw[] = ($tmp % 256); + $cw_num += 2; + $pos = $epos; + $enc = self::ENC_ASCII; + $this->encoding = $enc; + } else { + // switch to ASCII encoding + if ($enc !== self::ENC_ASCII) { + $enc = self::ENC_ASCII; + $this->encoding = $enc; + $cw[] = $this->getSwitchEncodingCodeword($enc); + + ++$cw_num; + + $pos = ($epos - $p); + } + } + } + break; + case self::ENC_EDF: + // F. While in EDIFACT (EDF) encodation + // initialize temporary array with 0 length + $temp_cw = []; + $epos = $pos; + $field_length = 0; + $newenc = $enc; + + do { + // 2. process the next character in EDIFACT encodation. + $chr = \ord($data[$epos]); + if ($this->isCharMode($chr, self::ENC_EDF)) { + ++$epos; + $temp_cw[] = $chr; + ++$field_length; + } + + if (($field_length === 4) + || ($epos === $data_length) + || !$this->isCharMode($chr, self::ENC_EDF) + ) { + if (($epos === $data_length) && ($field_length < 3)) { + $enc = self::ENC_ASCII; + $cw[] = $this->getSwitchEncodingCodeword($enc); + ++$cw_num; + + break; + } + + if ($field_length < 4) { + // set unlatch character + $temp_cw[] = 0x1f; + ++$field_length; + + // fill empty characters + for ($i = $field_length; $i < 4; ++$i) { + $temp_cw[] = 0; + } + + $enc = self::ENC_ASCII; + $this->encoding = $enc; + } + + // encodes four data characters in three codewords + $tcw = (($temp_cw[0] & 0x3F) << 2) + (($temp_cw[1] & 0x30) >> 4); + if ($tcw > 0) { + $cw[] = $tcw; + $cw_num++; + } + + $tcw = (($temp_cw[1] & 0x0F) << 4) + (($temp_cw[2] & 0x3C) >> 2); + if ($tcw > 0) { + $cw[] = $tcw; + $cw_num++; + } + + $tcw = (($temp_cw[2] & 0x03) << 6) + ($temp_cw[3] & 0x3F); + if ($tcw > 0) { + $cw[] = $tcw; + $cw_num++; + } + + $temp_cw = []; + $pos = $epos; + $field_length = 0; + + if ($enc === self::ENC_ASCII) { + break; + } + } + } while ($epos < $data_length); + + break; + case self::ENC_BASE256: + // G. While in Base 256 (B256) encodation + // initialize temporary array with 0 length + $temp_cw = []; + $field_length = 0; + + while (($pos < $data_length) && ($field_length <= 1555)) { + $newenc = $this->lookAheadTest($data, $pos, $enc); + + if ($newenc !== $enc) { + // 1. If the look-ahead test (starting at step J) indicates another mode, switch to that mode. + $enc = $newenc; + + break; + } else { + // 2. Otherwise, process the next character in Base 256 encodation. + $chr = \ord($data[$pos]); + ++$pos; + + $temp_cw[] = $chr; + + ++$field_length; + } + } + + // set field length + if ($field_length <= 249) { + $cw[] = $this->get255StateCodeword($field_length, ($cw_num + 1)); + ++$cw_num; + } else { + $cw[] = $this->get255StateCodeword((int) (\floor($field_length / 250) + 249), ($cw_num + 1)); + $cw[] = $this->get255StateCodeword(($field_length % 250), ($cw_num + 2)); + $cw_num += 2; + } + + if (!empty($temp_cw)) { + // add B256 field + foreach ($temp_cw as $p => $cht) { + $cw[] = $this->get255StateCodeword($cht, ($cw_num + $p + 1)); + } + } + + break; + } + } + + return $cw; + } + + /** + * Places "chr+bit" with appropriate wrapping within array[]. + */ + protected function placeModule(array $marr, int $nrow, int $ncol, int $row, int $col, int $chr, int $bit) : array + { + if ($row < 0) { + $row += $nrow; + $col += (4 - (($nrow + 4) % 8)); + } + + if ($col < 0) { + $col += $ncol; + $row += (4 - (($ncol + 4) % 8)); + } + + $marr[(($row * $ncol) + $col)] = ((10 * $chr) + $bit); + + return $marr; + } + + /** + * Places the 8 bits of a utah-shaped symbol character. + */ + protected function placeUtah(array $marr, int $nrow, int $ncol, int $row, int $col, int $chr) : array + { + $marr = $this->placeModule($marr, $nrow, $ncol, $row - 2, $col - 2, $chr, 1); + $marr = $this->placeModule($marr, $nrow, $ncol, $row - 2, $col - 1, $chr, 2); + $marr = $this->placeModule($marr, $nrow, $ncol, $row - 1, $col - 2, $chr, 3); + $marr = $this->placeModule($marr, $nrow, $ncol, $row - 1, $col - 1, $chr, 4); + $marr = $this->placeModule($marr, $nrow, $ncol, $row - 1, $col, $chr, 5); + $marr = $this->placeModule($marr, $nrow, $ncol, $row, $col - 2, $chr, 6); + $marr = $this->placeModule($marr, $nrow, $ncol, $row, $col - 1, $chr, 7); + $marr = $this->placeModule($marr, $nrow, $ncol, $row, $col, $chr, 8); + + return $marr; + } + + /** + * Places the 8 bits of the first special corner case. + */ + protected function placeCornerA(array $marr, int $nrow, int $ncol, int $chr) : array + { + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 1, 0, $chr, 1); + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 1, 1, $chr, 2); + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 1, 2, $chr, 3); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 2, $chr, 4); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 1, $chr, 5); + $marr = $this->placeModule($marr, $nrow, $ncol, 1, $ncol - 1, $chr, 6); + $marr = $this->placeModule($marr, $nrow, $ncol, 2, $ncol - 1, $chr, 7); + $marr = $this->placeModule($marr, $nrow, $ncol, 3, $ncol - 1, $chr, 8); + + return $marr; + } + + /** + * Places the 8 bits of the second special corner case. + */ + protected function placeCornerB(array $marr, int $nrow, int $ncol, int $chr) : array + { + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 3, 0, $chr, 1); + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 2, 0, $chr, 2); + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 1, 0, $chr, 3); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 4, $chr, 4); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 3, $chr, 5); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 2, $chr, 6); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 1, $chr, 7); + $marr = $this->placeModule($marr, $nrow, $ncol, 1, $ncol - 1, $chr, 8); + + return $marr; + } + + /** + * Places the 8 bits of the third special corner case. + */ + protected function placeCornerC(array $marr, int $nrow, int $ncol, int $chr) : array + { + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 3, 0, $chr, 1); + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 2, 0, $chr, 2); + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 1, 0, $chr, 3); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 2, $chr, 4); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 1, $chr, 5); + $marr = $this->placeModule($marr, $nrow, $ncol, 1, $ncol - 1, $chr, 6); + $marr = $this->placeModule($marr, $nrow, $ncol, 2, $ncol - 1, $chr, 7); + $marr = $this->placeModule($marr, $nrow, $ncol, 3, $ncol - 1, $chr, 8); + + return $marr; + } + + /** + * Places the 8 bits of the fourth special corner case. + */ + protected function placeCornerD(array $marr, int $nrow, int $ncol, int $chr) : array + { + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 1, 0, $chr, 1); + $marr = $this->placeModule($marr, $nrow, $ncol, $nrow - 1, $ncol - 1, $chr, 2); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 3, $chr, 3); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 2, $chr, 4); + $marr = $this->placeModule($marr, $nrow, $ncol, 0, $ncol - 1, $chr, 5); + $marr = $this->placeModule($marr, $nrow, $ncol, 1, $ncol - 3, $chr, 6); + $marr = $this->placeModule($marr, $nrow, $ncol, 1, $ncol - 2, $chr, 7); + $marr = $this->placeModule($marr, $nrow, $ncol, 1, $ncol - 1, $chr, 8); + + return $marr; + } + + /** + * Build a placement map. + */ + protected function getPlacementMap(int $nrow, int $ncol) : array + { + // initialize array with zeros + $marr = \array_fill(0, ($nrow * $ncol), 0); + + // set starting values + $chr = 1; + $row = 4; + $col = 0; + + do { + // repeatedly first check for one of the special corner cases, then + if (($row === $nrow) && ($col === 0)) { + $marr = $this->placeCornerA($marr, $nrow, $ncol, $chr); + ++$chr; + } + + if (($row === ($nrow - 2)) && ($col === 0) && ($ncol % 4)) { + $marr = $this->placeCornerB($marr, $nrow, $ncol, $chr); + ++$chr; + } + + if (($row === ($nrow - 2)) && ($col === 0) && (($ncol % 8) === 4)) { + $marr = $this->placeCornerC($marr, $nrow, $ncol, $chr); + ++$chr; + } + + if (($row === ($nrow + 4)) && ($col === 2) && (!($ncol % 8))) { + $marr = $this->placeCornerD($marr, $nrow, $ncol, $chr); + ++$chr; + } + + // sweep upward diagonally, inserting successive characters, + do { + if (($row < $nrow) && ($col >= 0) && (!$marr[(($row * $ncol) + $col)])) { + $marr = $this->placeUtah($marr, $nrow, $ncol, $row, $col, $chr); + ++$chr; + } + + $row -= 2; + $col += 2; + } while (($row >= 0) && ($col < $ncol)); + + ++$row; + $col += 3; + + // & then sweep downward diagonally, inserting successive characters,... + do { + if (($row >= 0) && ($col < $ncol) && (!$marr[(($row * $ncol) + $col)])) { + $marr = $this->placeUtah($marr, $nrow, $ncol, $row, $col, $chr); + ++$chr; + } + + $row += 2; + $col -= 2; + } while (($row < $nrow) && ($col >= 0)); + + $row += 3; + ++$col; + } while (($row < $nrow) || ($col < $ncol)); + + // lastly, if the lower righthand corner is untouched, fill in fixed pattern + if (!$marr[(($nrow * $ncol) - 1)]) { + $marr[(($nrow * $ncol) - 1)] = 1; + $marr[(($nrow * $ncol) - $ncol - 2)] = 1; + } + + return $marr; + } } diff --git a/Utils/Barcode/HIBCC.php b/Utils/Barcode/HIBCC.php index cb60712a2..47abc9779 100755 --- a/Utils/Barcode/HIBCC.php +++ b/Utils/Barcode/HIBCC.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Barcode; * HIBCC class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Barcode/OrientationType.php b/Utils/Barcode/OrientationType.php index 9f05219ef..cf6250070 100755 --- a/Utils/Barcode/OrientationType.php +++ b/Utils/Barcode/OrientationType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Barcode * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Orientation type enum. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Barcode/QR.php b/Utils/Barcode/QR.php index 62d850947..601793d43 100755 --- a/Utils/Barcode/QR.php +++ b/Utils/Barcode/QR.php @@ -5,8 +5,9 @@ * PHP Version 8.1 * * @package phpOMS\Utils\Barcode - * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @author Nicola Asuni - Tecnick.com LTD - www.tecnick.com + * @copyright Copyright (C) 2010 - 2014 Nicola Asuni - Tecnick.com LTD + * @license GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) * @version 1.0.0 * @link https://jingga.app */ @@ -18,10 +19,2405 @@ namespace phpOMS\Utils\Barcode; * QR class. * * @package phpOMS\Utils\Barcode - * @license OMS License 1.0 + * @license GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) * @link https://jingga.app * @since 1.0.0 */ -class QR +class QR extends TwoDAbstract { + public const QR_ECLEVEL_L = 0; + + public const QR_ECLEVEL_M = 1; + + public const QR_ECLEVEL_Q = 2; + + public const QR_ECLEVEL_H = 3; + + private const QRCODEDEFS = true; + + private const QR_MODE_NL = -1; + + private const QR_MODE_NM = 0; + + private const QR_MODE_AN = 1; + + private const QR_MODE_8B = 2; + + private const QR_MODE_KJ = 3; + + private const QR_MODE_ST = 4; + + private const QRSPEC_VERSION_MAX = 40; + + private const QRSPEC_WIDTH_MAX = 177; + + private const QRCAP_WIDTH = 0; + + private const QRCAP_WORDS = 1; + + private const QRCAP_REMINDER = 2; + + private const QRCAP_EC = 3; + + private const STRUCTURE_HEADER_BITS = 20; + + private const MAX_STRUCTURED_SYMBOLS = 16; + + private const N1 = 3; + + private const N2 = 3; + + private const N3 = 40; + + private const N4 = 10; + + private const QR_FIND_BEST_MASK = true; + + private const QR_FIND_FROM_RANDOM = 2; + + private const QR_DEFAULT_MASK = 2; + + /** + * Alphabet-numeric convesion table. + * @protected + */ + private const AN_TABLE = [ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, + -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + ]; + + /** + * Array Table of the capacity of symbols. + * See Table 1 (pp.13) and Table 12-16 (pp.30-36), JIS X0510:2004. + * @protected + */ + private const CAPACITY = [ + [ 0, 0, 0, [ 0, 0, 0, 0]], // + [ 21, 26, 0, [ 7, 10, 13, 17]], // 1 + [ 25, 44, 7, [ 10, 16, 22, 28]], // + [ 29, 70, 7, [ 15, 26, 36, 44]], // + [ 33, 100, 7, [ 20, 36, 52, 64]], // + [ 37, 134, 7, [ 26, 48, 72, 88]], // 5 + [ 41, 172, 7, [ 36, 64, 96, 112]], // + [ 45, 196, 0, [ 40, 72, 108, 130]], // + [ 49, 242, 0, [ 48, 88, 132, 156]], // + [ 53, 292, 0, [ 60, 110, 160, 192]], // + [ 57, 346, 0, [ 72, 130, 192, 224]], // 10 + [ 61, 404, 0, [ 80, 150, 224, 264]], // + [ 65, 466, 0, [ 96, 176, 260, 308]], // + [ 69, 532, 0, [104, 198, 288, 352]], // + [ 73, 581, 3, [120, 216, 320, 384]], // + [ 77, 655, 3, [132, 240, 360, 432]], // 15 + [ 81, 733, 3, [144, 280, 408, 480]], // + [ 85, 815, 3, [168, 308, 448, 532]], // + [ 89, 901, 3, [180, 338, 504, 588]], // + [ 93, 991, 3, [196, 364, 546, 650]], // + [ 97, 1085, 3, [224, 416, 600, 700]], // 20 + [101, 1156, 4, [224, 442, 644, 750]], // + [105, 1258, 4, [252, 476, 690, 816]], // + [109, 1364, 4, [270, 504, 750, 900]], // + [113, 1474, 4, [300, 560, 810, 960]], // + [117, 1588, 4, [312, 588, 870, 1050]], // 25 + [121, 1706, 4, [336, 644, 952, 1110]], // + [125, 1828, 4, [360, 700, 1020, 1200]], // + [129, 1921, 3, [390, 728, 1050, 1260]], // + [133, 2051, 3, [420, 784, 1140, 1350]], // + [137, 2185, 3, [450, 812, 1200, 1440]], // 30 + [141, 2323, 3, [480, 868, 1290, 1530]], // + [145, 2465, 3, [510, 924, 1350, 1620]], // + [149, 2611, 3, [540, 980, 1440, 1710]], // + [153, 2761, 3, [570, 1036, 1530, 1800]], // + [157, 2876, 0, [570, 1064, 1590, 1890]], // 35 + [161, 3034, 0, [600, 1120, 1680, 1980]], // + [165, 3196, 0, [630, 1204, 1770, 2100]], // + [169, 3362, 0, [660, 1260, 1860, 2220]], // + [173, 3532, 0, [720, 1316, 1950, 2310]], // + [177, 3706, 0, [750, 1372, 2040, 2430]], // 40 + ]; + + /** + * Array Length indicator. + * @protected + */ + private const LENGTH_TABLE_BITS = [ + [10, 12, 14], + [ 9, 11, 13], + [ 8, 16, 16], + [ 8, 10, 12], + ]; + + /** + * Array Table of the error correction code (Reed-Solomon block). + * See Table 12-16 (pp.30-36), JIS X0510:2004. + * @protected + */ + private const ECC_TABLE = [ + [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]], // + [[ 1, 0], [ 1, 0], [ 1, 0], [ 1, 0]], // 1 + [[ 1, 0], [ 1, 0], [ 1, 0], [ 1, 0]], // + [[ 1, 0], [ 1, 0], [ 2, 0], [ 2, 0]], // + [[ 1, 0], [ 2, 0], [ 2, 0], [ 4, 0]], // + [[ 1, 0], [ 2, 0], [ 2, 2], [ 2, 2]], // 5 + [[ 2, 0], [ 4, 0], [ 4, 0], [ 4, 0]], // + [[ 2, 0], [ 4, 0], [ 2, 4], [ 4, 1]], // + [[ 2, 0], [ 2, 2], [ 4, 2], [ 4, 2]], // + [[ 2, 0], [ 3, 2], [ 4, 4], [ 4, 4]], // + [[ 2, 2], [ 4, 1], [ 6, 2], [ 6, 2]], // 10 + [[ 4, 0], [ 1, 4], [ 4, 4], [ 3, 8]], // + [[ 2, 2], [ 6, 2], [ 4, 6], [ 7, 4]], // + [[ 4, 0], [ 8, 1], [ 8, 4], [12, 4]], // + [[ 3, 1], [ 4, 5], [11, 5], [11, 5]], // + [[ 5, 1], [ 5, 5], [ 5, 7], [11, 7]], // 15 + [[ 5, 1], [ 7, 3], [15, 2], [ 3, 13]], // + [[ 1, 5], [10, 1], [ 1, 15], [ 2, 17]], // + [[ 5, 1], [ 9, 4], [17, 1], [ 2, 19]], // + [[ 3, 4], [ 3, 11], [17, 4], [ 9, 16]], // + [[ 3, 5], [ 3, 13], [15, 5], [15, 10]], // 20 + [[ 4, 4], [17, 0], [17, 6], [19, 6]], // + [[ 2, 7], [17, 0], [ 7, 16], [34, 0]], // + [[ 4, 5], [ 4, 14], [11, 14], [16, 14]], // + [[ 6, 4], [ 6, 14], [11, 16], [30, 2]], // + [[ 8, 4], [ 8, 13], [ 7, 22], [22, 13]], // 25 + [[10, 2], [19, 4], [28, 6], [33, 4]], // + [[ 8, 4], [22, 3], [ 8, 26], [12, 28]], // + [[ 3, 10], [ 3, 23], [ 4, 31], [11, 31]], // + [[ 7, 7], [21, 7], [ 1, 37], [19, 26]], // + [[ 5, 10], [19, 10], [15, 25], [23, 25]], // 30 + [[13, 3], [ 2, 29], [42, 1], [23, 28]], // + [[17, 0], [10, 23], [10, 35], [19, 35]], // + [[17, 1], [14, 21], [29, 19], [11, 46]], // + [[13, 6], [14, 23], [44, 7], [59, 1]], // + [[12, 7], [12, 26], [39, 14], [22, 41]], // 35 + [[ 6, 14], [ 6, 34], [46, 10], [ 2, 64]], // + [[17, 4], [29, 14], [49, 10], [24, 46]], // + [[ 4, 18], [13, 32], [48, 14], [42, 32]], // + [[20, 4], [40, 7], [43, 22], [10, 67]], // + [[19, 6], [18, 31], [34, 34], [20, 61]], // 40 + ]; + + /** + * Array Positions of alignment patterns. + * This array includes only the second and the third position of the alignment patterns. Rest of them can be calculated from the distance between them. + * See Table 1 in Appendix E (pp.71) of JIS X0510:2004. + * @protected + */ + private const ALIGNMENT_PATTERN = [ + [ 0, 0], + [ 0, 0], [18, 0], [22, 0], [26, 0], [30, 0], // 1- 5 + [34, 0], [22, 38], [24, 42], [26, 46], [28, 50], // 6-10 + [30, 54], [32, 58], [34, 62], [26, 46], [26, 48], // 11-15 + [26, 50], [30, 54], [30, 56], [30, 58], [34, 62], // 16-20 + [28, 50], [26, 50], [30, 54], [28, 54], [32, 58], // 21-25 + [30, 58], [34, 62], [26, 50], [30, 54], [26, 52], // 26-30 + [30, 56], [34, 60], [30, 58], [34, 62], [30, 54], // 31-35 + [24, 50], [28, 54], [32, 58], [26, 54], [30, 58], // 35-40 + ]; + + /** + * Array Version information pattern (BCH coded). + * See Table 1 in Appendix D (pp.68) of JIS X0510:2004. + * size: [QRSPEC_VERSION_MAX - 6] + * @protected + */ + private const VERSION_PATTERN = [ + 0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d, + 0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9, + 0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75, + 0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64, + 0x27541, 0x28c69, + ]; + + /** + * Array Format information + * @protected + */ + private const FORMAT_INFO = [ + [0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976], + [0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0], + [0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed], + [0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b], + ]; + + private const PUT_ALIGNMENT_FILTER = [ + "\xa1\xa1\xa1\xa1\xa1", + "\xa1\xa0\xa0\xa0\xa1", + "\xa1\xa0\xa1\xa0\xa1", + "\xa1\xa0\xa0\xa0\xa1", + "\xa1\xa1\xa1\xa1\xa1", + ]; + + private const PUT_FINDER = [ + "\xc1\xc1\xc1\xc1\xc1\xc1\xc1", + "\xc1\xc0\xc0\xc0\xc0\xc0\xc1", + "\xc1\xc0\xc1\xc1\xc1\xc0\xc1", + "\xc1\xc0\xc1\xc1\xc1\xc0\xc1", + "\xc1\xc0\xc1\xc1\xc1\xc0\xc1", + "\xc1\xc0\xc0\xc0\xc0\xc0\xc1", + "\xc1\xc1\xc1\xc1\xc1\xc1\xc1", + ]; + + protected int $version = 0; + + /** + * Levels of error correction. See definitions for possible values. + * @protected + */ + public int $level = self::QR_ECLEVEL_L; + + /** + * Encoding mode. + * @protected + */ + protected int $hint = self::QR_MODE_8B; + + /** + * Boolean flag, if true the input string will be converted to uppercase. + * @protected + */ + protected bool $casesensitive = true; + + /** + * Structured QR code (not supported yet). + * @protected + */ + protected int $structured = 0; + + /** + * Mask data. + * @protected + */ + protected array $data = []; + + /** + * Width. + * @protected + */ + protected int $width = 0; + + /** + * Frame. + * @protected + */ + protected array $frame = []; + + /** + * X position of bit. + * @protected + */ + protected int $x = 0; + + /** + * Y position of bit. + * @protected + */ + protected int $y = 0; + + /** + * Direction. + * @protected + */ + protected int $dir = 0; + + /** + * Single bit value. + * @protected + */ + protected int $bit = 0; + + /** + * Data code. + * @protected + */ + protected array $datacode = []; + + /** + * Error correction code. + * @protected + */ + protected array $ecccode = []; + + /** + * Blocks. + * @protected + */ + protected int $blocks = 0; + + /** + * Reed-Solomon blocks. + * @protected + */ + protected array $rsblocks = []; //of RSblock + + /** + * Counter. + * @protected + */ + protected int $count = 0; + + /** + * Data length. + * @protected + */ + protected int $dataLength = 0; + + /** + * Error correction length. + * @protected + */ + protected int $eccLength = 0; + + /** + * Value b1. + * @protected + */ + protected int $b1 = 0; + + /** + * Run length. + * @protected + */ + protected array $runLength = []; + + /** + * Input data string. + * @protected + */ + protected string $dataStr = ''; + + /** + * Input items. + * @protected + */ + protected array $items = []; + + /** + * Reed-Solomon items. + * @protected + */ + protected array $rsitems = []; + + /** + * Array of frames. + * @protected + */ + protected array $frames = []; + + public function generateCodeArray() : array + { + $this->codearray = []; + + if (($this->hint !== self::QR_MODE_8B && $this->hint !== self::QR_MODE_KJ) + || ($this->version < 0 || $this->version > self::QRSPEC_VERSION_MAX) + ) { + return []; + } + + $this->items = []; + $this->encodeString($this->content); + + if (empty($this->data)) { + return []; + } + + $this->codearray = $this->binarize($this->data); + + return $this->codearray; + } + + /** + * Convert the frame in binary form + */ + protected function binarize(array $frame) : array + { + $bin = [[]]; + + foreach ($frame as $row => $cols) { + $len = \strlen($cols); + for ($i = 0; $i < $len; ++$i) { + $bin[$row][$i] = \ord($frame[$row][$i]) & 1 ? true : false; + } + } + + return $bin; + } + + /** + * Encode the input string to QR code + */ + protected function encodeString(string $string) : void + { + $this->dataStr = $string; + if (!$this->casesensitive) { + $this->toUpper(); + } + + $ret = $this->splitString(); + if ($ret < 0) { + return; + } + + $this->encodeMask(-1); + } + + /** + * Encode mask + */ + protected function encodeMask(int $mask) : void + { + $spec = [0, 0, 0, 0, 0]; + $this->datacode = $this->getByteStream($this->items); + + if (empty($this->datacode)) { + return; + } + + $spec = $this->getEccSpec($this->version, $this->level, $spec); + $this->b1 = $spec[0]; + $this->dataLength = $spec[0] * $spec[1] + $spec[3] * $spec[4]; + $this->eccLength = ($spec[0] + $spec[3]) * $spec[2]; + $this->ecccode = \array_fill(0, $this->eccLength, 0); + $this->blocks = $spec[0] + $spec[3]; + $ret = $this->init($spec); + + if ($ret < 0) { + return; + } + + $this->count = 0; + $this->width = self::CAPACITY[$this->version][self::QRCAP_WIDTH]; + $this->frame = $this->newFrame($this->version); + $this->x = $this->width - 1; + $this->y = $this->width - 1; + $this->dir = -1; + $this->bit = -1; + + // inteleaved data and ecc codes + for ($i = 0; $i < $this->dataLength + $this->eccLength; ++$i) { + $code = $this->getCode(); + $bit = 0x80; + + for ($j = 0; $j < 8; ++$j) { + $addr = $this->getNextPosition(); + $this->frame[$addr['y']][$addr['x']] = 0x02 | (($bit & $code) !== 0); + $bit = $bit >> 1; + } + } + + // remainder bits + $j = self::CAPACITY[$this->version][self::QRCAP_REMINDER]; + for ($i = 0; $i < $j; ++$i) { + $addr = $this->getNextPosition(); + $this->frame[$addr['y']][$addr['x']] = 0x02; + } + + // masking + $this->runLength = \array_fill(0, self::QRSPEC_WIDTH_MAX + 1, 0); + if ($mask < 0) { + $masked = self::QR_FIND_BEST_MASK + ? $this->mask($this->width, $this->frame, $this->level) + : $this->makeMask($this->width, $this->frame, (self::QR_DEFAULT_MASK % 8), $this->level); + } else { + $masked = $this->makeMask($this->width, $this->frame, $mask, $this->level); + } + + if (empty($masked)) { + return; + } + + $this->data = $masked; + } + + /** + * Get frame value at specified position + */ + protected function getFrameAt(array $at) : int + { + return \ord($this->frame[$at['y']][$at['x']]); + } + + /** + * Return the next frame position + */ + protected function getNextPosition() : array + { + do { + if ($this->bit === -1) { + $this->bit = 0; + + return ['x' => $this->x, 'y' => $this->y]; + } + + $x = $this->x; + $y = $this->y; + $w = $this->width; + + if ($this->bit === 0) { + --$x; + ++$this->bit; + } else { + ++$x; + --$this->bit; + + $y += $this->dir; + } + + if ($this->dir < 0) { + if ($y < 0) { + $y = 0; + $x -= 2; + $this->dir = 1; + + if ($x === 6) { + --$x; + $y = 9; + } + } + } else { + if ($y === $w) { + $y = $w - 1; + $x -= 2; + $this->dir = -1; + + if ($x === 6) { + --$x; + $y -= 8; + } + } + } + + if (($x < 0) || ($y < 0)) { + return []; + } + + $this->x = $x; + $this->y = $y; + } while (\ord($this->frame[$y][$x]) & 0x80); + + return ['x' => $x, 'y' => $y]; + } + + // - - - - - - - - - - - - - - - - - - - - - - - - - + + // QRrawcode + + /** + * Initialize code. + */ + protected function init(array $spec) : int + { + $dl = $spec[1]; + $el = $spec[2]; + $rs = $this->init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el); + $blockNo = 0; + $dataPos = 0; + $eccPos = 0; + $endfor = $spec[0]; + + for ($i = 0; $i < $endfor; ++$i) { + $ecc = \array_slice($this->ecccode, $eccPos); + $this->rsblocks[$blockNo] = []; + $this->rsblocks[$blockNo]['dataLength'] = $dl; + $this->rsblocks[$blockNo]['data'] = \array_slice($this->datacode, $dataPos); + $this->rsblocks[$blockNo]['eccLength'] = $el; + $ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc); + $this->rsblocks[$blockNo]['ecc'] = $ecc; + $this->ecccode = \array_merge(\array_slice($this->ecccode, 0, $eccPos), $ecc); + $dataPos += $dl; + $eccPos += $el; + + ++$blockNo; + } + if ($spec[3] === 0) { + return 0; + } + + $dl = $spec[4]; + $el = $spec[2]; + $rs = $this->init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el); + + if ($rs === null) { + return -1; + } + + $endfor = $spec[3]; + for ($i = 0; $i < $endfor; ++$i) { + $ecc = \array_slice($this->ecccode, $eccPos); + $this->rsblocks[$blockNo] = []; + $this->rsblocks[$blockNo]['dataLength'] = $dl; + $this->rsblocks[$blockNo]['data'] = \array_slice($this->datacode, $dataPos); + $this->rsblocks[$blockNo]['eccLength'] = $el; + $ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc); + $this->rsblocks[$blockNo]['ecc'] = $ecc; + $this->ecccode = \array_merge(\array_slice($this->ecccode, 0, $eccPos), $ecc); + $dataPos += $dl; + $eccPos += $el; + + ++$blockNo; + } + + return 0; + } + + /** + * Return Reed-Solomon block code. + */ + protected function getCode() : int + { + if ($this->count < $this->dataLength) { + $row = $this->count % $this->blocks; + $col = $this->count / $this->blocks; + + if ($col >= $this->rsblocks[0]['dataLength']) { + $row += $this->b1; + } + + $ret = $this->rsblocks[$row]['data'][$col]; + } elseif ($this->count < $this->dataLength + $this->eccLength) { + $row = ($this->count - $this->dataLength) % $this->blocks; + $col = ($this->count - $this->dataLength) / $this->blocks; + $ret = $this->rsblocks[$row]['ecc'][$col]; + } else { + return 0; + } + + ++$this->count; + + return $ret; + } + + /** + * Write Format Information on frame and returns the number of black bits + */ + protected function writeFormatInformation(int $width, array &$frame, int $mask, int $level) : int + { + $blacks = 0; + $format = $mask < 0 || $mask > 7 || $level < 0 || $level > 3 + ? 0 + : self::FORMAT_INFO[$level][$mask]; + + for ($i = 0; $i < 8; ++$i) { + if ($format & 1) { + $blacks += 2; + $v = 0x85; + } else { + $v = 0x84; + } + + $frame[8][$width - 1 - $i] = \chr($v); + if ($i < 6) { + $frame[$i][8] = \chr($v); + } else { + $frame[$i + 1][8] = \chr($v); + } + + $format = $format >> 1; + } + + for ($i = 0; $i < 7; ++$i) { + if ($format & 1) { + $blacks += 2; + $v = 0x85; + } else { + $v = 0x84; + } + + $frame[$width - 7 + $i][8] = \chr($v); + if ($i === 0) { + $frame[8][7] = \chr($v); + } else { + $frame[8][6 - $i] = \chr($v); + } + + $format = $format >> 1; + } + + return $blacks; + } + + /** + * Return bitmask + */ + protected function generateMaskNo(int $maskNo, int $width, array $frame) : array + { + $bitMask = \array_fill(0, $width, \array_fill(0, $width, 0)); + for ($y = 0; $y < $width; ++$y) { + for ($x = 0; $x < $width; ++$x) { + if (\ord($frame[$y][$x]) & 0x80) { + $bitMask[$y][$x] = 0; + } else { + $maskFunc = 0; + switch ($maskNo) { + case 0: + $maskFunc = ($x + $y) & 1; + break; + case 1: + $maskFunc = $y & 1; + break; + case 2: + $maskFunc = $x % 3; + break; + case 3: + $maskFunc = ($x + $y) % 3; + break; + case 4: + $maskFunc = (((int) ($y / 2)) + ((int) ($x / 3))) & 1; + break; + case 5: + $maskFunc = (($x * $y) & 1) + ($x * $y) % 3; + break; + case 6: + $maskFunc = ((($x * $y) & 1) + ($x * $y) % 3) & 1; + break; + case 7: + $maskFunc = ((($x * $y) % 3) + (($x + $y) & 1)) & 1; + break; + } + + $bitMask[$y][$x] = $maskFunc === 0 ? 1 : 0; + } + } + } + + return $bitMask; + } + + /** + * makeMaskNo + */ + protected function makeMaskNo(int $maskNo, int $width, array $s, array &$d, bool $maskGenOnly = false) : int + { + $b = 0; + $bitMask = []; + $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d); + + if ($maskGenOnly) { + return 0; + } + + $d = $s; + for ($y = 0; $y < $width; ++$y) { + for ($x = 0; $x < $width; ++$x) { + if ($bitMask[$y][$x] === 1) { + $d[$y][$x] = \chr(\ord($s[$y][$x]) ^ ((int) ($bitMask[$y][$x]))); + } + + $b += (int) (\ord($d[$y][$x]) & 1); + } + } + + return $b; + } + + /** + * makeMask + */ + protected function makeMask(int $width, array $frame, int $maskNo, int $level) : array + { + $masked = \array_fill(0, $width, \str_repeat("\0", $width)); + $this->makeMaskNo($maskNo, $width, $frame, $masked); + $this->writeFormatInformation($width, $masked, $maskNo, $level); + + return $masked; + } + + /** + * calcN1N3 + */ + protected function calcN1N3(int $length) : int + { + $demerit = 0; + for ($i = 0; $i < $length; ++$i) { + if ($this->runLength[$i] >= 5) { + $demerit += (self::N1 + ($this->runLength[$i] - 5)); + } + + if ($i & 1) { + if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 === 0)) { + $fact = (int) ($this->runLength[$i] / 3); + + if (($this->runLength[$i - 2] === $fact) + && ($this->runLength[$i - 1] === $fact) + && ($this->runLength[$i + 1] === $fact) + && ($this->runLength[$i + 2] === $fact) + ) { + if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) { + $demerit += self::N3; + } elseif (($i + 3) >= $length || $this->runLength[$i + 3] >= (4 * $fact)) { + $demerit += self::N3; + } + } + } + } + } + + return $demerit; + } + + /** + * evaluateSymbol + */ + protected function evaluateSymbol(int $width, array $frame) : int + { + $head = 0; + $demerit = 0; + + for ($y = 0; $y < $width; ++$y) { + $head = 0; + $this->runLength[0] = 1; + $frameY = $frame[$y]; + + if ($y > 0) { + $frameYM = $frame[$y - 1]; + } + + for ($x = 0; $x < $width; ++$x) { + if (($x > 0) && ($y > 0)) { + $b22 = \ord($frameY[$x]) & \ord($frameY[$x - 1]) & \ord($frameYM[$x]) & \ord($frameYM[$x - 1]); + $w22 = \ord($frameY[$x]) | \ord($frameY[$x - 1]) | \ord($frameYM[$x]) | \ord($frameYM[$x - 1]); + + if (($b22 | ($w22 ^ 1)) & 1) { + $demerit += self::N2; + } + } + + if (($x === 0) && (\ord($frameY[$x]) & 1)) { + $this->runLength[0] = -1; + $head = 1; + $this->runLength[$head] = 1; + } elseif ($x > 0) { + if ((\ord($frameY[$x]) ^ \ord($frameY[$x - 1])) & 1) { + ++$head; + $this->runLength[$head] = 1; + } else { + ++$this->runLength[$head]; + } + } + } + + $demerit += $this->calcN1N3($head+1); + } + + for ($x = 0; $x < $width; ++$x) { + $head = 0; + $this->runLength[0] = 1; + + for ($y = 0; $y < $width; ++$y) { + if (($y === 0) && (\ord($frame[$y][$x]) & 1)) { + $this->runLength[0] = -1; + $head = 1; + $this->runLength[$head] = 1; + } elseif ($y > 0) { + if ((\ord($frame[$y][$x]) ^ \ord($frame[$y - 1][$x])) & 1) { + ++$head; + $this->runLength[$head] = 1; + } else { + ++$this->runLength[$head]; + } + } + } + + $demerit += $this->calcN1N3($head+1); + } + + return $demerit; + } + + /** + * mask + */ + protected function mask(int $width, array $frame, int $level) : array + { + $minDemerit = \PHP_INT_MAX; + $bestMask = []; + $checked_masks = [0, 1, 2, 3, 4, 5, 6, 7]; + + if (self::QR_FIND_FROM_RANDOM !== false) { + $howManuOut = 8 - (self::QR_FIND_FROM_RANDOM % 9); + for ($i = 0; $i < $howManuOut; ++$i) { + $remPos = \mt_rand(0, \count($checked_masks)-1); + unset($checked_masks[$remPos]); + $checked_masks = \array_values($checked_masks); + } + } + + $bestMask = $frame; + foreach ($checked_masks as $i) { + $mask = \array_fill(0, $width, \str_repeat("\0", $width)); + $demerit = 0; + $blacks = 0; + $blacks = $this->makeMaskNo($i, $width, $frame, $mask); + $blacks += $this->writeFormatInformation($width, $mask, $i, $level); + $blacks = (int) (100 * $blacks / ($width * $width)); + $demerit = (int) ((int) (\abs($blacks - 50) / 5) * self::N4); + $demerit += $this->evaluateSymbol($width, $mask); + + if ($demerit < $minDemerit) { + $minDemerit = $demerit; + $bestMask = $mask; + } + } + + return $bestMask; + } + + /** + * Return true if the character at specified position is a number + */ + protected function isdigitat(string $str, int $pos) : bool + { + if ($pos >= \strlen($str)) { + return false; + } + + return \ord($str[$pos]) >= \ord('0') && \ord($str[$pos]) <= \ord('9'); + } + + /** + * Return true if the character at specified position is an alphanumeric character + */ + protected function isalnumat(string $str, int $pos) : bool + { + if ($pos >= \strlen($str)) { + return false; + } + + return $this->lookAnTable(\ord($str[$pos])) >= 0; + } + + /** + * identifyMode + */ + protected function identifyMode(int $pos) : int + { + if ($pos >= \strlen($this->dataStr)) { + return self::QR_MODE_NL; + } + + $c = $this->dataStr[$pos]; + if ($this->isdigitat($this->dataStr, $pos)) { + return self::QR_MODE_NM; + } elseif ($this->isalnumat($this->dataStr, $pos)) { + return self::QR_MODE_AN; + } elseif ($this->hint === self::QR_MODE_KJ) { + if ($pos + 1 < \strlen($this->dataStr)) { + $d = $this->dataStr[$pos+1]; + $word = (\ord($c) << 8) | \ord($d); + + if (($word >= 0x8140 && $word <= 0x9ffc) + || ($word >= 0xe040 && $word <= 0xebbf) + ) { + return self::QR_MODE_KJ; + } + } + } + + return self::QR_MODE_8B; + } + + /** + * eatNum + */ + protected function eatNum() : int + { + $ln = $this->lengthIndicator(self::QR_MODE_NM, $this->version); + $p = 0; + + while ($this->isdigitat($this->dataStr, $p)) { + ++$p; + } + + $run = $p; + $mode = $this->identifyMode($p); + + if ($mode === self::QR_MODE_8B) { + $dif = $this->estimateBitsModeNum($run) + 4 + $ln + + $this->estimateBitsMode8(1) // + 4 + l8 + - $this->estimateBitsMode8($run + 1); // - 4 - l8 + + if ($dif > 0) { + return $this->eat8(); + } + } + if ($mode === self::QR_MODE_AN) { + $dif = $this->estimateBitsModeNum($run) + 4 + $ln + + $this->estimateBitsModeAn(1) // + 4 + la + - $this->estimateBitsModeAn($run + 1);// - 4 - la + + if ($dif > 0) { + return $this->eatAn(); + } + } + + $this->items = $this->appendNewInputItem($this->items, self::QR_MODE_NM, $run, \str_split($this->dataStr)); + + return $run; + } + + /** + * eatAn + */ + protected function eatAn() : int + { + $la = $this->lengthIndicator(self::QR_MODE_AN, $this->version); + $ln = $this->lengthIndicator(self::QR_MODE_NM, $this->version); + $p = 1; + + while ($this->isalnumat($this->dataStr, $p)) { + if ($this->isdigitat($this->dataStr, $p)) { + $q = $p; + while ($this->isdigitat($this->dataStr, $q)) { + ++$q; + } + + $dif = $this->estimateBitsModeAn($p) // + 4 + la + + $this->estimateBitsModeNum($q - $p) + 4 + $ln + - $this->estimateBitsModeAn($q); // - 4 - la + + if ($dif < 0) { + break; + } else { + $p = $q; + } + } else { + ++$p; + } + } + + $run = $p; + if (!$this->isalnumat($this->dataStr, $p)) { + $dif = $this->estimateBitsModeAn($run) + 4 + $la + + $this->estimateBitsMode8(1) // + 4 + l8 + - $this->estimateBitsMode8($run + 1); // - 4 - l8 + + if ($dif > 0) { + return $this->eat8(); + } + } + + $this->items = $this->appendNewInputItem($this->items, self::QR_MODE_AN, $run, \str_split($this->dataStr)); + + return $run; + } + + /** + * eatKanji + */ + protected function eatKanji() : int + { + $p = 0; + while ($this->identifyMode($p) === self::QR_MODE_KJ) { + $p += 2; + } + + $this->items = $this->appendNewInputItem($this->items, self::QR_MODE_KJ, $p, \str_split($this->dataStr)); + $run = $p; + + return $run; + } + + /** + * eat8 + */ + protected function eat8() : int + { + $la = $this->lengthIndicator(self::QR_MODE_AN, $this->version); + $ln = $this->lengthIndicator(self::QR_MODE_NM, $this->version); + $p = 1; + $dataStrLen = \strlen($this->dataStr); + + while ($p < $dataStrLen) { + $mode = $this->identifyMode($p); + if ($mode === self::QR_MODE_KJ) { + break; + } + + if ($mode === self::QR_MODE_NM) { + $q = $p; + while ($this->isdigitat($this->dataStr, $q)) { + ++$q; + } + + $dif = $this->estimateBitsMode8($p) // + 4 + l8 + + $this->estimateBitsModeNum($q - $p) + 4 + $ln + - $this->estimateBitsMode8($q); // - 4 - l8 + + if ($dif < 0) { + break; + } else { + $p = $q; + } + } elseif ($mode === self::QR_MODE_AN) { + $q = $p; + while ($this->isalnumat($this->dataStr, $q)) { + ++$q; + } + + $dif = $this->estimateBitsMode8($p) // + 4 + l8 + + $this->estimateBitsModeAn($q - $p) + 4 + $la + - $this->estimateBitsMode8($q); // - 4 - l8 + + if ($dif < 0) { + break; + } else { + $p = $q; + } + } else { + ++$p; + } + } + + $run = $p; + $this->items = $this->appendNewInputItem($this->items, self::QR_MODE_8B, $run, \str_split($this->dataStr)); + + return $run; + } + + /** + * splitString + */ + protected function splitString() : int + { + while (\strlen($this->dataStr) > 0) { + $mode = $this->identifyMode(0); + switch ($mode) { + case self::QR_MODE_NM: + $length = $this->eatNum(); + break; + case self::QR_MODE_AN: + $length = $this->eatAn(); + break; + case self::QR_MODE_KJ: + if ($this->hint === self::QR_MODE_KJ) { + $length = $this->eatKanji(); + } else { + $length = $this->eat8(); + } + break; + default: + $length = $this->eat8(); + break; + } + + if ($length === 0) { + return 0; + } + + if ($length < 0) { + return -1; + } + + $this->dataStr = \substr($this->dataStr, $length); + } + + return 0; + } + + /** + * toUpper + */ + protected function toUpper() : string + { + $stringLen = \strlen($this->dataStr); + $p = 0; + + while ($p < $stringLen) { + $mode = $this->identifyMode(\strlen(\substr($this->dataStr, $p)), $this->hint); + if ($mode === self::QR_MODE_KJ) { + $p += 2; + } else { + if (\ord($this->dataStr[$p]) >= \ord('a') && \ord($this->dataStr[$p]) <= \ord('z')) { + $this->dataStr[$p] = \chr(\ord($this->dataStr[$p]) - 32); + } + + ++$p; + } + } + return $this->dataStr; + } + + /** + * newInputItem + */ + protected function newInputItem(int $mode, int $size, array $data, array $bstream = []) : array + { + $setData = \array_slice($data, 0, $size); + if (\count($setData) < $size) { + $setData = \array_merge($setData, \array_fill(0, ($size - \count($setData)), 0)); + } + + if (!$this->check($mode, $size, $setData)) { + return []; + } + + $inputitem = []; + $inputitem['mode'] = $mode; + $inputitem['size'] = $size; + $inputitem['data'] = $setData; + $inputitem['bstream'] = $bstream; + + return $inputitem; + } + + /** + * encodeModeNum + */ + protected function encodeModeNum(array $inputitem, int $version) : array + { + $words = (int) ($inputitem['size'] / 3); + $inputitem['bstream'] = []; + $val = 0x1; + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val); + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(self::QR_MODE_NM, $version), $inputitem['size']); + + $ord0 = \ord('0'); + + for ($i = 0; $i < $words; ++$i) { + $val = (\ord($inputitem['data'][$i*3 ]) - $ord0) * 100; + $val += (\ord($inputitem['data'][$i*3+1]) - $ord0) * 10; + $val += (\ord($inputitem['data'][$i*3+2]) - $ord0); + + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 10, $val); + } + + if ($inputitem['size'] - $words * 3 === 1) { + $val = \ord($inputitem['data'][$words*3]) - $ord0; + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val); + } elseif (($inputitem['size'] - ($words * 3)) === 2) { + $val = (\ord($inputitem['data'][$words*3 ]) - $ord0) * 10; + $val += (\ord($inputitem['data'][$words*3+1]) - $ord0); + + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 7, $val); + } + + return $inputitem; + } + + /** + * encodeModeAn + */ + protected function encodeModeAn(array $inputitem, int $version) : array + { + $words = (int) ($inputitem['size'] / 2); + + $inputitem['bstream'] = []; + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02); + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(self::QR_MODE_AN, $version), $inputitem['size']); + + for ($i = 0; $i < $words; ++$i) { + $val = $this->lookAnTable(\ord($inputitem['data'][$i*2])) * 45; + $val += $this->lookAnTable(\ord($inputitem['data'][($i*2)+1])); + + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val); + } + + if ($inputitem['size'] & 1) { + $val = $this->lookAnTable(\ord($inputitem['data'][($words * 2)])); + + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 6, $val); + } + + return $inputitem; + } + + /** + * encodeMode8 + */ + protected function encodeMode8(array $inputitem, int $version) : array + { + $inputitem['bstream'] = []; + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x4); + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(self::QR_MODE_8B, $version), $inputitem['size']); + + for ($i=0; $i < $inputitem['size']; ++$i) { + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, \ord($inputitem['data'][$i])); + } + + return $inputitem; + } + + /** + * encodeModeKanji + */ + protected function encodeModeKanji(array $inputitem, int $version) : array + { + $inputitem['bstream'] = []; + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x8); + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(self::QR_MODE_KJ, $version), (int) ($inputitem['size'] / 2)); + + for ($i = 0; $i < $inputitem['size']; $i += 2) { + $val = (\ord($inputitem['data'][$i]) << 8) | \ord($inputitem['data'][$i + 1]); + + if ($val <= 0x9ffc) { + $val -= 0x8140; + } else { + $val -= 0xc140; + } + + $h = ($val >> 8) * 0xc0; + $val = ($val & 0xff) + $h; + + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 13, $val); + } + + return $inputitem; + } + + /** + * encodeModeStructure + */ + protected function encodeModeStructure(array $inputitem) : array + { + $inputitem['bstream'] = []; + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x03); + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, \ord($inputitem['data'][1]) - 1); + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, \ord($inputitem['data'][0]) - 1); + $inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, \ord($inputitem['data'][2])); + + return $inputitem; + } + + /** + * encodeBitStream + */ + protected function encodeBitStream(array $inputitem, int $version) : array + { + $inputitem['bstream'] = []; + $words = $this->maximumWords($inputitem['mode'], $version); + + if ($inputitem['size'] > $words) { + $st1 = $this->newInputItem($inputitem['mode'], $words, $inputitem['data']); + $st2 = $this->newInputItem($inputitem['mode'], $inputitem['size'] - $words, \array_slice($inputitem['data'], $words)); + $st1 = $this->encodeBitStream($st1, $version); + $st2 = $this->encodeBitStream($st2, $version); + + $inputitem['bstream'] = []; + $inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']); + $inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']); + } else { + switch($inputitem['mode']) { + case self::QR_MODE_NM: + $inputitem = $this->encodeModeNum($inputitem, $version); + break; + case self::QR_MODE_AN: + $inputitem = $this->encodeModeAn($inputitem, $version); + break; + case self::QR_MODE_8B: + $inputitem = $this->encodeMode8($inputitem, $version); + break; + case self::QR_MODE_KJ: + $inputitem = $this->encodeModeKanji($inputitem, $version); + break; + case self::QR_MODE_ST: + $inputitem = $this->encodeModeStructure($inputitem); + break; + } + } + + return $inputitem; + } + + /** + * Append data to an input object. + * The data is copied and appended to the input object. + */ + protected function appendNewInputItem(array $items, int $mode, int $size, array $data) : array + { + $newitem = $this->newInputItem($mode, $size, $data); + + if (!empty($newitem)) { + $items[] = $newitem; + } + + return $items; + } + + /** + * insertStructuredAppendHeader + */ + protected function insertStructuredAppendHeader(array $items, int $size, int $index, int $parity) : array + { + if ($size > self::MAX_STRUCTURED_SYMBOLS + || $index <= 0 + || $index > self::MAX_STRUCTURED_SYMBOLS + ) { + return -1; + } + + $buf = [$size, $index, $parity]; + $entry = $this->newInputItem(self::QR_MODE_ST, 3, $buf); + + \array_unshift($items, $entry); + + return $items; + } + + /** + * calcParity + */ + protected function calcParity(array $items) : int + { + $parity = 0; + foreach ($items as $item) { + if ($item['mode'] !== self::QR_MODE_ST) { + for ($i = $item['size'] - 1; $i >= 0; --$i) { + $parity ^= $item['data'][$i]; + } + } + } + + return $parity; + } + + /** + * checkModeNum + */ + protected function checkModeNum(int $size, array $data) : bool + { + for ($i = 0; $i < $size; ++$i) { + if (\ord($data[$i]) < \ord('0') || \ord($data[$i]) > \ord('9')) { + return false; + } + } + + return true; + } + + /** + * Look up the alphabet-numeric conversion table (see JIS X0510:2004, pp.19). + */ + protected function lookAnTable(int $c) : int + { + return $c > 127 ? -1 : self::AN_TABLE[$c]; + } + + /** + * checkModeAn + */ + protected function checkModeAn(int $size, array $data) : bool + { + for ($i = 0; $i < $size; ++$i) { + if ($this->lookAnTable(\ord($data[$i])) === -1) { + return false; + } + } + + return true; + } + + /** + * estimateBitsModeNum + */ + protected function estimateBitsModeNum(int $size) : int + { + $w = (int) ($size / 3); + $bits = ($w * 10); + + switch($size - ($w * 3)) { + case 1: + $bits += 4; + break; + case 2: + $bits += 7; + break; + } + + return $bits; + } + + /** + * estimateBitsModeAn + */ + protected function estimateBitsModeAn(int $size) : int + { + $bits = (int) ($size * 5.5); // (size / 2 ) * 11 + if ($size & 1) { + $bits += 6; + } + + return $bits; + } + + /** + * estimateBitsMode8 + */ + protected function estimateBitsMode8(int $size) : int + { + return $size * 8; + } + + /** + * estimateBitsModeKanji + */ + protected function estimateBitsModeKanji(int $size) : int + { + return (int) ($size * 6.5); // (size / 2 ) * 13 + } + + /** + * checkModeKanji + */ + protected function checkModeKanji(int $size, array $data) : bool + { + if ($size & 1) { + return false; + } + + for ($i = 0; $i < $size; $i += 2) { + $val = (\ord($data[$i]) << 8) | \ord($data[$i + 1]); + if ($val < 0x8140 || ($val > 0x9ffc && $val < 0xe040) || $val > 0xebbf) { + return false; + } + } + + return true; + } + + /** + * Validate the input data. + */ + protected function check(int $mode, int $size, array $data) : bool + { + if ($size <= 0) { + return false; + } + + switch($mode) { + case self::QR_MODE_NM: + return $this->checkModeNum($size, $data); + case self::QR_MODE_AN: + return $this->checkModeAn($size, $data); + case self::QR_MODE_KJ: + return $this->checkModeKanji($size, $data); + case self::QR_MODE_8B: + return true; + case self::QR_MODE_ST: + return true; + } + + return false; + } + + /** + * estimateBitStreamSize + */ + protected function estimateBitStreamSize(array $items, int $version) : int + { + $bits = 0; + if ($version === 0) { + $version = 1; + } + + foreach ($items as $item) { + switch($item['mode']) { + case self::QR_MODE_NM: + $bits = $this->estimateBitsModeNum($item['size']); + break; + case self::QR_MODE_AN: + $bits = $this->estimateBitsModeAn($item['size']); + break; + case self::QR_MODE_8B: + $bits = $this->estimateBitsMode8($item['size']); + break; + case self::QR_MODE_KJ: + $bits = $this->estimateBitsModeKanji($item['size']); + break; + case self::QR_MODE_ST: + return self::STRUCTURE_HEADER_BITS; + default: + return 0; + } + + $l = $this->lengthIndicator($item['mode'], $version); + $m = 1 << $l; + $num = (int) (($item['size'] + $m - 1) / $m); + $bits += $num * (4 + $l); + } + + return $bits; + } + + /** + * estimateVersion + */ + protected function estimateVersion(array $items) : int + { + $version = 0; + $prev = 0; + + do { + $prev = $version; + $bits = $this->estimateBitStreamSize($items, $prev); + $version = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level); + + if ($version < 0) { + return -1; + } + } while ($version > $prev); + + return $version; + } + + /** + * lengthOfCode + */ + protected function lengthOfCode(int $mode, int $version, int $bits) : int + { + $payload = $bits - 4 - $this->lengthIndicator($mode, $version); + switch($mode) { + case self::QR_MODE_NM: + $chunks = (int) ($payload / 10); + $remain = $payload - $chunks * 10; + $size = $chunks * 3; + + if ($remain >= 7) { + $size += 2; + } elseif ($remain >= 4) { + $size += 1; + } + + break; + case self::QR_MODE_AN: + $chunks = (int) ($payload / 11); + $remain = $payload - $chunks * 11; + $size = $chunks * 2; + + if ($remain >= 6) { + ++$size; + } + + break; + case self::QR_MODE_8B: + $size = (int) ($payload / 8); + break; + case self::QR_MODE_KJ: + $size = (int) (($payload / 13) * 2); + break; + case self::QR_MODE_ST: + $size = (int) ($payload / 8); + break; + default: + $size = 0; + break; + } + + $maxsize = $this->maximumWords($mode, $version); + if ($size < 0) { + $size = 0; + } + + if ($size > $maxsize) { + $size = $maxsize; + } + + return $size; + } + + /** + * createBitStream + */ + protected function createBitStream(array $items) : array + { + $total = 0; + foreach ($items as $key => $item) { + $items[$key] = $this->encodeBitStream($item, $this->version); + $bits = \count($items[$key]['bstream']); + $total += $bits; + } + + return [$items, $total]; + } + + /** + * convertData + */ + protected function convertData(array $items) : array + { + $ver = $this->estimateVersion($items); + if ($ver > $this->version) { + $this->version = $ver; + } + + while (true) { + $cbs = $this->createBitStream($items); + $items = $cbs[0]; + $bits = $cbs[1]; + + if ($bits < 0) { + return []; + } + + $ver = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level); + if ($ver < 0) { + return []; + } elseif ($ver > $this->version) { + $this->version = $ver; + } else { + break; + } + } + + return $items; + } + + /** + * Append Padding Bit to bitstream + */ + protected function appendPaddingBit(array $bstream) : array + { + if (empty($bstream)) { + return []; + } + + $bits = \count($bstream); + $maxwords = self::CAPACITY[$this->version][self::QRCAP_WORDS] - self::CAPACITY[$this->version][self::QRCAP_EC][$this->level]; + $maxbits = $maxwords * 8; + + if ($maxbits === $bits) { + return $bstream; + } + + if ($maxbits - $bits < 5) { + return $this->appendNum($bstream, $maxbits - $bits, 0); + } + + $bits += 4; + $words = (int) (($bits + 7) / 8); + $padding = []; + $padding = $this->appendNum($padding, $words * 8 - $bits + 4, 0); + $padlen = $maxwords - $words; + + if ($padlen > 0) { + $padbuf = []; + + for ($i = 0; $i < $padlen; ++$i) { + $padbuf[$i] = ($i & 1) ? 0x11 : 0xec; + } + + $padding = $this->appendBytes($padding, $padlen, $padbuf); + } + + return $this->appendBitstream($bstream, $padding); + } + + /** + * mergeBitStream + */ + protected function mergeBitStream(array $items) : array + { + $items = $this->convertData($items); + if (empty($items)) { + return []; + } + + $bstream = []; + foreach ($items as $item) { + $bstream = $this->appendBitstream($bstream, $item['bstream']); + } + + return $bstream; + } + + /** + * Returns a stream of bits. + */ + protected function getBitStream(array $items) : array + { + $bstream = $this->mergeBitStream($items); + + return $this->appendPaddingBit($bstream); + } + + /** + * Pack all bit streams padding bits into a byte array. + */ + protected function getByteStream(array $items) : array + { + $bstream = $this->getBitStream($items); + + return $this->bitstreamToByte($bstream); + } + + /** + * Return an array with zeros + */ + protected function allocate(int $setLength) : array + { + return \array_fill(0, $setLength, 0); + } + + /** + * Return new bitstream from number + */ + protected function newFromNum(int $bits, int $num) : array + { + $bstream = $this->allocate($bits); + $mask = 1 << ($bits - 1); + + for ($i = 0; $i < $bits; ++$i) { + $bstream[$i] = ($num & $mask) ? 1 : 0; + $mask = $mask >> 1; + } + + return $bstream; + } + + /** + * Return new bitstream from bytes + */ + protected function newFromBytes(int $size, array $data) : array + { + $bstream = $this->allocate($size * 8); + $p = 0; + + for ($i = 0; $i < $size; ++$i) { + $mask = 0x80; + + for ($j = 0; $j < 8; ++$j) { + $bstream[$p] = ($data[$i] & $mask) ? 1 : 0; + $mask = $mask >> 1; + + ++$p; + } + } + + return $bstream; + } + + /** + * Append one bitstream to another + */ + protected function appendBitstream(array $bitstream, array $append) : array + { + if (empty($append)) { + return $bitstream; + } + + if (empty($bitstream)) { + return $append; + } + + return \array_values(\array_merge($bitstream, $append)); + } + + /** + * Append one bitstream created from number to another + */ + protected function appendNum(array $bitstream, int $bits, int $num) : array + { + if ($bits === 0) { + return []; + } + + $b = $this->newFromNum($bits, $num); + + return $this->appendBitstream($bitstream, $b); + } + + /** + * Append one bitstream created from bytes to another + */ + protected function appendBytes(array $bitstream, int $size, array $data) : array + { + if ($size === 0) { + return []; + } + + $b = $this->newFromBytes($size, $data); + + return $this->appendBitstream($bitstream, $b); + } + + /** + * Convert bitstream to bytes + */ + protected function bitstreamToByte(array $bstream) : array + { + $size = \count($bstream); + if ($size === 0) { + return []; + } + + $data = \array_fill(0, (int) (($size + 7) / 8), 0); + $bytes = (int) ($size / 8); + $p = 0; + + for ($i = 0; $i < $bytes; ++$i) { + $v = 0; + + for ($j = 0; $j < 8; ++$j) { + $v = $v << 1; + $v |= $bstream[$p]; + ++$p; + } + + $data[$i] = $v; + } + + if ($size & 7) { + $v = 0; + + for ($j = 0; $j < ($size & 7); ++$j) { + $v = $v << 1; + $v |= $bstream[$p]; + ++$p; + } + + $data[$bytes] = $v; + } + + return $data; + } + + /** + * Replace a value on the array at the specified position + */ + protected function qrstrset(array $srctab, int $x, int $y, string $repl, int $replLen = 0) : array + { + $srctab[$y] = \substr_replace( + $srctab[$y], + $replLen !== 0 ? \substr($repl, 0, $replLen) : $repl, + $x, + $replLen !== 0 ? $replLen : \strlen($repl) + ); + + return $srctab; + } + + /** + * Return a version number that satisfies the input code length. + */ + protected function getMinimumVersion(int $size, int $level) : int + { + for ($i = 1; $i <= self::QRSPEC_VERSION_MAX; ++$i) { + $words = self::CAPACITY[$i][self::QRCAP_WORDS] - self::CAPACITY[$i][self::QRCAP_EC][$level]; + if ($words >= $size) { + return $i; + } + } + + // the size of input data is greater than QR capacity, try to lover the error correction mode + return -1; + } + + /** + * Return the size of length indicator for the mode and version. + */ + protected function lengthIndicator(int $mode, int $version) : int + { + if ($mode === self::QR_MODE_ST) { + return 0; + } + + if ($version <= 9) { + $l = 0; + } elseif ($version <= 26) { + $l = 1; + } else { + $l = 2; + } + + return self::LENGTH_TABLE_BITS[$mode][$l]; + } + + /** + * Return the maximum length for the mode and version. + */ + protected function maximumWords(int $mode, int $version) : int + { + if ($mode === self::QR_MODE_ST) { + return 3; + } + + if ($version <= 9) { + $l = 0; + } elseif ($version <= 26) { + $l = 1; + } else { + $l = 2; + } + + $bits = self::LENGTH_TABLE_BITS[$mode][$l]; + $words = (1 << $bits) - 1; + + if ($mode === self::QR_MODE_KJ) { + $words *= 2; // the number of bytes is required + } + + return $words; + } + + /** + * Return an array of ECC specification. + */ + protected function getEccSpec(int $version, int $level, array $spec) : array + { + if (\count($spec) < 5) { + $spec = [0, 0, 0, 0, 0]; + } + + $b1 = self::ECC_TABLE[$version][$level][0]; + $b2 = self::ECC_TABLE[$version][$level][1]; + $data = self::CAPACITY[$version][self::QRCAP_WORDS] - self::CAPACITY[$version][self::QRCAP_EC][$level]; + $ecc = self::CAPACITY[$version][self::QRCAP_EC][$level]; + + if ($b2 === 0) { + $spec[0] = $b1; + $spec[1] = (int) ($data / $b1); + $spec[2] = (int) ($ecc / $b1); + $spec[3] = 0; + $spec[4] = 0; + } else { + $spec[0] = $b1; + $spec[1] = (int) ($data / ($b1 + $b2)); + $spec[2] = (int) ($ecc / ($b1 + $b2)); + $spec[3] = $b2; + $spec[4] = $spec[1] + 1; + } + + return $spec; + } + + /** + * Put an alignment marker. + */ + protected function putAlignmentMarker(array $frame, int $ox, int $oy) : array + { + $yStart = $oy - 2; + $xStart = $ox - 2; + + for ($y = 0; $y < 5; ++$y) { + $frame = $this->qrstrset($frame, $xStart, $yStart + $y, self::PUT_ALIGNMENT_FILTER[$y]); + } + + return $frame; + } + + /** + * Put an alignment pattern. + */ + protected function putAlignmentPattern(int $version, array $frame, int $width) : array + { + if ($version < 2) { + return $frame; + } + + $d = self::ALIGNMENT_PATTERN[$version][1] - self::ALIGNMENT_PATTERN[$version][0]; + $w = $d < 0 + ? 2 + : (int) (($width - self::ALIGNMENT_PATTERN[$version][0]) / $d + 2); + + if ($w * $w - 3 === 1) { + $x = self::ALIGNMENT_PATTERN[$version][0]; + $y = self::ALIGNMENT_PATTERN[$version][0]; + $frame = $this->putAlignmentMarker($frame, $x, $y); + + return $frame; + } + + $cx = self::ALIGNMENT_PATTERN[$version][0]; + $wo = $w - 1; + + for ($x = 1; $x < $wo; ++$x) { + $frame = $this->putAlignmentMarker($frame, 6, $cx); + $frame = $this->putAlignmentMarker($frame, $cx, 6); + + $cx += $d; + } + + $cy = self::ALIGNMENT_PATTERN[$version][0]; + for ($y = 0; $y < $wo; ++$y) { + $cx = self::ALIGNMENT_PATTERN[$version][0]; + + for ($x = 0; $x < $wo; ++$x) { + $frame = $this->putAlignmentMarker($frame, $cx, $cy); + + $cx += $d; + } + + $cy += $d; + } + + return $frame; + } + + /** + * Put a finder pattern. + */ + protected function putFinderPattern(array $frame, int $ox, int $oy) : array + { + for ($y = 0; $y < 7; ++$y) { + $frame = $this->qrstrset($frame, $ox, ($oy + $y), self::PUT_FINDER[$y]); + } + + return $frame; + } + + /** + * Return a copy of initialized frame. + */ + protected function createFrame(int $version) : array + { + $width = self::CAPACITY[$version][self::QRCAP_WIDTH]; + $frameLine = \str_repeat ("\0", $width); + $frame = \array_fill(0, $width, $frameLine); + + // Finder pattern + $frame = $this->putFinderPattern($frame, 0, 0); + $frame = $this->putFinderPattern($frame, $width - 7, 0); + $frame = $this->putFinderPattern($frame, 0, $width - 7); + + // Separator + $yOffset = $width - 7; + for ($y = 0; $y < 7; ++$y) { + $frame[$y][7] = "\xc0"; + $frame[$y][$width - 8] = "\xc0"; + $frame[$yOffset][7] = "\xc0"; + + ++$yOffset; + } + + $setPattern = \str_repeat("\xc0", 8); + $frame = $this->qrstrset($frame, 0, 7, $setPattern); + $frame = $this->qrstrset($frame, $width-8, 7, $setPattern); + $frame = $this->qrstrset($frame, 0, $width - 8, $setPattern); + + // Format info + $setPattern = \str_repeat("\x84", 9); + $frame = $this->qrstrset($frame, 0, 8, $setPattern); + $frame = $this->qrstrset($frame, $width - 8, 8, $setPattern, 8); + $yOffset = $width - 8; + + for ($y = 0; $y < 8; ++$y, ++$yOffset) { + $frame[$y][8] = "\x84"; + $frame[$yOffset][8] = "\x84"; + } + + // Timing pattern + $wo = $width - 15; + for ($i = 1; $i < $wo; ++$i) { + $frame[6][7+$i] = \chr(0x90 | ($i & 1)); + $frame[7+$i][6] = \chr(0x90 | ($i & 1)); + } + + // Alignment pattern + $frame = $this->putAlignmentPattern($version, $frame, $width); + + // Version information + if ($version >= 7) { + $vinf = $version > self::QRSPEC_VERSION_MAX + ? 0 + : self::VERSION_PATTERN[$version - 7]; + + $v = $vinf; + for ($x = 0; $x<6; ++$x) { + for ($y = 0; $y<3; ++$y) { + $frame[($width - 11)+$y][$x] = \chr(0x88 | ($v & 1)); + $v = $v >> 1; + } + } + + $v = $vinf; + for ($y = 0; $y < 6; ++$y) { + for ($x = 0; $x < 3; ++$x) { + $frame[$y][$x + ($width - 11)] = \chr(0x88 | ($v & 1)); + $v = $v >> 1; + } + } + } + + // and a little bit... + $frame[$width - 8][8] = "\x81"; + + return $frame; + } + + /** + * Set new frame for the specified version. + */ + protected function newFrame(int $version) : array + { + if ($version < 1 || $version > self::QRSPEC_VERSION_MAX) { + return []; + } + + if (!isset($this->frames[$version])) { + $this->frames[$version] = $this->createFrame($version); + } + + if ($this->frames[$version] === null) { + return []; + } + + return $this->frames[$version]; + } + + /** + * Initialize a Reed-Solomon codec and add it to existing rsitems + */ + protected function init_rs(int $symsize, int $gfpoly, int $fcr, int $prim, int $nroots, int $pad) : array + { + foreach ($this->rsitems as $rs) { + if (($rs['pad'] !== $pad) || ($rs['nroots'] !== $nroots) || ($rs['mm'] !== $symsize) + || ($rs['gfpoly'] !== $gfpoly) || ($rs['fcr'] !== $fcr) || ($rs['prim'] !== $prim) + ) { + continue; + } + + return $rs; + } + + $rs = $this->init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad); + \array_unshift($this->rsitems, $rs); + + return $rs; + } + + /** + * modnn + */ + protected function modnn(array $rs, int $x) : int + { + while ($x >= $rs['nn']) { + $x -= $rs['nn']; + $x = ($x >> $rs['mm']) + ($x & $rs['nn']); + } + + return $x; + } + + /** + * Initialize a Reed-Solomon codec and returns an array of values. + */ + protected function init_rs_char(int $symsize, int $gfpoly, int $fcr, int $prim, int $nroots, int $pad) : array + { + // Based on Reed solomon encoder by Phil Karn, KA9Q (GNU-LGPLv2) + // Check parameter ranges + if ($symsize < 0 || $symsize > 8 + || $fcr < 0 || $fcr >= (1<<$symsize) + || $prim <= 0 || $prim >= (1<<$symsize) + || $nroots < 0 || $nroots >= (1<<$symsize) + || $pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots) + ) { + return []; + } + + $rs = []; + $rs['mm'] = $symsize; + $rs['nn'] = (1 << $symsize) - 1; + $rs['pad'] = $pad; + $rs['alpha_to'] = \array_fill(0, ($rs['nn'] + 1), 0); + $rs['index_of'] = \array_fill(0, ($rs['nn'] + 1), 0); + + // PHP style macro replacement ;) + $NN =& $rs['nn']; + $A0 =& $NN; + + // Generate Galois field lookup tables + $rs['index_of'][0] = $A0; // log(zero) = -inf + $rs['alpha_to'][$A0] = 0; // alpha**-inf = 0 + $sr = 1; + + for ($i = 0; $i < $rs['nn']; ++$i) { + $rs['index_of'][$sr] = $i; + $rs['alpha_to'][$i] = $sr; + $sr <<= 1; + + if ($sr & (1 << $symsize)) { + $sr ^= $gfpoly; + } + + $sr &= $rs['nn']; + } + + if ($sr !== 1) { + // field generator polynomial is not primitive! + return []; + } + + // Form RS code generator polynomial from its roots + $rs['genpoly'] = \array_fill(0, ($nroots + 1), 0); + $rs['fcr'] = $fcr; + $rs['prim'] = $prim; + $rs['nroots'] = $nroots; + $rs['gfpoly'] = $gfpoly; + + // Find prim-th root of 1, used in decoding + for ($iprim=1; ($iprim % $prim) !== 0; $iprim += $rs['nn']) { + ; // intentional empty-body loop! + } + + $rs['iprim'] = (int) ($iprim / $prim); + $rs['genpoly'][0] = 1; + + for ($i = 0,$root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) { + $rs['genpoly'][$i + 1] = 1; + + // Multiply rs->genpoly[] by @**(root + x) + for ($j = $i; $j > 0; --$j) { + if ($rs['genpoly'][$j] !== 0) { + $rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)]; + } else { + $rs['genpoly'][$j] = $rs['genpoly'][$j-1]; + } + } + + // rs->genpoly[0] can never be zero + $rs['genpoly'][0] = $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][0]] + $root)]; + } + + // convert rs->genpoly[] to index form for quicker encoding + for ($i = 0; $i <= $nroots; ++$i) { + $rs['genpoly'][$i] = $rs['index_of'][$rs['genpoly'][$i]]; + } + + return $rs; + } + + /** + * Encode a Reed-Solomon codec and returns the parity array + */ + protected function encode_rs_char(array $rs, array $data, array $parity) : array + { + $MM =& $rs['mm']; // bits per symbol + $NN =& $rs['nn']; // the total number of symbols in a RS block + $ALPHA_TO =& $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form + $INDEX_OF =& $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form + $GENPOLY =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form + $NROOTS =& $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block + $FCR =& $rs['fcr']; // first consecutive root, index form + $PRIM =& $rs['prim']; // primitive element, index form + $IPRIM =& $rs['iprim']; // prim-th root of 1, index form + $PAD =& $rs['pad']; // the number of pad symbols in a block + $A0 =& $NN; + $parity = \array_fill(0, $NROOTS, 0); + + for ($i = 0; $i < $NN - $NROOTS - $PAD; ++$i) { + $feedback = $INDEX_OF[$data[$i] ^ $parity[0]]; + + if ($feedback !== $A0) { + // feedback term is non-zero + // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must + // always be for the polynomials constructed by init_rs() + $feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback); + + for ($j = 1; $j < $NROOTS; ++$j) { + $parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])]; + } + } + + // Shift + \array_shift($parity); + $parity[] = $feedback !== $A0 + ? $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[0])] + : 0; + } + + return $parity; + } } diff --git a/Utils/Barcode/TwoDAbstract.php b/Utils/Barcode/TwoDAbstract.php new file mode 100644 index 000000000..df3de5104 --- /dev/null +++ b/Utils/Barcode/TwoDAbstract.php @@ -0,0 +1,118 @@ + + * @copyright Copyright (C) 2010 - 2014 Nicola Asuni - Tecnick.com LTD + * @license GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) + * @version 1.0.0 + * @link https://jingga.app + */ +declare(strict_types=1); + +namespace phpOMS\Utils\Barcode; + +/** + * 2DAbstract class. + * + * @package phpOMS\Utils\Barcode + * @license GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) + * @link https://jingga.app + * @since 1.0.0 + */ +abstract class TwoDAbstract extends CodeAbstract +{ + /** + * {@inheritdoc} + */ + public function get() : mixed + { + $codeArray = $this->generateCodeArray(); + + return $this->createImage($codeArray); + } + + public abstract function generateCodeArray() : array; + + /** + * Create barcode image + * + * @param array $codeArray Code array to render + * + * @return \GdImage + * + * @since 1.0.0 + */ + protected function createImage(array $codeArray) : mixed + { + $dimensions = $this->calculateDimensions($codeArray); + $image = \imagecreate($dimensions['width'], $dimensions['height']); + + if ($image === false) { + throw new \Exception(); // @codeCoverageIgnore + } + + $black = \imagecolorallocate($image, 0, 0, 0); + $white = \imagecolorallocate($image, 255, 255, 255); + + if ($white === false || $black === false) { + throw new \Exception(); // @codeCoverageIgnore + } + + \imagefill($image, 0, 0, $white); + + $width = \count($codeArray); + $height = \count(\reset($codeArray)); + + $multiplier = (int) (($dimensions['width'] - 2 * $this->margin) / $width); + + $locationX = $this->margin; + + // @todo: Allow manual dimensions + for ($posX = 0; $posX < $width; ++$posX) { + $locationY = $this->margin; + + for ($posY = 0; $posY < $height; ++$posY) { + \imagefilledrectangle( + $image, + $locationX, + $locationY, + $locationX + $multiplier, + $locationY + $multiplier, + $codeArray[$posY][$posX] ? $black : $white + ); + + $locationY += $multiplier; + } + + $locationX += $multiplier; + } + + return $image; + } + + /** + * Calculate the code dimensions + * + * @param array $codeArray Code string to render + * + * @return array + * + * @since 1.0.0 + */ + private function calculateDimensions(array $codeArray) : array + { + $matrixDimension = \max(\count($codeArray), \count(\reset($codeArray))); + $imageDimension = \max($this->dimension['width'], $this->dimension['width']); + + $multiplier = (int) ($imageDimension - 2 * $this->margin) / $matrixDimension; + + $dimensions['width'] = $matrixDimension * $multiplier + 2 * $this->margin; + $dimensions['height'] = $matrixDimension * $multiplier + 2 * $this->margin; + + return $dimensions; + } +} diff --git a/Utils/ColorUtils.php b/Utils/ColorUtils.php index 8da365709..9f59e3d61 100755 --- a/Utils/ColorUtils.php +++ b/Utils/ColorUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils; * Color class for color operations. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Compression/CompressionInterface.php b/Utils/Compression/CompressionInterface.php index 49c00be5e..ee1023de8 100755 --- a/Utils/Compression/CompressionInterface.php +++ b/Utils/Compression/CompressionInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Compression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Compression; * Compression Interface * * @package phpOMS\Utils\Compression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Compression/LZW.php b/Utils/Compression/LZW.php index d30f6fd0e..eafebc634 100755 --- a/Utils/Compression/LZW.php +++ b/Utils/Compression/LZW.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Compression * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Compression; * LZW compression class * * @package phpOMS\Utils\Compression - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/AngleType.php b/Utils/Converter/AngleType.php index 7f34b05a5..1d05260e3 100755 --- a/Utils/Converter/AngleType.php +++ b/Utils/Converter/AngleType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Angle type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/AreaType.php b/Utils/Converter/AreaType.php index 79e2fa458..9bd7fbd8d 100755 --- a/Utils/Converter/AreaType.php +++ b/Utils/Converter/AreaType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Area type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/Currency.php b/Utils/Converter/Currency.php index 6a8b1bb7b..d981eface 100755 --- a/Utils/Converter/Currency.php +++ b/Utils/Converter/Currency.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Uri\HttpUri; * Currency converter. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/EnergyPowerType.php b/Utils/Converter/EnergyPowerType.php index 590ffb1c7..d79069bcc 100755 --- a/Utils/Converter/EnergyPowerType.php +++ b/Utils/Converter/EnergyPowerType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Energy/Power type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/File.php b/Utils/Converter/File.php index faebae20f..96418fd6b 100755 --- a/Utils/Converter/File.php +++ b/Utils/Converter/File.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Converter; * File converter. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/FileSizeType.php b/Utils/Converter/FileSizeType.php index 1665aacf8..b2bdcec8f 100755 --- a/Utils/Converter/FileSizeType.php +++ b/Utils/Converter/FileSizeType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * File size type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/Ip.php b/Utils/Converter/Ip.php index de1fdbb1a..8576ad2f1 100755 --- a/Utils/Converter/Ip.php +++ b/Utils/Converter/Ip.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Converter; * Ip converter. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/LengthType.php b/Utils/Converter/LengthType.php index edf768cd7..244b2417c 100755 --- a/Utils/Converter/LengthType.php +++ b/Utils/Converter/LengthType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Length type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/Measurement.php b/Utils/Converter/Measurement.php index fe98709eb..1cc622618 100755 --- a/Utils/Converter/Measurement.php +++ b/Utils/Converter/Measurement.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Converter; * Measurement converter. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/Numeric.php b/Utils/Converter/Numeric.php index 8fbcf82b8..2755e4613 100755 --- a/Utils/Converter/Numeric.php +++ b/Utils/Converter/Numeric.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Converter; * Numeric converter. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/PressureType.php b/Utils/Converter/PressureType.php index 7efa566a8..f62fd9fbd 100755 --- a/Utils/Converter/PressureType.php +++ b/Utils/Converter/PressureType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Pressure type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/SpeedType.php b/Utils/Converter/SpeedType.php index af3328807..021556fff 100755 --- a/Utils/Converter/SpeedType.php +++ b/Utils/Converter/SpeedType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Speed type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/TemperatureType.php b/Utils/Converter/TemperatureType.php index bdcf09bc7..8a1ea6da6 100755 --- a/Utils/Converter/TemperatureType.php +++ b/Utils/Converter/TemperatureType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Temperature type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/TimeType.php b/Utils/Converter/TimeType.php index 8d7c56e77..8a6ca054b 100755 --- a/Utils/Converter/TimeType.php +++ b/Utils/Converter/TimeType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Time type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/VolumeType.php b/Utils/Converter/VolumeType.php index b48d6c190..351d3d7e7 100755 --- a/Utils/Converter/VolumeType.php +++ b/Utils/Converter/VolumeType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Volume type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Converter/WeightType.php b/Utils/Converter/WeightType.php index f47d495e1..fe9d31f64 100755 --- a/Utils/Converter/WeightType.php +++ b/Utils/Converter/WeightType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Converter * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Weight type enum. * * @package phpOMS\Utils\Converter - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Encoding/Caesar.php b/Utils/Encoding/Caesar.php index 051200a39..54d7347c4 100755 --- a/Utils/Encoding/Caesar.php +++ b/Utils/Encoding/Caesar.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Encoding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Encoding; * Gray encoding class * * @package phpOMS\Utils\Encoding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Encoding/EncodingInterface.php b/Utils/Encoding/EncodingInterface.php index 4aded1ad2..7c740cfc2 100755 --- a/Utils/Encoding/EncodingInterface.php +++ b/Utils/Encoding/EncodingInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Encoding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Encoding; * Encoding Interface * * @package phpOMS\Utils\Encoding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Encoding/Gray.php b/Utils/Encoding/Gray.php index a7705a971..d9f25c7ba 100755 --- a/Utils/Encoding/Gray.php +++ b/Utils/Encoding/Gray.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Encoding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Encoding; * Gray encoding class * * @package phpOMS\Utils\Encoding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Encoding/Huffman/Dictionary.php b/Utils/Encoding/Huffman/Dictionary.php index 537d6996a..79c1c74b9 100755 --- a/Utils/Encoding/Huffman/Dictionary.php +++ b/Utils/Encoding/Huffman/Dictionary.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Encoding\Huffman * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Encoding\Huffman; * Gray encoding class * * @package phpOMS\Utils\Encoding\Huffman - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Encoding/Huffman/Huffman.php b/Utils/Encoding/Huffman/Huffman.php index 82771af71..1c1da6dc1 100755 --- a/Utils/Encoding/Huffman/Huffman.php +++ b/Utils/Encoding/Huffman/Huffman.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Encoding\Huffman * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Encoding\Huffman; * Gray encoding class * * @package phpOMS\Utils\Encoding\Huffman - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Encoding/XorEncoding.php b/Utils/Encoding/XorEncoding.php index ff3a01998..c585d66ce 100755 --- a/Utils/Encoding/XorEncoding.php +++ b/Utils/Encoding/XorEncoding.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Encoding * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Encoding; * XOR encoding class * * @package phpOMS\Utils\Encoding - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Git/Author.php b/Utils/Git/Author.php index d2bbcb601..53771bf92 100755 --- a/Utils/Git/Author.php +++ b/Utils/Git/Author.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Git * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Git; * Gray encoding class * * @package phpOMS\Utils\Git - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Git/Branch.php b/Utils/Git/Branch.php index 08129961e..ad9007ebf 100755 --- a/Utils/Git/Branch.php +++ b/Utils/Git/Branch.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Git * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Git; * Gray encoding class * * @package phpOMS\Utils\Git - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Git/Commit.php b/Utils/Git/Commit.php index d2981f543..235cc8e79 100755 --- a/Utils/Git/Commit.php +++ b/Utils/Git/Commit.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Git * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Git; * Gray encoding class * * @package phpOMS\Utils\Git - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Git/Git.php b/Utils/Git/Git.php index bed0085fb..515dbcee9 100755 --- a/Utils/Git/Git.php +++ b/Utils/Git/Git.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Git * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\System\File\PathException; * Gray encoding class * * @package phpOMS\Utils\Git - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Utils/Git/NullCommit.php b/Utils/Git/NullCommit.php index d6078995b..189165830 100755 --- a/Utils/Git/NullCommit.php +++ b/Utils/Git/NullCommit.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Git * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Git; * Gray encoding class * * @package phpOMS\Utils\Git - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Git/Repository.php b/Utils/Git/Repository.php index 4f163ce6a..b10292d7b 100755 --- a/Utils/Git/Repository.php +++ b/Utils/Git/Repository.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Git * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Utils\StringUtils; * Repository class * * @package phpOMS\Utils\Git - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Utils/Git/Tag.php b/Utils/Git/Tag.php index 35372eabb..a31616c9c 100755 --- a/Utils/Git/Tag.php +++ b/Utils/Git/Tag.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Git * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\Git; * Gray encoding class * * @package phpOMS\Utils\Git - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Csv/CsvInterface.php b/Utils/IO/Csv/CsvInterface.php index 8ed63ada1..de3fb582b 100755 --- a/Utils/IO/Csv/CsvInterface.php +++ b/Utils/IO/Csv/CsvInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Csv * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO\Csv; * Cvs interface. * * @package phpOMS\Utils\IO\Csv - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Csv/CsvSettings.php b/Utils/IO/Csv/CsvSettings.php index c45167c99..4a4644335 100755 --- a/Utils/IO/Csv/CsvSettings.php +++ b/Utils/IO/Csv/CsvSettings.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Csv * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO\Csv; * Csv settings. * * @package phpOMS\Utils\IO\Csv - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/ExchangeInterface.php b/Utils/IO/ExchangeInterface.php index 8713a0f90..9267ac171 100755 --- a/Utils/IO/ExchangeInterface.php +++ b/Utils/IO/ExchangeInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Utils\IO\Spreadsheet\SpreadsheetInterface; * Exchange interface. * * @package phpOMS\Utils\IO - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/IODatabaseMapper.php b/Utils/IO/IODatabaseMapper.php index dcddec909..c0a8c7859 100755 --- a/Utils/IO/IODatabaseMapper.php +++ b/Utils/IO/IODatabaseMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO; * IO database mapper. * * @package phpOMS\Utils\IO - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Json/InvalidJsonException.php b/Utils/IO/Json/InvalidJsonException.php index 8d7d41ae9..e588b3a2f 100755 --- a/Utils/IO/Json/InvalidJsonException.php +++ b/Utils/IO/Json/InvalidJsonException.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Json * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO\Json; * Json decoding exception class. * * @package phpOMS\Utils\IO\Json - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Json/JsonInterface.php b/Utils/IO/Json/JsonInterface.php index ce32251f2..20a227683 100755 --- a/Utils/IO/Json/JsonInterface.php +++ b/Utils/IO/Json/JsonInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Json * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO\Json; * Cvs interface. * * @package phpOMS\Utils\IO\Json - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Pdf/PdfInterface.php b/Utils/IO/Pdf/PdfInterface.php index 2a0d0caa0..d7fcbf05e 100755 --- a/Utils/IO/Pdf/PdfInterface.php +++ b/Utils/IO/Pdf/PdfInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Pdf * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO\Pdf; * Pdf interface. * * @package phpOMS\Utils\IO\Pdf - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php index a66e846be..ded4b9d6b 100755 --- a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php +++ b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Spreadsheet * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Utils\StringUtils; * Spreadsheet database mapper. * * @package phpOMS\Utils\IO\Spreadsheet - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Spreadsheet/SpreadsheetInterface.php b/Utils/IO/Spreadsheet/SpreadsheetInterface.php index 01ae9bf7e..059a9e734 100755 --- a/Utils/IO/Spreadsheet/SpreadsheetInterface.php +++ b/Utils/IO/Spreadsheet/SpreadsheetInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Spreadsheet * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO\Spreadsheet; * Spreadsheet interface. * * @package phpOMS\Utils\IO\Spreadsheet - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Zip/ArchiveInterface.php b/Utils/IO/Zip/ArchiveInterface.php index 60c6b8fe8..c0d2265c5 100755 --- a/Utils/IO/Zip/ArchiveInterface.php +++ b/Utils/IO/Zip/ArchiveInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Zip * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\IO\Zip; * Archive interface * * @package phpOMS\Utils\IO\Zip - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Zip/Gz.php b/Utils/IO/Zip/Gz.php index e303319e0..f68955735 100755 --- a/Utils/IO/Zip/Gz.php +++ b/Utils/IO/Zip/Gz.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Zip * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Utils\IO\Zip; * Providing basic zip support * * @package phpOMS\Utils\IO\Zip - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Zip/Tar.php b/Utils/IO/Zip/Tar.php index f66733e34..8e3f20622 100755 --- a/Utils/IO/Zip/Tar.php +++ b/Utils/IO/Zip/Tar.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Zip * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -27,7 +27,7 @@ use phpOMS\System\File\Local\Directory; * bug? https://bugs.php.net/bug.php?id=75101 * * @package phpOMS\Utils\IO\Zip - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Zip/TarGz.php b/Utils/IO/Zip/TarGz.php index 7337695f9..781d4402f 100755 --- a/Utils/IO/Zip/TarGz.php +++ b/Utils/IO/Zip/TarGz.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Zip * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\System\File\Local\File; * Providing basic zip support * * @package phpOMS\Utils\IO\Zip - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/IO/Zip/Zip.php b/Utils/IO/Zip/Zip.php index e3f00ff5f..3ffa6f89a 100755 --- a/Utils/IO/Zip/Zip.php +++ b/Utils/IO/Zip/Zip.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\IO\Zip * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\System\File\Local\Directory; * Providing basic zip support * * @package phpOMS\Utils\IO\Zip - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/ImageUtils.php b/Utils/ImageUtils.php index e5325022d..68c79738e 100755 --- a/Utils/ImageUtils.php +++ b/Utils/ImageUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Utils; * This class provides static helper functionalities for images. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -212,6 +212,7 @@ final class ImageUtils $newDim = [\max($imageDim1[0], $imageDim2[0]), \max($imageDim1[1], $imageDim2[1])]; $diff = empty($out) ? -1 : $out; + $dst = false; if ($diff !== -1) { $dst = $diff === 0 @@ -290,7 +291,7 @@ final class ImageUtils } } - if ($diff !== -1) { + if ($dst !== false) { if (\stripos($out, '.jpg') || \stripos($out, '.jpeg')) { \imagejpeg($dst, $out); } elseif (\stripos($out, '.png')) { diff --git a/Utils/MbStringUtils.php b/Utils/MbStringUtils.php index e5396b3fe..01bec5237 100755 --- a/Utils/MbStringUtils.php +++ b/Utils/MbStringUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\System\CharsetType; * This class provides static helper functionalities for strings. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Utils/NumericUtils.php b/Utils/NumericUtils.php index 8898cd286..d88d506c8 100755 --- a/Utils/NumericUtils.php +++ b/Utils/NumericUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils; * Array utils. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Parser/Calendar/ICalParser.php b/Utils/Parser/Calendar/ICalParser.php new file mode 100644 index 000000000..b3e81a519 --- /dev/null +++ b/Utils/Parser/Calendar/ICalParser.php @@ -0,0 +1,79 @@ +oPhpPresentation = $oPHPPpt; } - public function renderHtml() + /** + * Render presentation + * + * @return string + * + * @since 1.0.0 + */ + public function renderHtml() : string { $this->append('
'); $this->append('
'); @@ -67,12 +94,30 @@ class PresentationWriter return $this->htmlOutput; } - protected function append($sHTML) + /** + * Add html to output + * + * @param string $sHTML Html + * + * @return void + * + * @since 1.0.0 + */ + protected function append(string $sHTML) : void { $this->htmlOutput .= $sHTML; } - protected function displayPhpPresentation(PhpPresentation $oPHPPpt) + /** + * Constructor + * + * @param PhpPresentation $oPHPPpt Presentation object + * + * @return void + * + * @since 1.0.0 + */ + protected function displayPhpPresentation(PhpPresentation $oPHPPpt) : void { $this->append('
  • PhpPresentation'); $this->append('
      '); @@ -102,7 +147,16 @@ class PresentationWriter $this->append(''); } - protected function displayShape(AbstractShape $shape) + /** + * Render a shape + * + * @param AbstractShape $shape Shape to render + * + * @return void + * + * @since 1.0.0 + */ + protected function displayShape(AbstractShape $shape) : void { if ($shape instanceof Drawing\Gd) { $this->append('
    • Shape "Drawing\Gd"
      • '); @@ -119,7 +173,16 @@ class PresentationWriter } } - protected function displayPhpPresentationInfo(PhpPresentation $oPHPPpt) + /** + * Render a shape + * + * @param PhpPresentation $oPHPPpt Presentation object + * + * @return void + * + * @since 1.0.0 + */ + protected function displayPhpPresentationInfo(PhpPresentation $oPHPPpt) : void { $this->append('
      '); $this->append('
      '); @@ -185,7 +248,16 @@ class PresentationWriter } } - protected function displayShapeInfo(AbstractShape $oShape) + /** + * Render a shape info + * + * @param AbstractShape $oShape Shape to render + * + * @return void + * + * @since 1.0.0 + */ + protected function displayShapeInfo(AbstractShape $oShape) : void { $this->append('
      '); $this->append('
      '); @@ -298,14 +370,25 @@ class PresentationWriter $this->append('
      '); } - protected function getConstantName($class, $search, $startWith = '') + /** + * Find constant + * + * @param string $class Class to search in + * @param string $search Value to search for + * @param string $startWith Constant name it starts with + * + * @return void + * + * @since 1.0.0 + */ + protected function getConstantName(string $class, string $search, string $startWith = '') : string { $fooClass = new \ReflectionClass($class); $constants = $fooClass->getConstants(); - $constName = null; + $constName = ''; foreach ($constants as $key => $value) { if ($value == $search) { - if (empty($startWith) || (!empty($startWith) && 0 === strpos($key, $startWith))) { + if (empty($startWith) || (!empty($startWith) && \strpos($key, $startWith) === 0)) { $constName = $key; } break; diff --git a/Utils/Parser/Spreadsheet/SpreadsheetParser.php b/Utils/Parser/Spreadsheet/SpreadsheetParser.php index 874efe468..fe837d6ad 100644 --- a/Utils/Parser/Spreadsheet/SpreadsheetParser.php +++ b/Utils/Parser/Spreadsheet/SpreadsheetParser.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Parser\Spreadsheet * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup; * Spreadsheet parser class. * * @package phpOMS\Utils\Parser\Spreadsheet - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/Parser/Spreadsheet/SpreadsheetWriter.php b/Utils/Parser/Spreadsheet/SpreadsheetWriter.php index 11d65076e..9fc793023 100644 --- a/Utils/Parser/Spreadsheet/SpreadsheetWriter.php +++ b/Utils/Parser/Spreadsheet/SpreadsheetWriter.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\Parser\Spreadsheet * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,15 +18,32 @@ use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup; use PhpOffice\PhpSpreadsheet\Writer\Html; use PhpOffice\PhpSpreadsheet\Writer\Pdf; +/** + * Spreadsheet writer + * + * @package phpOMS\Utils\Parser\Spreadsheet + * @license OMS License 2.0 + * @link https://jingga.app + * @since 1.0.0 + */ class SpreadsheetWriter extends Pdf { - /** @var bool */ - protected $isMPdf = true; + /** + * Render Pdf + * + * @todo: can be removed? + * + * @var bool + * @since 1.0.0 + */ + protected bool $isMPdf = true; /** * Save Spreadsheet to file. * - * @param string $filename Name of the file to save as + * @return string + * + * @since 1.0.0 */ public function toPdfString(): string { @@ -44,10 +61,10 @@ class SpreadsheetWriter extends Pdf $pdf->DefOrientation = $orientation; $pdf->AddPageByArray([ 'orientation' => $orientation, - 'margin-left' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getLeft()), - 'margin-right' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getRight()), - 'margin-top' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getTop()), - 'margin-bottom' => $this->inchesToMm($this->spreadsheet->getActiveSheet()->getPageMargins()->getBottom()), + 'margin-left' => $this->spreadsheet->getActiveSheet()->getPageMargins()->getLeft() * 25.4, + 'margin-right' => $this->spreadsheet->getActiveSheet()->getPageMargins()->getRight() * 25.4, + 'margin-top' => $this->spreadsheet->getActiveSheet()->getPageMargins()->getTop() * 25.4, + 'margin-bottom' => $this->spreadsheet->getActiveSheet()->getPageMargins()->getBottom() * 25.4, ]); // Document info @@ -78,16 +95,4 @@ class SpreadsheetWriter extends Pdf return $html; } - - /** - * Convert inches to mm. - * - * @param float $inches - * - * @return float - */ - private function inchesToMm($inches) - { - return $inches * 25.4; - } } diff --git a/Utils/Permutation.php b/Utils/Permutation.php index 31bfb931c..21c5472df 100755 --- a/Utils/Permutation.php +++ b/Utils/Permutation.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils; * String utils. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/ArrayRandomize.php b/Utils/RnG/ArrayRandomize.php index 709f9f064..a59cde15e 100755 --- a/Utils/RnG/ArrayRandomize.php +++ b/Utils/RnG/ArrayRandomize.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * Array randomizer class * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/DateTime.php b/Utils/RnG/DateTime.php index d87b47d7e..81d0b8ba1 100755 --- a/Utils/RnG/DateTime.php +++ b/Utils/RnG/DateTime.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * DateTime generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/DistributionType.php b/Utils/RnG/DistributionType.php index 0d2118f3f..d5c126562 100755 --- a/Utils/RnG/DistributionType.php +++ b/Utils/RnG/DistributionType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Distribution type enum. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/Email.php b/Utils/RnG/Email.php index 4e1af995b..8e6280c18 100755 --- a/Utils/RnG/Email.php +++ b/Utils/RnG/Email.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * Email generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/File.php b/Utils/RnG/File.php index 48987addb..eccd0bdff 100755 --- a/Utils/RnG/File.php +++ b/Utils/RnG/File.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * File generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/LinearCongruentialGenerator.php b/Utils/RnG/LinearCongruentialGenerator.php index 7b921c927..7242a0e31 100755 --- a/Utils/RnG/LinearCongruentialGenerator.php +++ b/Utils/RnG/LinearCongruentialGenerator.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * Linear congruential generator class * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/Name.php b/Utils/RnG/Name.php index e7f5fcecd..0ea9f2a70 100755 --- a/Utils/RnG/Name.php +++ b/Utils/RnG/Name.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * Name generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/Phone.php b/Utils/RnG/Phone.php index 97c0ea40d..b814a2321 100755 --- a/Utils/RnG/Phone.php +++ b/Utils/RnG/Phone.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * Phone generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/StringUtils.php b/Utils/RnG/StringUtils.php index 2cd6f074d..fbfc858db 100755 --- a/Utils/RnG/StringUtils.php +++ b/Utils/RnG/StringUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * String generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/Text.php b/Utils/RnG/Text.php index 16542a3c1..6317f7658 100755 --- a/Utils/RnG/Text.php +++ b/Utils/RnG/Text.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * Text generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/RnG/UUID.php b/Utils/RnG/UUID.php index 6ec453fad..bb6cf1a4a 100644 --- a/Utils/RnG/UUID.php +++ b/Utils/RnG/UUID.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\RnG * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\RnG; * UUID generator. * * @package phpOMS\Utils\RnG - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/StringCompare.php b/Utils/StringCompare.php index 697a13b39..c549eb822 100755 --- a/Utils/StringCompare.php +++ b/Utils/StringCompare.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Utils; * This class helps to compare two strings * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/StringUtils.php b/Utils/StringUtils.php index 3630a83b3..b375a669e 100755 --- a/Utils/StringUtils.php +++ b/Utils/StringUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Contract\SerializableInterface; * This class provides static helper functionalities for strings. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * diff --git a/Utils/TaskSchedule/Cron.php b/Utils/TaskSchedule/Cron.php index d819c1e0a..95b768de5 100755 --- a/Utils/TaskSchedule/Cron.php +++ b/Utils/TaskSchedule/Cron.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\TaskSchedule; * Cron class. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Utils/TaskSchedule/CronJob.php b/Utils/TaskSchedule/CronJob.php index 822906d4c..639d03a70 100755 --- a/Utils/TaskSchedule/CronJob.php +++ b/Utils/TaskSchedule/CronJob.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\TaskSchedule; * CronJob class. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/Interval.php b/Utils/TaskSchedule/Interval.php index b6c73ce01..add6c6ae6 100755 --- a/Utils/TaskSchedule/Interval.php +++ b/Utils/TaskSchedule/Interval.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\SerializableInterface; * Interval class for tasks. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/NullCronJob.php b/Utils/TaskSchedule/NullCronJob.php index e4c07d8bb..6d9b749da 100755 --- a/Utils/TaskSchedule/NullCronJob.php +++ b/Utils/TaskSchedule/NullCronJob.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\TaskSchedule; * CronJob class. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/NullSchedule.php b/Utils/TaskSchedule/NullSchedule.php index 86be47b24..650980c65 100755 --- a/Utils/TaskSchedule/NullSchedule.php +++ b/Utils/TaskSchedule/NullSchedule.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\TaskSchedule; * CronJob class. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/Schedule.php b/Utils/TaskSchedule/Schedule.php index 7abe3856f..79e9f65ce 100755 --- a/Utils/TaskSchedule/Schedule.php +++ b/Utils/TaskSchedule/Schedule.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\Base\DateTime; * Schedule class. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/SchedulerAbstract.php b/Utils/TaskSchedule/SchedulerAbstract.php index 9988570d5..71140755b 100755 --- a/Utils/TaskSchedule/SchedulerAbstract.php +++ b/Utils/TaskSchedule/SchedulerAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\System\File\PathException; * Scheduler abstract. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Utils/TaskSchedule/SchedulerFactory.php b/Utils/TaskSchedule/SchedulerFactory.php index c681c3927..4d82c27b6 100755 --- a/Utils/TaskSchedule/SchedulerFactory.php +++ b/Utils/TaskSchedule/SchedulerFactory.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\System\SystemType; * Scheduler factory. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/TaskAbstract.php b/Utils/TaskSchedule/TaskAbstract.php index 50b51d948..fcc38db65 100755 --- a/Utils/TaskSchedule/TaskAbstract.php +++ b/Utils/TaskSchedule/TaskAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\TaskSchedule; * Abstract task class. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/TaskFactory.php b/Utils/TaskSchedule/TaskFactory.php index 012a6b67a..900f4ab19 100755 --- a/Utils/TaskSchedule/TaskFactory.php +++ b/Utils/TaskSchedule/TaskFactory.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\System\SystemType; * Task factory. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TaskSchedule/TaskScheduler.php b/Utils/TaskSchedule/TaskScheduler.php index 39e0c3692..64dc23210 100755 --- a/Utils/TaskSchedule/TaskScheduler.php +++ b/Utils/TaskSchedule/TaskScheduler.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Utils\TaskSchedule; * Task scheduler class. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Utils/TaskSchedule/TaskStatus.php b/Utils/TaskSchedule/TaskStatus.php index 5c7121dcb..886c6b177 100755 --- a/Utils/TaskSchedule/TaskStatus.php +++ b/Utils/TaskSchedule/TaskStatus.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils\TaskSchedule * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Job status enum. * * @package phpOMS\Utils\TaskSchedule - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Utils/TestUtils.php b/Utils/TestUtils.php index 1e4f6c9c2..464ec746a 100755 --- a/Utils/TestUtils.php +++ b/Utils/TestUtils.php @@ -6,7 +6,7 @@ * * @package phpOMS\Utils * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Utils; * Only for testing purposes. MUST NOT be used for other purposes. * * @package phpOMS\Utils - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Base/DateTime.php b/Validation/Base/DateTime.php index 5d72635fb..d579d8058 100755 --- a/Validation/Base/DateTime.php +++ b/Validation/Base/DateTime.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\ValidatorAbstract; * Validate date. * * @package phpOMS\Validation\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Base/Json.php b/Validation/Base/Json.php index 9a1ad7d58..b6707de96 100755 --- a/Validation/Base/Json.php +++ b/Validation/Base/Json.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Base * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -21,7 +21,7 @@ use phpOMS\Validation\ValidatorAbstract; * Validate json. * * @package phpOMS\Validation\Base - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Finance/BIC.php b/Validation/Finance/BIC.php index 3f62a6d65..d79db7050 100755 --- a/Validation/Finance/BIC.php +++ b/Validation/Finance/BIC.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\ValidatorAbstract; * Validate BIC * * @package phpOMS\Validation\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Finance/CreditCard.php b/Validation/Finance/CreditCard.php index 3877eec33..bd6a1ca64 100755 --- a/Validation/Finance/CreditCard.php +++ b/Validation/Finance/CreditCard.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\ValidatorAbstract; * Credit card validation * * @package phpOMS\Validation\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Finance/Iban.php b/Validation/Finance/Iban.php index 814745c35..47172c803 100755 --- a/Validation/Finance/Iban.php +++ b/Validation/Finance/Iban.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\ValidatorAbstract; * Iban validation. * * @package phpOMS\Validation\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Finance/IbanEnum.php b/Validation/Finance/IbanEnum.php index a2a0e2f6a..68fd5ace9 100755 --- a/Validation/Finance/IbanEnum.php +++ b/Validation/Finance/IbanEnum.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Iban layout definition. * * @package phpOMS\Validation\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Finance/IbanErrorType.php b/Validation/Finance/IbanErrorType.php index 30147cb60..b06a5c443 100755 --- a/Validation/Finance/IbanErrorType.php +++ b/Validation/Finance/IbanErrorType.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Finance * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Iban error type enum. * * @package phpOMS\Validation\Finance - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Network/Email.php b/Validation/Network/Email.php index ec9f5f95b..a0e121eaa 100755 --- a/Validation/Network/Email.php +++ b/Validation/Network/Email.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Network * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\ValidatorAbstract; * Validate email. * * @package phpOMS\Validation\Network - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Network/Hostname.php b/Validation/Network/Hostname.php index b5fe73947..fc8eea88c 100755 --- a/Validation/Network/Hostname.php +++ b/Validation/Network/Hostname.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Network * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\ValidatorAbstract; * Validate hostname. * * @package phpOMS\Validation\Network - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Network/Ip.php b/Validation/Network/Ip.php index 995196502..b175e21c1 100755 --- a/Validation/Network/Ip.php +++ b/Validation/Network/Ip.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation\Network * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Validation\ValidatorAbstract; * Validate IP. * * @package phpOMS\Validation\Network - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/Validator.php b/Validation/Validator.php index f98ef9b78..c7015b16d 100755 --- a/Validation/Validator.php +++ b/Validation/Validator.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Utils\StringUtils; * Validator class. * * @package phpOMS\Validation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/ValidatorAbstract.php b/Validation/ValidatorAbstract.php index 4a4996016..1303a70ba 100755 --- a/Validation/ValidatorAbstract.php +++ b/Validation/ValidatorAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Validation; * Validator abstract. * * @package phpOMS\Validation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Validation/ValidatorInterface.php b/Validation/ValidatorInterface.php index 16a71b99a..9ff6b3415 100755 --- a/Validation/ValidatorInterface.php +++ b/Validation/ValidatorInterface.php @@ -6,7 +6,7 @@ * * @package phpOMS\Validation * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Validation; * Validator interface. * * @package phpOMS\Validation - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Version/Version.php b/Version/Version.php index f97641f0c..2c9d59274 100755 --- a/Version/Version.php +++ b/Version/Version.php @@ -6,7 +6,7 @@ * * @package phpOMS\Version * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace phpOMS\Version; * Responsible for handling versions * * @package phpOMS\Version - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Views/NullView.php b/Views/NullView.php index a3cd4a508..9d5eeb2c8 100755 --- a/Views/NullView.php +++ b/Views/NullView.php @@ -6,7 +6,7 @@ * * @package phpOMS\Views * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Views; * Null View * * @package phpOMS\Views - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Views/PaginationView.php b/Views/PaginationView.php index 7dc96dddd..e1bc7841b 100755 --- a/Views/PaginationView.php +++ b/Views/PaginationView.php @@ -6,7 +6,7 @@ * * @package phpOMS\Views * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\Views; * Pagination view. * * @package phpOMS\Views - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Views/View.php b/Views/View.php index 4d9faa004..d9b852430 100755 --- a/Views/View.php +++ b/Views/View.php @@ -6,7 +6,7 @@ * * @package phpOMS\Views * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\Module\Exception\InvalidThemeException; * Basic view which can be used as basis for specific implementations. * * @package phpOMS\Views - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -98,7 +98,7 @@ class View extends ViewAbstract */ public function __construct(L11nManager $l11n = null, RequestAbstract $request = null, ResponseAbstract $response = null) { - $this->l11nManager = $l11n ?? new L11nManager('Error'); + $this->l11nManager = $l11n ?? new L11nManager(); $this->request = $request; $this->response = $response; $this->l11n = $response !== null ? $response->header->l11n : new Localization(); diff --git a/Views/ViewAbstract.php b/Views/ViewAbstract.php index a977a9014..92281e3ca 100755 --- a/Views/ViewAbstract.php +++ b/Views/ViewAbstract.php @@ -6,7 +6,7 @@ * * @package phpOMS\Views * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Contract\RenderableInterface; * View Abstract. * * @package phpOMS\Views - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/preload.php b/preload.php index 15b800e34..ee750a29f 100755 --- a/preload.php +++ b/preload.php @@ -6,7 +6,7 @@ * * @package Karaka * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/AccountManagerTest.php b/tests/Account/AccountManagerTest.php index c3bbb8482..3d9711d75 100755 --- a/tests/Account/AccountManagerTest.php +++ b/tests/Account/AccountManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/AccountStatusTest.php b/tests/Account/AccountStatusTest.php index ebe6ca072..f39ff58e8 100755 --- a/tests/Account/AccountStatusTest.php +++ b/tests/Account/AccountStatusTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/AccountTest.php b/tests/Account/AccountTest.php index 2fc7003be..10f12a21a 100755 --- a/tests/Account/AccountTest.php +++ b/tests/Account/AccountTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/AccountTypeTest.php b/tests/Account/AccountTypeTest.php index 8ab28aed6..1f098b21c 100755 --- a/tests/Account/AccountTypeTest.php +++ b/tests/Account/AccountTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/GroupStatusTest.php b/tests/Account/GroupStatusTest.php index b0351b3f4..b3639ab60 100755 --- a/tests/Account/GroupStatusTest.php +++ b/tests/Account/GroupStatusTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/GroupTest.php b/tests/Account/GroupTest.php index 43acbebdb..8a628853c 100755 --- a/tests/Account/GroupTest.php +++ b/tests/Account/GroupTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/NullAccountTest.php b/tests/Account/NullAccountTest.php index e0191f67c..ae6dc514c 100755 --- a/tests/Account/NullAccountTest.php +++ b/tests/Account/NullAccountTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/NullGroupTest.php b/tests/Account/NullGroupTest.php index 549f0ba00..4aa74afdb 100755 --- a/tests/Account/NullGroupTest.php +++ b/tests/Account/NullGroupTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/PermissionAbstractTest.php b/tests/Account/PermissionAbstractTest.php index 9b983a396..38b997799 100755 --- a/tests/Account/PermissionAbstractTest.php +++ b/tests/Account/PermissionAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Account/PermissionTypeTest.php b/tests/Account/PermissionTypeTest.php index da2ec4f0e..3c1ef22b6 100755 --- a/tests/Account/PermissionTypeTest.php +++ b/tests/Account/PermissionTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Ai/Ocr/BasicOcrTest.php b/tests/Ai/Ocr/BasicOcrTest.php index b77c030ac..6c7dad458 100755 --- a/tests/Ai/Ocr/BasicOcrTest.php +++ b/tests/Ai/Ocr/BasicOcrTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Ai/Ocr/Tesseract/TesseractOcrTest.php b/tests/Ai/Ocr/Tesseract/TesseractOcrTest.php index 404dae0b2..db6534b9b 100755 --- a/tests/Ai/Ocr/Tesseract/TesseractOcrTest.php +++ b/tests/Ai/Ocr/Tesseract/TesseractOcrTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Clustering/KmeansTest.php b/tests/Algorithm/Clustering/KmeansTest.php index 79878df08..bd118c42f 100755 --- a/tests/Algorithm/Clustering/KmeansTest.php +++ b/tests/Algorithm/Clustering/KmeansTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Clustering/PointTest.php b/tests/Algorithm/Clustering/PointTest.php index d67564ce0..b92a2830c 100755 --- a/tests/Algorithm/Clustering/PointTest.php +++ b/tests/Algorithm/Clustering/PointTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/CoinMatching/MinimumCoinProblemTest.php b/tests/Algorithm/CoinMatching/MinimumCoinProblemTest.php index 5c7336459..da9abaf9c 100755 --- a/tests/Algorithm/CoinMatching/MinimumCoinProblemTest.php +++ b/tests/Algorithm/CoinMatching/MinimumCoinProblemTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/JobScheduling/JobTest.php b/tests/Algorithm/JobScheduling/JobTest.php index e2cabbaaa..83bd2d2f1 100755 --- a/tests/Algorithm/JobScheduling/JobTest.php +++ b/tests/Algorithm/JobScheduling/JobTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/JobScheduling/WeightedTest.php b/tests/Algorithm/JobScheduling/WeightedTest.php index fde8207f5..f94a6a759 100755 --- a/tests/Algorithm/JobScheduling/WeightedTest.php +++ b/tests/Algorithm/JobScheduling/WeightedTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Knapsack/BackpackTest.php b/tests/Algorithm/Knapsack/BackpackTest.php index d564e6df6..f80b82cc2 100755 --- a/tests/Algorithm/Knapsack/BackpackTest.php +++ b/tests/Algorithm/Knapsack/BackpackTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Knapsack/BoundedTest.php b/tests/Algorithm/Knapsack/BoundedTest.php index 04da86a6c..307bd79cb 100755 --- a/tests/Algorithm/Knapsack/BoundedTest.php +++ b/tests/Algorithm/Knapsack/BoundedTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Knapsack/ContinuousTest.php b/tests/Algorithm/Knapsack/ContinuousTest.php index 6dbed00d5..b8fec0f9b 100755 --- a/tests/Algorithm/Knapsack/ContinuousTest.php +++ b/tests/Algorithm/Knapsack/ContinuousTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Knapsack/ItemTest.php b/tests/Algorithm/Knapsack/ItemTest.php index 26ed0ad17..1460d717c 100755 --- a/tests/Algorithm/Knapsack/ItemTest.php +++ b/tests/Algorithm/Knapsack/ItemTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Maze/MazeGeneratorTest.php b/tests/Algorithm/Maze/MazeGeneratorTest.php index 67925c35b..048e44618 100755 --- a/tests/Algorithm/Maze/MazeGeneratorTest.php +++ b/tests/Algorithm/Maze/MazeGeneratorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/AStarNodeTest.php b/tests/Algorithm/PathFinding/AStarNodeTest.php index 872cd3ab0..48850a81e 100755 --- a/tests/Algorithm/PathFinding/AStarNodeTest.php +++ b/tests/Algorithm/PathFinding/AStarNodeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/AStarTest.php b/tests/Algorithm/PathFinding/AStarTest.php index 9faeb9380..38a9a1d22 100755 --- a/tests/Algorithm/PathFinding/AStarTest.php +++ b/tests/Algorithm/PathFinding/AStarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/GridTest.php b/tests/Algorithm/PathFinding/GridTest.php index 726490835..83cdadd20 100755 --- a/tests/Algorithm/PathFinding/GridTest.php +++ b/tests/Algorithm/PathFinding/GridTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/HeuristicTest.php b/tests/Algorithm/PathFinding/HeuristicTest.php index 5f94b6ce3..a5d188e5e 100755 --- a/tests/Algorithm/PathFinding/HeuristicTest.php +++ b/tests/Algorithm/PathFinding/HeuristicTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/JumpPointNodeTest.php b/tests/Algorithm/PathFinding/JumpPointNodeTest.php index d09d6e19a..aba2bb06a 100755 --- a/tests/Algorithm/PathFinding/JumpPointNodeTest.php +++ b/tests/Algorithm/PathFinding/JumpPointNodeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/JumpPointSearchTest.php b/tests/Algorithm/PathFinding/JumpPointSearchTest.php index 75b032c67..1104e47c8 100755 --- a/tests/Algorithm/PathFinding/JumpPointSearchTest.php +++ b/tests/Algorithm/PathFinding/JumpPointSearchTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/NodeTest.php b/tests/Algorithm/PathFinding/NodeTest.php index 47dfea503..668907831 100755 --- a/tests/Algorithm/PathFinding/NodeTest.php +++ b/tests/Algorithm/PathFinding/NodeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/PathFinding/PathTest.php b/tests/Algorithm/PathFinding/PathTest.php index c93c64adc..472d2fb51 100755 --- a/tests/Algorithm/PathFinding/PathTest.php +++ b/tests/Algorithm/PathFinding/PathTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/BitonicSortTest.php b/tests/Algorithm/Sort/BitonicSortTest.php index e4ed4a71d..450645aa3 100755 --- a/tests/Algorithm/Sort/BitonicSortTest.php +++ b/tests/Algorithm/Sort/BitonicSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/BubbleSortTest.php b/tests/Algorithm/Sort/BubbleSortTest.php index d15ddad60..37ef60b99 100755 --- a/tests/Algorithm/Sort/BubbleSortTest.php +++ b/tests/Algorithm/Sort/BubbleSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/BucketSortTest.php b/tests/Algorithm/Sort/BucketSortTest.php index 3125c4084..3d3b76b72 100755 --- a/tests/Algorithm/Sort/BucketSortTest.php +++ b/tests/Algorithm/Sort/BucketSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/CocktailShakerSortTest.php b/tests/Algorithm/Sort/CocktailShakerSortTest.php index 5914a1600..7ea0eb77f 100755 --- a/tests/Algorithm/Sort/CocktailShakerSortTest.php +++ b/tests/Algorithm/Sort/CocktailShakerSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/CombSortTest.php b/tests/Algorithm/Sort/CombSortTest.php index 9a7cfb105..468adcc0f 100755 --- a/tests/Algorithm/Sort/CombSortTest.php +++ b/tests/Algorithm/Sort/CombSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/CycleSortTest.php b/tests/Algorithm/Sort/CycleSortTest.php index db3e5eb29..7f99fc8ce 100755 --- a/tests/Algorithm/Sort/CycleSortTest.php +++ b/tests/Algorithm/Sort/CycleSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/GnomeSortTest.php b/tests/Algorithm/Sort/GnomeSortTest.php index 12a0c4f81..d7b268ee8 100755 --- a/tests/Algorithm/Sort/GnomeSortTest.php +++ b/tests/Algorithm/Sort/GnomeSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/HeapSortTest.php b/tests/Algorithm/Sort/HeapSortTest.php index eaf0d63d1..c06aec52d 100755 --- a/tests/Algorithm/Sort/HeapSortTest.php +++ b/tests/Algorithm/Sort/HeapSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/InsertionSortTest.php b/tests/Algorithm/Sort/InsertionSortTest.php index 800ff6f20..e33367c68 100755 --- a/tests/Algorithm/Sort/InsertionSortTest.php +++ b/tests/Algorithm/Sort/InsertionSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/IntroSortTest.php b/tests/Algorithm/Sort/IntroSortTest.php index 9e02c62b3..9c188e80b 100755 --- a/tests/Algorithm/Sort/IntroSortTest.php +++ b/tests/Algorithm/Sort/IntroSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/MergeSortTest.php b/tests/Algorithm/Sort/MergeSortTest.php index f80677f53..5cfff3ccc 100755 --- a/tests/Algorithm/Sort/MergeSortTest.php +++ b/tests/Algorithm/Sort/MergeSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/NumericElement.php b/tests/Algorithm/Sort/NumericElement.php index 9541f8517..f350ac258 100755 --- a/tests/Algorithm/Sort/NumericElement.php +++ b/tests/Algorithm/Sort/NumericElement.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/OddEvenSortTest.php b/tests/Algorithm/Sort/OddEvenSortTest.php index 8019dbfc1..7c44f434a 100755 --- a/tests/Algorithm/Sort/OddEvenSortTest.php +++ b/tests/Algorithm/Sort/OddEvenSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/PancakeSortTest.php b/tests/Algorithm/Sort/PancakeSortTest.php index 79349a1f3..171902986 100755 --- a/tests/Algorithm/Sort/PancakeSortTest.php +++ b/tests/Algorithm/Sort/PancakeSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/QuickSortTest.php b/tests/Algorithm/Sort/QuickSortTest.php index b545480f9..ca2162c77 100755 --- a/tests/Algorithm/Sort/QuickSortTest.php +++ b/tests/Algorithm/Sort/QuickSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/SelectionSortTest.php b/tests/Algorithm/Sort/SelectionSortTest.php index 08d44dd9e..0f1c291c6 100755 --- a/tests/Algorithm/Sort/SelectionSortTest.php +++ b/tests/Algorithm/Sort/SelectionSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/ShellSortTest.php b/tests/Algorithm/Sort/ShellSortTest.php index c0358e156..f95ebd6bb 100755 --- a/tests/Algorithm/Sort/ShellSortTest.php +++ b/tests/Algorithm/Sort/ShellSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/StoogeSortTest.php b/tests/Algorithm/Sort/StoogeSortTest.php index 7269ca18a..ad448986e 100755 --- a/tests/Algorithm/Sort/StoogeSortTest.php +++ b/tests/Algorithm/Sort/StoogeSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Algorithm/Sort/TimSortTest.php b/tests/Algorithm/Sort/TimSortTest.php index c99299032..6c1bedca1 100755 --- a/tests/Algorithm/Sort/TimSortTest.php +++ b/tests/Algorithm/Sort/TimSortTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/ApplicationAbstractTest.php b/tests/Application/ApplicationAbstractTest.php index 37359f396..78ce2cf1b 100755 --- a/tests/Application/ApplicationAbstractTest.php +++ b/tests/Application/ApplicationAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/ApplicationInfoTest.php b/tests/Application/ApplicationInfoTest.php index 076c59d7d..d9d71736d 100755 --- a/tests/Application/ApplicationInfoTest.php +++ b/tests/Application/ApplicationInfoTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/ApplicationManagerTest.php b/tests/Application/ApplicationManagerTest.php index 85d68e3a2..6a03dffa7 100755 --- a/tests/Application/ApplicationManagerTest.php +++ b/tests/Application/ApplicationManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/InstallerAbstractTest.php b/tests/Application/InstallerAbstractTest.php index 456f3b0be..180761cbd 100755 --- a/tests/Application/InstallerAbstractTest.php +++ b/tests/Application/InstallerAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/StatusAbstractTest.php b/tests/Application/StatusAbstractTest.php index 3155aacee..61323844f 100755 --- a/tests/Application/StatusAbstractTest.php +++ b/tests/Application/StatusAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/Testapp/Admin/Install/Application/Hooks.php b/tests/Application/Testapp/Admin/Install/Application/Hooks.php index 3225eb67f..1a602fc50 100755 --- a/tests/Application/Testapp/Admin/Install/Application/Hooks.php +++ b/tests/Application/Testapp/Admin/Install/Application/Hooks.php @@ -6,7 +6,7 @@ * * @package \phpOMS\tess\Application\Apps\Testapp * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/Testapp/Admin/Install/Application/Routes.php b/tests/Application/Testapp/Admin/Install/Application/Routes.php index 0ce5b8347..fdc25d729 100755 --- a/tests/Application/Testapp/Admin/Install/Application/Routes.php +++ b/tests/Application/Testapp/Admin/Install/Application/Routes.php @@ -6,7 +6,7 @@ * * @package Modules * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Application/Testapp/Admin/Installer.php b/tests/Application/Testapp/Admin/Installer.php index 57433414c..de33d3cf8 100755 --- a/tests/Application/Testapp/Admin/Installer.php +++ b/tests/Application/Testapp/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package phpOMS\tests\Application\Apps\{APPNAME}\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\InstallerAbstract; * Installer class. * * @package phpOMS\tests\Application\Apps\{APPNAME}\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Application/Testapp/Admin/Status.php b/tests/Application/Testapp/Admin/Status.php index 334ae2ff9..d89abcf38 100755 --- a/tests/Application/Testapp/Admin/Status.php +++ b/tests/Application/Testapp/Admin/Status.php @@ -6,7 +6,7 @@ * * @package phpOMS\tests\Application\Apps\{APPNAME}\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\StatusAbstract; * Status class. * * @package phpOMS\tests\Application\Apps\{APPNAME}\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Application/Testapp/Admin/Uninstaller.php b/tests/Application/Testapp/Admin/Uninstaller.php index a04abb330..d1fd3bcbb 100755 --- a/tests/Application/Testapp/Admin/Uninstaller.php +++ b/tests/Application/Testapp/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package phpOMS\tests\Application\Apps\{APPNAME}\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\UninstallerAbstract; * Uninstaller class. * * @package phpOMS\tests\Application\Apps\{APPNAME}\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Application/Testapp/Controller/Controller.php b/tests/Application/Testapp/Controller/Controller.php index 534b98d94..c6e0e644e 100755 --- a/tests/Application/Testapp/Controller/Controller.php +++ b/tests/Application/Testapp/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Web\Backend * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract; * Home class. * * @package Web\Backend - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Application/UninstallerAbstractTest.php b/tests/Application/UninstallerAbstractTest.php index a24fccf57..b4c5509d9 100755 --- a/tests/Application/UninstallerAbstractTest.php +++ b/tests/Application/UninstallerAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Asset/AssetManagerTest.php b/tests/Asset/AssetManagerTest.php index 1f44e1550..2d918ec8c 100755 --- a/tests/Asset/AssetManagerTest.php +++ b/tests/Asset/AssetManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Asset/AssetTypeTest.php b/tests/Asset/AssetTypeTest.php index 33071bea8..0708ccb2b 100755 --- a/tests/Asset/AssetTypeTest.php +++ b/tests/Asset/AssetTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php index 155f91f3a..2a4bd966f 100755 --- a/tests/Auth/AuthTest.php +++ b/tests/Auth/AuthTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Auth/LoginReturnTypeTest.php b/tests/Auth/LoginReturnTypeTest.php index 7a2fd7000..cb4cdad4a 100755 --- a/tests/Auth/LoginReturnTypeTest.php +++ b/tests/Auth/LoginReturnTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/AutoloadExceptionTest.php b/tests/AutoloadExceptionTest.php index be7af658a..aa3738ed1 100755 --- a/tests/AutoloadExceptionTest.php +++ b/tests/AutoloadExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Autoloader.php b/tests/Autoloader.php index beb400721..48c3f7a5d 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace Tests\PHPUnit; * Autoloader class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/AutoloaderTest.php b/tests/AutoloaderTest.php index fa5deb4f6..97ca18b68 100755 --- a/tests/AutoloaderTest.php +++ b/tests/AutoloaderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Finance/DepreciationTest.php b/tests/Business/Finance/DepreciationTest.php index 39afba4be..5a93b45f5 100755 --- a/tests/Business/Finance/DepreciationTest.php +++ b/tests/Business/Finance/DepreciationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Finance/FinanceFormulasTest.php b/tests/Business/Finance/FinanceFormulasTest.php index 5722a1289..73331c399 100755 --- a/tests/Business/Finance/FinanceFormulasTest.php +++ b/tests/Business/Finance/FinanceFormulasTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Finance/LoanTest.php b/tests/Business/Finance/LoanTest.php index 315274951..194d67291 100755 --- a/tests/Business/Finance/LoanTest.php +++ b/tests/Business/Finance/LoanTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Finance/LorenzkurveTest.php b/tests/Business/Finance/LorenzkurveTest.php index c20d899aa..6637cd6fa 100755 --- a/tests/Business/Finance/LorenzkurveTest.php +++ b/tests/Business/Finance/LorenzkurveTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Finance/StockBondsTest.php b/tests/Business/Finance/StockBondsTest.php index 9d1e01de2..cc7b289ca 100755 --- a/tests/Business/Finance/StockBondsTest.php +++ b/tests/Business/Finance/StockBondsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Marketing/ArticleCorrelationAffinityTest.php b/tests/Business/Marketing/ArticleCorrelationAffinityTest.php index cb2fa8d1d..11be19f01 100755 --- a/tests/Business/Marketing/ArticleCorrelationAffinityTest.php +++ b/tests/Business/Marketing/ArticleCorrelationAffinityTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Marketing/CustomerValueTest.php b/tests/Business/Marketing/CustomerValueTest.php index c011b8fc2..4948e4d29 100755 --- a/tests/Business/Marketing/CustomerValueTest.php +++ b/tests/Business/Marketing/CustomerValueTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Marketing/MetricsTest.php b/tests/Business/Marketing/MetricsTest.php index 8c7ed0e5b..2a2f7fce5 100755 --- a/tests/Business/Marketing/MetricsTest.php +++ b/tests/Business/Marketing/MetricsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Marketing/NetPromoterScoreTest.php b/tests/Business/Marketing/NetPromoterScoreTest.php index 087980211..ce90f26cd 100755 --- a/tests/Business/Marketing/NetPromoterScoreTest.php +++ b/tests/Business/Marketing/NetPromoterScoreTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Marketing/PageRankTest.php b/tests/Business/Marketing/PageRankTest.php index bab1c55e5..134cc501e 100755 --- a/tests/Business/Marketing/PageRankTest.php +++ b/tests/Business/Marketing/PageRankTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Programming/MetricsTest.php b/tests/Business/Programming/MetricsTest.php index 8978c0168..2ce311845 100755 --- a/tests/Business/Programming/MetricsTest.php +++ b/tests/Business/Programming/MetricsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Business/Sales/MarketShareEstimationTest.php b/tests/Business/Sales/MarketShareEstimationTest.php index c359a4e10..4f54ed7a3 100755 --- a/tests/Business/Sales/MarketShareEstimationTest.php +++ b/tests/Business/Sales/MarketShareEstimationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Config/OptionsTraitTest.php b/tests/Config/OptionsTraitTest.php index 18b4424ab..aba968517 100755 --- a/tests/Config/OptionsTraitTest.php +++ b/tests/Config/OptionsTraitTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/CachePoolTest.php b/tests/DataStorage/Cache/CachePoolTest.php index 25f7cba1b..aee1f84b3 100755 --- a/tests/DataStorage/Cache/CachePoolTest.php +++ b/tests/DataStorage/Cache/CachePoolTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/CacheStatusTest.php b/tests/DataStorage/Cache/CacheStatusTest.php index 16f327aee..694a12737 100755 --- a/tests/DataStorage/Cache/CacheStatusTest.php +++ b/tests/DataStorage/Cache/CacheStatusTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/CacheTypeTest.php b/tests/DataStorage/Cache/CacheTypeTest.php index 322330f8d..5de937896 100755 --- a/tests/DataStorage/Cache/CacheTypeTest.php +++ b/tests/DataStorage/Cache/CacheTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/CacheValueTypeTest.php b/tests/DataStorage/Cache/Connection/CacheValueTypeTest.php index 001b7af9c..3c7c11997 100755 --- a/tests/DataStorage/Cache/Connection/CacheValueTypeTest.php +++ b/tests/DataStorage/Cache/Connection/CacheValueTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php b/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php index a3c71a5d6..bca141f49 100755 --- a/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php +++ b/tests/DataStorage/Cache/Connection/ConnectionFactoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/FileCacheJsonSerializable.php b/tests/DataStorage/Cache/Connection/FileCacheJsonSerializable.php index 5e3bd0284..1d12df576 100755 --- a/tests/DataStorage/Cache/Connection/FileCacheJsonSerializable.php +++ b/tests/DataStorage/Cache/Connection/FileCacheJsonSerializable.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/FileCacheSerializable.php b/tests/DataStorage/Cache/Connection/FileCacheSerializable.php index e7229cd1d..e12314f4f 100755 --- a/tests/DataStorage/Cache/Connection/FileCacheSerializable.php +++ b/tests/DataStorage/Cache/Connection/FileCacheSerializable.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/FileCacheTest.php b/tests/DataStorage/Cache/Connection/FileCacheTest.php index 3d61581ae..1782b14d8 100755 --- a/tests/DataStorage/Cache/Connection/FileCacheTest.php +++ b/tests/DataStorage/Cache/Connection/FileCacheTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/MemCachedTest.php b/tests/DataStorage/Cache/Connection/MemCachedTest.php index 096f78edf..45726b972 100755 --- a/tests/DataStorage/Cache/Connection/MemCachedTest.php +++ b/tests/DataStorage/Cache/Connection/MemCachedTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/NullCacheTest.php b/tests/DataStorage/Cache/Connection/NullCacheTest.php index 5273f8768..5cd813882 100755 --- a/tests/DataStorage/Cache/Connection/NullCacheTest.php +++ b/tests/DataStorage/Cache/Connection/NullCacheTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Connection/RedisCacheTest.php b/tests/DataStorage/Cache/Connection/RedisCacheTest.php index 309c3bc40..2e1fa0a8e 100755 --- a/tests/DataStorage/Cache/Connection/RedisCacheTest.php +++ b/tests/DataStorage/Cache/Connection/RedisCacheTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cache/Exception/InvalidConnectionConfigExceptionTest.php b/tests/DataStorage/Cache/Exception/InvalidConnectionConfigExceptionTest.php index ecf8f5e6d..784785048 100755 --- a/tests/DataStorage/Cache/Exception/InvalidConnectionConfigExceptionTest.php +++ b/tests/DataStorage/Cache/Exception/InvalidConnectionConfigExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Cookie/CookieJarTest.php b/tests/DataStorage/Cookie/CookieJarTest.php index 15e80761b..c9266b0a9 100755 --- a/tests/DataStorage/Cookie/CookieJarTest.php +++ b/tests/DataStorage/Cookie/CookieJarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Connection/ConnectionFactoryTest.php b/tests/DataStorage/Database/Connection/ConnectionFactoryTest.php index 087244fd6..489d9822f 100755 --- a/tests/DataStorage/Database/Connection/ConnectionFactoryTest.php +++ b/tests/DataStorage/Database/Connection/ConnectionFactoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Connection/MysqlConnectionTest.php b/tests/DataStorage/Database/Connection/MysqlConnectionTest.php index b5b00d191..9c3552b3e 100755 --- a/tests/DataStorage/Database/Connection/MysqlConnectionTest.php +++ b/tests/DataStorage/Database/Connection/MysqlConnectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Connection/NullConnectionTest.php b/tests/DataStorage/Database/Connection/NullConnectionTest.php index 8d7204a9b..63ce51b27 100755 --- a/tests/DataStorage/Database/Connection/NullConnectionTest.php +++ b/tests/DataStorage/Database/Connection/NullConnectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Connection/PostgresConnectionTest.php b/tests/DataStorage/Database/Connection/PostgresConnectionTest.php index 421139388..c82b5f72e 100755 --- a/tests/DataStorage/Database/Connection/PostgresConnectionTest.php +++ b/tests/DataStorage/Database/Connection/PostgresConnectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php b/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php index 55f35037a..0a54f37b4 100755 --- a/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php +++ b/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php b/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php index 7d1792a46..09f284b8b 100755 --- a/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php +++ b/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/DataMapperAbstractTest.php b/tests/DataStorage/Database/DataMapperAbstractTest.php index 0d42533b6..a73052b28 100755 --- a/tests/DataStorage/Database/DataMapperAbstractTest.php +++ b/tests/DataStorage/Database/DataMapperAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/DatabasePoolTest.php b/tests/DataStorage/Database/DatabasePoolTest.php index dac5454a7..6ed5081ed 100755 --- a/tests/DataStorage/Database/DatabasePoolTest.php +++ b/tests/DataStorage/Database/DatabasePoolTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/DatabaseStatusTest.php b/tests/DataStorage/Database/DatabaseStatusTest.php index a90d4a634..fc1fff272 100755 --- a/tests/DataStorage/Database/DatabaseStatusTest.php +++ b/tests/DataStorage/Database/DatabaseStatusTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/DatabaseTypeTest.php b/tests/DataStorage/Database/DatabaseTypeTest.php index 3b7759e02..b85d30e99 100755 --- a/tests/DataStorage/Database/DatabaseTypeTest.php +++ b/tests/DataStorage/Database/DatabaseTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Exception/InvalidConnectionConfigExceptionTest.php b/tests/DataStorage/Database/Exception/InvalidConnectionConfigExceptionTest.php index 9f62fcadd..84f5cb929 100755 --- a/tests/DataStorage/Database/Exception/InvalidConnectionConfigExceptionTest.php +++ b/tests/DataStorage/Database/Exception/InvalidConnectionConfigExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Exception/InvalidDatabaseTypeExceptionTest.php b/tests/DataStorage/Database/Exception/InvalidDatabaseTypeExceptionTest.php index 19204b9e0..d571ea963 100755 --- a/tests/DataStorage/Database/Exception/InvalidDatabaseTypeExceptionTest.php +++ b/tests/DataStorage/Database/Exception/InvalidDatabaseTypeExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Exception/InvalidMapperExceptionTest.php b/tests/DataStorage/Database/Exception/InvalidMapperExceptionTest.php index 258dc54a3..3ef919a6e 100755 --- a/tests/DataStorage/Database/Exception/InvalidMapperExceptionTest.php +++ b/tests/DataStorage/Database/Exception/InvalidMapperExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/BuilderTest.php b/tests/DataStorage/Database/Query/BuilderTest.php index ea43f0050..fa22d4797 100755 --- a/tests/DataStorage/Database/Query/BuilderTest.php +++ b/tests/DataStorage/Database/Query/BuilderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/ColumnTest.php b/tests/DataStorage/Database/Query/ColumnTest.php index 41317c3ec..db2e6d046 100755 --- a/tests/DataStorage/Database/Query/ColumnTest.php +++ b/tests/DataStorage/Database/Query/ColumnTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/CountTest.php b/tests/DataStorage/Database/Query/CountTest.php index 4359a3d28..baab05815 100755 --- a/tests/DataStorage/Database/Query/CountTest.php +++ b/tests/DataStorage/Database/Query/CountTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/ExpressionTest.php b/tests/DataStorage/Database/Query/ExpressionTest.php index c3f5885a6..2e0a23100 100755 --- a/tests/DataStorage/Database/Query/ExpressionTest.php +++ b/tests/DataStorage/Database/Query/ExpressionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/FromTest.php b/tests/DataStorage/Database/Query/FromTest.php index 781966ad0..d891a96fe 100755 --- a/tests/DataStorage/Database/Query/FromTest.php +++ b/tests/DataStorage/Database/Query/FromTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/Grammar/GrammarTest.php b/tests/DataStorage/Database/Query/Grammar/GrammarTest.php index e813dc05b..df7e8f7bc 100755 --- a/tests/DataStorage/Database/Query/Grammar/GrammarTest.php +++ b/tests/DataStorage/Database/Query/Grammar/GrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/Grammar/MysqlGrammarTest.php b/tests/DataStorage/Database/Query/Grammar/MysqlGrammarTest.php index 66ff4d461..71d3ff18b 100755 --- a/tests/DataStorage/Database/Query/Grammar/MysqlGrammarTest.php +++ b/tests/DataStorage/Database/Query/Grammar/MysqlGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/Grammar/OracleGrammarTest.php b/tests/DataStorage/Database/Query/Grammar/OracleGrammarTest.php index 8d42fd564..c114213e1 100755 --- a/tests/DataStorage/Database/Query/Grammar/OracleGrammarTest.php +++ b/tests/DataStorage/Database/Query/Grammar/OracleGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/Grammar/PostgresGrammarTest.php b/tests/DataStorage/Database/Query/Grammar/PostgresGrammarTest.php index 73c9648cb..2e1940192 100755 --- a/tests/DataStorage/Database/Query/Grammar/PostgresGrammarTest.php +++ b/tests/DataStorage/Database/Query/Grammar/PostgresGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/Grammar/SQLiteGrammarTest.php b/tests/DataStorage/Database/Query/Grammar/SQLiteGrammarTest.php index f85685b7a..fb0827e8b 100755 --- a/tests/DataStorage/Database/Query/Grammar/SQLiteGrammarTest.php +++ b/tests/DataStorage/Database/Query/Grammar/SQLiteGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/Grammar/SqlServerGrammarTest.php b/tests/DataStorage/Database/Query/Grammar/SqlServerGrammarTest.php index 1f03c7a66..7f814a3d2 100755 --- a/tests/DataStorage/Database/Query/Grammar/SqlServerGrammarTest.php +++ b/tests/DataStorage/Database/Query/Grammar/SqlServerGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/IntoTest.php b/tests/DataStorage/Database/Query/IntoTest.php index d52a70d3e..adefbaf9a 100755 --- a/tests/DataStorage/Database/Query/IntoTest.php +++ b/tests/DataStorage/Database/Query/IntoTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/JoinTypeTest.php b/tests/DataStorage/Database/Query/JoinTypeTest.php index c819b21ad..b32598204 100755 --- a/tests/DataStorage/Database/Query/JoinTypeTest.php +++ b/tests/DataStorage/Database/Query/JoinTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/QueryTypeTest.php b/tests/DataStorage/Database/Query/QueryTypeTest.php index 46d94f3d5..493520290 100755 --- a/tests/DataStorage/Database/Query/QueryTypeTest.php +++ b/tests/DataStorage/Database/Query/QueryTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/SelectTest.php b/tests/DataStorage/Database/Query/SelectTest.php index 0e0894897..a5bea0636 100755 --- a/tests/DataStorage/Database/Query/SelectTest.php +++ b/tests/DataStorage/Database/Query/SelectTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Query/WhereTest.php b/tests/DataStorage/Database/Query/WhereTest.php index cac2cb385..c6ecdef06 100755 --- a/tests/DataStorage/Database/Query/WhereTest.php +++ b/tests/DataStorage/Database/Query/WhereTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/RelationTypeTest.php b/tests/DataStorage/Database/RelationTypeTest.php index d33d40d5e..d6d0368d2 100755 --- a/tests/DataStorage/Database/RelationTypeTest.php +++ b/tests/DataStorage/Database/RelationTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/BuilderTest.php b/tests/DataStorage/Database/Schema/BuilderTest.php index 039119f5b..85403304e 100755 --- a/tests/DataStorage/Database/Schema/BuilderTest.php +++ b/tests/DataStorage/Database/Schema/BuilderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/Grammar/GrammarTest.php b/tests/DataStorage/Database/Schema/Grammar/GrammarTest.php index 72e4e3b8b..e97fa259e 100755 --- a/tests/DataStorage/Database/Schema/Grammar/GrammarTest.php +++ b/tests/DataStorage/Database/Schema/Grammar/GrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/Grammar/MysqlGrammarTest.php b/tests/DataStorage/Database/Schema/Grammar/MysqlGrammarTest.php index 4169ec9ed..7dabff6b6 100755 --- a/tests/DataStorage/Database/Schema/Grammar/MysqlGrammarTest.php +++ b/tests/DataStorage/Database/Schema/Grammar/MysqlGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/Grammar/OracleGrammarTest.php b/tests/DataStorage/Database/Schema/Grammar/OracleGrammarTest.php index a8b807ef7..336017d22 100755 --- a/tests/DataStorage/Database/Schema/Grammar/OracleGrammarTest.php +++ b/tests/DataStorage/Database/Schema/Grammar/OracleGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/Grammar/PostgresGrammarTest.php b/tests/DataStorage/Database/Schema/Grammar/PostgresGrammarTest.php index 214770b7b..a9ee211a0 100755 --- a/tests/DataStorage/Database/Schema/Grammar/PostgresGrammarTest.php +++ b/tests/DataStorage/Database/Schema/Grammar/PostgresGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/Grammar/SQLiteGrammarTest.php b/tests/DataStorage/Database/Schema/Grammar/SQLiteGrammarTest.php index 636871125..62504d7ec 100755 --- a/tests/DataStorage/Database/Schema/Grammar/SQLiteGrammarTest.php +++ b/tests/DataStorage/Database/Schema/Grammar/SQLiteGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/Grammar/SqlServerGrammarTest.php b/tests/DataStorage/Database/Schema/Grammar/SqlServerGrammarTest.php index b7efde009..b510ddc8c 100755 --- a/tests/DataStorage/Database/Schema/Grammar/SqlServerGrammarTest.php +++ b/tests/DataStorage/Database/Schema/Grammar/SqlServerGrammarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/Schema/QueryTypeTest.php b/tests/DataStorage/Database/Schema/QueryTypeTest.php index e5501675a..dbcda6bbb 100755 --- a/tests/DataStorage/Database/Schema/QueryTypeTest.php +++ b/tests/DataStorage/Database/Schema/QueryTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/SchemaMapperTest.php b/tests/DataStorage/Database/SchemaMapperTest.php index 0c7a6e169..e6263bb10 100755 --- a/tests/DataStorage/Database/SchemaMapperTest.php +++ b/tests/DataStorage/Database/SchemaMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/BaseModel.php b/tests/DataStorage/Database/TestModel/BaseModel.php index f26b40cda..017de850f 100755 --- a/tests/DataStorage/Database/TestModel/BaseModel.php +++ b/tests/DataStorage/Database/TestModel/BaseModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/BaseModelMapper.php b/tests/DataStorage/Database/TestModel/BaseModelMapper.php index 83ae5ef7b..54bc1c54b 100755 --- a/tests/DataStorage/Database/TestModel/BaseModelMapper.php +++ b/tests/DataStorage/Database/TestModel/BaseModelMapper.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/BelongsToModel.php b/tests/DataStorage/Database/TestModel/BelongsToModel.php index 6818b1a1e..0ee12c29c 100755 --- a/tests/DataStorage/Database/TestModel/BelongsToModel.php +++ b/tests/DataStorage/Database/TestModel/BelongsToModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php b/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php index 2e4224682..d706aa99b 100755 --- a/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php +++ b/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/Conditional.php b/tests/DataStorage/Database/TestModel/Conditional.php index 2c5c5c444..63ee8e84f 100755 --- a/tests/DataStorage/Database/TestModel/Conditional.php +++ b/tests/DataStorage/Database/TestModel/Conditional.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/ConditionalMapper.php b/tests/DataStorage/Database/TestModel/ConditionalMapper.php index 146de6ee3..58515beef 100755 --- a/tests/DataStorage/Database/TestModel/ConditionalMapper.php +++ b/tests/DataStorage/Database/TestModel/ConditionalMapper.php @@ -6,7 +6,7 @@ * * @package Modules\Tag\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Tag mapper class. * * @package Modules\Tag\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/DataStorage/Database/TestModel/ManyToManyDirectModel.php b/tests/DataStorage/Database/TestModel/ManyToManyDirectModel.php index 2922282c2..febef17aa 100755 --- a/tests/DataStorage/Database/TestModel/ManyToManyDirectModel.php +++ b/tests/DataStorage/Database/TestModel/ManyToManyDirectModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php b/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php index 780c9fafc..439a1648e 100755 --- a/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php +++ b/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/ManyToManyRelModel.php b/tests/DataStorage/Database/TestModel/ManyToManyRelModel.php index d383b1914..a9dbd9a4d 100755 --- a/tests/DataStorage/Database/TestModel/ManyToManyRelModel.php +++ b/tests/DataStorage/Database/TestModel/ManyToManyRelModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php b/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php index 15b4c7607..8ff2ce808 100755 --- a/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php +++ b/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/NullBaseModel.php b/tests/DataStorage/Database/TestModel/NullBaseModel.php index 64e8fff23..bb28c75cf 100755 --- a/tests/DataStorage/Database/TestModel/NullBaseModel.php +++ b/tests/DataStorage/Database/TestModel/NullBaseModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/NullBelongsToModel.php b/tests/DataStorage/Database/TestModel/NullBelongsToModel.php index 75324fa97..6a7dda250 100755 --- a/tests/DataStorage/Database/TestModel/NullBelongsToModel.php +++ b/tests/DataStorage/Database/TestModel/NullBelongsToModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/NullManyToManyDirectModel.php b/tests/DataStorage/Database/TestModel/NullManyToManyDirectModel.php index 1254f74a5..1adcca4cf 100755 --- a/tests/DataStorage/Database/TestModel/NullManyToManyDirectModel.php +++ b/tests/DataStorage/Database/TestModel/NullManyToManyDirectModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/NullManyToManyRelModel.php b/tests/DataStorage/Database/TestModel/NullManyToManyRelModel.php index 3c3a52fff..bf1c37d9e 100755 --- a/tests/DataStorage/Database/TestModel/NullManyToManyRelModel.php +++ b/tests/DataStorage/Database/TestModel/NullManyToManyRelModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/NullOwnsOneModel.php b/tests/DataStorage/Database/TestModel/NullOwnsOneModel.php index 532851c76..034517fa9 100755 --- a/tests/DataStorage/Database/TestModel/NullOwnsOneModel.php +++ b/tests/DataStorage/Database/TestModel/NullOwnsOneModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/OwnsOneModel.php b/tests/DataStorage/Database/TestModel/OwnsOneModel.php index 3d3adc240..fab107fa6 100755 --- a/tests/DataStorage/Database/TestModel/OwnsOneModel.php +++ b/tests/DataStorage/Database/TestModel/OwnsOneModel.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php b/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php index b5baa30a6..707461686 100755 --- a/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php +++ b/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/LockExceptionTest.php b/tests/DataStorage/LockExceptionTest.php index cd4cda7ad..5169b7889 100755 --- a/tests/DataStorage/LockExceptionTest.php +++ b/tests/DataStorage/LockExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/DataStorage/Session/HttpSessionTest.php b/tests/DataStorage/Session/HttpSessionTest.php index 613c81e6e..6bc667daf 100755 --- a/tests/DataStorage/Session/HttpSessionTest.php +++ b/tests/DataStorage/Session/HttpSessionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Dispatcher/DispatcherTest.php b/tests/Dispatcher/DispatcherTest.php index ba579898b..168bc1705 100755 --- a/tests/Dispatcher/DispatcherTest.php +++ b/tests/Dispatcher/DispatcherTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Dispatcher/TestController.php b/tests/Dispatcher/TestController.php index 6d706e005..a781cecbe 100755 --- a/tests/Dispatcher/TestController.php +++ b/tests/Dispatcher/TestController.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Event/EventManagerTest.php b/tests/Event/EventManagerTest.php index a1dce4429..cd9656059 100755 --- a/tests/Event/EventManagerTest.php +++ b/tests/Event/EventManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/ExtensionTest.php b/tests/ExtensionTest.php index 7e7adb202..710e8ac57 100755 --- a/tests/ExtensionTest.php +++ b/tests/ExtensionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Image/KernelTest.php b/tests/Image/KernelTest.php index 349ed295b..1ffab22b0 100755 --- a/tests/Image/KernelTest.php +++ b/tests/Image/KernelTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Image/SkewTest.php b/tests/Image/SkewTest.php index 473128f98..273e5a13b 100755 --- a/tests/Image/SkewTest.php +++ b/tests/Image/SkewTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Image/ThresholdingTest.php b/tests/Image/ThresholdingTest.php index 01d101fec..d1b8e57cb 100755 --- a/tests/Image/ThresholdingTest.php +++ b/tests/Image/ThresholdingTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/CityMapperTest.php b/tests/Localization/Defaults/CityMapperTest.php index bf41f7715..75704f42e 100755 --- a/tests/Localization/Defaults/CityMapperTest.php +++ b/tests/Localization/Defaults/CityMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/CityTest.php b/tests/Localization/Defaults/CityTest.php index e2825e7d9..ade5d9d1f 100755 --- a/tests/Localization/Defaults/CityTest.php +++ b/tests/Localization/Defaults/CityTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/CountryMapperTest.php b/tests/Localization/Defaults/CountryMapperTest.php index 1847be192..15c54037e 100755 --- a/tests/Localization/Defaults/CountryMapperTest.php +++ b/tests/Localization/Defaults/CountryMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/CountryTest.php b/tests/Localization/Defaults/CountryTest.php index e6113e8cc..bc0200949 100755 --- a/tests/Localization/Defaults/CountryTest.php +++ b/tests/Localization/Defaults/CountryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/CurrencyMapperTest.php b/tests/Localization/Defaults/CurrencyMapperTest.php index 3ca1dde36..bbf22ac20 100755 --- a/tests/Localization/Defaults/CurrencyMapperTest.php +++ b/tests/Localization/Defaults/CurrencyMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/CurrencyTest.php b/tests/Localization/Defaults/CurrencyTest.php index b782bf618..d4431da3a 100755 --- a/tests/Localization/Defaults/CurrencyTest.php +++ b/tests/Localization/Defaults/CurrencyTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/IbanMapperTest.php b/tests/Localization/Defaults/IbanMapperTest.php index 60f36fb46..0d5e37851 100755 --- a/tests/Localization/Defaults/IbanMapperTest.php +++ b/tests/Localization/Defaults/IbanMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/IbanTest.php b/tests/Localization/Defaults/IbanTest.php index f4a429e22..a16a1d31b 100755 --- a/tests/Localization/Defaults/IbanTest.php +++ b/tests/Localization/Defaults/IbanTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/LanguageMapperTest.php b/tests/Localization/Defaults/LanguageMapperTest.php index 457d818c9..afe45665b 100755 --- a/tests/Localization/Defaults/LanguageMapperTest.php +++ b/tests/Localization/Defaults/LanguageMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/Defaults/LanguageTest.php b/tests/Localization/Defaults/LanguageTest.php index 3de192a1f..405b09ab1 100755 --- a/tests/Localization/Defaults/LanguageTest.php +++ b/tests/Localization/Defaults/LanguageTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO3166CharEnumTest.php b/tests/Localization/ISO3166CharEnumTest.php index c46d13327..ec5bf9c9c 100755 --- a/tests/Localization/ISO3166CharEnumTest.php +++ b/tests/Localization/ISO3166CharEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO3166NameEnumTest.php b/tests/Localization/ISO3166NameEnumTest.php index 203447a3f..363cd2fc3 100755 --- a/tests/Localization/ISO3166NameEnumTest.php +++ b/tests/Localization/ISO3166NameEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO3166NumEnumTest.php b/tests/Localization/ISO3166NumEnumTest.php index 243a8a23c..f5c3c5172 100755 --- a/tests/Localization/ISO3166NumEnumTest.php +++ b/tests/Localization/ISO3166NumEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO3166TwoEnumTest.php b/tests/Localization/ISO3166TwoEnumTest.php index 4e01cf600..3dc4ad8b1 100755 --- a/tests/Localization/ISO3166TwoEnumTest.php +++ b/tests/Localization/ISO3166TwoEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO4217CharEnumTest.php b/tests/Localization/ISO4217CharEnumTest.php index 8b10ed9f1..d7607c348 100755 --- a/tests/Localization/ISO4217CharEnumTest.php +++ b/tests/Localization/ISO4217CharEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO4217DecimalEnumTest.php b/tests/Localization/ISO4217DecimalEnumTest.php index f4b690ca0..3bd4d243e 100755 --- a/tests/Localization/ISO4217DecimalEnumTest.php +++ b/tests/Localization/ISO4217DecimalEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO4217EnumTest.php b/tests/Localization/ISO4217EnumTest.php index 8e9f0873e..399f3b344 100755 --- a/tests/Localization/ISO4217EnumTest.php +++ b/tests/Localization/ISO4217EnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO4217NumEnumTest.php b/tests/Localization/ISO4217NumEnumTest.php index 2e857c71e..ab2a15e29 100755 --- a/tests/Localization/ISO4217NumEnumTest.php +++ b/tests/Localization/ISO4217NumEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO4217SubUnitEnumTest.php b/tests/Localization/ISO4217SubUnitEnumTest.php index b93d9c4b4..1a4f3f364 100755 --- a/tests/Localization/ISO4217SubUnitEnumTest.php +++ b/tests/Localization/ISO4217SubUnitEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO4217SymbolEnumTest.php b/tests/Localization/ISO4217SymbolEnumTest.php index 4ce86a307..014158d29 100755 --- a/tests/Localization/ISO4217SymbolEnumTest.php +++ b/tests/Localization/ISO4217SymbolEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO639EnumTest.php b/tests/Localization/ISO639EnumTest.php index c3409d387..19d48ad24 100755 --- a/tests/Localization/ISO639EnumTest.php +++ b/tests/Localization/ISO639EnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO639x1EnumTest.php b/tests/Localization/ISO639x1EnumTest.php index e12281c32..0c3df105d 100755 --- a/tests/Localization/ISO639x1EnumTest.php +++ b/tests/Localization/ISO639x1EnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO639x2EnumTest.php b/tests/Localization/ISO639x2EnumTest.php index 29cd23044..16b023428 100755 --- a/tests/Localization/ISO639x2EnumTest.php +++ b/tests/Localization/ISO639x2EnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/ISO8601EnumArrayTest.php b/tests/Localization/ISO8601EnumArrayTest.php index 7566d18c6..4e3f9ea96 100755 --- a/tests/Localization/ISO8601EnumArrayTest.php +++ b/tests/Localization/ISO8601EnumArrayTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/L11nManagerTest.php b/tests/Localization/L11nManagerTest.php index fdde431e7..192372910 100755 --- a/tests/Localization/L11nManagerTest.php +++ b/tests/Localization/L11nManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/LocalizationTest.php b/tests/Localization/LocalizationTest.php index 01bb21a51..558f7fd31 100755 --- a/tests/Localization/LocalizationTest.php +++ b/tests/Localization/LocalizationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/MoneyTest.php b/tests/Localization/MoneyTest.php index 705b28c7d..1b2be65ce 100755 --- a/tests/Localization/MoneyTest.php +++ b/tests/Localization/MoneyTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/PhoneEnumTest.php b/tests/Localization/PhoneEnumTest.php index 76d5c0de2..65b18b258 100755 --- a/tests/Localization/PhoneEnumTest.php +++ b/tests/Localization/PhoneEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Localization/TimeZoneEnumArrayTest.php b/tests/Localization/TimeZoneEnumArrayTest.php index a2e590703..7ab7f2a0a 100755 --- a/tests/Localization/TimeZoneEnumArrayTest.php +++ b/tests/Localization/TimeZoneEnumArrayTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Log/FileLoggerTest.php b/tests/Log/FileLoggerTest.php index 55b76dff8..5a027f19b 100755 --- a/tests/Log/FileLoggerTest.php +++ b/tests/Log/FileLoggerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Log/LogLevelTest.php b/tests/Log/LogLevelTest.php index 77b357fc9..dd4dd7b29 100755 --- a/tests/Log/LogLevelTest.php +++ b/tests/Log/LogLevelTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Exception/ZeroDevisionExceptionTest.php b/tests/Math/Exception/ZeroDevisionExceptionTest.php index 7c481a066..351791db0 100755 --- a/tests/Math/Exception/ZeroDevisionExceptionTest.php +++ b/tests/Math/Exception/ZeroDevisionExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Functions/BetaTest.php b/tests/Math/Functions/BetaTest.php index 1a5c2d693..bfeabc600 100755 --- a/tests/Math/Functions/BetaTest.php +++ b/tests/Math/Functions/BetaTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Functions/FibonacciTest.php b/tests/Math/Functions/FibonacciTest.php index f2685fef5..06672a0f4 100755 --- a/tests/Math/Functions/FibonacciTest.php +++ b/tests/Math/Functions/FibonacciTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Functions/FunctionsTest.php b/tests/Math/Functions/FunctionsTest.php index 69b6a5d31..ab2ee89cf 100755 --- a/tests/Math/Functions/FunctionsTest.php +++ b/tests/Math/Functions/FunctionsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Functions/GammaTest.php b/tests/Math/Functions/GammaTest.php index e2075bd85..444d0bcbd 100755 --- a/tests/Math/Functions/GammaTest.php +++ b/tests/Math/Functions/GammaTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/ConvexHull/MonotoneChainTest.php b/tests/Math/Geometry/ConvexHull/MonotoneChainTest.php index d05d492ff..6ce0187e2 100755 --- a/tests/Math/Geometry/ConvexHull/MonotoneChainTest.php +++ b/tests/Math/Geometry/ConvexHull/MonotoneChainTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D2/CircleTest.php b/tests/Math/Geometry/Shape/D2/CircleTest.php index 6b4fbdf9b..5f1b54f3e 100755 --- a/tests/Math/Geometry/Shape/D2/CircleTest.php +++ b/tests/Math/Geometry/Shape/D2/CircleTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D2/EllipseTest.php b/tests/Math/Geometry/Shape/D2/EllipseTest.php index 691d0857c..7195d3b22 100755 --- a/tests/Math/Geometry/Shape/D2/EllipseTest.php +++ b/tests/Math/Geometry/Shape/D2/EllipseTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D2/PolygonTest.php b/tests/Math/Geometry/Shape/D2/PolygonTest.php index 82da98643..d63d970b1 100755 --- a/tests/Math/Geometry/Shape/D2/PolygonTest.php +++ b/tests/Math/Geometry/Shape/D2/PolygonTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D2/QuadrilateralTest.php b/tests/Math/Geometry/Shape/D2/QuadrilateralTest.php index c623e4786..c00a23187 100755 --- a/tests/Math/Geometry/Shape/D2/QuadrilateralTest.php +++ b/tests/Math/Geometry/Shape/D2/QuadrilateralTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D2/RectangleTest.php b/tests/Math/Geometry/Shape/D2/RectangleTest.php index 29aa0769c..f372a1364 100755 --- a/tests/Math/Geometry/Shape/D2/RectangleTest.php +++ b/tests/Math/Geometry/Shape/D2/RectangleTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D2/TrapezoidTest.php b/tests/Math/Geometry/Shape/D2/TrapezoidTest.php index f35386de3..a7a4a8455 100755 --- a/tests/Math/Geometry/Shape/D2/TrapezoidTest.php +++ b/tests/Math/Geometry/Shape/D2/TrapezoidTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D2/TriangleTest.php b/tests/Math/Geometry/Shape/D2/TriangleTest.php index b3ae79516..26a8b9df4 100755 --- a/tests/Math/Geometry/Shape/D2/TriangleTest.php +++ b/tests/Math/Geometry/Shape/D2/TriangleTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D3/ConeTest.php b/tests/Math/Geometry/Shape/D3/ConeTest.php index 3a28946be..1ef2c616c 100755 --- a/tests/Math/Geometry/Shape/D3/ConeTest.php +++ b/tests/Math/Geometry/Shape/D3/ConeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D3/CuboidTest.php b/tests/Math/Geometry/Shape/D3/CuboidTest.php index 3dc93f532..0300ed6f1 100755 --- a/tests/Math/Geometry/Shape/D3/CuboidTest.php +++ b/tests/Math/Geometry/Shape/D3/CuboidTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D3/CylinderTest.php b/tests/Math/Geometry/Shape/D3/CylinderTest.php index 332554f1e..6ec18a560 100755 --- a/tests/Math/Geometry/Shape/D3/CylinderTest.php +++ b/tests/Math/Geometry/Shape/D3/CylinderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D3/PrismTest.php b/tests/Math/Geometry/Shape/D3/PrismTest.php index d8890e23f..5f8158755 100755 --- a/tests/Math/Geometry/Shape/D3/PrismTest.php +++ b/tests/Math/Geometry/Shape/D3/PrismTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D3/RectangularPyramidTest.php b/tests/Math/Geometry/Shape/D3/RectangularPyramidTest.php index 25a996462..09ec0a1f0 100755 --- a/tests/Math/Geometry/Shape/D3/RectangularPyramidTest.php +++ b/tests/Math/Geometry/Shape/D3/RectangularPyramidTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D3/SphereTest.php b/tests/Math/Geometry/Shape/D3/SphereTest.php index 48c3f0d5e..0d304e847 100755 --- a/tests/Math/Geometry/Shape/D3/SphereTest.php +++ b/tests/Math/Geometry/Shape/D3/SphereTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Geometry/Shape/D3/TetrahedronTest.php b/tests/Math/Geometry/Shape/D3/TetrahedronTest.php index 496e6d552..66beab89b 100755 --- a/tests/Math/Geometry/Shape/D3/TetrahedronTest.php +++ b/tests/Math/Geometry/Shape/D3/TetrahedronTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/CholeskyDecompositionTest.php b/tests/Math/Matrix/CholeskyDecompositionTest.php index 74f37965f..10ea9e2cb 100755 --- a/tests/Math/Matrix/CholeskyDecompositionTest.php +++ b/tests/Math/Matrix/CholeskyDecompositionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/EigenvalueDecompositionTest.php b/tests/Math/Matrix/EigenvalueDecompositionTest.php index d3c459674..77ef48ac9 100755 --- a/tests/Math/Matrix/EigenvalueDecompositionTest.php +++ b/tests/Math/Matrix/EigenvalueDecompositionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/Exception/InvalidDimensionExceptionTest.php b/tests/Math/Matrix/Exception/InvalidDimensionExceptionTest.php index 8729b5412..f317c9057 100755 --- a/tests/Math/Matrix/Exception/InvalidDimensionExceptionTest.php +++ b/tests/Math/Matrix/Exception/InvalidDimensionExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/IdentityMatrixTest.php b/tests/Math/Matrix/IdentityMatrixTest.php index 08bd5413d..3bceb664c 100755 --- a/tests/Math/Matrix/IdentityMatrixTest.php +++ b/tests/Math/Matrix/IdentityMatrixTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/LUDecompositionTest.php b/tests/Math/Matrix/LUDecompositionTest.php index 30f501757..8bb14d38c 100755 --- a/tests/Math/Matrix/LUDecompositionTest.php +++ b/tests/Math/Matrix/LUDecompositionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/MatrixTest.php b/tests/Math/Matrix/MatrixTest.php index 6749eef08..75a332c6d 100755 --- a/tests/Math/Matrix/MatrixTest.php +++ b/tests/Math/Matrix/MatrixTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/QRDecompositionTest.php b/tests/Math/Matrix/QRDecompositionTest.php index 3d6315518..c9b87a559 100755 --- a/tests/Math/Matrix/QRDecompositionTest.php +++ b/tests/Math/Matrix/QRDecompositionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Matrix/VectorTest.php b/tests/Math/Matrix/VectorTest.php index ddd219072..226c6db04 100755 --- a/tests/Math/Matrix/VectorTest.php +++ b/tests/Math/Matrix/VectorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Number/ComplexTest.php b/tests/Math/Number/ComplexTest.php index e3e138373..95aee8ef2 100755 --- a/tests/Math/Number/ComplexTest.php +++ b/tests/Math/Number/ComplexTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Number/IntegerTest.php b/tests/Math/Number/IntegerTest.php index 43b09008d..6abd2ab44 100755 --- a/tests/Math/Number/IntegerTest.php +++ b/tests/Math/Number/IntegerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Number/NaturalTest.php b/tests/Math/Number/NaturalTest.php index 0cd0275c7..8b235c343 100755 --- a/tests/Math/Number/NaturalTest.php +++ b/tests/Math/Number/NaturalTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Number/NumberTypeTest.php b/tests/Math/Number/NumberTypeTest.php index b8d5d9f4a..eb13ca51d 100755 --- a/tests/Math/Number/NumberTypeTest.php +++ b/tests/Math/Number/NumberTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Number/NumbersTest.php b/tests/Math/Number/NumbersTest.php index ff749d0fa..a47d3ef3c 100755 --- a/tests/Math/Number/NumbersTest.php +++ b/tests/Math/Number/NumbersTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Number/PrimeTest.php b/tests/Math/Number/PrimeTest.php index b700de2af..f430904d5 100755 --- a/tests/Math/Number/PrimeTest.php +++ b/tests/Math/Number/PrimeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Numerics/IntegrationTest.php b/tests/Math/Numerics/IntegrationTest.php index 500525ee2..a403db8a2 100755 --- a/tests/Math/Numerics/IntegrationTest.php +++ b/tests/Math/Numerics/IntegrationTest.php @@ -7,7 +7,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Numerics/Interpolation/CubicSplineInterpolationTest.php b/tests/Math/Numerics/Interpolation/CubicSplineInterpolationTest.php index 6d0a506ce..ed7c4cbea 100755 --- a/tests/Math/Numerics/Interpolation/CubicSplineInterpolationTest.php +++ b/tests/Math/Numerics/Interpolation/CubicSplineInterpolationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Numerics/Interpolation/LagrangeInterpolationTest.php b/tests/Math/Numerics/Interpolation/LagrangeInterpolationTest.php index e456b084d..0b60083d9 100755 --- a/tests/Math/Numerics/Interpolation/LagrangeInterpolationTest.php +++ b/tests/Math/Numerics/Interpolation/LagrangeInterpolationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Numerics/Interpolation/LinearInterpolationTest.php b/tests/Math/Numerics/Interpolation/LinearInterpolationTest.php index 7374c006c..6aeb6176e 100755 --- a/tests/Math/Numerics/Interpolation/LinearInterpolationTest.php +++ b/tests/Math/Numerics/Interpolation/LinearInterpolationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Parser/EvaluatorTest.php b/tests/Math/Parser/EvaluatorTest.php index a96d488b6..ab938d785 100755 --- a/tests/Math/Parser/EvaluatorTest.php +++ b/tests/Math/Parser/EvaluatorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/AverageTest.php b/tests/Math/Statistic/AverageTest.php index 5dd8c23f2..a19ee26da 100755 --- a/tests/Math/Statistic/AverageTest.php +++ b/tests/Math/Statistic/AverageTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/BasicTest.php b/tests/Math/Statistic/BasicTest.php index 149c4d148..4a76cc38c 100755 --- a/tests/Math/Statistic/BasicTest.php +++ b/tests/Math/Statistic/BasicTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/CorrelationTest.php b/tests/Math/Statistic/CorrelationTest.php index 255db1319..d0b728aae 100755 --- a/tests/Math/Statistic/CorrelationTest.php +++ b/tests/Math/Statistic/CorrelationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/Forecast/ErrorTest.php b/tests/Math/Statistic/Forecast/ErrorTest.php index bbf13e60a..306c26f47 100755 --- a/tests/Math/Statistic/Forecast/ErrorTest.php +++ b/tests/Math/Statistic/Forecast/ErrorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/Forecast/ForecastsTest.php b/tests/Math/Statistic/Forecast/ForecastsTest.php index dc43dcdbe..dbd2f3cac 100755 --- a/tests/Math/Statistic/Forecast/ForecastsTest.php +++ b/tests/Math/Statistic/Forecast/ForecastsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/Forecast/Regression/LevelLevelRegressionTest.php b/tests/Math/Statistic/Forecast/Regression/LevelLevelRegressionTest.php index af061365e..54f037e79 100755 --- a/tests/Math/Statistic/Forecast/Regression/LevelLevelRegressionTest.php +++ b/tests/Math/Statistic/Forecast/Regression/LevelLevelRegressionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/Forecast/Regression/LevelLogRegressionTest.php b/tests/Math/Statistic/Forecast/Regression/LevelLogRegressionTest.php index 503d80e74..44000795d 100755 --- a/tests/Math/Statistic/Forecast/Regression/LevelLogRegressionTest.php +++ b/tests/Math/Statistic/Forecast/Regression/LevelLogRegressionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/Forecast/Regression/LogLevelRegressionTest.php b/tests/Math/Statistic/Forecast/Regression/LogLevelRegressionTest.php index 209d83040..f36591c38 100755 --- a/tests/Math/Statistic/Forecast/Regression/LogLevelRegressionTest.php +++ b/tests/Math/Statistic/Forecast/Regression/LogLevelRegressionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/Forecast/Regression/LogLogRegressionTest.php b/tests/Math/Statistic/Forecast/Regression/LogLogRegressionTest.php index 510688d5f..eab28de2c 100755 --- a/tests/Math/Statistic/Forecast/Regression/LogLogRegressionTest.php +++ b/tests/Math/Statistic/Forecast/Regression/LogLogRegressionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/Forecast/Regression/PolynomialRegressionTest.php b/tests/Math/Statistic/Forecast/Regression/PolynomialRegressionTest.php index ba4aaa7d5..d4f0ae0a9 100755 --- a/tests/Math/Statistic/Forecast/Regression/PolynomialRegressionTest.php +++ b/tests/Math/Statistic/Forecast/Regression/PolynomialRegressionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Statistic/MeasureOfDispersionTest.php b/tests/Math/Statistic/MeasureOfDispersionTest.php index 8fa3372b1..b903dd06f 100755 --- a/tests/Math/Statistic/MeasureOfDispersionTest.php +++ b/tests/Math/Statistic/MeasureOfDispersionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/BernoulliDistributionTest.php b/tests/Math/Stochastic/Distribution/BernoulliDistributionTest.php index faf378721..1d330fc55 100755 --- a/tests/Math/Stochastic/Distribution/BernoulliDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/BernoulliDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/BetaDistributionTest.php b/tests/Math/Stochastic/Distribution/BetaDistributionTest.php index 14f6f4673..7d17d5c8a 100755 --- a/tests/Math/Stochastic/Distribution/BetaDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/BetaDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/BinomialDistributionTest.php b/tests/Math/Stochastic/Distribution/BinomialDistributionTest.php index fb8953e1c..b983e9ef0 100755 --- a/tests/Math/Stochastic/Distribution/BinomialDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/BinomialDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/CauchyDistributionTest.php b/tests/Math/Stochastic/Distribution/CauchyDistributionTest.php index 8a666e062..eaf5203ef 100755 --- a/tests/Math/Stochastic/Distribution/CauchyDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/CauchyDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/ChiSquaredDistributionTest.php b/tests/Math/Stochastic/Distribution/ChiSquaredDistributionTest.php index 51e0bc3ba..741649c31 100755 --- a/tests/Math/Stochastic/Distribution/ChiSquaredDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/ChiSquaredDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/ExponentialDistributionTest.php b/tests/Math/Stochastic/Distribution/ExponentialDistributionTest.php index f9e8d00a6..e9eb37e2b 100755 --- a/tests/Math/Stochastic/Distribution/ExponentialDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/ExponentialDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/FDistributionTest.php b/tests/Math/Stochastic/Distribution/FDistributionTest.php index ca2586714..b8fcec9a8 100755 --- a/tests/Math/Stochastic/Distribution/FDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/FDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/GammaDistributionTest.php b/tests/Math/Stochastic/Distribution/GammaDistributionTest.php index 8439a5f71..785d1df7c 100755 --- a/tests/Math/Stochastic/Distribution/GammaDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/GammaDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/GeometricDistributionTest.php b/tests/Math/Stochastic/Distribution/GeometricDistributionTest.php index 0002a5d71..bc1af9530 100755 --- a/tests/Math/Stochastic/Distribution/GeometricDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/GeometricDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/HypergeometricDistributionTest.php b/tests/Math/Stochastic/Distribution/HypergeometricDistributionTest.php index 7fd1f9c13..880cffcdb 100755 --- a/tests/Math/Stochastic/Distribution/HypergeometricDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/HypergeometricDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/LaplaceDistributionTest.php b/tests/Math/Stochastic/Distribution/LaplaceDistributionTest.php index cf5029fc9..2710b2f63 100755 --- a/tests/Math/Stochastic/Distribution/LaplaceDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/LaplaceDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/LogDistributionTest.php b/tests/Math/Stochastic/Distribution/LogDistributionTest.php index 5531d5b16..8da0b2e91 100755 --- a/tests/Math/Stochastic/Distribution/LogDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/LogDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/LogNormalDistributionTest.php b/tests/Math/Stochastic/Distribution/LogNormalDistributionTest.php index 3771a2c72..aa4931792 100755 --- a/tests/Math/Stochastic/Distribution/LogNormalDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/LogNormalDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/LogisticDistributionTest.php b/tests/Math/Stochastic/Distribution/LogisticDistributionTest.php index 163ae4ad1..61b880fa6 100755 --- a/tests/Math/Stochastic/Distribution/LogisticDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/LogisticDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/NormalDistributionTest.php b/tests/Math/Stochastic/Distribution/NormalDistributionTest.php index 4e0d14d39..7662e5f64 100755 --- a/tests/Math/Stochastic/Distribution/NormalDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/NormalDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/ParetoDistributionTest.php b/tests/Math/Stochastic/Distribution/ParetoDistributionTest.php index beb12d25b..ff26c979f 100755 --- a/tests/Math/Stochastic/Distribution/ParetoDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/ParetoDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/PoissonDistributionTest.php b/tests/Math/Stochastic/Distribution/PoissonDistributionTest.php index 0c3334dbf..fc7ced8fb 100755 --- a/tests/Math/Stochastic/Distribution/PoissonDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/PoissonDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/TDistributionTest.php b/tests/Math/Stochastic/Distribution/TDistributionTest.php index 395068d2f..55c6a902f 100755 --- a/tests/Math/Stochastic/Distribution/TDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/TDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/UniformDistributionContinuousTest.php b/tests/Math/Stochastic/Distribution/UniformDistributionContinuousTest.php index 13dff0e0d..9cf61e66a 100755 --- a/tests/Math/Stochastic/Distribution/UniformDistributionContinuousTest.php +++ b/tests/Math/Stochastic/Distribution/UniformDistributionContinuousTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/UniformDistributionDiscreteTest.php b/tests/Math/Stochastic/Distribution/UniformDistributionDiscreteTest.php index 4175b80f7..ee30f1329 100755 --- a/tests/Math/Stochastic/Distribution/UniformDistributionDiscreteTest.php +++ b/tests/Math/Stochastic/Distribution/UniformDistributionDiscreteTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/WeibullDistributionTest.php b/tests/Math/Stochastic/Distribution/WeibullDistributionTest.php index 29307f130..b2e7f090f 100755 --- a/tests/Math/Stochastic/Distribution/WeibullDistributionTest.php +++ b/tests/Math/Stochastic/Distribution/WeibullDistributionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/Distribution/ZTestTest.php b/tests/Math/Stochastic/Distribution/ZTestTest.php index 47f5e681d..0c84faf7b 100755 --- a/tests/Math/Stochastic/Distribution/ZTestTest.php +++ b/tests/Math/Stochastic/Distribution/ZTestTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Stochastic/NaiveBayesClassifierTest.php b/tests/Math/Stochastic/NaiveBayesClassifierTest.php index e32efa291..67f26f27d 100755 --- a/tests/Math/Stochastic/NaiveBayesClassifierTest.php +++ b/tests/Math/Stochastic/NaiveBayesClassifierTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Topology/Metrics2DTest.php b/tests/Math/Topology/Metrics2DTest.php index 59d89be1b..082e1f3d2 100755 --- a/tests/Math/Topology/Metrics2DTest.php +++ b/tests/Math/Topology/Metrics2DTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Math/Topology/MetricsNDTest.php b/tests/Math/Topology/MetricsNDTest.php index b06a091ac..58f137c07 100755 --- a/tests/Math/Topology/MetricsNDTest.php +++ b/tests/Math/Topology/MetricsNDTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Cli/CliHeaderTest.php b/tests/Message/Cli/CliHeaderTest.php index bda78e777..4223e8161 100644 --- a/tests/Message/Cli/CliHeaderTest.php +++ b/tests/Message/Cli/CliHeaderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Cli/CliRequestTest.php b/tests/Message/Cli/CliRequestTest.php index 44f4a155f..f69673b60 100644 --- a/tests/Message/Cli/CliRequestTest.php +++ b/tests/Message/Cli/CliRequestTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Cli/CliResponseTest.php b/tests/Message/Cli/CliResponseTest.php index 4fa63844b..81b7e46ad 100644 --- a/tests/Message/Cli/CliResponseTest.php +++ b/tests/Message/Cli/CliResponseTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/HeaderAbstractTest.php b/tests/Message/HeaderAbstractTest.php index 6d8104b62..0b3d011d8 100755 --- a/tests/Message/HeaderAbstractTest.php +++ b/tests/Message/HeaderAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/BrowserTypeTest.php b/tests/Message/Http/BrowserTypeTest.php index b88ef7fc2..1c6ca9fbc 100755 --- a/tests/Message/Http/BrowserTypeTest.php +++ b/tests/Message/Http/BrowserTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/HttpHeaderTest.php b/tests/Message/Http/HttpHeaderTest.php index e68e60abb..08a7ab938 100755 --- a/tests/Message/Http/HttpHeaderTest.php +++ b/tests/Message/Http/HttpHeaderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/HttpRequestTest.php b/tests/Message/Http/HttpRequestTest.php index 82faea350..9b012d3ee 100755 --- a/tests/Message/Http/HttpRequestTest.php +++ b/tests/Message/Http/HttpRequestTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/HttpResponseTest.php b/tests/Message/Http/HttpResponseTest.php index 30f787c34..a91a6398f 100755 --- a/tests/Message/Http/HttpResponseTest.php +++ b/tests/Message/Http/HttpResponseTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/OSTypeTest.php b/tests/Message/Http/OSTypeTest.php index e4e97f0b4..939be9193 100755 --- a/tests/Message/Http/OSTypeTest.php +++ b/tests/Message/Http/OSTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/RequestMethodTest.php b/tests/Message/Http/RequestMethodTest.php index 163159279..06a584bb5 100755 --- a/tests/Message/Http/RequestMethodTest.php +++ b/tests/Message/Http/RequestMethodTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/RequestStatusCodeTest.php b/tests/Message/Http/RequestStatusCodeTest.php index 9296032f3..6b375b85b 100755 --- a/tests/Message/Http/RequestStatusCodeTest.php +++ b/tests/Message/Http/RequestStatusCodeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/RequestStatusTest.php b/tests/Message/Http/RequestStatusTest.php index bb4779f83..3aa79490b 100755 --- a/tests/Message/Http/RequestStatusTest.php +++ b/tests/Message/Http/RequestStatusTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Http/RestTest.php b/tests/Message/Http/RestTest.php index c5ae7ae01..bcc3ecfb8 100755 --- a/tests/Message/Http/RestTest.php +++ b/tests/Message/Http/RestTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Mail/EmailTest.php b/tests/Message/Mail/EmailTest.php index cfba5f964..fa3439402 100755 --- a/tests/Message/Mail/EmailTest.php +++ b/tests/Message/Mail/EmailTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Mail/ImapTest.php b/tests/Message/Mail/ImapTest.php index 2e4caab5f..b5024e54b 100755 --- a/tests/Message/Mail/ImapTest.php +++ b/tests/Message/Mail/ImapTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Mail/MailHandlerMailTrait.php b/tests/Message/Mail/MailHandlerMailTrait.php index 9c4cc3c80..cec314b59 100755 --- a/tests/Message/Mail/MailHandlerMailTrait.php +++ b/tests/Message/Mail/MailHandlerMailTrait.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Mail/MailHandlerSendmailTrait.php b/tests/Message/Mail/MailHandlerSendmailTrait.php index be5a637ee..ddea77d9e 100755 --- a/tests/Message/Mail/MailHandlerSendmailTrait.php +++ b/tests/Message/Mail/MailHandlerSendmailTrait.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Mail/MailHandlerSmtpTrait.php b/tests/Message/Mail/MailHandlerSmtpTrait.php index d5f1216d1..9a9dc87d4 100755 --- a/tests/Message/Mail/MailHandlerSmtpTrait.php +++ b/tests/Message/Mail/MailHandlerSmtpTrait.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Mail/MailHandlerTest.php b/tests/Message/Mail/MailHandlerTest.php index dd951eee1..98da3908c 100755 --- a/tests/Message/Mail/MailHandlerTest.php +++ b/tests/Message/Mail/MailHandlerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Mail/Pop3Test.php b/tests/Message/Mail/Pop3Test.php index 269816071..1b2263cc9 100755 --- a/tests/Message/Mail/Pop3Test.php +++ b/tests/Message/Mail/Pop3Test.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/RequestAbstractTest.php b/tests/Message/RequestAbstractTest.php index a6f510d56..ee674c925 100755 --- a/tests/Message/RequestAbstractTest.php +++ b/tests/Message/RequestAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/ResponseAbstractTest.php b/tests/Message/ResponseAbstractTest.php index 1a4a28c43..2460af20c 100755 --- a/tests/Message/ResponseAbstractTest.php +++ b/tests/Message/ResponseAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Socket/HeaderTest.php b/tests/Message/Socket/HeaderTest.php index 78fef0ddf..c009e6e83 100755 --- a/tests/Message/Socket/HeaderTest.php +++ b/tests/Message/Socket/HeaderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Socket/PacketManagerTest.php b/tests/Message/Socket/PacketManagerTest.php index 551789412..88ee43207 100755 --- a/tests/Message/Socket/PacketManagerTest.php +++ b/tests/Message/Socket/PacketManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Socket/PacketTypeTest.php b/tests/Message/Socket/PacketTypeTest.php index a1ac14234..27e231752 100755 --- a/tests/Message/Socket/PacketTypeTest.php +++ b/tests/Message/Socket/PacketTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Socket/RequestTest.php b/tests/Message/Socket/RequestTest.php index da573228a..735a51e76 100755 --- a/tests/Message/Socket/RequestTest.php +++ b/tests/Message/Socket/RequestTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Message/Socket/ResponseTest.php b/tests/Message/Socket/ResponseTest.php index 829a05264..c6dd2e66c 100755 --- a/tests/Message/Socket/ResponseTest.php +++ b/tests/Message/Socket/ResponseTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Html/FormElementGeneratorTest.php b/tests/Model/Html/FormElementGeneratorTest.php index d385b74fd..6cedf6359 100755 --- a/tests/Model/Html/FormElementGeneratorTest.php +++ b/tests/Model/Html/FormElementGeneratorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Html/HeadTest.php b/tests/Model/Html/HeadTest.php index c49fac077..b74731c64 100755 --- a/tests/Model/Html/HeadTest.php +++ b/tests/Model/Html/HeadTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Html/MetaTest.php b/tests/Model/Html/MetaTest.php index 28ca007e6..a1da13978 100755 --- a/tests/Model/Html/MetaTest.php +++ b/tests/Model/Html/MetaTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Message/DomActionTest.php b/tests/Model/Message/DomActionTest.php index 2ae7439b8..e20b03663 100755 --- a/tests/Model/Message/DomActionTest.php +++ b/tests/Model/Message/DomActionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Message/DomTest.php b/tests/Model/Message/DomTest.php index 277e370fd..f8627f8f8 100755 --- a/tests/Model/Message/DomTest.php +++ b/tests/Model/Message/DomTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright 2013 Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Message/FormValidationTest.php b/tests/Model/Message/FormValidationTest.php index fb41a1386..b1ec524c9 100755 --- a/tests/Model/Message/FormValidationTest.php +++ b/tests/Model/Message/FormValidationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright 2013 Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Message/NotifyTest.php b/tests/Model/Message/NotifyTest.php index fde9b3185..e7d4f7067 100755 --- a/tests/Model/Message/NotifyTest.php +++ b/tests/Model/Message/NotifyTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright 2013 Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Message/NotifyTypeTest.php b/tests/Model/Message/NotifyTypeTest.php index 56bd0998e..88e636b2b 100755 --- a/tests/Model/Message/NotifyTypeTest.php +++ b/tests/Model/Message/NotifyTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Message/RedirectTest.php b/tests/Model/Message/RedirectTest.php index e7f1f8c01..0424897f3 100755 --- a/tests/Model/Message/RedirectTest.php +++ b/tests/Model/Message/RedirectTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright 2013 Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Model/Message/ReloadTest.php b/tests/Model/Message/ReloadTest.php index afd326a74..2e5f1574b 100755 --- a/tests/Model/Message/ReloadTest.php +++ b/tests/Model/Message/ReloadTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright 2013 Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/Exception/InvalidModuleExceptionTest.php b/tests/Module/Exception/InvalidModuleExceptionTest.php index b4a9c891d..7535f9e17 100755 --- a/tests/Module/Exception/InvalidModuleExceptionTest.php +++ b/tests/Module/Exception/InvalidModuleExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/Exception/InvalidThemeExceptionTest.php b/tests/Module/Exception/InvalidThemeExceptionTest.php index 418c59f5d..472dc656d 100755 --- a/tests/Module/Exception/InvalidThemeExceptionTest.php +++ b/tests/Module/Exception/InvalidThemeExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/InstallerAbstractTest.php b/tests/Module/InstallerAbstractTest.php index 6d72234fd..80f14227c 100755 --- a/tests/Module/InstallerAbstractTest.php +++ b/tests/Module/InstallerAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/ModuleAbstractTest.php b/tests/Module/ModuleAbstractTest.php index 84fa76c2e..af9e787f1 100755 --- a/tests/Module/ModuleAbstractTest.php +++ b/tests/Module/ModuleAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/ModuleInfoTest.php b/tests/Module/ModuleInfoTest.php index a714b062f..6e8184b54 100755 --- a/tests/Module/ModuleInfoTest.php +++ b/tests/Module/ModuleInfoTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/ModuleManagerTest.php b/tests/Module/ModuleManagerTest.php index f1060908c..88a229454 100755 --- a/tests/Module/ModuleManagerTest.php +++ b/tests/Module/ModuleManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/NullModuleTest.php b/tests/Module/NullModuleTest.php index 4f2387de0..41ec4c5b5 100755 --- a/tests/Module/NullModuleTest.php +++ b/tests/Module/NullModuleTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/PackageManagerTest.php b/tests/Module/PackageManagerTest.php index 1e9f47970..3d6993760 100755 --- a/tests/Module/PackageManagerTest.php +++ b/tests/Module/PackageManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/StatusAbstractTest.php b/tests/Module/StatusAbstractTest.php index 5f568e319..76c7bb725 100755 --- a/tests/Module/StatusAbstractTest.php +++ b/tests/Module/StatusAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php b/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php index e4a152fcf..c73fd4d4b 100755 --- a/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php +++ b/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Module/Testmodule/Admin/Installer.php b/tests/Module/Testmodule/Admin/Installer.php index 3b4fb29d2..41b6a1070 100755 --- a/tests/Module/Testmodule/Admin/Installer.php +++ b/tests/Module/Testmodule/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\InstallerAbstract; * Installer class. * * @package tests - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/Module/UninstallerAbstractTest.php b/tests/Module/UninstallerAbstractTest.php index 34b0aa2ca..2267c43c0 100755 --- a/tests/Module/UninstallerAbstractTest.php +++ b/tests/Module/UninstallerAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Preload0.php b/tests/Preload0.php index 3cfaf49ed..e7ef499a6 100755 --- a/tests/Preload0.php +++ b/tests/Preload0.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\tests; * Preload class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/PreloadTest/Preload1.php b/tests/PreloadTest/Preload1.php index ddd620f6a..8491197e4 100755 --- a/tests/PreloadTest/Preload1.php +++ b/tests/PreloadTest/Preload1.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\tests\PreloadTest; * Preload class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/PreloadTest/Sub/Preload2.php b/tests/PreloadTest/Sub/Preload2.php index 09fbe46c0..bb98ebed2 100755 --- a/tests/PreloadTest/Sub/Preload2.php +++ b/tests/PreloadTest/Sub/Preload2.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\tests\PreloadTest\Sub; * Preload class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/PreloadTest/Sub/Preload3.php b/tests/PreloadTest/Sub/Preload3.php index 750749fdc..10fb8bd89 100755 --- a/tests/PreloadTest/Sub/Preload3.php +++ b/tests/PreloadTest/Sub/Preload3.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\tests\PreloadTest\Sub; * Preload class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/PreloaderTest.php b/tests/PreloaderTest.php index 505a4d2ff..216a7e53f 100755 --- a/tests/PreloaderTest.php +++ b/tests/PreloaderTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Router/RouteVerbTest.php b/tests/Router/RouteVerbTest.php index 723f527d5..b7fb61620 100755 --- a/tests/Router/RouteVerbTest.php +++ b/tests/Router/RouteVerbTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Router/SocketRouterTest.php b/tests/Router/SocketRouterTest.php index a09ae78b5..6ad05ca6f 100755 --- a/tests/Router/SocketRouterTest.php +++ b/tests/Router/SocketRouterTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Router/WebRouterTest.php b/tests/Router/WebRouterTest.php index 6a85ae47d..22204071a 100755 --- a/tests/Router/WebRouterTest.php +++ b/tests/Router/WebRouterTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Security/PhpCodeTest.php b/tests/Security/PhpCodeTest.php index 671b0612f..0757018e5 100755 --- a/tests/Security/PhpCodeTest.php +++ b/tests/Security/PhpCodeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Socket/Client/ClientConnectionTest.php b/tests/Socket/Client/ClientConnectionTest.php index 6098d0ff5..11603afe7 100755 --- a/tests/Socket/Client/ClientConnectionTest.php +++ b/tests/Socket/Client/ClientConnectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Socket/Client/ClientTest.php b/tests/Socket/Client/ClientTest.php index 85b8aec5a..8b33a9820 100755 --- a/tests/Socket/Client/ClientTest.php +++ b/tests/Socket/Client/ClientTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -69,7 +69,7 @@ final class ClientTest extends \PHPUnit\Framework\TestCase $this->app->dispatcher = new Dispatcher($this->app); $this->app->eventManager = new EventManager($this->app->dispatcher); $this->app->eventManager->importFromFile(__DIR__ . '/../../../Socket/Hooks.php'); - $this->app->l11nManager = new L11nManager($this->app->appName); + $this->app->l11nManager = new L11nManager(); $this->app->router = new SocketRouter(); } diff --git a/tests/Socket/Client/ClientTestHelper.php b/tests/Socket/Client/ClientTestHelper.php index 997761109..13260900d 100755 --- a/tests/Socket/Client/ClientTestHelper.php +++ b/tests/Socket/Client/ClientTestHelper.php @@ -6,7 +6,7 @@ * * @package test * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link http://karaka.com */ diff --git a/tests/Socket/Client/NullClientConnectionTest.php b/tests/Socket/Client/NullClientConnectionTest.php index 1195e550c..80d0278eb 100755 --- a/tests/Socket/Client/NullClientConnectionTest.php +++ b/tests/Socket/Client/NullClientConnectionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Socket/Server/ClientManagerTest.php b/tests/Socket/Server/ClientManagerTest.php index 795c8a56a..576b6902f 100755 --- a/tests/Socket/Server/ClientManagerTest.php +++ b/tests/Socket/Server/ClientManagerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Socket/Server/ServerTest.php b/tests/Socket/Server/ServerTest.php index 5e861ad2a..c9909bc04 100755 --- a/tests/Socket/Server/ServerTest.php +++ b/tests/Socket/Server/ServerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -69,7 +69,7 @@ final class ServerTest extends \PHPUnit\Framework\TestCase $this->app->dispatcher = new Dispatcher($this->app); $this->app->eventManager = new EventManager($this->app->dispatcher); $this->app->eventManager->importFromFile(__DIR__ . '/../../../Socket/Hooks.php'); - $this->app->l11nManager = new L11nManager($this->app->appName); + $this->app->l11nManager = new L11nManager(); $this->app->router = new SocketRouter(); } diff --git a/tests/Socket/Server/ServerTestHelper.php b/tests/Socket/Server/ServerTestHelper.php index 3bafce4f5..04c9ffc0f 100755 --- a/tests/Socket/Server/ServerTestHelper.php +++ b/tests/Socket/Server/ServerTestHelper.php @@ -6,7 +6,7 @@ * * @package test * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link http://karaka.com */ diff --git a/tests/Stdlib/Base/AddressTest.php b/tests/Stdlib/Base/AddressTest.php index 1d2386f00..fa9617dec 100755 --- a/tests/Stdlib/Base/AddressTest.php +++ b/tests/Stdlib/Base/AddressTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/AddressTypeTest.php b/tests/Stdlib/Base/AddressTypeTest.php index 50170ffc8..a6a786055 100755 --- a/tests/Stdlib/Base/AddressTypeTest.php +++ b/tests/Stdlib/Base/AddressTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/EnumArrayDemo.php b/tests/Stdlib/Base/EnumArrayDemo.php index 912cd92bd..e778238cd 100755 --- a/tests/Stdlib/Base/EnumArrayDemo.php +++ b/tests/Stdlib/Base/EnumArrayDemo.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/EnumArrayTest.php b/tests/Stdlib/Base/EnumArrayTest.php index e544f2d65..b69835a71 100755 --- a/tests/Stdlib/Base/EnumArrayTest.php +++ b/tests/Stdlib/Base/EnumArrayTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/EnumDemo.php b/tests/Stdlib/Base/EnumDemo.php index 8bf44f891..e75340956 100755 --- a/tests/Stdlib/Base/EnumDemo.php +++ b/tests/Stdlib/Base/EnumDemo.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/EnumTest.php b/tests/Stdlib/Base/EnumTest.php index 6826ca723..86eb7437d 100755 --- a/tests/Stdlib/Base/EnumTest.php +++ b/tests/Stdlib/Base/EnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/Exception/InvalidEnumNameTest.php b/tests/Stdlib/Base/Exception/InvalidEnumNameTest.php index 8f53223cd..0043a8b3d 100755 --- a/tests/Stdlib/Base/Exception/InvalidEnumNameTest.php +++ b/tests/Stdlib/Base/Exception/InvalidEnumNameTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/Exception/InvalidEnumValueTest.php b/tests/Stdlib/Base/Exception/InvalidEnumValueTest.php index 04180a34d..09fa434f8 100755 --- a/tests/Stdlib/Base/Exception/InvalidEnumValueTest.php +++ b/tests/Stdlib/Base/Exception/InvalidEnumValueTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/HeapItem.php b/tests/Stdlib/Base/HeapItem.php index 8ad1649d4..88fe2f8c0 100755 --- a/tests/Stdlib/Base/HeapItem.php +++ b/tests/Stdlib/Base/HeapItem.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/HeapTest.php b/tests/Stdlib/Base/HeapTest.php index 94a532f36..0335432e1 100755 --- a/tests/Stdlib/Base/HeapTest.php +++ b/tests/Stdlib/Base/HeapTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/IbanTest.php b/tests/Stdlib/Base/IbanTest.php index 3c5eea804..447933299 100755 --- a/tests/Stdlib/Base/IbanTest.php +++ b/tests/Stdlib/Base/IbanTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/LocationTest.php b/tests/Stdlib/Base/LocationTest.php index cea7b38c2..09333c458 100755 --- a/tests/Stdlib/Base/LocationTest.php +++ b/tests/Stdlib/Base/LocationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/NullLocationTest.php b/tests/Stdlib/Base/NullLocationTest.php index 3dbefceb2..9ae67b176 100755 --- a/tests/Stdlib/Base/NullLocationTest.php +++ b/tests/Stdlib/Base/NullLocationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/PhoneTypeTest.php b/tests/Stdlib/Base/PhoneTypeTest.php index 4af22a509..e7ee5b502 100755 --- a/tests/Stdlib/Base/PhoneTypeTest.php +++ b/tests/Stdlib/Base/PhoneTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Base/SmartDateTimeTest.php b/tests/Stdlib/Base/SmartDateTimeTest.php index 281cd5dce..ecea6a2de 100755 --- a/tests/Stdlib/Base/SmartDateTimeTest.php +++ b/tests/Stdlib/Base/SmartDateTimeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Graph/BinaryTreeTest.php b/tests/Stdlib/Graph/BinaryTreeTest.php index 7656ece7a..eedeecd10 100755 --- a/tests/Stdlib/Graph/BinaryTreeTest.php +++ b/tests/Stdlib/Graph/BinaryTreeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Graph/EdgeTest.php b/tests/Stdlib/Graph/EdgeTest.php index 5beef8ea8..9b0224a4f 100755 --- a/tests/Stdlib/Graph/EdgeTest.php +++ b/tests/Stdlib/Graph/EdgeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Graph/GraphTest.php b/tests/Stdlib/Graph/GraphTest.php index 264ddb5f6..265ffe37c 100755 --- a/tests/Stdlib/Graph/GraphTest.php +++ b/tests/Stdlib/Graph/GraphTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Graph/NodeTest.php b/tests/Stdlib/Graph/NodeTest.php index 04318b142..bdedd2034 100755 --- a/tests/Stdlib/Graph/NodeTest.php +++ b/tests/Stdlib/Graph/NodeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Graph/TreeTest.php b/tests/Stdlib/Graph/TreeTest.php index 8c91a8a45..65a1ab3b2 100755 --- a/tests/Stdlib/Graph/TreeTest.php +++ b/tests/Stdlib/Graph/TreeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Map/KeyTypeTest.php b/tests/Stdlib/Map/KeyTypeTest.php index 6b2b1b664..33c9ec3d4 100755 --- a/tests/Stdlib/Map/KeyTypeTest.php +++ b/tests/Stdlib/Map/KeyTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Map/MultiMapTest.php b/tests/Stdlib/Map/MultiMapTest.php index e94328bee..1d1a07dce 100755 --- a/tests/Stdlib/Map/MultiMapTest.php +++ b/tests/Stdlib/Map/MultiMapTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Map/OrderTypeTest.php b/tests/Stdlib/Map/OrderTypeTest.php index c61c21847..ebfd03bf6 100755 --- a/tests/Stdlib/Map/OrderTypeTest.php +++ b/tests/Stdlib/Map/OrderTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Queue/PriorityModeTest.php b/tests/Stdlib/Queue/PriorityModeTest.php index 86412cbbf..13325915c 100755 --- a/tests/Stdlib/Queue/PriorityModeTest.php +++ b/tests/Stdlib/Queue/PriorityModeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Stdlib/Queue/PriorityQueueTest.php b/tests/Stdlib/Queue/PriorityQueueTest.php index aa063d058..3672b95bc 100755 --- a/tests/Stdlib/Queue/PriorityQueueTest.php +++ b/tests/Stdlib/Queue/PriorityQueueTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/CharsetTypeTest.php b/tests/System/CharsetTypeTest.php index 1d4e2b37e..2331450e6 100755 --- a/tests/System/CharsetTypeTest.php +++ b/tests/System/CharsetTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/ContentPutModeTest.php b/tests/System/File/ContentPutModeTest.php index a18d6edc6..bc7c26340 100755 --- a/tests/System/File/ContentPutModeTest.php +++ b/tests/System/File/ContentPutModeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/ExtensionTypeTest.php b/tests/System/File/ExtensionTypeTest.php index 9945c147b..668f25504 100755 --- a/tests/System/File/ExtensionTypeTest.php +++ b/tests/System/File/ExtensionTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/FileUtilsTest.php b/tests/System/File/FileUtilsTest.php index 906d5d969..e5261151d 100755 --- a/tests/System/File/FileUtilsTest.php +++ b/tests/System/File/FileUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/Ftp/DirectoryTest.php b/tests/System/File/Ftp/DirectoryTest.php index 6d9b105ab..3c6625e84 100755 --- a/tests/System/File/Ftp/DirectoryTest.php +++ b/tests/System/File/Ftp/DirectoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/Ftp/FileTest.php b/tests/System/File/Ftp/FileTest.php index 610ef6563..4472dd54c 100755 --- a/tests/System/File/Ftp/FileTest.php +++ b/tests/System/File/Ftp/FileTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/Ftp/FtpStorageTest.php b/tests/System/File/Ftp/FtpStorageTest.php index f9f0e9571..ef131de88 100755 --- a/tests/System/File/Ftp/FtpStorageTest.php +++ b/tests/System/File/Ftp/FtpStorageTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/Local/DirectoryTest.php b/tests/System/File/Local/DirectoryTest.php index 1b3febf8f..c436b5cb8 100755 --- a/tests/System/File/Local/DirectoryTest.php +++ b/tests/System/File/Local/DirectoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/Local/FileTest.php b/tests/System/File/Local/FileTest.php index c33d64c96..8876abe9f 100755 --- a/tests/System/File/Local/FileTest.php +++ b/tests/System/File/Local/FileTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/Local/LocalStorageTest.php b/tests/System/File/Local/LocalStorageTest.php index 046b1081a..7d5a7896e 100755 --- a/tests/System/File/Local/LocalStorageTest.php +++ b/tests/System/File/Local/LocalStorageTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/PathExceptionTest.php b/tests/System/File/PathExceptionTest.php index 468532c18..656f04080 100755 --- a/tests/System/File/PathExceptionTest.php +++ b/tests/System/File/PathExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/PermissionExceptionTest.php b/tests/System/File/PermissionExceptionTest.php index ce8516f44..8d04d304d 100755 --- a/tests/System/File/PermissionExceptionTest.php +++ b/tests/System/File/PermissionExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/File/StorageTest.php b/tests/System/File/StorageTest.php index 814c03abe..787e04d02 100755 --- a/tests/System/File/StorageTest.php +++ b/tests/System/File/StorageTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/MimeTypeTest.php b/tests/System/MimeTypeTest.php index 2a683dc82..13bf2de18 100755 --- a/tests/System/MimeTypeTest.php +++ b/tests/System/MimeTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/OperatingSystemTest.php b/tests/System/OperatingSystemTest.php index 0f482c880..cc8ad15b0 100755 --- a/tests/System/OperatingSystemTest.php +++ b/tests/System/OperatingSystemTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/Search/StringSearchTest.php b/tests/System/Search/StringSearchTest.php index 75c6750fb..4a8e7551e 100755 --- a/tests/System/Search/StringSearchTest.php +++ b/tests/System/Search/StringSearchTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/SystemTypeTest.php b/tests/System/SystemTypeTest.php index b5e32e122..03d2e9a1a 100755 --- a/tests/System/SystemTypeTest.php +++ b/tests/System/SystemTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/System/SystemUtilsTest.php b/tests/System/SystemUtilsTest.php index c7830abaa..dce9dd37d 100755 --- a/tests/System/SystemUtilsTest.php +++ b/tests/System/SystemUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/TestLoad.php b/tests/TestLoad.php index cf73f2af4..2da380d9b 100755 --- a/tests/TestLoad.php +++ b/tests/TestLoad.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\tests; * Autoloader class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/TestLoad2.php b/tests/TestLoad2.php index 986b6f02d..95d852658 100755 --- a/tests/TestLoad2.php +++ b/tests/TestLoad2.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace tests; * Autoloader class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/TestLoad3.php b/tests/TestLoad3.php index ec532aee4..db762f6e9 100755 --- a/tests/TestLoad3.php +++ b/tests/TestLoad3.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\tests; * Autoloader class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/TestLoad4.php b/tests/TestLoad4.php index 9c1d734a4..f2c0506c3 100755 --- a/tests/TestLoad4.php +++ b/tests/TestLoad4.php @@ -6,7 +6,7 @@ * * @package Tests\PHPUnit * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -18,7 +18,7 @@ namespace phpOMS\tests; * Autoloader class. * * @package Tests\PHPUnit - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/tests/UnhandledHandlerTest.php b/tests/UnhandledHandlerTest.php index bdf8ec3d8..e08ea5094 100755 --- a/tests/UnhandledHandlerTest.php +++ b/tests/UnhandledHandlerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Uri/ArgumentTest.php b/tests/Uri/ArgumentTest.php index 0425f0da6..a206f398e 100755 --- a/tests/Uri/ArgumentTest.php +++ b/tests/Uri/ArgumentTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Uri/HttpUriTest.php b/tests/Uri/HttpUriTest.php index e706de022..8c1287281 100755 --- a/tests/Uri/HttpUriTest.php +++ b/tests/Uri/HttpUriTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Uri/InvalidUriExceptionTest.php b/tests/Uri/InvalidUriExceptionTest.php index f5c983647..99a97d876 100755 --- a/tests/Uri/InvalidUriExceptionTest.php +++ b/tests/Uri/InvalidUriExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Uri/UriFactoryTest.php b/tests/Uri/UriFactoryTest.php index 87d2355f4..010ca702d 100755 --- a/tests/Uri/UriFactoryTest.php +++ b/tests/Uri/UriFactoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Uri/UriSchemeTest.php b/tests/Uri/UriSchemeTest.php index 49e14fcf7..2174c0283 100755 --- a/tests/Uri/UriSchemeTest.php +++ b/tests/Uri/UriSchemeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/ArrayUtilsTest.php b/tests/Utils/ArrayUtilsTest.php index ef62cac64..2e9fc8903 100755 --- a/tests/Utils/ArrayUtilsTest.php +++ b/tests/Utils/ArrayUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/AztecTest.php b/tests/Utils/Barcode/AztecTest.php index 71eb929d1..83447f474 100755 --- a/tests/Utils/Barcode/AztecTest.php +++ b/tests/Utils/Barcode/AztecTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/C128AbstractTest.php b/tests/Utils/Barcode/C128AbstractTest.php index f85a44ff7..9e91f5a3b 100755 --- a/tests/Utils/Barcode/C128AbstractTest.php +++ b/tests/Utils/Barcode/C128AbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/C128aTest.php b/tests/Utils/Barcode/C128aTest.php index 8e703e0eb..0974bb8e4 100755 --- a/tests/Utils/Barcode/C128aTest.php +++ b/tests/Utils/Barcode/C128aTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/C128bTest.php b/tests/Utils/Barcode/C128bTest.php index 29aa15d6a..7fbf0814f 100755 --- a/tests/Utils/Barcode/C128bTest.php +++ b/tests/Utils/Barcode/C128bTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/C128cTest.php b/tests/Utils/Barcode/C128cTest.php index de021dabb..88af5e095 100755 --- a/tests/Utils/Barcode/C128cTest.php +++ b/tests/Utils/Barcode/C128cTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/C25Test.php b/tests/Utils/Barcode/C25Test.php index 0f26eafd1..f048e42f4 100755 --- a/tests/Utils/Barcode/C25Test.php +++ b/tests/Utils/Barcode/C25Test.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/C39Test.php b/tests/Utils/Barcode/C39Test.php index 68b94eba7..3f003b47a 100755 --- a/tests/Utils/Barcode/C39Test.php +++ b/tests/Utils/Barcode/C39Test.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/CodebarTest.php b/tests/Utils/Barcode/CodebarTest.php index cf6da5d66..63a9b6f9b 100755 --- a/tests/Utils/Barcode/CodebarTest.php +++ b/tests/Utils/Barcode/CodebarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/DatamatrixTest.php b/tests/Utils/Barcode/DatamatrixTest.php index 7ea2a81a7..794c46297 100755 --- a/tests/Utils/Barcode/DatamatrixTest.php +++ b/tests/Utils/Barcode/DatamatrixTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/HIBCCTest.php b/tests/Utils/Barcode/HIBCCTest.php index 2166be6fb..56703c212 100755 --- a/tests/Utils/Barcode/HIBCCTest.php +++ b/tests/Utils/Barcode/HIBCCTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/OrientationTypeTest.php b/tests/Utils/Barcode/OrientationTypeTest.php index d8d075b5f..a6d541ee6 100755 --- a/tests/Utils/Barcode/OrientationTypeTest.php +++ b/tests/Utils/Barcode/OrientationTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Barcode/QRTest.php b/tests/Utils/Barcode/QRTest.php index d8e03abc0..ad88bf89d 100755 --- a/tests/Utils/Barcode/QRTest.php +++ b/tests/Utils/Barcode/QRTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/ColorUtilsTest.php b/tests/Utils/ColorUtilsTest.php index 6a041cb79..6ff608b49 100755 --- a/tests/Utils/ColorUtilsTest.php +++ b/tests/Utils/ColorUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Compression/LZWTest.php b/tests/Utils/Compression/LZWTest.php index 89b6a6fa9..4ba445a48 100755 --- a/tests/Utils/Compression/LZWTest.php +++ b/tests/Utils/Compression/LZWTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/AngleTypeTest.php b/tests/Utils/Converter/AngleTypeTest.php index cfcd689d7..0cb0d8416 100755 --- a/tests/Utils/Converter/AngleTypeTest.php +++ b/tests/Utils/Converter/AngleTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/AreaTypeTest.php b/tests/Utils/Converter/AreaTypeTest.php index cb85deab0..13194ff5f 100755 --- a/tests/Utils/Converter/AreaTypeTest.php +++ b/tests/Utils/Converter/AreaTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/CurrencyTest.php b/tests/Utils/Converter/CurrencyTest.php index 1ffea042b..73f863af6 100755 --- a/tests/Utils/Converter/CurrencyTest.php +++ b/tests/Utils/Converter/CurrencyTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/EnergyPowerTypeTest.php b/tests/Utils/Converter/EnergyPowerTypeTest.php index 235028616..e7aa0f5cb 100755 --- a/tests/Utils/Converter/EnergyPowerTypeTest.php +++ b/tests/Utils/Converter/EnergyPowerTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/FileSizeTypeTest.php b/tests/Utils/Converter/FileSizeTypeTest.php index e178a704a..599dc6e56 100755 --- a/tests/Utils/Converter/FileSizeTypeTest.php +++ b/tests/Utils/Converter/FileSizeTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/FileTest.php b/tests/Utils/Converter/FileTest.php index d2314a352..434cc4ecf 100755 --- a/tests/Utils/Converter/FileTest.php +++ b/tests/Utils/Converter/FileTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/IpTest.php b/tests/Utils/Converter/IpTest.php index e8617be1c..11aa85b8f 100755 --- a/tests/Utils/Converter/IpTest.php +++ b/tests/Utils/Converter/IpTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/LengthTypeTest.php b/tests/Utils/Converter/LengthTypeTest.php index 7f03a5a03..e92cbe758 100755 --- a/tests/Utils/Converter/LengthTypeTest.php +++ b/tests/Utils/Converter/LengthTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/MeasurementTest.php b/tests/Utils/Converter/MeasurementTest.php index b0071f5b6..54595ef38 100755 --- a/tests/Utils/Converter/MeasurementTest.php +++ b/tests/Utils/Converter/MeasurementTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/NumericTest.php b/tests/Utils/Converter/NumericTest.php index d4f1c8ca2..cfd674c4f 100755 --- a/tests/Utils/Converter/NumericTest.php +++ b/tests/Utils/Converter/NumericTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/PressureTypeTest.php b/tests/Utils/Converter/PressureTypeTest.php index 225421078..b9748ab8f 100755 --- a/tests/Utils/Converter/PressureTypeTest.php +++ b/tests/Utils/Converter/PressureTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/SpeedTypeTest.php b/tests/Utils/Converter/SpeedTypeTest.php index 60de999f6..7880e6a95 100755 --- a/tests/Utils/Converter/SpeedTypeTest.php +++ b/tests/Utils/Converter/SpeedTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/TemperatureTypeTest.php b/tests/Utils/Converter/TemperatureTypeTest.php index 379a2524c..9d3ae0b89 100755 --- a/tests/Utils/Converter/TemperatureTypeTest.php +++ b/tests/Utils/Converter/TemperatureTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/TimeTypeTest.php b/tests/Utils/Converter/TimeTypeTest.php index 85ed40e31..f884058a7 100755 --- a/tests/Utils/Converter/TimeTypeTest.php +++ b/tests/Utils/Converter/TimeTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/VolumeTypeTest.php b/tests/Utils/Converter/VolumeTypeTest.php index a07a10462..630949af7 100755 --- a/tests/Utils/Converter/VolumeTypeTest.php +++ b/tests/Utils/Converter/VolumeTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Converter/WeightTypeTest.php b/tests/Utils/Converter/WeightTypeTest.php index bd1564032..ea67d4b97 100755 --- a/tests/Utils/Converter/WeightTypeTest.php +++ b/tests/Utils/Converter/WeightTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Encoding/CaesarTest.php b/tests/Utils/Encoding/CaesarTest.php index f8aff7456..f461470ed 100755 --- a/tests/Utils/Encoding/CaesarTest.php +++ b/tests/Utils/Encoding/CaesarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Encoding/GrayTest.php b/tests/Utils/Encoding/GrayTest.php index c8e66a1bd..a1a6cdb80 100755 --- a/tests/Utils/Encoding/GrayTest.php +++ b/tests/Utils/Encoding/GrayTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Encoding/Huffman/DictionaryTest.php b/tests/Utils/Encoding/Huffman/DictionaryTest.php index 70cedc1bc..8b5a91712 100755 --- a/tests/Utils/Encoding/Huffman/DictionaryTest.php +++ b/tests/Utils/Encoding/Huffman/DictionaryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Encoding/Huffman/HuffmanTest.php b/tests/Utils/Encoding/Huffman/HuffmanTest.php index 4cde5d3a4..3e4af9798 100755 --- a/tests/Utils/Encoding/Huffman/HuffmanTest.php +++ b/tests/Utils/Encoding/Huffman/HuffmanTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Encoding/XorEncodingTest.php b/tests/Utils/Encoding/XorEncodingTest.php index ba240aa78..3a3d8de02 100755 --- a/tests/Utils/Encoding/XorEncodingTest.php +++ b/tests/Utils/Encoding/XorEncodingTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Excel/ExcelTest.php b/tests/Utils/Excel/ExcelTest.php index 76930b2c6..9a70e96f4 100755 --- a/tests/Utils/Excel/ExcelTest.php +++ b/tests/Utils/Excel/ExcelTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Git/AuthorTest.php b/tests/Utils/Git/AuthorTest.php index bcacb9539..336a868d3 100755 --- a/tests/Utils/Git/AuthorTest.php +++ b/tests/Utils/Git/AuthorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Git/BranchTest.php b/tests/Utils/Git/BranchTest.php index 9f74bd11d..2b16b3e7d 100755 --- a/tests/Utils/Git/BranchTest.php +++ b/tests/Utils/Git/BranchTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Git/CommitTest.php b/tests/Utils/Git/CommitTest.php index 595451bc9..3775c0b79 100755 --- a/tests/Utils/Git/CommitTest.php +++ b/tests/Utils/Git/CommitTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Git/GitTest.php b/tests/Utils/Git/GitTest.php index 97e1699cc..35a93a703 100755 --- a/tests/Utils/Git/GitTest.php +++ b/tests/Utils/Git/GitTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Git/RepositoryTest.php b/tests/Utils/Git/RepositoryTest.php index 4c8449ffc..6c1f6d17d 100755 --- a/tests/Utils/Git/RepositoryTest.php +++ b/tests/Utils/Git/RepositoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Git/TagTest.php b/tests/Utils/Git/TagTest.php index caae611b9..3f9b6292d 100755 --- a/tests/Utils/Git/TagTest.php +++ b/tests/Utils/Git/TagTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/Csv/CsvSettingsTest.php b/tests/Utils/IO/Csv/CsvSettingsTest.php index 86dcc059f..3a5acd651 100755 --- a/tests/Utils/IO/Csv/CsvSettingsTest.php +++ b/tests/Utils/IO/Csv/CsvSettingsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/IODatabaseMapperTest.php b/tests/Utils/IO/IODatabaseMapperTest.php index 71e6765d1..17390f244 100755 --- a/tests/Utils/IO/IODatabaseMapperTest.php +++ b/tests/Utils/IO/IODatabaseMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/Json/InvalidJsonExceptionTest.php b/tests/Utils/IO/Json/InvalidJsonExceptionTest.php index 6ecc3bb85..d4f1326ee 100755 --- a/tests/Utils/IO/Json/InvalidJsonExceptionTest.php +++ b/tests/Utils/IO/Json/InvalidJsonExceptionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapperTest.php b/tests/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapperTest.php index 1db74ceee..8e9945949 100755 --- a/tests/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapperTest.php +++ b/tests/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapperTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/Zip/GzTest.php b/tests/Utils/IO/Zip/GzTest.php index 9ec5a099b..a2ff24293 100755 --- a/tests/Utils/IO/Zip/GzTest.php +++ b/tests/Utils/IO/Zip/GzTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/Zip/TarGzTest.php b/tests/Utils/IO/Zip/TarGzTest.php index b8259b3dd..a278a6de0 100755 --- a/tests/Utils/IO/Zip/TarGzTest.php +++ b/tests/Utils/IO/Zip/TarGzTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/Zip/TarTest.php b/tests/Utils/IO/Zip/TarTest.php index 6f75a5c4c..e7beaa6f5 100755 --- a/tests/Utils/IO/Zip/TarTest.php +++ b/tests/Utils/IO/Zip/TarTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/IO/Zip/ZipTest.php b/tests/Utils/IO/Zip/ZipTest.php index 55969ce20..ef27749ec 100755 --- a/tests/Utils/IO/Zip/ZipTest.php +++ b/tests/Utils/IO/Zip/ZipTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/ImageUtilsTest.php b/tests/Utils/ImageUtilsTest.php index 7e1738d64..81371b08a 100755 --- a/tests/Utils/ImageUtilsTest.php +++ b/tests/Utils/ImageUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/MbStringUtilsTest.php b/tests/Utils/MbStringUtilsTest.php index 1b4de8f78..85b7e2c26 100755 --- a/tests/Utils/MbStringUtilsTest.php +++ b/tests/Utils/MbStringUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/NumericUtilsTest.php b/tests/Utils/NumericUtilsTest.php index b8926e275..50f53a896 100755 --- a/tests/Utils/NumericUtilsTest.php +++ b/tests/Utils/NumericUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/PDF/PdfTest.php b/tests/Utils/PDF/PdfTest.php index daff70919..a5bc91128 100755 --- a/tests/Utils/PDF/PdfTest.php +++ b/tests/Utils/PDF/PdfTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Parser/Markdown/MarkdownTest.php b/tests/Utils/Parser/Markdown/MarkdownTest.php index 3ac18a249..673abfca0 100755 --- a/tests/Utils/Parser/Markdown/MarkdownTest.php +++ b/tests/Utils/Parser/Markdown/MarkdownTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/Parser/Php/ArrayParserTest.php b/tests/Utils/Parser/Php/ArrayParserTest.php index 1fb729237..1abd844a1 100755 --- a/tests/Utils/Parser/Php/ArrayParserTest.php +++ b/tests/Utils/Parser/Php/ArrayParserTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/PermutationTest.php b/tests/Utils/PermutationTest.php index b0d3b9c5b..4de0b9ff6 100755 --- a/tests/Utils/PermutationTest.php +++ b/tests/Utils/PermutationTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/ArrayRandomizeTest.php b/tests/Utils/RnG/ArrayRandomizeTest.php index f63943bde..b2fc07191 100755 --- a/tests/Utils/RnG/ArrayRandomizeTest.php +++ b/tests/Utils/RnG/ArrayRandomizeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/DateTimeTest.php b/tests/Utils/RnG/DateTimeTest.php index 16ae84c39..860e9b83e 100755 --- a/tests/Utils/RnG/DateTimeTest.php +++ b/tests/Utils/RnG/DateTimeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/DistributionTypeTest.php b/tests/Utils/RnG/DistributionTypeTest.php index 6208f2908..f2b065ec5 100755 --- a/tests/Utils/RnG/DistributionTypeTest.php +++ b/tests/Utils/RnG/DistributionTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/FileTest.php b/tests/Utils/RnG/FileTest.php index b110c1c63..f720f79a6 100755 --- a/tests/Utils/RnG/FileTest.php +++ b/tests/Utils/RnG/FileTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/LinearCongruentialGeneratorTest.php b/tests/Utils/RnG/LinearCongruentialGeneratorTest.php index cee2b13c4..29d966d0b 100755 --- a/tests/Utils/RnG/LinearCongruentialGeneratorTest.php +++ b/tests/Utils/RnG/LinearCongruentialGeneratorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/NameTest.php b/tests/Utils/RnG/NameTest.php index b873347b6..8e74a11f3 100755 --- a/tests/Utils/RnG/NameTest.php +++ b/tests/Utils/RnG/NameTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/PhoneTest.php b/tests/Utils/RnG/PhoneTest.php index cada42ee1..5bec3468a 100755 --- a/tests/Utils/RnG/PhoneTest.php +++ b/tests/Utils/RnG/PhoneTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/StringUtilsTest.php b/tests/Utils/RnG/StringUtilsTest.php index ec38bd08d..4ccfa323b 100755 --- a/tests/Utils/RnG/StringUtilsTest.php +++ b/tests/Utils/RnG/StringUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/RnG/TextTest.php b/tests/Utils/RnG/TextTest.php index 21cb614ee..f546980c5 100755 --- a/tests/Utils/RnG/TextTest.php +++ b/tests/Utils/RnG/TextTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/StringCompareTest.php b/tests/Utils/StringCompareTest.php index 7256a8426..0748ce6de 100755 --- a/tests/Utils/StringCompareTest.php +++ b/tests/Utils/StringCompareTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/StringUtilsTest.php b/tests/Utils/StringUtilsTest.php index 3d990ee33..ab7b798c7 100755 --- a/tests/Utils/StringUtilsTest.php +++ b/tests/Utils/StringUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/CronJobTest.php b/tests/Utils/TaskSchedule/CronJobTest.php index b25bc29ac..b0b916e18 100755 --- a/tests/Utils/TaskSchedule/CronJobTest.php +++ b/tests/Utils/TaskSchedule/CronJobTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/CronTest.php b/tests/Utils/TaskSchedule/CronTest.php index 1633dd291..a3875494a 100755 --- a/tests/Utils/TaskSchedule/CronTest.php +++ b/tests/Utils/TaskSchedule/CronTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/IntervalTest.php b/tests/Utils/TaskSchedule/IntervalTest.php index 7abbdb098..431806b60 100755 --- a/tests/Utils/TaskSchedule/IntervalTest.php +++ b/tests/Utils/TaskSchedule/IntervalTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/ScheduleTest.php b/tests/Utils/TaskSchedule/ScheduleTest.php index de41f435f..cb507cc06 100755 --- a/tests/Utils/TaskSchedule/ScheduleTest.php +++ b/tests/Utils/TaskSchedule/ScheduleTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/SchedulerAbstractTest.php b/tests/Utils/TaskSchedule/SchedulerAbstractTest.php index d9d63dd75..c895658ad 100755 --- a/tests/Utils/TaskSchedule/SchedulerAbstractTest.php +++ b/tests/Utils/TaskSchedule/SchedulerAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/SchedulerFactoryTest.php b/tests/Utils/TaskSchedule/SchedulerFactoryTest.php index 8371cc0ef..282c03705 100755 --- a/tests/Utils/TaskSchedule/SchedulerFactoryTest.php +++ b/tests/Utils/TaskSchedule/SchedulerFactoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/TaskAbstractTest.php b/tests/Utils/TaskSchedule/TaskAbstractTest.php index 450cd088d..b5a68dd5b 100755 --- a/tests/Utils/TaskSchedule/TaskAbstractTest.php +++ b/tests/Utils/TaskSchedule/TaskAbstractTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/TaskFactoryTest.php b/tests/Utils/TaskSchedule/TaskFactoryTest.php index 97554ab09..4c020d328 100755 --- a/tests/Utils/TaskSchedule/TaskFactoryTest.php +++ b/tests/Utils/TaskSchedule/TaskFactoryTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TaskSchedule/TaskSchedulerTest.php b/tests/Utils/TaskSchedule/TaskSchedulerTest.php index e5d6363f2..7d6e49f29 100755 --- a/tests/Utils/TaskSchedule/TaskSchedulerTest.php +++ b/tests/Utils/TaskSchedule/TaskSchedulerTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TestUtilsClass.php b/tests/Utils/TestUtilsClass.php index 32e26053b..5f1dff7dc 100755 --- a/tests/Utils/TestUtilsClass.php +++ b/tests/Utils/TestUtilsClass.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Utils/TestUtilsTest.php b/tests/Utils/TestUtilsTest.php index 731bdac1d..96929a6c2 100755 --- a/tests/Utils/TestUtilsTest.php +++ b/tests/Utils/TestUtilsTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Base/DateTimeTest.php b/tests/Validation/Base/DateTimeTest.php index 96c5edad4..876b86961 100755 --- a/tests/Validation/Base/DateTimeTest.php +++ b/tests/Validation/Base/DateTimeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Base/JsonTest.php b/tests/Validation/Base/JsonTest.php index 6ebe60ebe..6b77a769c 100755 --- a/tests/Validation/Base/JsonTest.php +++ b/tests/Validation/Base/JsonTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Finance/BICTest.php b/tests/Validation/Finance/BICTest.php index a9cde221e..daee819a6 100755 --- a/tests/Validation/Finance/BICTest.php +++ b/tests/Validation/Finance/BICTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Finance/CreditCardTest.php b/tests/Validation/Finance/CreditCardTest.php index 6b9806133..67324a32e 100755 --- a/tests/Validation/Finance/CreditCardTest.php +++ b/tests/Validation/Finance/CreditCardTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Finance/IbanEnumTest.php b/tests/Validation/Finance/IbanEnumTest.php index bad11c5a4..a335b5306 100755 --- a/tests/Validation/Finance/IbanEnumTest.php +++ b/tests/Validation/Finance/IbanEnumTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Finance/IbanErrorTypeTest.php b/tests/Validation/Finance/IbanErrorTypeTest.php index 00f159aa1..7eab77100 100755 --- a/tests/Validation/Finance/IbanErrorTypeTest.php +++ b/tests/Validation/Finance/IbanErrorTypeTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Finance/IbanTest.php b/tests/Validation/Finance/IbanTest.php index 1745e7213..7ec46cefe 100755 --- a/tests/Validation/Finance/IbanTest.php +++ b/tests/Validation/Finance/IbanTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Network/EmailTest.php b/tests/Validation/Network/EmailTest.php index aa359f373..0a7880c05 100755 --- a/tests/Validation/Network/EmailTest.php +++ b/tests/Validation/Network/EmailTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Network/HostnameTest.php b/tests/Validation/Network/HostnameTest.php index d243d8403..1d11bb0b9 100755 --- a/tests/Validation/Network/HostnameTest.php +++ b/tests/Validation/Network/HostnameTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/Network/IpTest.php b/tests/Validation/Network/IpTest.php index e2b7dc74e..702af5d39 100755 --- a/tests/Validation/Network/IpTest.php +++ b/tests/Validation/Network/IpTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Validation/ValidatorTest.php b/tests/Validation/ValidatorTest.php index 58c1076de..a1feea739 100755 --- a/tests/Validation/ValidatorTest.php +++ b/tests/Validation/ValidatorTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Version/VersionTest.php b/tests/Version/VersionTest.php index 6671e796e..3b2c00c58 100755 --- a/tests/Version/VersionTest.php +++ b/tests/Version/VersionTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Views/PaginationViewTest.php b/tests/Views/PaginationViewTest.php index 4ad527ef0..0433b103a 100755 --- a/tests/Views/PaginationViewTest.php +++ b/tests/Views/PaginationViewTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Views/ViewTest.php b/tests/Views/ViewTest.php index ae2ac23a9..b550a6a5a 100755 --- a/tests/Views/ViewTest.php +++ b/tests/Views/ViewTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -51,7 +51,7 @@ final class ViewTest extends \PHPUnit\Framework\TestCase protected string $appName = 'Api'; }; - $this->app->l11nManager = new L11nManager($this->app->appName); + $this->app->l11nManager = new L11nManager(); $this->app->dbPool = $this->dbPool; } diff --git a/tests/Views/testArray.tpl.php b/tests/Views/testArray.tpl.php index 9ba9e49c5..935625632 100755 --- a/tests/Views/testArray.tpl.php +++ b/tests/Views/testArray.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Views/testReturnTemplate.tpl.php b/tests/Views/testReturnTemplate.tpl.php index 7ef800ab9..b338c182c 100755 --- a/tests/Views/testReturnTemplate.tpl.php +++ b/tests/Views/testReturnTemplate.tpl.php @@ -6,7 +6,7 @@ * * @package Template * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */