{{ formgroup(
{
"label": null
@@ -635,10 +640,11 @@
[{
"type":"checkbox",
"parameter": {
- "label": "Notruffunktion im Backend",
+ "label": "Notruffunktion im Backend (Durch das Deaktivieren der Funktion wird auch ein aktuell bestehender Notruf am Standort beendet.)",
"name": "preferences[workstation][emergencyEnabled]",
"value": 1,
"checked": scope.preferences.workstation.emergencyEnabled|default(0),
+ "class": "emergency__button-end"
}
}]
) }}
diff --git a/zmsapi/.gitignore b/zmsapi/.gitignore
index dbf690fac..bdb73a8be 100644
--- a/zmsapi/.gitignore
+++ b/zmsapi/.gitignore
@@ -14,4 +14,5 @@ cache
vendor.old
vendor.update
VERSION
-.phpunit.result.cache
\ No newline at end of file
+.phpunit.result.cache
+coverage
\ No newline at end of file
diff --git a/zmsapi/.gitlab-ci.yml b/zmsapi/.gitlab-ci.yml
index 3bc5197e7..0ca0b5cfe 100644
--- a/zmsapi/.gitlab-ci.yml
+++ b/zmsapi/.gitlab-ci.yml
@@ -29,7 +29,7 @@ test-php-80:
extends: .test-php-custom
allow_failure: true
services:
- - name: mariadb:10.1
+ - name: mariadb:10.11
alias: mysql
command: ["mysqld", "--general-log=1", "--general-log-file=/var/log/mysql/general.log"]
before_script:
diff --git a/zmsapi/composer.lock b/zmsapi/composer.lock
index fe409ea2b..5510ca634 100644
--- a/zmsapi/composer.lock
+++ b/zmsapi/composer.lock
@@ -237,7 +237,7 @@
"dist": {
"type": "path",
"url": "../zmsclient",
- "reference": "249f1aa96e13e3c2379353bf33539f0174fced53"
+ "reference": "f37d3a5ad27043e12c9d5ebd3dc40c7b660456d6"
},
"require": {
"aronduby/dump": "^0.9",
@@ -260,7 +260,7 @@
"phpmd/phpmd": "@stable",
"phpspec/prophecy-phpunit": "^2.0.0",
"phpunit/phpunit": "^9.5.4",
- "squizlabs/php_codesniffer": "^3.5.8"
+ "squizlabs/php_codesniffer": "*"
},
"type": "library",
"autoload": {
@@ -295,13 +295,16 @@
"dist": {
"type": "path",
"url": "../zmsdb",
- "reference": "880ca9f83e4c65ca106a8d80c2de1375b2cdd86a"
+ "reference": "b9c944963b2c6984b9aaa90aa0997d4e1bcb5917"
},
"require": {
"aura/sql": "^4",
"eappointment/mellon": "@dev",
+ "eappointment/zmsapi": "@dev",
+ "eappointment/zmsclient": "@dev",
"eappointment/zmsdldb": "@dev",
"eappointment/zmsentities": "@dev",
+ "eappointment/zmsslim": "@dev",
"ext-intl": "*",
"ext-json": ">=1.0",
"ext-mbstring": ">=0",
@@ -312,9 +315,9 @@
},
"require-dev": {
"mockery/mockery": "^0.9.4",
- "phpmd/phpmd": "^2.3",
+ "phpmd/phpmd": "@stable",
"phpunit/phpunit": "^9.5.4",
- "squizlabs/php_codesniffer": "^2.4"
+ "squizlabs/php_codesniffer": "^3.5"
},
"bin": [
"bin/archiveStatisticData",
@@ -442,7 +445,7 @@
"dist": {
"type": "path",
"url": "../zmsentities",
- "reference": "6d50c616376c01caa495318e4a4c3825703dd24b"
+ "reference": "4c07e846593be4b45f201db71b48a45f9b6e1efe"
},
"require": {
"eappointment/mellon": "@dev",
@@ -464,7 +467,7 @@
"league/json-reference": "^1.0",
"phpmd/phpmd": "@stable",
"phpunit/phpunit": "^9.6",
- "squizlabs/php_codesniffer": "^3.5.8",
+ "squizlabs/php_codesniffer": "*",
"yuloh/json-guard-cli": "^0.3.0"
},
"type": "library",
@@ -4275,16 +4278,16 @@
},
{
"name": "helmich/phpunit-json-assert",
- "version": "v3.5.1",
+ "version": "v3.5.2",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-json-assert.git",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c"
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/f8958119e9e9ea1339d6b4d6fd2df24536261b50",
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50",
"shasum": ""
},
"require": {
@@ -4293,10 +4296,10 @@
"softcreatr/jsonpath": "^0.8"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 11.0"
+ "phpunit/phpunit": "<8.0 || >= 12.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0"
},
"type": "library",
"autoload": {
@@ -4317,7 +4320,7 @@
"description": "PHPUnit assertions for JSON documents",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-json-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.1"
+ "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.2"
},
"funding": [
{
@@ -4329,33 +4332,34 @@
"type": "github"
}
],
- "time": "2023-03-03T14:09:38+00:00"
+ "time": "2024-05-20T11:18:46+00:00"
},
{
"name": "helmich/phpunit-psr7-assert",
- "version": "v4.3.0",
+ "version": "v4.4.1",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-psr7-assert.git",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878"
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/dfe594a09f55ea7f87120363d6720ca1a94c0878",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/f35fa69e07cc16977b52805d3abd873cc16747fd",
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd",
"shasum": ""
},
"require": {
"helmich/phpunit-json-assert": "^3.4",
- "php": "^7.2 || ^8.0",
- "psr/http-message": "^1.0"
+ "php": "^8.0",
+ "psr/http-message": "^1.1 || ^2.0"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 10.0"
+ "phpunit/phpunit": "<8.0 || >= 11.0"
},
"require-dev": {
- "guzzlehttp/psr7": "^1.2",
- "phpunit/phpunit": "^8.0 || ^9.0"
+ "guzzlehttp/psr7": "^2.4",
+ "mockery/mockery": "^1.4.1",
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
},
"type": "library",
"autoload": {
@@ -4376,7 +4380,7 @@
"description": "PHPUnit assertions for testing PSR7-compliant applications",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-psr7-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.3.0"
+ "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.4.1"
},
"funding": [
{
@@ -4388,24 +4392,24 @@
"type": "github"
}
],
- "time": "2020-12-22T06:27:54+00:00"
+ "time": "2023-07-26T19:04:29+00:00"
},
{
"name": "justinrainbow/json-schema",
- "version": "v5.2.13",
+ "version": "5.3.0",
"source": {
"type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+ "url": "https://github.com/jsonrainbow/json-schema.git",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+ "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
@@ -4416,11 +4420,6 @@
"bin/validate-json"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"JsonSchema\\": "src/JsonSchema/"
@@ -4455,10 +4454,10 @@
"schema"
],
"support": {
- "issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+ "issues": "https://github.com/jsonrainbow/json-schema/issues",
+ "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
},
- "time": "2023-09-26T02:20:38+00:00"
+ "time": "2024-07-06T21:00:26+00:00"
},
{
"name": "mockery/mockery",
diff --git a/zmsapi/phpunit.xml b/zmsapi/phpunit.xml
index e877055de..6de34c9b7 100644
--- a/zmsapi/phpunit.xml
+++ b/zmsapi/phpunit.xml
@@ -21,7 +21,15 @@
- ./src
+ ./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
\ No newline at end of file
diff --git a/zmsapi/src/Zmsapi/ApikeyDelete.php b/zmsapi/src/Zmsapi/ApikeyDelete.php
index 6d845bf92..310d90972 100644
--- a/zmsapi/src/Zmsapi/ApikeyDelete.php
+++ b/zmsapi/src/Zmsapi/ApikeyDelete.php
@@ -4,15 +4,15 @@
* @package ZMS API
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
**/
+
namespace BO\Zmsapi;
-use \BO\Slim\Render;
-use \BO\Mellon\Validator;
-use \BO\Zmsdb\Apikey as Query;
+use BO\Slim\Render;
+use BO\Mellon\Validator;
+use BO\Zmsdb\Apikey as Query;
class ApikeyDelete extends BaseController
{
-
/**
* @SuppressWarnings(Param)
* @return String
@@ -23,7 +23,7 @@ public function readResponse(
array $args
) {
$message = Response\Message::create($request);
- $message->data = (new Query)->deleteEntity($args['key']);
+ $message->data = (new Query())->deleteEntity($args['key']);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ApikeyGet.php b/zmsapi/src/Zmsapi/ApikeyGet.php
index 38e437b2a..a37410eb4 100644
--- a/zmsapi/src/Zmsapi/ApikeyGet.php
+++ b/zmsapi/src/Zmsapi/ApikeyGet.php
@@ -4,15 +4,15 @@
* @package ZMS API
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
**/
+
namespace BO\Zmsapi;
-use \BO\Slim\Render;
-use \BO\Mellon\Validator;
-use \BO\Zmsdb\Apikey as Query;
+use BO\Slim\Render;
+use BO\Mellon\Validator;
+use BO\Zmsdb\Apikey as Query;
class ApikeyGet extends BaseController
{
-
/**
* @SuppressWarnings(Param)
* @return String
diff --git a/zmsapi/src/Zmsapi/ApikeyUpdate.php b/zmsapi/src/Zmsapi/ApikeyUpdate.php
index e2ccfd450..c759bfc65 100644
--- a/zmsapi/src/Zmsapi/ApikeyUpdate.php
+++ b/zmsapi/src/Zmsapi/ApikeyUpdate.php
@@ -4,15 +4,15 @@
* @package ZMS API
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
**/
+
namespace BO\Zmsapi;
-use \BO\Slim\Render;
-use \BO\Mellon\Validator;
-use \BO\Zmsdb\Apikey as Query;
+use BO\Slim\Render;
+use BO\Mellon\Validator;
+use BO\Zmsdb\Apikey as Query;
class ApikeyUpdate extends BaseController
{
-
/**
* @SuppressWarnings(Param)
* @return String
@@ -30,7 +30,7 @@ public function readResponse(
\BO\Zmsdb\Connection\Select::getWriteConnection();
$apiKey = (new Query())->readEntity($entity->key);
if ($clientKey) {
- $apiClient = (new \BO\Zmsdb\Apiclient)->readEntity($clientKey);
+ $apiClient = (new \BO\Zmsdb\Apiclient())->readEntity($clientKey);
if (!$apiClient || !isset($apiClient->accesslevel) || $apiClient->accesslevel == 'blocked') {
throw new Exception\Process\ApiclientInvalid();
}
diff --git a/zmsapi/src/Zmsapi/Application.php b/zmsapi/src/Zmsapi/Application.php
index 90ad19ec8..59509d9a7 100644
--- a/zmsapi/src/Zmsapi/Application.php
+++ b/zmsapi/src/Zmsapi/Application.php
@@ -1,4 +1,5 @@
checkRights();
Helper\Matching::testCurrentScopeHasRequest($process);
} elseif ($clientKey) {
- $apiClient = (new \BO\Zmsdb\Apiclient)->readEntity($clientKey);
+ $apiClient = (new \BO\Zmsdb\Apiclient())->readEntity($clientKey);
if (!$apiClient || !isset($apiClient->accesslevel) || $apiClient->accesslevel == 'blocked') {
throw new Exception\Process\ApiclientInvalid();
}
@@ -53,13 +53,13 @@ public function readResponse(
if ($apiClient->accesslevel != 'intern') {
$slotsRequired = 0;
$slotType = $apiClient->accesslevel;
- $process = (new Process)->readSlotCount($process);
+ $process = (new Process())->readSlotCount($process);
}
$process->apiclient = $apiClient;
} else {
$slotsRequired = 0;
$slotType = 'public';
- $process = (new Process)->readSlotCount($process);
+ $process = (new Process())->readSlotCount($process);
}
$process = Process::init()->writeEntityWithNewAppointment(
diff --git a/zmsapi/src/Zmsapi/AvailabilityAdd.php b/zmsapi/src/Zmsapi/AvailabilityAdd.php
index b63a024ac..201b5cfe8 100644
--- a/zmsapi/src/Zmsapi/AvailabilityAdd.php
+++ b/zmsapi/src/Zmsapi/AvailabilityAdd.php
@@ -1,4 +1,5 @@
readEntity($args['id'], $resolveReferences);
+ $scope = (new \BO\Zmsdb\Scope())->readEntity($args['id'], $resolveReferences);
$this->testScope($scope);
$this->testAccessRights($request, $scope);
-
+
$message = Response\Message::create($request);
$message->meta->reducedData = $graphQl ? true : false;
$message->data = $this->getAvailabilityList($scope, $startDate, $endDate);
diff --git a/zmsapi/src/Zmsapi/AvailabilitySlotsUpdate.php b/zmsapi/src/Zmsapi/AvailabilitySlotsUpdate.php
index 60adcf781..2185f098d 100644
--- a/zmsapi/src/Zmsapi/AvailabilitySlotsUpdate.php
+++ b/zmsapi/src/Zmsapi/AvailabilitySlotsUpdate.php
@@ -1,4 +1,5 @@
readEntity();
- if ($checkConfigOnSave && in_array(
- getenv('ZMS_ENV'),
- explode(',', $config->getPreference('availability', 'calculateSlotsOnSave'))
- )) {
- (new SlotRepository)->writeByAvailability($availability, \App::$now);
+ if (
+ $checkConfigOnSave && in_array(
+ getenv('ZMS_ENV'),
+ explode(',', $config->getPreference('availability', 'calculateSlotsOnSave'))
+ )
+ ) {
+ (new SlotRepository())->writeByAvailability($availability, \App::$now);
(new CalculateSlotsHelper(\App::DEBUG))
->writePostProcessingByScope($availability->scope, \App::$now);
}
- if (! $checkConfigOnSave && in_array(
- getenv('ZMS_ENV'),
- explode(',', $config->getPreference('availability', 'calculateSlotsOnDemand'))
- )) {
- (new SlotRepository)->writeByAvailability($availability, \App::$now);
+ if (
+ ! $checkConfigOnSave && in_array(
+ getenv('ZMS_ENV'),
+ explode(',', $config->getPreference('availability', 'calculateSlotsOnDemand'))
+ )
+ ) {
+ (new SlotRepository())->writeByAvailability($availability, \App::$now);
(new CalculateSlotsHelper(\App::DEBUG))
->writePostProcessingByScope($availability->scope, \App::$now);
}
diff --git a/zmsapi/src/Zmsapi/AvailabilityUpdate.php b/zmsapi/src/Zmsapi/AvailabilityUpdate.php
index 29d656505..d42e9acde 100644
--- a/zmsapi/src/Zmsapi/AvailabilityUpdate.php
+++ b/zmsapi/src/Zmsapi/AvailabilityUpdate.php
@@ -1,4 +1,5 @@
getClusterList() as $cluster) {
- $cluster = (new \BO\Zmsdb\Cluster)->readEntity($cluster->id);
+ $cluster = (new \BO\Zmsdb\Cluster())->readEntity($cluster->id);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
}
foreach ($calldisplay->getScopeList() as $scope) {
- $scope = (new \BO\Zmsdb\Scope)->readEntity($scope->id);
+ $scope = (new \BO\Zmsdb\Scope())->readEntity($scope->id);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
diff --git a/zmsapi/src/Zmsapi/CalldisplayQueue.php b/zmsapi/src/Zmsapi/CalldisplayQueue.php
index 6ea1716f0..5ef73f9a7 100644
--- a/zmsapi/src/Zmsapi/CalldisplayQueue.php
+++ b/zmsapi/src/Zmsapi/CalldisplayQueue.php
@@ -1,4 +1,5 @@
readQueueListByStatus($calldisplay, $statusList, $resolveReferences) :
$this->readFullQueueList($calldisplay, $resolveReferences);
-
-
+
+
$message = Response\Message::create($request);
$message->data = $queueList->withoutDublicates();
@@ -54,13 +55,13 @@ protected function testScopeAndCluster($calldisplay, $resolveReferences)
throw new Exception\Calldisplay\ScopeAndClusterNotFound();
}
foreach ($calldisplay->getClusterList() as $cluster) {
- $cluster = (new \BO\Zmsdb\Cluster)->readEntity($cluster->getId());
+ $cluster = (new \BO\Zmsdb\Cluster())->readEntity($cluster->getId());
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
}
foreach ($calldisplay->getScopeList() as $scope) {
- $scope = (new \BO\Zmsdb\Scope)->readWithWorkstationCount($scope->getId(), \App::$now, $resolveReferences);
+ $scope = (new \BO\Zmsdb\Scope())->readWithWorkstationCount($scope->getId(), \App::$now, $resolveReferences);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
diff --git a/zmsapi/src/Zmsapi/Cli/Config.php b/zmsapi/src/Zmsapi/Cli/Config.php
index 625b5c9b9..84e8f62ae 100644
--- a/zmsapi/src/Zmsapi/Cli/Config.php
+++ b/zmsapi/src/Zmsapi/Cli/Config.php
@@ -11,7 +11,6 @@
*/
class Config extends Base
{
-
/**
* @SuppressWarnings(Parameter)
*
@@ -82,6 +81,6 @@ protected function printType(\League\CLImate\CLImate $climate, $type, $subconfig
protected function printValue(\League\CLImate\CLImate $climate, $key, $value)
{
$padding = $climate->padding(25)->char(' ');
- $padding->label("\"$key\"")->result("= \"". (string)$value . '"');
+ $padding->label("\"$key\"")->result("= \"" . (string)$value . '"');
}
}
diff --git a/zmsapi/src/Zmsapi/Cli/Info.php b/zmsapi/src/Zmsapi/Cli/Info.php
index 3cb304a8b..874ec17ae 100644
--- a/zmsapi/src/Zmsapi/Cli/Info.php
+++ b/zmsapi/src/Zmsapi/Cli/Info.php
@@ -7,7 +7,6 @@
class Info extends Base
{
-
/**
* @SuppressWarnings(Parameter)
* @codeCoverageIgnore
diff --git a/zmsapi/src/Zmsapi/Cli/Status.php b/zmsapi/src/Zmsapi/Cli/Status.php
index 7ed632e51..44314faae 100644
--- a/zmsapi/src/Zmsapi/Cli/Status.php
+++ b/zmsapi/src/Zmsapi/Cli/Status.php
@@ -7,7 +7,6 @@
class Status extends Base
{
-
/**
* @SuppressWarnings(Parameter)
* @codeCoverageIgnore
diff --git a/zmsapi/src/Zmsapi/ClusterByScopeId.php b/zmsapi/src/Zmsapi/ClusterByScopeId.php
index d7376d214..b47fe16e2 100644
--- a/zmsapi/src/Zmsapi/ClusterByScopeId.php
+++ b/zmsapi/src/Zmsapi/ClusterByScopeId.php
@@ -1,4 +1,5 @@
meta->reducedData = true;
}
- $cluster = (new Query)->readByScopeId($args['id'], $resolveReferences);
+ $cluster = (new Query())->readByScopeId($args['id'], $resolveReferences);
$message->data = ($cluster) ? $cluster : array();
$response = Render::withLastModified($response, time(), '0');
diff --git a/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataDelete.php b/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataDelete.php
index 09870b82a..0a581561f 100644
--- a/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataDelete.php
+++ b/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataDelete.php
@@ -1,4 +1,5 @@
checkRights('cluster');
- $cluster = (new Query)->readEntity($args['id']);
+ $cluster = (new Query())->readEntity($args['id']);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
$message = Response\Message::create($request);
- $result = (new Query)->deleteImage($cluster->id);
+ $result = (new Query())->deleteImage($cluster->id);
$message->data = $result;
$response = Render::withLastModified($response, time(), '0');
diff --git a/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataGet.php b/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataGet.php
index fd2642895..a51ce866a 100644
--- a/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataGet.php
+++ b/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataGet.php
@@ -1,4 +1,5 @@
readEntity($args['id']);
+ $cluster = (new Query())->readEntity($args['id']);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
$message = Response\Message::create($request);
- $message->data = (new Query)->readImageData($cluster->id);
+ $message->data = (new Query())->readImageData($cluster->id);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataUpdate.php b/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataUpdate.php
index 344d1ba93..445a08695 100644
--- a/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataUpdate.php
+++ b/zmsapi/src/Zmsapi/ClusterCalldisplayImageDataUpdate.php
@@ -1,4 +1,5 @@
checkRights('cluster');
\BO\Zmsdb\Connection\Select::getWriteConnection();
- $cluster = (new Query)->readEntity($args['id']);
+ $cluster = (new Query())->readEntity($args['id']);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
@@ -32,7 +33,7 @@ public function readResponse(
$mimepart = new \BO\Zmsentities\Mimepart($input);
$message = Response\Message::create($request);
- $message->data = (new Query)->writeImageData($cluster->id, $mimepart);
+ $message->data = (new Query())->writeImageData($cluster->id, $mimepart);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ClusterDelete.php b/zmsapi/src/Zmsapi/ClusterDelete.php
index a4fffc992..7ed0e3438 100644
--- a/zmsapi/src/Zmsapi/ClusterDelete.php
+++ b/zmsapi/src/Zmsapi/ClusterDelete.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(0)->getValue();
-
+
if ((new Helper\User($request))->hasRights() || $resolveReferences > 0) {
$resolveReferences = ($resolveReferences > 0 ) ? $resolveReferences : 1;
(new Helper\User($request))->checkRights('basic');
@@ -33,7 +34,7 @@ public function readResponse(
$message->meta->reducedData = true;
}
-
+
$cluster = ($getScopeIsOpened)
? (new Query())->readEntityWithOpenedScopeStatus($args['id'], \App::$now, $resolveReferences)
: (new Query())->readEntity($args['id'], $resolveReferences);
diff --git a/zmsapi/src/Zmsapi/ClusterQueue.php b/zmsapi/src/Zmsapi/ClusterQueue.php
index f97038eec..df07a8c30 100644
--- a/zmsapi/src/Zmsapi/ClusterQueue.php
+++ b/zmsapi/src/Zmsapi/ClusterQueue.php
@@ -1,4 +1,5 @@
checkRights();
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(0)->getValue();
- $cluster = (new Query)->readEntity($args['id']);
+ $cluster = (new Query())->readEntity($args['id']);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
- $cluster = (new Query)->readWithScopeWorkstationCount($args['id'], \App::$now, $resolveReferences);
+ $cluster = (new Query())->readWithScopeWorkstationCount($args['id'], \App::$now, $resolveReferences);
$message = Response\Message::create($request);
$message->data = $cluster;
diff --git a/zmsapi/src/Zmsapi/ConfigGet.php b/zmsapi/src/Zmsapi/ConfigGet.php
index c7fc1cb57..d0542f8ef 100644
--- a/zmsapi/src/Zmsapi/ConfigGet.php
+++ b/zmsapi/src/Zmsapi/ConfigGet.php
@@ -1,4 +1,5 @@
isJson()->assertValid()->getValue();
$entity = new Entity($input);
$entity->testValid();
- $scope = (new Scope)->readEntity($entity->id, 0);
+ $scope = (new Scope())->readEntity($entity->id, 0);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
diff --git a/zmsapi/src/Zmsapi/DayoffList.php b/zmsapi/src/Zmsapi/DayoffList.php
index 23e6811b3..55031df7c 100644
--- a/zmsapi/src/Zmsapi/DayoffList.php
+++ b/zmsapi/src/Zmsapi/DayoffList.php
@@ -1,4 +1,5 @@
readEntity($args['id'], 1);
+ $department = (new \BO\Zmsdb\Department())->readEntity($args['id'], 1);
(new Helper\User($request, 2))->checkRights(
'department',
new \BO\Zmsentities\Useraccount\EntityAccess($department)
diff --git a/zmsapi/src/Zmsapi/DepartmentAddScope.php b/zmsapi/src/Zmsapi/DepartmentAddScope.php
index 4cce055c4..7ea723804 100644
--- a/zmsapi/src/Zmsapi/DepartmentAddScope.php
+++ b/zmsapi/src/Zmsapi/DepartmentAddScope.php
@@ -1,4 +1,5 @@
readEntity($args['id'], 1);
+ $department = (new \BO\Zmsdb\Department())->readEntity($args['id'], 1);
(new Helper\User($request, 2))->checkRights(
'department',
new \BO\Zmsentities\Useraccount\EntityAccess($department)
diff --git a/zmsapi/src/Zmsapi/DepartmentByScopeId.php b/zmsapi/src/Zmsapi/DepartmentByScopeId.php
index 0ebea6084..dac32f348 100644
--- a/zmsapi/src/Zmsapi/DepartmentByScopeId.php
+++ b/zmsapi/src/Zmsapi/DepartmentByScopeId.php
@@ -1,4 +1,5 @@
checkRights('basic');
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(1)->getValue();
- $department = (new Query)->readEntity($args['id'], $resolveReferences);
+ $department = (new Query())->readEntity($args['id'], $resolveReferences);
if (! $department) {
throw new Exception\Department\DepartmentNotFound();
}
diff --git a/zmsapi/src/Zmsapi/DepartmentList.php b/zmsapi/src/Zmsapi/DepartmentList.php
index 921a0a214..f135187ad 100644
--- a/zmsapi/src/Zmsapi/DepartmentList.php
+++ b/zmsapi/src/Zmsapi/DepartmentList.php
@@ -1,4 +1,5 @@
checkRights('basic');
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(0)->getValue();
- $departmentList = (new Query)->readList($resolveReferences);
+ $departmentList = (new Query())->readList($resolveReferences);
$message = Response\Message::create($request);
$message->data = $departmentList;
diff --git a/zmsapi/src/Zmsapi/DepartmentUpdate.php b/zmsapi/src/Zmsapi/DepartmentUpdate.php
index 22337f00e..e456ae938 100644
--- a/zmsapi/src/Zmsapi/DepartmentUpdate.php
+++ b/zmsapi/src/Zmsapi/DepartmentUpdate.php
@@ -1,4 +1,5 @@
data = (new Query())->updateEntity($department->id, $department);
diff --git a/zmsapi/src/Zmsapi/DepartmentWorkstationList.php b/zmsapi/src/Zmsapi/DepartmentWorkstationList.php
index 02822e30a..41054f58a 100644
--- a/zmsapi/src/Zmsapi/DepartmentWorkstationList.php
+++ b/zmsapi/src/Zmsapi/DepartmentWorkstationList.php
@@ -1,4 +1,5 @@
checkRights('useraccount');
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(1)->getValue();
$department = Helper\User::checkDepartment($args['id']);
- $workstationList = (new Workstation)->readCollectionByDepartmentId($department->id, $resolveReferences);
+ $workstationList = (new Workstation())->readCollectionByDepartmentId($department->id, $resolveReferences);
$message = Response\Message::create($request);
$message->data = $workstationList;
diff --git a/zmsapi/src/Zmsapi/Exception/Calendar/InvalidFirstDay.php b/zmsapi/src/Zmsapi/Exception/Calendar/InvalidFirstDay.php
index 596da0dc1..f28d7582d 100644
--- a/zmsapi/src/Zmsapi/Exception/Calendar/InvalidFirstDay.php
+++ b/zmsapi/src/Zmsapi/Exception/Calendar/InvalidFirstDay.php
@@ -7,5 +7,4 @@
*/
class InvalidFirstDay extends \Exception
{
-
}
diff --git a/zmsapi/src/Zmsapi/Exception/Notification/NotificationNotFound.php b/zmsapi/src/Zmsapi/Exception/Notification/NotificationNotFound.php
index a9be8debf..54dbb367d 100644
--- a/zmsapi/src/Zmsapi/Exception/Notification/NotificationNotFound.php
+++ b/zmsapi/src/Zmsapi/Exception/Notification/NotificationNotFound.php
@@ -7,7 +7,6 @@
*/
class NotificationNotFound extends \Exception
{
-
protected $code = 404;
protected $message = 'Notification does not exists';
diff --git a/zmsapi/src/Zmsapi/Exception/Organisation/OrganisationNotFound.php b/zmsapi/src/Zmsapi/Exception/Organisation/OrganisationNotFound.php
index 73f8e6ecd..069933a08 100644
--- a/zmsapi/src/Zmsapi/Exception/Organisation/OrganisationNotFound.php
+++ b/zmsapi/src/Zmsapi/Exception/Organisation/OrganisationNotFound.php
@@ -7,7 +7,6 @@
*/
class OrganisationNotFound extends \Exception
{
-
protected $code = 404;
protected $message = 'Organisation id does not exists';
diff --git a/zmsapi/src/Zmsapi/Exception/Process/MoreThanAllowedAppointmentsPerMail.php b/zmsapi/src/Zmsapi/Exception/Process/MoreThanAllowedAppointmentsPerMail.php
index 2382ebd69..38ae9404e 100644
--- a/zmsapi/src/Zmsapi/Exception/Process/MoreThanAllowedAppointmentsPerMail.php
+++ b/zmsapi/src/Zmsapi/Exception/Process/MoreThanAllowedAppointmentsPerMail.php
@@ -1,10 +1,10 @@
-modify('last day of this month');
} elseif ('month' == static::$periodIdentifier) {
- static::$endDateTime = new \DateTimeImmutable(static::$year .'-12-31');
+ static::$endDateTime = new \DateTimeImmutable(static::$year . '-12-31');
}
return static::$endDateTime;
}
diff --git a/zmsapi/src/Zmsapi/Helper/Matching.php b/zmsapi/src/Zmsapi/Helper/Matching.php
index 5cd0bfcee..7aa52f6e3 100644
--- a/zmsapi/src/Zmsapi/Helper/Matching.php
+++ b/zmsapi/src/Zmsapi/Helper/Matching.php
@@ -2,9 +2,9 @@
namespace BO\Zmsapi\Helper;
-use \BO\Mellon\Validator;
-use \BO\Zmsdb\Provider;
-use \BO\Zmsdb\Request;
+use BO\Mellon\Validator;
+use BO\Zmsdb\Provider;
+use BO\Zmsdb\Request;
/**
* example class to generate a response
@@ -51,9 +51,10 @@ public static function isRequestExisting($session)
public static function testCurrentScopeHasRequest($process)
{
$testProcess = clone $process;
- $scope = (new \BO\Zmsdb\Scope)->readEntity($testProcess->getScopeId(), 2);
+ $scope = (new \BO\Zmsdb\Scope())->readEntity($testProcess->getScopeId(), 2);
$testProcess->scope = $scope;
- if (0 < count($testProcess->getRequestIds()) &&
+ if (
+ 0 < count($testProcess->getRequestIds()) &&
!$testProcess->getCurrentScope()->getRequestList()->hasRequests($testProcess->getRequestCSV())
) {
throw new \BO\Zmsapi\Exception\Matching\RequestNotFound();
diff --git a/zmsapi/src/Zmsapi/Helper/TicketprinterAccess.php b/zmsapi/src/Zmsapi/Helper/TicketprinterAccess.php
index 007db66c1..3855fe3a1 100644
--- a/zmsapi/src/Zmsapi/Helper/TicketprinterAccess.php
+++ b/zmsapi/src/Zmsapi/Helper/TicketprinterAccess.php
@@ -2,8 +2,8 @@
namespace BO\Zmsapi\Helper;
-use \BO\Slim\Render;
-use \BO\Zmsdb\Useraccount;
+use BO\Slim\Render;
+use BO\Zmsdb\Useraccount;
class TicketprinterAccess
{
@@ -15,7 +15,7 @@ class TicketprinterAccess
public static function testTicketprinter($entity)
{
if ($entity->hasId()) {
- $organisation = (new \BO\Zmsdb\Organisation)->readByHash($entity->hash);
+ $organisation = (new \BO\Zmsdb\Organisation())->readByHash($entity->hash);
}
self::testTicketprinterNotFound($entity);
self::testTicketprinterValidHash($entity);
@@ -25,7 +25,7 @@ public static function testTicketprinter($entity)
public static function testMatchingClusterAndScopes($entity, $organisationId)
{
if (isset($entity->buttons) && $entity->buttons) {
- $departmentList = (new \BO\Zmsdb\Department)->readByOrganisationId($organisationId, 1);
+ $departmentList = (new \BO\Zmsdb\Department())->readByOrganisationId($organisationId, 1);
$scopeList = $departmentList->getUniqueScopeList();
//$clusterList = $departmentList->getUniqueClusterList();
foreach ($entity->buttons as $button) {
@@ -40,7 +40,7 @@ public static function testMatchingClusterAndScopes($entity, $organisationId)
public static function testTicketprinterNotFound($entity)
{
- if (! $entity->hasId() || ! (new \BO\Zmsdb\Ticketprinter)->readByHash($entity->getId())->hasId()) {
+ if (! $entity->hasId() || ! (new \BO\Zmsdb\Ticketprinter())->readByHash($entity->getId())->hasId()) {
throw new \BO\Zmsapi\Exception\Ticketprinter\TicketprinterNotFound();
}
}
@@ -53,10 +53,12 @@ public static function testTicketprinterIsProtectedEnabled($entity, $isProtectio
}
public static function testTicketprinterValidHash($entity)
- {
- if (isset($entity->id) &&
+ {
+ if (
+ isset($entity->id) &&
$entity->id &&
- (new \BO\Zmsdb\Ticketprinter)->readByHash($entity->hash)->id != $entity->id) {
+ (new \BO\Zmsdb\Ticketprinter())->readByHash($entity->hash)->id != $entity->id
+ ) {
throw new \BO\Zmsapi\Exception\Ticketprinter\TicketprinterHashNotValid();
}
}
diff --git a/zmsapi/src/Zmsapi/Helper/User.php b/zmsapi/src/Zmsapi/Helper/User.php
index c533da506..a01878564 100644
--- a/zmsapi/src/Zmsapi/Helper/User.php
+++ b/zmsapi/src/Zmsapi/Helper/User.php
@@ -2,10 +2,10 @@
namespace BO\Zmsapi\Helper;
-use \BO\Slim\Render;
-use \BO\Zmsdb\Useraccount;
-use \BO\Zmsdb\Workstation;
-use \BO\Zmsapi\Helper\UserAuth;
+use BO\Slim\Render;
+use BO\Zmsdb\Useraccount;
+use BO\Zmsdb\Workstation;
+use BO\Zmsapi\Helper\UserAuth;
/**
*
@@ -61,7 +61,8 @@ public static function testWorkstationAssigend(\BO\Zmsentities\Workstation $enti
$resolveReferences
);
}
- if (static::$assignedWorkstation &&
+ if (
+ static::$assignedWorkstation &&
static::$assignedWorkstation->id != $entity->id &&
static::$assignedWorkstation->name == $entity->name &&
static::$assignedWorkstation->scope['id'] == $entity->scope['id'] &&
@@ -77,7 +78,8 @@ public static function testWorkstationAssigend(\BO\Zmsentities\Workstation $enti
*/
public static function testWorkstationAccessRights($useraccount)
{
- if ((
+ if (
+ (
! static::$workstation->getUseraccount()->isSuperUser() &&
! static::$workstation->hasAccessToUseraccount($useraccount)
) ||
diff --git a/zmsapi/src/Zmsapi/Helper/UserAuth.php b/zmsapi/src/Zmsapi/Helper/UserAuth.php
index 233fd6931..2a5999020 100644
--- a/zmsapi/src/Zmsapi/Helper/UserAuth.php
+++ b/zmsapi/src/Zmsapi/Helper/UserAuth.php
@@ -2,8 +2,8 @@
namespace BO\Zmsapi\Helper;
-use \BO\Slim\Render;
-use \BO\Zmsdb\Useraccount;
+use BO\Slim\Render;
+use BO\Zmsdb\Useraccount;
class UserAuth
{
diff --git a/zmsapi/src/Zmsapi/Index.php b/zmsapi/src/Zmsapi/Index.php
index 678758507..d1b22c624 100644
--- a/zmsapi/src/Zmsapi/Index.php
+++ b/zmsapi/src/Zmsapi/Index.php
@@ -1,4 +1,5 @@
checkRights('superuser');
$providerId = $args['providerId'];
-
+
$config = (new MailTemplatesQuery())->readListByProvider($providerId);
-
+
$message = Response\Message::create($request);
$message->data = $config;
diff --git a/zmsapi/src/Zmsapi/MailDelete.php b/zmsapi/src/Zmsapi/MailDelete.php
index 52a1e6f8d..fd0bf2b08 100644
--- a/zmsapi/src/Zmsapi/MailDelete.php
+++ b/zmsapi/src/Zmsapi/MailDelete.php
@@ -1,12 +1,13 @@
checkRights('superuser');
$mailId = $args['id'];
$mail = (new Query())->readEntity($mailId);
-
+
if (!$mail || !$mail->hasId()) {
throw new Exception\Mail\MailNotFound();
}
diff --git a/zmsapi/src/Zmsapi/MailList.php b/zmsapi/src/Zmsapi/MailList.php
index dfb7455e8..acbf849ac 100644
--- a/zmsapi/src/Zmsapi/MailList.php
+++ b/zmsapi/src/Zmsapi/MailList.php
@@ -1,4 +1,5 @@
isBool()->setDefault(false)->getValue();
$ids = Validator::param('ids')->isString()->setDefault('')->getValue();
$query = new Query();
-
+
if ($onlyIds) {
if (!empty($ids)) {
$itemIds = array_map('intval', explode(',', $ids));
- $result = $query->readEntitiesIds($itemIds, $resolveReferences, $limit, 'ASC');
+ $result = $query->readEntitiesIds($itemIds, $resolveReferences, $limit, 'ASC');
} else {
$result = $query->readListIds($resolveReferences, $limit, 'ASC');
}
diff --git a/zmsapi/src/Zmsapi/MailMergedTemplatesGet.php b/zmsapi/src/Zmsapi/MailMergedTemplatesGet.php
index 0397066a6..1bd646621 100644
--- a/zmsapi/src/Zmsapi/MailMergedTemplatesGet.php
+++ b/zmsapi/src/Zmsapi/MailMergedTemplatesGet.php
@@ -1,4 +1,5 @@
readCustomizedListForProvider($providerId);
-
+
$message = Response\Message::create($request);
$message->data = $mailtemplates;
diff --git a/zmsapi/src/Zmsapi/MailTemplatesCreateCustomization.php b/zmsapi/src/Zmsapi/MailTemplatesCreateCustomization.php
index 3b817a58a..3f20b9c1d 100644
--- a/zmsapi/src/Zmsapi/MailTemplatesCreateCustomization.php
+++ b/zmsapi/src/Zmsapi/MailTemplatesCreateCustomization.php
@@ -1,4 +1,5 @@
checkRights('superuser');
$config = (new MailTemplatesQuery())->readListWithoutProvider();
-
+
$message = Response\Message::create($request);
$message->data = $config;
diff --git a/zmsapi/src/Zmsapi/MailTemplatesPreview.php b/zmsapi/src/Zmsapi/MailTemplatesPreview.php
index c4aed05a6..7cbd55476 100644
--- a/zmsapi/src/Zmsapi/MailTemplatesPreview.php
+++ b/zmsapi/src/Zmsapi/MailTemplatesPreview.php
@@ -1,4 +1,5 @@
checkRights('superuser');
-
+
$mailStatus = $args['mailStatus'];
$providerId = $args['providerId'];
- $mainProcessExample = ((new \BO\Zmsentities\Process)->getExample());
+ $mainProcessExample = ((new \BO\Zmsentities\Process())->getExample());
$mainProcessExample->id = 987654;
$mainProcessExample->scope->provider['id'] = $providerId;
$dateTime = new \DateTimeImmutable("2015-10-23 08:00:00", new \DateTimeZone('Europe/Berlin'));
@@ -42,7 +43,7 @@ public function readResponse(
->toResolvedEntity($mainProcessExample, $config, $mailStatus);
$message = Response\Message::create($request);
- $message->data = array('xy'=>'Missing dummy template.','previewHtml'=>$mail->getHtmlPart(),'previewPlain'=>$mail->getPlainPart());
+ $message->data = array('xy' => 'Missing dummy template.','previewHtml' => $mail->getHtmlPart(),'previewPlain' => $mail->getPlainPart());
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/MailTemplatesUpdate.php b/zmsapi/src/Zmsapi/MailTemplatesUpdate.php
index 4acb0a3bf..7cc87b699 100644
--- a/zmsapi/src/Zmsapi/MailTemplatesUpdate.php
+++ b/zmsapi/src/Zmsapi/MailTemplatesUpdate.php
@@ -1,4 +1,5 @@
readEntity($args['id'], 1);
+ $organisation = (new \BO\Zmsdb\Organisation())->readEntity($args['id'], 1);
(new Helper\User($request, 2))->checkRights(
'department',
new \BO\Zmsentities\Useraccount\EntityAccess($organisation)
diff --git a/zmsapi/src/Zmsapi/OrganisationByCluster.php b/zmsapi/src/Zmsapi/OrganisationByCluster.php
index 3dd1d6de1..85def53cd 100644
--- a/zmsapi/src/Zmsapi/OrganisationByCluster.php
+++ b/zmsapi/src/Zmsapi/OrganisationByCluster.php
@@ -1,4 +1,5 @@
readEntity($args['id'], 2);
+ $owner = (new \BO\Zmsdb\Owner())->readEntity($args['id'], 2);
(new Helper\User($request, 2))->checkRights(
new \BO\Zmsentities\Useraccount\EntityAccess($owner)
);
diff --git a/zmsapi/src/Zmsapi/OwnerByOrganisation.php b/zmsapi/src/Zmsapi/OwnerByOrganisation.php
index 637d45340..b8245b47c 100644
--- a/zmsapi/src/Zmsapi/OwnerByOrganisation.php
+++ b/zmsapi/src/Zmsapi/OwnerByOrganisation.php
@@ -1,4 +1,5 @@
data = (new Query)->updateEntity($owner->id, $entity);
+ $message->data = (new Query())->updateEntity($owner->id, $entity);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/Pickup.php b/zmsapi/src/Zmsapi/Pickup.php
index 6d90de8bd..ef9c3b981 100644
--- a/zmsapi/src/Zmsapi/Pickup.php
+++ b/zmsapi/src/Zmsapi/Pickup.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(null)->getValue();
$selectedScope = Validator::param('selectedScope')->isNumber()->getValue();
$scopeId = ($selectedScope) ? $selectedScope : $workstation->scope['id'];
- $scope = (new \BO\Zmsdb\Scope)->readEntity($scopeId, 0);
+ $scope = (new \BO\Zmsdb\Scope())->readEntity($scopeId, 0);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
- $processList = (new Process)->readProcessListByScopeAndStatus(
+ $processList = (new Process())->readProcessListByScopeAndStatus(
$scope['id'],
'pending',
$resolveReferences,
diff --git a/zmsapi/src/Zmsapi/ProcessAddLog.php b/zmsapi/src/Zmsapi/ProcessAddLog.php
index e6a927c66..3110c1d0e 100644
--- a/zmsapi/src/Zmsapi/ProcessAddLog.php
+++ b/zmsapi/src/Zmsapi/ProcessAddLog.php
@@ -1,4 +1,5 @@
readQueueListWithWaitingTime($scope, \App::$now, $resolveReferences + 1);
+ $queueList = (new \BO\Zmsdb\Scope())->readQueueListWithWaitingTime($scope, \App::$now, $resolveReferences + 1);
$process = $queueList->getQueueByNumber($args['number']);
if ($process) {
$process = $process->getProcess();
diff --git a/zmsapi/src/Zmsapi/ProcessConfirm.php b/zmsapi/src/Zmsapi/ProcessConfirm.php
index 6ef022319..b19977a27 100644
--- a/zmsapi/src/Zmsapi/ProcessConfirm.php
+++ b/zmsapi/src/Zmsapi/ProcessConfirm.php
@@ -1,4 +1,5 @@
status && 'reserved' != $process->status) {
throw new Exception\Process\ProcessNotPreconfirmedAnymore();
}
-
+
$process = (new Process())->updateProcessStatus(
$process,
'confirmed',
diff --git a/zmsapi/src/Zmsapi/ProcessConfirmationMail.php b/zmsapi/src/Zmsapi/ProcessConfirmationMail.php
index 54163959e..afbbfe5f2 100644
--- a/zmsapi/src/Zmsapi/ProcessConfirmationMail.php
+++ b/zmsapi/src/Zmsapi/ProcessConfirmationMail.php
@@ -1,4 +1,5 @@
readEntity();
+ $config = (new Config())->readEntity();
$department = (new Department())->readByScopeId($process->scope['id']);
$collection = static::getProcessListOverview($process, $config);
- $status = ($process->isWithAppointment())? 'appointment': 'queued';
- $mail = (new \BO\Zmsentities\Mail)
+ $status = ($process->isWithAppointment()) ? 'appointment' : 'queued';
+ $mail = (new \BO\Zmsentities\Mail())
->setTemplateProvider(new \BO\Zmsdb\Helper\MailTemplateProvider($process))
->toResolvedEntity($collection, $config, $status)
->withDepartment($department);
$mail->testValid();
if ($process->getFirstClient()->hasEmail() && $process->scope->hasEmailFrom()) {
- $mail = (new \BO\Zmsdb\Mail)->writeInQueue($mail, \App::$now, false);
+ $mail = (new \BO\Zmsdb\Mail())->writeInQueue($mail, \App::$now, false);
\App::$log->debug("Send mail", [$mail]);
}
return $mail;
@@ -71,7 +72,8 @@ protected function testProcessData($process)
throw new Exception\Process\ProcessNotFound();
} elseif ($authCheck['authKey'] != $process->authKey && $authCheck['authName'] != $process->authKey) {
throw new Exception\Process\AuthKeyMatchFailed();
- } elseif ($process->toProperty()->scope->preferences->client->emailRequired->get() &&
+ } elseif (
+ $process->toProperty()->scope->preferences->client->emailRequired->get() &&
! $process->getFirstClient()->hasEmail()
) {
throw new Exception\Process\EmailRequired();
@@ -81,10 +83,11 @@ protected function testProcessData($process)
public static function getProcessListOverview($process, $config)
{
$collection = (new Collection())->addEntity($process);
- if (in_array(
- getenv('ZMS_ENV'),
- explode(',', $config->getPreference('appointments', 'enableSummaryByMail'))
- ) && $process->getFirstClient()->hasEmail()
+ if (
+ in_array(
+ getenv('ZMS_ENV'),
+ explode(',', $config->getPreference('appointments', 'enableSummaryByMail'))
+ ) && $process->getFirstClient()->hasEmail()
) {
$processList = (new ProcessRepository())->readListByMailAndStatusList(
$process->getFirstClient()->email,
diff --git a/zmsapi/src/Zmsapi/ProcessConfirmationNotification.php b/zmsapi/src/Zmsapi/ProcessConfirmationNotification.php
index dbdf1a3d7..46fc815d0 100644
--- a/zmsapi/src/Zmsapi/ProcessConfirmationNotification.php
+++ b/zmsapi/src/Zmsapi/ProcessConfirmationNotification.php
@@ -1,4 +1,5 @@
readEntity($process->id, $process->authKey);
\BO\Zmsdb\Connection\Select::getWriteConnection();
-
+
$notification = $this->writeNotification($process);
$message = Response\Message::create($request);
$message->data = ($notification->hasId()) ? $notification : null;
-
+
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, 200);
return $response;
diff --git a/zmsapi/src/Zmsapi/ProcessDelete.php b/zmsapi/src/Zmsapi/ProcessDelete.php
index 7eaf1e591..b63264abc 100644
--- a/zmsapi/src/Zmsapi/ProcessDelete.php
+++ b/zmsapi/src/Zmsapi/ProcessDelete.php
@@ -1,4 +1,5 @@
readWorkstation();
\BO\Zmsdb\Connection\Select::getWriteConnection();
- $process = (new Process)->readEntity($args['id'], new \BO\Zmsdb\Helper\NoAuth(), 2);
+ $process = (new Process())->readEntity($args['id'], new \BO\Zmsdb\Helper\NoAuth(), 2);
$this->testProcessData($process, $args['authKey']);
if ('reserved' == $process->status) {
- if (!(new Process)->writeBlockedEntity($process, false, $workstation->getUseraccount())) {
+ if (!(new Process())->writeBlockedEntity($process, false, $workstation->getUseraccount())) {
throw new Exception\Process\ProcessDeleteFailed(); // @codeCoverageIgnore
}
$processDeleted = $process;
} else {
- $processDeleted = (new Process)->writeCanceledEntity(
+ $processDeleted = (new Process())->writeCanceledEntity(
$args['id'],
$args['authKey'],
null,
@@ -82,4 +83,4 @@ protected function testProcessData($process, $authKey)
throw new Exception\Process\AuthKeyMatchFailed();
}
}
-}
\ No newline at end of file
+}
diff --git a/zmsapi/src/Zmsapi/ProcessDeleteMail.php b/zmsapi/src/Zmsapi/ProcessDeleteMail.php
index 91b16efb8..910f7558e 100644
--- a/zmsapi/src/Zmsapi/ProcessDeleteMail.php
+++ b/zmsapi/src/Zmsapi/ProcessDeleteMail.php
@@ -1,4 +1,5 @@
isJson()->assertValid()->getValue();
$process = new Process($input);
-
+
$process->testValid();
$this->testProcessData($process);
@@ -52,13 +53,13 @@ protected static function writeMail(Process $process)
$department = (new DepartmentRepository())->readByScopeId($process->scope['id']);
$collection = ProcessConfirmationMail::getProcessListOverview($process, $config);
- $mail = (new \BO\Zmsentities\Mail)
+ $mail = (new \BO\Zmsentities\Mail())
->setTemplateProvider(new \BO\Zmsdb\Helper\MailTemplateProvider($process))
->toResolvedEntity($collection, $config, 'deleted')
->withDepartment($department);
$mail->testValid();
if ($process->getFirstClient()->hasEmail() && $process->scope->hasEmailFrom()) {
- $mail = (new \BO\Zmsdb\Mail)->writeInQueue($mail, \App::$now, false);
+ $mail = (new \BO\Zmsdb\Mail())->writeInQueue($mail, \App::$now, false);
\App::$log->debug("Send mail", [$mail]);
}
return $mail;
@@ -69,7 +70,8 @@ protected function testProcessData($process)
$authCheck = (new ProcessRepository())->readAuthKeyByProcessId($process->getId());
if (! $authCheck) {
throw new Exception\Process\ProcessNotFound();
- } elseif ($process->toProperty()->scope->preferences->client->emailRequired->get() &&
+ } elseif (
+ $process->toProperty()->scope->preferences->client->emailRequired->get() &&
! $process->getFirstClient()->hasEmail()
) {
throw new Exception\Process\EmailRequired();
diff --git a/zmsapi/src/Zmsapi/ProcessDeleteNotification.php b/zmsapi/src/Zmsapi/ProcessDeleteNotification.php
index 4f9aab3e6..b7b5a36ee 100644
--- a/zmsapi/src/Zmsapi/ProcessDeleteNotification.php
+++ b/zmsapi/src/Zmsapi/ProcessDeleteNotification.php
@@ -1,4 +1,5 @@
testProcessData($process);
$process = (new Process())->readEntity($process->id, $process->authKey);
$process->addData($input);
-
+
\BO\Zmsdb\Connection\Select::getWriteConnection();
-
+
$config = (new Config())->readEntity();
$department = (new Department())->readByScopeId($process->scope['id']);
$notification = (new \BO\Zmsentities\Notification())
diff --git a/zmsapi/src/Zmsapi/ProcessDeleteQuick.php b/zmsapi/src/Zmsapi/ProcessDeleteQuick.php
index 197fbbcbe..24e181abb 100644
--- a/zmsapi/src/Zmsapi/ProcessDeleteQuick.php
+++ b/zmsapi/src/Zmsapi/ProcessDeleteQuick.php
@@ -1,4 +1,5 @@
checkRights('basic');
\BO\Zmsdb\Connection\Select::getWriteConnection();
- $process = (new Process)->readEntity($args['id'], new \BO\Zmsdb\Helper\NoAuth(), 2);
+ $process = (new Process())->readEntity($args['id'], new \BO\Zmsdb\Helper\NoAuth(), 2);
$this->testProcess($workstation, $process);
$process->status = 'blocked';
$this->writeMails($request, $process);
- $status = (new Process)->writeBlockedEntity($process, false, $workstation->getUseraccount());
+ $status = (new Process())->writeBlockedEntity($process, false, $workstation->getUseraccount());
if (! $status) {
throw new Exception\Process\ProcessDeleteFailed(); // @codeCoverageIgnore
}
@@ -50,9 +51,11 @@ protected function testProcess($workstation, $process)
throw new Exception\Process\ProcessNotFound();
}
- if (! in_array(
- $process->getCurrentScope()->getId(),
- $workstation->getScopeListFromAssignedDepartments()->getIds())
+ if (
+ ! in_array(
+ $process->getCurrentScope()->getId(),
+ $workstation->getScopeListFromAssignedDepartments()->getIds()
+ )
) {
throw new Exception\Process\ProcessNoAccess();
}
diff --git a/zmsapi/src/Zmsapi/ProcessFinished.php b/zmsapi/src/Zmsapi/ProcessFinished.php
index 92c41030d..d4c55dc00 100644
--- a/zmsapi/src/Zmsapi/ProcessFinished.php
+++ b/zmsapi/src/Zmsapi/ProcessFinished.php
@@ -1,4 +1,5 @@
getUseraccount()
);
- (new Workstation)->writeRemovedProcess($workstation);
+ (new Workstation())->writeRemovedProcess($workstation);
} else {
$query->writeEntityFinished($process, \App::$now, true, $workstation->getUseraccount());
}
@@ -52,7 +53,7 @@ public function readResponse(
if ($survey) {
$this->writeSurveyMail($process);
}
-
+
$message = Response\Message::create($request);
$message->data = $process;
@@ -63,7 +64,7 @@ public function readResponse(
protected function testProcessInWorkstation($process, $workstation)
{
- $department = (new \BO\Zmsdb\Department)->readByScopeId($workstation->scope['id'], 1);
+ $department = (new \BO\Zmsdb\Department())->readByScopeId($workstation->scope['id'], 1);
$workstation->process = $process;
$workstation->testMatchingProcessScope($department->getScopeList());
}
diff --git a/zmsapi/src/Zmsapi/ProcessFree.php b/zmsapi/src/Zmsapi/ProcessFree.php
index 3f2a331d2..7b5c11186 100644
--- a/zmsapi/src/Zmsapi/ProcessFree.php
+++ b/zmsapi/src/Zmsapi/ProcessFree.php
@@ -1,13 +1,15 @@
readFreeProcesses($calendar, \App::getNow(), $slotType, $slotsRequired, $groupData ? true: false)
+ ->readFreeProcesses($calendar, \App::getNow(), $slotType, $slotsRequired, $groupData ? true : false)
->withLessData($keepLessData)
;
if ($groupData && count($processList) >= $groupData) {
diff --git a/zmsapi/src/Zmsapi/ProcessGet.php b/zmsapi/src/Zmsapi/ProcessGet.php
index 5e95a43a9..a60b88dde 100644
--- a/zmsapi/src/Zmsapi/ProcessGet.php
+++ b/zmsapi/src/Zmsapi/ProcessGet.php
@@ -1,4 +1,5 @@
isNumber()->setDefault('appointment')->getValue();
$this->testProcessData($args['id'], $args['authKey']);
- $process = (new Process)->readEntity($args['id'], $args['authKey'], 2);
+ $process = (new Process())->readEntity($args['id'], $args['authKey'], 2);
$config = (new Config())->readEntity();
$templateProvider = new \BO\Zmsdb\Helper\MailTemplateProvider($process);
diff --git a/zmsapi/src/Zmsapi/ProcessListByClusterAndDate.php b/zmsapi/src/Zmsapi/ProcessListByClusterAndDate.php
index bce6b8fde..7e7cac48d 100644
--- a/zmsapi/src/Zmsapi/ProcessListByClusterAndDate.php
+++ b/zmsapi/src/Zmsapi/ProcessListByClusterAndDate.php
@@ -1,4 +1,5 @@
addList($query->readQueueListWithWaitingTime(
$scope,
$date,
- $resolveReferences? $resolveReferences + 1 : 1 // resolveReferences is for process, for queue we have to +1
+ $resolveReferences ? $resolveReferences + 1 : 1 // resolveReferences is for process, for queue we have to +1
));
}
diff --git a/zmsapi/src/Zmsapi/ProcessListByScopeAndStatus.php b/zmsapi/src/Zmsapi/ProcessListByScopeAndStatus.php
index 4be4350a5..18e536571 100644
--- a/zmsapi/src/Zmsapi/ProcessListByScopeAndStatus.php
+++ b/zmsapi/src/Zmsapi/ProcessListByScopeAndStatus.php
@@ -1,4 +1,5 @@
checkRights();
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(0)->getValue();
- $scope = (new Scope)->readEntity($args['id'], $resolveReferences);
+ $scope = (new Scope())->readEntity($args['id'], $resolveReferences);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
diff --git a/zmsapi/src/Zmsapi/ProcessListSummaryMail.php b/zmsapi/src/Zmsapi/ProcessListSummaryMail.php
index b9ce5f979..8504fa6ed 100644
--- a/zmsapi/src/Zmsapi/ProcessListSummaryMail.php
+++ b/zmsapi/src/Zmsapi/ProcessListSummaryMail.php
@@ -1,4 +1,5 @@
readEntity();
+ $config = (new ConfigRepository())->readEntity();
$department = $this->readDepartment($config, $collection->getFirst());
- $mail = (new Mail)->toResolvedEntity($collection, $config, 'overview')->withDepartment($department);
+ $mail = (new Mail())->toResolvedEntity($collection, $config, 'overview')->withDepartment($department);
$mail = $this->setWithProcessClient($mail, $mailAddress);
$mail->testValid();
diff --git a/zmsapi/src/Zmsapi/ProcessLog.php b/zmsapi/src/Zmsapi/ProcessLog.php
index 9d1e6328d..76d228ed5 100644
--- a/zmsapi/src/Zmsapi/ProcessLog.php
+++ b/zmsapi/src/Zmsapi/ProcessLog.php
@@ -1,4 +1,5 @@
withScopeId($workstation->getScope()->getId())
->toQueueList($dateTime);
}
-
+
$message = Response\Message::create($request);
$message->data = ProcessNextByScope::getProcess($queueList, $dateTime, $exclude);
diff --git a/zmsapi/src/Zmsapi/ProcessNextByScope.php b/zmsapi/src/Zmsapi/ProcessNextByScope.php
index b2eb26193..d6d475703 100644
--- a/zmsapi/src/Zmsapi/ProcessNextByScope.php
+++ b/zmsapi/src/Zmsapi/ProcessNextByScope.php
@@ -1,4 +1,5 @@
data = static::getProcess($queueList, $dateTime, $exclude);
-
+
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, 200);
return $response;
diff --git a/zmsapi/src/Zmsapi/ProcessPickup.php b/zmsapi/src/Zmsapi/ProcessPickup.php
index 4e2500862..4eb200575 100644
--- a/zmsapi/src/Zmsapi/ProcessPickup.php
+++ b/zmsapi/src/Zmsapi/ProcessPickup.php
@@ -1,4 +1,5 @@
readValidProcess($workstation, $entity, $input);
$this->testProcessAccess($workstation, $process);
- (new \BO\Zmsdb\Workstation)->writeAssignedProcess($workstation, $process, \App::$now);
+ (new \BO\Zmsdb\Workstation())->writeAssignedProcess($workstation, $process, \App::$now);
$message = Response\Message::create($request);
- $message->data = (new Query)->readEntity($process->id, $process->authKey);
+ $message->data = (new Query())->readEntity($process->id, $process->authKey);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
@@ -55,7 +56,7 @@ protected function testProcessData($entity)
protected function testProcessAccess($workstation, $process)
{
- $cluster = (new \BO\Zmsdb\Cluster)->readByScopeId($workstation->scope['id'], 1);
+ $cluster = (new \BO\Zmsdb\Cluster())->readByScopeId($workstation->scope['id'], 1);
$workstation->testMatchingProcessScope($workstation->getScopeList($cluster), $process);
if ($workstation->process && $workstation->process->hasId() && $workstation->process->id != $process->id) {
$exception = new Exception\Workstation\WorkstationHasAssignedProcess();
@@ -83,7 +84,7 @@ protected function readValidProcess($workstation, $entity, $input)
$process = ProcessStatusQueued::init()
->readByQueueNumberAndScope($entity['queue']['number'], $workstation->scope['id'], 0, 100000000);
if (! $process->id) {
- $workstation = (new \BO\Zmsdb\Workstation)->readResolvedReferences($workstation, 1);
+ $workstation = (new \BO\Zmsdb\Workstation())->readResolvedReferences($workstation, 1);
$process = (new Query())->writeNewPickup(
$workstation->scope,
\App::$now,
diff --git a/zmsapi/src/Zmsapi/ProcessPreconfirm.php b/zmsapi/src/Zmsapi/ProcessPreconfirm.php
index 7027500e9..61d81724d 100644
--- a/zmsapi/src/Zmsapi/ProcessPreconfirm.php
+++ b/zmsapi/src/Zmsapi/ProcessPreconfirm.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(3)->getValue();
$input = Validator::input()->isJson()->assertValid()->getValue();
$entity = new \BO\Zmsentities\Process($input);
@@ -37,7 +38,7 @@ public function readResponse(
if ('reserved' != $process->status) {
throw new Exception\Process\ProcessNotReservedAnymore();
}
-
+
$process = (new Process())->updateProcessStatus(
$process,
'preconfirmed',
@@ -47,7 +48,7 @@ public function readResponse(
);
$message = Response\Message::create($request);
$message->data = $process;
-
+
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
return $response;
diff --git a/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php b/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php
index bb8f98758..bbf314a68 100644
--- a/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php
+++ b/zmsapi/src/Zmsapi/ProcessPreconfirmationMail.php
@@ -1,4 +1,5 @@
readEntity();
+ $config = (new Config())->readEntity();
$department = (new Department())->readByScopeId($process->scope['id']);
$status = ($process->isWithAppointment()) ? 'preconfirmed' : 'queued';
$collection = static::getProcessListOverview($process, $config);
- $mail = (new \BO\Zmsentities\Mail)
+ $mail = (new \BO\Zmsentities\Mail())
->setTemplateProvider(new \BO\Zmsdb\Helper\MailTemplateProvider($process))
->toResolvedEntity($collection, $config, $status)
->withDepartment($department);
$mail->testValid();
if ($process->getFirstClient()->hasEmail() && $process->scope->hasEmailFrom()) {
- $mail = (new \BO\Zmsdb\Mail)->writeInQueue($mail, \App::$now, false);
+ $mail = (new \BO\Zmsdb\Mail())->writeInQueue($mail, \App::$now, false);
\App::$log->debug("Send mail", [$mail]);
}
return $mail;
@@ -69,7 +70,8 @@ protected function testProcessData($process)
throw new Exception\Process\ProcessNotFound();
} elseif ($authCheck['authKey'] != $process->authKey && $authCheck['authName'] != $process->authKey) {
throw new Exception\Process\AuthKeyMatchFailed();
- } elseif ($process->toProperty()->scope->preferences->client->emailRequired->get() &&
+ } elseif (
+ $process->toProperty()->scope->preferences->client->emailRequired->get() &&
! $process->getFirstClient()->hasEmail()
) {
throw new Exception\Process\EmailRequired();
@@ -79,10 +81,11 @@ protected function testProcessData($process)
public static function getProcessListOverview($process, $config)
{
$collection = (new Collection())->addEntity($process);
- if (in_array(
- getenv('ZMS_ENV'),
- explode(',', $config->getPreference('appointments', 'enableSummaryByMail'))
- ) && $process->getFirstClient()->hasEmail()
+ if (
+ in_array(
+ getenv('ZMS_ENV'),
+ explode(',', $config->getPreference('appointments', 'enableSummaryByMail'))
+ ) && $process->getFirstClient()->hasEmail()
) {
$processList = (new ProcessRepository())->readListByMailAndStatusList(
$process->getFirstClient()->email,
@@ -93,7 +96,7 @@ public static function getProcessListOverview($process, $config)
2,
50
);
-
+
//add list of found processes without the main process
$collection->addList($processList->withOutProcessId($process->getId()));
}
diff --git a/zmsapi/src/Zmsapi/ProcessQueued.php b/zmsapi/src/Zmsapi/ProcessQueued.php
index 22d4a0726..ffe187421 100644
--- a/zmsapi/src/Zmsapi/ProcessQueued.php
+++ b/zmsapi/src/Zmsapi/ProcessQueued.php
@@ -1,4 +1,5 @@
status = 'queued';
$process->queue['callCount'] = 0;
$process->queue['lastCallTime'] = 0;
- $cluster = (new \BO\Zmsdb\Cluster)->readByScopeId($workstation->scope['id'], 1);
+ $cluster = (new \BO\Zmsdb\Cluster())->readByScopeId($workstation->scope['id'], 1);
$workstation->testMatchingProcessScope($workstation->getScopeList($cluster), $process);
$process = (new Query())->updateEntity(
$process,
diff --git a/zmsapi/src/Zmsapi/ProcessRedirect.php b/zmsapi/src/Zmsapi/ProcessRedirect.php
index 3c894c181..87ac2b68e 100644
--- a/zmsapi/src/Zmsapi/ProcessRedirect.php
+++ b/zmsapi/src/Zmsapi/ProcessRedirect.php
@@ -1,4 +1,5 @@
status = 'finished';
- $process = (new Query)->updateEntity(
+ $process = (new Query())->updateEntity(
$process,
\App::$now,
0,
'processing',
$workstation->getUseraccount()
);
- (new Workstation)->writeRemovedProcess($workstation);
+ (new Workstation())->writeRemovedProcess($workstation);
$processStatusArchived->writeEntityFinished($process, \App::$now, true);
$newProcess = (new \BO\Zmsdb\Process())->redirectToScope(
$newProcess,
$process->scope,
- $process->id,
+ $process->queue['number'] ?? $process->id,
$workstation->getUseraccount()
);
@@ -78,7 +79,7 @@ protected function testProcessData($entity)
protected function testProcessAccess($workstation, $process)
{
- $cluster = (new \BO\Zmsdb\Cluster)->readByScopeId($workstation->scope['id'], 1);
+ $cluster = (new \BO\Zmsdb\Cluster())->readByScopeId($workstation->scope['id'], 1);
$workstation->testMatchingProcessScope($workstation->getScopeList($cluster), $process);
if ($workstation->process && $workstation->process->hasId() && $workstation->process->id != $process->id) {
$exception = new Exception\Workstation\WorkstationHasAssignedProcess();
@@ -106,7 +107,7 @@ protected function readValidProcess($workstation, $entity, $input)
$process = ProcessStatusQueued::init()
->readByQueueNumberAndScope($entity['queue']['number'], $workstation->scope['id'], 0, 100000000);
if (! $process->id) {
- $workstation = (new \BO\Zmsdb\Workstation)->readResolvedReferences($workstation, 1);
+ $workstation = (new \BO\Zmsdb\Workstation())->readResolvedReferences($workstation, 1);
$process = (new Query())->writeNewPickup(
$workstation->scope,
\App::$now,
diff --git a/zmsapi/src/Zmsapi/ProcessReserve.php b/zmsapi/src/Zmsapi/ProcessReserve.php
index 547a289dc..7822b5831 100644
--- a/zmsapi/src/Zmsapi/ProcessReserve.php
+++ b/zmsapi/src/Zmsapi/ProcessReserve.php
@@ -1,4 +1,5 @@
checkRights();
Helper\Matching::testCurrentScopeHasRequest($process);
} elseif ($clientKey) {
- $apiClient = (new \BO\Zmsdb\Apiclient)->readEntity($clientKey);
+ $apiClient = (new \BO\Zmsdb\Apiclient())->readEntity($clientKey);
if (!$apiClient || !isset($apiClient->accesslevel) || $apiClient->accesslevel == 'blocked') {
throw new Exception\Process\ApiclientInvalid();
}
@@ -50,17 +51,17 @@ public function readResponse(
if ($apiClient->accesslevel != 'intern') {
$slotsRequired = 0;
$slotType = $apiClient->accesslevel;
- $process = (new Process)->readSlotCount($process);
+ $process = (new Process())->readSlotCount($process);
}
$process->apiclient = $apiClient;
} else {
$slotsRequired = 0;
$slotType = 'public';
- $process = (new Process)->readSlotCount($process);
+ $process = (new Process())->readSlotCount($process);
}
$userAccount = (isset($workstation)) ? $workstation->getUseraccount() : null;
- $process = (new ProcessStatusFree)
+ $process = (new ProcessStatusFree())
->writeEntityReserved($process, \App::$now, $slotType, $slotsRequired, $resolveReferences, $userAccount);
$message = Response\Message::create($request);
$message->data = $process;
diff --git a/zmsapi/src/Zmsapi/ProcessReservedList.php b/zmsapi/src/Zmsapi/ProcessReservedList.php
index 773bfa2c2..5a2c83d08 100644
--- a/zmsapi/src/Zmsapi/ProcessReservedList.php
+++ b/zmsapi/src/Zmsapi/ProcessReservedList.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(2)->getValue();
$message = Response\Message::create($request);
- $message->data = (new ProcessStatusFree)->readReservedProcesses($resolveReferences);
+ $message->data = (new ProcessStatusFree())->readReservedProcesses($resolveReferences);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, 200);
diff --git a/zmsapi/src/Zmsapi/ProcessSearch.php b/zmsapi/src/Zmsapi/ProcessSearch.php
index 606ca9854..6999eb167 100644
--- a/zmsapi/src/Zmsapi/ProcessSearch.php
+++ b/zmsapi/src/Zmsapi/ProcessSearch.php
@@ -1,4 +1,5 @@
readSearch($parameters, $resolveReferences, $limit);
+ $processList = (new Process())->readSearch($parameters, $resolveReferences, $limit);
if ($lessResolvedData) {
$processList = $processList->withLessData();
}
diff --git a/zmsapi/src/Zmsapi/ProcessUpdate.php b/zmsapi/src/Zmsapi/ProcessUpdate.php
index 95a7ff06f..b0b67e87e 100644
--- a/zmsapi/src/Zmsapi/ProcessUpdate.php
+++ b/zmsapi/src/Zmsapi/ProcessUpdate.php
@@ -1,4 +1,5 @@
readEntity($clientKey);
+ $apiClient = (new \BO\Zmsdb\Apiclient())->readEntity($clientKey);
if (!$apiClient || !isset($apiClient->accesslevel) || $apiClient->accesslevel == 'blocked') {
throw new Exception\Process\ApiclientInvalid();
}
$entity->apiclient = $apiClient;
- $process = (new Process)->updateEntity(
+ $process = (new Process())->updateEntity(
$entity,
\App::$now,
$resolveReferences,
@@ -66,7 +67,7 @@ public function readResponse(
$workstation->getUseraccount()
);
} else {
- $process = (new Process)->updateEntity(
+ $process = (new Process())->updateEntity(
$entity,
\App::$now,
$resolveReferences,
@@ -81,7 +82,7 @@ public function readResponse(
$workstation->getUseraccount()
);
}
-
+
if ($initiator && $process->hasScopeAdmin() && $process->sendAdminMailOnUpdated()) {
$config = (new Config())->readEntity();
@@ -92,7 +93,7 @@ public function readResponse(
}
$message = Response\Message::create($request);
$message->data = $process;
-
+
$response = Render::withLastModified($response, time(), '0');
return Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ProviderByRequestList.php b/zmsapi/src/Zmsapi/ProviderByRequestList.php
index 666bb7444..cb315be85 100644
--- a/zmsapi/src/Zmsapi/ProviderByRequestList.php
+++ b/zmsapi/src/Zmsapi/ProviderByRequestList.php
@@ -1,4 +1,5 @@
readListBySource($args['source'], $resolveReferences, null, $args['csv']);
-
+ $providerList = (new Provider())->readListBySource($args['source'], $resolveReferences, null, $args['csv']);
+
if (0 == $providerList->count()) {
throw new Exception\Provider\ProviderNotFound();
}
diff --git a/zmsapi/src/Zmsapi/ProviderGet.php b/zmsapi/src/Zmsapi/ProviderGet.php
index 9a67e779f..f12cd62a4 100644
--- a/zmsapi/src/Zmsapi/ProviderGet.php
+++ b/zmsapi/src/Zmsapi/ProviderGet.php
@@ -1,4 +1,5 @@
isBool()->getValue();
$requestList = Validator::param('requestList')->isString()->getValue();
- $providerList = (new Provider)->readListBySource(
+ $providerList = (new Provider())->readListBySource(
$args['source'],
$resolveReferences,
$isAssigned,
$requestList
);
-
+
$message = Response\Message::create($request);
$message->data = $providerList;
diff --git a/zmsapi/src/Zmsapi/RequestGet.php b/zmsapi/src/Zmsapi/RequestGet.php
index 7c9a446ec..59dc8a6e8 100644
--- a/zmsapi/src/Zmsapi/RequestGet.php
+++ b/zmsapi/src/Zmsapi/RequestGet.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
- $cluster = (new \BO\Zmsdb\Cluster)->readEntity($args['id'], $resolveReferences ? $resolveReferences : 2);
+ $cluster = (new \BO\Zmsdb\Cluster())->readEntity($args['id'], $resolveReferences ? $resolveReferences : 2);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
$message = Response\Message::create($request);
- $message->data = (new Request)->readListByCluster($cluster, $resolveReferences);
+ $message->data = (new Request())->readListByCluster($cluster, $resolveReferences);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, 200);
diff --git a/zmsapi/src/Zmsapi/RequestListByProvider.php b/zmsapi/src/Zmsapi/RequestListByProvider.php
index 03e500d10..72ece1fc8 100644
--- a/zmsapi/src/Zmsapi/RequestListByProvider.php
+++ b/zmsapi/src/Zmsapi/RequestListByProvider.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
- $provider = (new \BO\Zmsdb\Provider)->readEntity($args['source'], $args['id'], $resolveReferences);
+ $provider = (new \BO\Zmsdb\Provider())->readEntity($args['source'], $args['id'], $resolveReferences);
if (! $provider->hasId()) {
throw new Exception\Provider\ProviderNotFound();
}
$message = Response\Message::create($request);
- $message->data = (new Request)->readListByProvider($args['source'], $provider->id, $resolveReferences);
+ $message->data = (new Request())->readListByProvider($args['source'], $provider->id, $resolveReferences);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, 200);
diff --git a/zmsapi/src/Zmsapi/RequestListByScope.php b/zmsapi/src/Zmsapi/RequestListByScope.php
index dcd911f81..0d385783a 100644
--- a/zmsapi/src/Zmsapi/RequestListByScope.php
+++ b/zmsapi/src/Zmsapi/RequestListByScope.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
- $scope = (new \BO\Zmsdb\Scope)->readEntity($args['id'], $resolveReferences ? $resolveReferences : 1);
+ $scope = (new \BO\Zmsdb\Scope())->readEntity($args['id'], $resolveReferences ? $resolveReferences : 1);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
- $requestList = (new Request)
+ $requestList = (new Request())
->readListByProvider($scope->provider['source'], $scope->getProviderId(), $resolveReferences);
$message = Response\Message::create($request);
diff --git a/zmsapi/src/Zmsapi/Response/Message.php b/zmsapi/src/Zmsapi/Response/Message.php
index 7dbb420f4..9539147fb 100644
--- a/zmsapi/src/Zmsapi/Response/Message.php
+++ b/zmsapi/src/Zmsapi/Response/Message.php
@@ -2,9 +2,8 @@
namespace BO\Zmsapi\Response;
-use \BO\Zmsdb\Connection\Select;
-
-use \BO\Zmsclient\GraphQL\GraphQLInterpreter;
+use BO\Zmsdb\Connection\Select;
+use BO\Zmsclient\GraphQL\GraphQLInterpreter;
/**
* example class to generate a response
@@ -115,7 +114,7 @@ public function jsonSerialize()
$schema .= $this->request->getUri()->getHost();
$schema .= \App::$slim->urlFor('index');
$jsonCompressLevel = $this->getJsonCompressLevel();
-
+
if ($jsonCompressLevel > 0 && $this->data && is_object($this->data)) {
$this->data->setJsonCompressLevel($jsonCompressLevel);
}
diff --git a/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataDelete.php b/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataDelete.php
index d44f6c0f3..d9e60fbf9 100644
--- a/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataDelete.php
+++ b/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataDelete.php
@@ -1,4 +1,5 @@
readEntity($args['id']);
+ $scope = (new Query())->readEntity($args['id']);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}(new Helper\User($request, 2))->checkRights(
@@ -30,7 +31,7 @@ public function readResponse(
);
$message = Response\Message::create($request);
- $result = (new Query)->deleteImage($scope->id);
+ $result = (new Query())->deleteImage($scope->id);
$message->data = $result;
$response = Render::withLastModified($response, time(), '0');
diff --git a/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataGet.php b/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataGet.php
index 3995326cb..3efcf6b42 100644
--- a/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataGet.php
+++ b/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataGet.php
@@ -1,4 +1,5 @@
readEntity($args['id']);
+ $scope = (new Query())->readEntity($args['id']);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
$message = Response\Message::create($request);
- $message->data = (new Query)->readImageData($scope->id);
+ $message->data = (new Query())->readImageData($scope->id);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataUpdate.php b/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataUpdate.php
index e5a86867b..5605b83a5 100644
--- a/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataUpdate.php
+++ b/zmsapi/src/Zmsapi/ScopeCalldisplayImageDataUpdate.php
@@ -1,4 +1,5 @@
readEntity($args['id']);
+ $scope = (new Query())->readEntity($args['id']);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}(new Helper\User($request, 2))->checkRights(
@@ -34,7 +35,7 @@ public function readResponse(
$mimepart = new \BO\Zmsentities\Mimepart($input);
$message = Response\Message::create($request);
- $message->data = (new Query)->writeImageData($scope->id, $mimepart);
+ $message->data = (new Query())->writeImageData($scope->id, $mimepart);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ScopeDelete.php b/zmsapi/src/Zmsapi/ScopeDelete.php
index 5ec97c934..ff7956f37 100644
--- a/zmsapi/src/Zmsapi/ScopeDelete.php
+++ b/zmsapi/src/Zmsapi/ScopeDelete.php
@@ -1,12 +1,14 @@
readEntity($args['id'], 0);
+ $scope = (new Scope())->readEntity($args['id'], 0);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}(new Helper\User($request, 2))->checkRights(
@@ -27,7 +29,7 @@ public function readResponse(
new \BO\Zmsentities\Useraccount\EntityAccess($scope)
);
$message = Response\Message::create($request);
- $message->data = (new Scope)->deleteEntity($scope->id);
+ $message->data = (new Scope())->deleteEntity($scope->id);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ScopeEmergency.php b/zmsapi/src/Zmsapi/ScopeEmergency.php
index 2e59474f7..775092cdf 100644
--- a/zmsapi/src/Zmsapi/ScopeEmergency.php
+++ b/zmsapi/src/Zmsapi/ScopeEmergency.php
@@ -1,4 +1,5 @@
scope->status['emergency']['acceptedByWorkstation'] = -1;
$message = Response\Message::create($request);
- $message->data = (new Scope)->updateEmergency($args['id'], $workstation->scope);
+ $message->data = (new Scope())->updateEmergency($args['id'], $workstation->scope);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ScopeEmergencyRespond.php b/zmsapi/src/Zmsapi/ScopeEmergencyRespond.php
index 14d851465..11b44444d 100644
--- a/zmsapi/src/Zmsapi/ScopeEmergencyRespond.php
+++ b/zmsapi/src/Zmsapi/ScopeEmergencyRespond.php
@@ -1,4 +1,5 @@
scope->status['emergency']['acceptedByWorkstation'] = $workstation->getName();
$message = Response\Message::create($request);
- $message->data = (new Scope)->updateEmergency($args['id'], $workstation->scope);
+ $message->data = (new Scope())->updateEmergency($args['id'], $workstation->scope);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ScopeEmergencyStop.php b/zmsapi/src/Zmsapi/ScopeEmergencyStop.php
index 88f53ad71..dd428eb76 100644
--- a/zmsapi/src/Zmsapi/ScopeEmergencyStop.php
+++ b/zmsapi/src/Zmsapi/ScopeEmergencyStop.php
@@ -1,4 +1,5 @@
scope->status['emergency']['acceptedByWorkstation'] = -1;
$message = Response\Message::create($request);
- $message->data = (new Scope)->updateEmergency($args['id'], $workstation->scope);
+ $message->data = (new Scope())->updateEmergency($args['id'], $workstation->scope);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ScopeGet.php b/zmsapi/src/Zmsapi/ScopeGet.php
index 12e86951f..9ac4ec5f8 100644
--- a/zmsapi/src/Zmsapi/ScopeGet.php
+++ b/zmsapi/src/Zmsapi/ScopeGet.php
@@ -1,17 +1,18 @@
isString()->getValue();
$accessRights = Validator::param('accessRights')->isString()->isBiggerThan(4)->setDefault('basic')->getValue();
$getIsOpened = Validator::param('getIsOpened')->isNumber()->setDefault(0)->getValue();
- $scope = (new Scope)->readEntity($args['id'], $resolveReferences);
+ $scope = (new Scope())->readEntity($args['id'], $resolveReferences);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
@@ -44,7 +45,7 @@ public function readResponse(
}
if ($getIsOpened) {
- $scope->setStatusAvailability('isOpened', (new Scope)->readIsOpened($scope->getId(), \App::$now));
+ $scope->setStatusAvailability('isOpened', (new Scope())->readIsOpened($scope->getId(), \App::$now));
}
$message->data = $scope;
diff --git a/zmsapi/src/Zmsapi/ScopeList.php b/zmsapi/src/Zmsapi/ScopeList.php
index 9abb50671..e42505ec9 100644
--- a/zmsapi/src/Zmsapi/ScopeList.php
+++ b/zmsapi/src/Zmsapi/ScopeList.php
@@ -1,4 +1,5 @@
checkRights();
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(1)->getValue();
- $cluster = (new \BO\Zmsdb\Cluster)->readEntity($args['id']);
+ $cluster = (new \BO\Zmsdb\Cluster())->readEntity($args['id']);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
diff --git a/zmsapi/src/Zmsapi/ScopeListByProvider.php b/zmsapi/src/Zmsapi/ScopeListByProvider.php
index ca53f6f83..66c362805 100644
--- a/zmsapi/src/Zmsapi/ScopeListByProvider.php
+++ b/zmsapi/src/Zmsapi/ScopeListByProvider.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(1)->getValue();
- $provider = (new \BO\Zmsdb\Provider)->readEntity($args['source'], $args['id']);
+ $provider = (new \BO\Zmsdb\Provider())->readEntity($args['source'], $args['id']);
if (! $provider->hasId()) {
throw new Exception\Provider\ProviderNotFound();
}
diff --git a/zmsapi/src/Zmsapi/ScopeListByRequest.php b/zmsapi/src/Zmsapi/ScopeListByRequest.php
index 01ee02ff7..3bdce1193 100644
--- a/zmsapi/src/Zmsapi/ScopeListByRequest.php
+++ b/zmsapi/src/Zmsapi/ScopeListByRequest.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(1)->getValue();
- $requestEntity = (new \BO\Zmsdb\Request)->readEntity($args['source'], $args['id']);
+ $requestEntity = (new \BO\Zmsdb\Request())->readEntity($args['source'], $args['id']);
if (! $requestEntity->hasId()) {
throw new Exception\Request\RequestNotFound();
}
diff --git a/zmsapi/src/Zmsapi/ScopePreferedByCluster.php b/zmsapi/src/Zmsapi/ScopePreferedByCluster.php
index f3785ee08..f82414dbb 100644
--- a/zmsapi/src/Zmsapi/ScopePreferedByCluster.php
+++ b/zmsapi/src/Zmsapi/ScopePreferedByCluster.php
@@ -1,4 +1,5 @@
checkRights();
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(0)->getValue();
- $cluster = (new \BO\Zmsdb\Cluster)->readEntity($args['id']);
+ $cluster = (new \BO\Zmsdb\Cluster())->readEntity($args['id']);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
diff --git a/zmsapi/src/Zmsapi/ScopeQueue.php b/zmsapi/src/Zmsapi/ScopeQueue.php
index 1eb919f2a..2f92cce14 100644
--- a/zmsapi/src/Zmsapi/ScopeQueue.php
+++ b/zmsapi/src/Zmsapi/ScopeQueue.php
@@ -1,4 +1,5 @@
modify(\App::$now->format('H:i')) : \App::$now;
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(0)->getValue();
- $scope = (new \BO\Zmsdb\Scope)->readWithWorkstationCount($args['id'], \App::$now, $resolveReferences);
+ $scope = (new \BO\Zmsdb\Scope())->readWithWorkstationCount($args['id'], \App::$now, $resolveReferences);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
diff --git a/zmsapi/src/Zmsapi/ScopeUpdate.php b/zmsapi/src/Zmsapi/ScopeUpdate.php
index 9a9e8ee29..92f02ef9c 100644
--- a/zmsapi/src/Zmsapi/ScopeUpdate.php
+++ b/zmsapi/src/Zmsapi/ScopeUpdate.php
@@ -1,4 +1,5 @@
isJson()->assertValid()->getValue();
- $scope = (new Scope)->readEntity($args['id'], 1);
+ $scope = (new Scope())->readEntity($args['id'], 1);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
@@ -33,7 +34,7 @@ public function readResponse(
);
$message = Response\Message::create($request);
- $message->data = (new Scope)->updateEntity($scope->id, $scope);
+ $message->data = (new Scope())->updateEntity($scope->id, $scope);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message, $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/ScopeWithWorkstationCount.php b/zmsapi/src/Zmsapi/ScopeWithWorkstationCount.php
index 6e1054272..0f86b17b8 100644
--- a/zmsapi/src/Zmsapi/ScopeWithWorkstationCount.php
+++ b/zmsapi/src/Zmsapi/ScopeWithWorkstationCount.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
- $scope = (new Scope)->readWithWorkstationCount($args['id'], \App::$now, $resolveReferences);
+ $scope = (new Scope())->readWithWorkstationCount($args['id'], \App::$now, $resolveReferences);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
diff --git a/zmsapi/src/Zmsapi/SessionDelete.php b/zmsapi/src/Zmsapi/SessionDelete.php
index b29fb5d8a..fce06fc9c 100644
--- a/zmsapi/src/Zmsapi/SessionDelete.php
+++ b/zmsapi/src/Zmsapi/SessionDelete.php
@@ -1,4 +1,5 @@
readEntity($args['name'], $args['id']);
- if (! $session || ! (new Session)->deleteEntity($args['name'], $args['id'])) {
+ $session = (new Session())->readEntity($args['name'], $args['id']);
+ if (! $session || ! (new Session())->deleteEntity($args['name'], $args['id'])) {
throw new Exception\Session\SessionDeleteFailed();
}
diff --git a/zmsapi/src/Zmsapi/SessionGet.php b/zmsapi/src/Zmsapi/SessionGet.php
index 16877b459..9a6b0da3b 100644
--- a/zmsapi/src/Zmsapi/SessionGet.php
+++ b/zmsapi/src/Zmsapi/SessionGet.php
@@ -1,4 +1,5 @@
readEntity($args['name'], $args['id']);
+ $session = (new Session())->readEntity($args['name'], $args['id']);
if (! $session) {
throw new Exception\Session\SessionNotFound();
}
diff --git a/zmsapi/src/Zmsapi/SessionUpdate.php b/zmsapi/src/Zmsapi/SessionUpdate.php
index 2f40b91f7..18a259975 100644
--- a/zmsapi/src/Zmsapi/SessionUpdate.php
+++ b/zmsapi/src/Zmsapi/SessionUpdate.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
$sourceData = (isset($args['source']) && $args['source'])
- ? (new Source)->readEntity($args['source'], $resolveReferences)
+ ? (new Source())->readEntity($args['source'], $resolveReferences)
: false;
if (! $sourceData) {
throw new Exception\Source\SourceNotFound();
diff --git a/zmsapi/src/Zmsapi/SourceList.php b/zmsapi/src/Zmsapi/SourceList.php
index 5e43e394d..9a032ac17 100644
--- a/zmsapi/src/Zmsapi/SourceList.php
+++ b/zmsapi/src/Zmsapi/SourceList.php
@@ -1,17 +1,18 @@
isNumber()->setDefault(0)->getValue();
- $sourceList = (new Source)->readList($resolveReferences);
+ $sourceList = (new Source())->readList($resolveReferences);
$message->data = $sourceList;
$response = Render::withLastModified($response, time(), '0');
diff --git a/zmsapi/src/Zmsapi/SourceUpdate.php b/zmsapi/src/Zmsapi/SourceUpdate.php
index b942844ac..0e6197cdf 100644
--- a/zmsapi/src/Zmsapi/SourceUpdate.php
+++ b/zmsapi/src/Zmsapi/SourceUpdate.php
@@ -1,4 +1,5 @@
isJson()->assertValid()->getValue();
$entity = new Entity($input);
$entity->testValid();
@@ -38,7 +38,7 @@ public function readResponse(
$entity = $entity->toStructuredButtonList();
}
- $ticketprinter = (new Query)->readByButtonList($entity, \App::$now);
+ $ticketprinter = (new Query())->readByButtonList($entity, \App::$now);
Helper\TicketprinterAccess::testTicketprinter($ticketprinter);
$message = Response\Message::create($request);
diff --git a/zmsapi/src/Zmsapi/TicketprinterGet.php b/zmsapi/src/Zmsapi/TicketprinterGet.php
index ba56f56c4..2d8d94c67 100644
--- a/zmsapi/src/Zmsapi/TicketprinterGet.php
+++ b/zmsapi/src/Zmsapi/TicketprinterGet.php
@@ -1,4 +1,5 @@
readByHash($args['hash']);
+ $ticketprinter = (new Query())->readByHash($args['hash']);
Helper\TicketprinterAccess::testTicketprinter($ticketprinter);
$message = Response\Message::create($request);
diff --git a/zmsapi/src/Zmsapi/TicketprinterListByScopeList.php b/zmsapi/src/Zmsapi/TicketprinterListByScopeList.php
index 6e33a1009..9764ab162 100644
--- a/zmsapi/src/Zmsapi/TicketprinterListByScopeList.php
+++ b/zmsapi/src/Zmsapi/TicketprinterListByScopeList.php
@@ -1,4 +1,5 @@
readIsEnabled($scopeId, \App::$now);
+ $isEnabled = (new \BO\Zmsdb\Scope())->readIsEnabled($scopeId, \App::$now);
$entity = (new \BO\Zmsentities\Ticketprinter([
'enabled' => $isEnabled,
- 'buttonlist' => 's'. $scopeId
+ 'buttonlist' => 's' . $scopeId
]));
$ticketprinterList->addEntity($entity->toStructuredButtonList());
}
diff --git a/zmsapi/src/Zmsapi/TicketprinterWaitingnumberByCluster.php b/zmsapi/src/Zmsapi/TicketprinterWaitingnumberByCluster.php
index 91671d929..d4f372181 100644
--- a/zmsapi/src/Zmsapi/TicketprinterWaitingnumberByCluster.php
+++ b/zmsapi/src/Zmsapi/TicketprinterWaitingnumberByCluster.php
@@ -1,4 +1,5 @@
password = $entity->getHash($entity->password);
$message = Response\Message::create($request);
- $message->data = (new Useraccount)->writeEntity($entity, $resolveReferences);
+ $message->data = (new Useraccount())->writeEntity($entity, $resolveReferences);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
@@ -50,7 +51,7 @@ protected function testEntity($entity, $input)
throw $exception;
}
- if ((new Useraccount)->readIsUserExisting($entity->id)) {
+ if ((new Useraccount())->readIsUserExisting($entity->id)) {
throw new Exception\Useraccount\UseraccountAlreadyExists();
}
}
diff --git a/zmsapi/src/Zmsapi/UseraccountByDepartmentList.php b/zmsapi/src/Zmsapi/UseraccountByDepartmentList.php
index 399c7e1b0..8896b8720 100644
--- a/zmsapi/src/Zmsapi/UseraccountByDepartmentList.php
+++ b/zmsapi/src/Zmsapi/UseraccountByDepartmentList.php
@@ -1,4 +1,5 @@
checkRights('useraccount');
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(1)->getValue();
$department = Helper\User::checkDepartment($args['id']);
/** @var Useraccount $useraccount */
$useraccountList = new Collection();
- $useraccountList = (new Query)->readCollectionByDepartmentId($department->id, $resolveReferences);
+ $useraccountList = (new Query())->readCollectionByDepartmentId($department->id, $resolveReferences);
$useraccountList = $useraccountList->withAccessByWorkstation($workstation);
foreach ($useraccountList as $userAccount) {
if ($resolveReferences < 1 && !$userAccount->getDepartmentById($department->id)) {
@@ -53,5 +53,4 @@ public function readResponse(
$response = Render::withLastModified($response, time(), '0');
return Render::withJson($response, $message, 200);
}
-
}
diff --git a/zmsapi/src/Zmsapi/UseraccountByRoleAndDepartmentList.php b/zmsapi/src/Zmsapi/UseraccountByRoleAndDepartmentList.php
index 279922046..9ab711afc 100644
--- a/zmsapi/src/Zmsapi/UseraccountByRoleAndDepartmentList.php
+++ b/zmsapi/src/Zmsapi/UseraccountByRoleAndDepartmentList.php
@@ -1,4 +1,5 @@
readListByRoleAndDepartment($roleLevel, $department->id, $resolveReferences)->withLessData();
+ $useraccountList = (new Useraccount())->readListByRoleAndDepartment($roleLevel, $department->id, $resolveReferences)->withLessData();
$useraccountList = $useraccountList->withAccessByWorkstation($workstation);
-
+
if (! $useraccountList or count($useraccountList) === 0) {
throw new \BO\Zmsapi\Exception\Useraccount\UserRoleNotFoundAtDepartment();
}
@@ -48,12 +49,11 @@ public function readResponse(
}
}
$useraccountList = $validUserAccounts;
-
+
$message = Response\Message::create($request);
$message->data = $useraccountList;
$response = Render::withLastModified($response, time(), '0');
return Render::withJson($response, $message, 200);
}
-
}
diff --git a/zmsapi/src/Zmsapi/UseraccountByRoleList.php b/zmsapi/src/Zmsapi/UseraccountByRoleList.php
index 369bb2adc..41ff83508 100644
--- a/zmsapi/src/Zmsapi/UseraccountByRoleList.php
+++ b/zmsapi/src/Zmsapi/UseraccountByRoleList.php
@@ -1,4 +1,5 @@
readListRole($roleLevel, $resolveReferences)->withLessData();
+ $useraccountList = (new Useraccount())->readListRole($roleLevel, $resolveReferences)->withLessData();
$useraccountList = $useraccountList->withAccessByWorkstation($workstation);
if (! $useraccountList or count($useraccountList) === 0) {
throw new \BO\Zmsapi\Exception\Useraccount\UserRoleNotFound();
}
-
+
$validUserAccounts = [];
foreach ($useraccountList as $useraccount) {
try {
@@ -47,12 +48,11 @@ public function readResponse(
}
}
$useraccountList = $validUserAccounts;
-
+
$message = Response\Message::create($request);
$message->data = $useraccountList;
-
+
$response = Render::withLastModified($response, time(), '0');
return Render::withJson($response, $message, 200);
}
-
}
diff --git a/zmsapi/src/Zmsapi/UseraccountDelete.php b/zmsapi/src/Zmsapi/UseraccountDelete.php
index 0864dd5f4..f1ed7643e 100644
--- a/zmsapi/src/Zmsapi/UseraccountDelete.php
+++ b/zmsapi/src/Zmsapi/UseraccountDelete.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(2)->getValue();
(new Helper\User($request, $resolveReferences))->checkRights('useraccount');
- $useraccount = (new Useraccount)->readEntity($args['loginname'], $resolveReferences);
- if (! $useraccount->hasId() || ! (new Useraccount)->deleteEntity($useraccount->getId())) {
+ $useraccount = (new Useraccount())->readEntity($args['loginname'], $resolveReferences);
+ if (! $useraccount->hasId() || ! (new Useraccount())->deleteEntity($useraccount->getId())) {
throw new Exception\Useraccount\UseraccountNotFound();
}
Helper\User::testWorkstationAccessRights($useraccount);
diff --git a/zmsapi/src/Zmsapi/UseraccountGet.php b/zmsapi/src/Zmsapi/UseraccountGet.php
index 6a11afb43..8486fe0b4 100644
--- a/zmsapi/src/Zmsapi/UseraccountGet.php
+++ b/zmsapi/src/Zmsapi/UseraccountGet.php
@@ -1,4 +1,5 @@
checkRights('useraccount');
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(2)->getValue();
- $useraccount = (new Useraccount)->readEntity($args['loginname'], $resolveReferences);
+ $useraccount = (new Useraccount())->readEntity($args['loginname'], $resolveReferences);
if (! $useraccount->hasId()) {
throw new Exception\Useraccount\UseraccountNotFound();
}
diff --git a/zmsapi/src/Zmsapi/UseraccountList.php b/zmsapi/src/Zmsapi/UseraccountList.php
index 679d99163..3a8c351ea 100644
--- a/zmsapi/src/Zmsapi/UseraccountList.php
+++ b/zmsapi/src/Zmsapi/UseraccountList.php
@@ -1,4 +1,5 @@
readList($resolveReferences)->withLessData();
+ $useraccountList = (new Useraccount())->readList($resolveReferences)->withLessData();
$validUserAccounts = [];
foreach ($useraccountList as $useraccount) {
@@ -48,5 +49,4 @@ public function readResponse(
$response = Render::withLastModified($response, time(), '0');
return Render::withJson($response, $message, 200);
}
-
}
diff --git a/zmsapi/src/Zmsapi/UseraccountSearch.php b/zmsapi/src/Zmsapi/UseraccountSearch.php
index 7f7e9471a..f224039bb 100644
--- a/zmsapi/src/Zmsapi/UseraccountSearch.php
+++ b/zmsapi/src/Zmsapi/UseraccountSearch.php
@@ -1,4 +1,5 @@
readSearch($parameters, $resolveReferences)->withLessData();
+ $useraccountList = (new Useraccount())->readSearch($parameters, $resolveReferences)->withLessData();
$validUserAccounts = [];
foreach ($useraccountList as $useraccount) {
@@ -49,5 +50,4 @@ public function readResponse(
$response = Render::withLastModified($response, time(), '0');
return Render::withJson($response, $message, 200);
}
-
}
diff --git a/zmsapi/src/Zmsapi/UseraccountSearchByDepartment.php b/zmsapi/src/Zmsapi/UseraccountSearchByDepartment.php
index a4652d39e..75312a628 100644
--- a/zmsapi/src/Zmsapi/UseraccountSearchByDepartment.php
+++ b/zmsapi/src/Zmsapi/UseraccountSearchByDepartment.php
@@ -1,4 +1,5 @@
readSearchByDepartmentId($department->id, $parameters, $resolveReferences)->withLessData();
+ $useraccountList = (new Useraccount())->readSearchByDepartmentId($department->id, $parameters, $resolveReferences)->withLessData();
$useraccountList = $useraccountList->withAccessByWorkstation($workstation);
-
+
$validUserAccounts = [];
foreach ($useraccountList as $useraccount) {
try {
@@ -45,7 +46,7 @@ public function readResponse(
}
}
$useraccountList = $validUserAccounts;
-
+
$message = Response\Message::create($request);
$message->data = $useraccountList;
@@ -54,5 +55,4 @@ public function readResponse(
return $response;
}
-
}
diff --git a/zmsapi/src/Zmsapi/UseraccountUpdate.php b/zmsapi/src/Zmsapi/UseraccountUpdate.php
index e3ada132d..4569ebedf 100644
--- a/zmsapi/src/Zmsapi/UseraccountUpdate.php
+++ b/zmsapi/src/Zmsapi/UseraccountUpdate.php
@@ -1,4 +1,5 @@
checkRights('useraccount');
-
+
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(2)->getValue();
$input = Validator::input()->isJson()->assertValid()->getValue();
$entity = new \BO\Zmsentities\Useraccount($input);
- if (! (new Useraccount)->readIsUserExisting($args['loginname'])) {
+ if (! (new Useraccount())->readIsUserExisting($args['loginname'])) {
throw new Exception\Useraccount\UseraccountNotFound();
}
$this->testEntity($entity, $input, $args);
-
+
if (isset($entity->changePassword)) {
$entity->password = $entity->getHash(reset($entity->changePassword));
}
$message = Response\Message::create($request);
- $message->data = (new Useraccount)->writeUpdatedEntity($args['loginname'], $entity, $resolveReferences);
+ $message->data = (new Useraccount())->writeUpdatedEntity($args['loginname'], $entity, $resolveReferences);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
@@ -60,7 +61,7 @@ protected function testEntity($entity, $input, $args)
throw $exception;
}
- if ($args['loginname'] != $entity->id && (new Useraccount)->readIsUserExisting($entity->id)) {
+ if ($args['loginname'] != $entity->id && (new Useraccount())->readIsUserExisting($entity->id)) {
throw new Exception\Useraccount\UseraccountAlreadyExists();
}
diff --git a/zmsapi/src/Zmsapi/WarehousePeriodGet.php b/zmsapi/src/Zmsapi/WarehousePeriodGet.php
index c6094d86b..80fafa349 100644
--- a/zmsapi/src/Zmsapi/WarehousePeriodGet.php
+++ b/zmsapi/src/Zmsapi/WarehousePeriodGet.php
@@ -1,4 +1,5 @@
readEntity(
+ $subjectPeriod = (new $exchangeClass())->readEntity(
$subjectId,
$periodHelper->getStartDateTime(),
$periodHelper->getEndDateTime(),
diff --git a/zmsapi/src/Zmsapi/WarehousePeriodListGet.php b/zmsapi/src/Zmsapi/WarehousePeriodListGet.php
index 41e612e27..af1473cdb 100644
--- a/zmsapi/src/Zmsapi/WarehousePeriodListGet.php
+++ b/zmsapi/src/Zmsapi/WarehousePeriodListGet.php
@@ -1,4 +1,5 @@
readPeriodList($subjectId, $period);
+ $subjectPeriodList = (new $exchangeClass())->readPeriodList($subjectId, $period);
$message = Response\Message::create($request);
$message->data = $subjectPeriodList;
diff --git a/zmsapi/src/Zmsapi/WarehouseSubjectGet.php b/zmsapi/src/Zmsapi/WarehouseSubjectGet.php
index 1a26f6e86..098cc399a 100644
--- a/zmsapi/src/Zmsapi/WarehouseSubjectGet.php
+++ b/zmsapi/src/Zmsapi/WarehouseSubjectGet.php
@@ -1,4 +1,5 @@
readSubjectList();
+ $subjectIdList = (new $exchangeClass())->readSubjectList();
$message = Response\Message::create($request);
$message->data = (new Helper\ExchangeAccessFilter($subjectIdList, $workstation))
diff --git a/zmsapi/src/Zmsapi/WarehouseSubjectListGet.php b/zmsapi/src/Zmsapi/WarehouseSubjectListGet.php
index 4a98949a1..45b6ee514 100644
--- a/zmsapi/src/Zmsapi/WarehouseSubjectListGet.php
+++ b/zmsapi/src/Zmsapi/WarehouseSubjectListGet.php
@@ -1,4 +1,5 @@
checkRights('scope');
$message = Response\Message::create($request);
- $subjectsList = (new Query)->readSubjectsList();
+ $subjectsList = (new Query())->readSubjectsList();
$message->data = (new Helper\ExchangeAccessFilter($subjectsList, $workstation))
->getFilteredEntity()
->withLessData();
diff --git a/zmsapi/src/Zmsapi/WorkstationDelete.php b/zmsapi/src/Zmsapi/WorkstationDelete.php
index 456af6462..0cebb7e92 100644
--- a/zmsapi/src/Zmsapi/WorkstationDelete.php
+++ b/zmsapi/src/Zmsapi/WorkstationDelete.php
@@ -1,4 +1,5 @@
checkRights();
$resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(2)->getValue();
- if (! (new Useraccount)->readIsUserExisting($args['loginname'])) {
+ if (! (new Useraccount())->readIsUserExisting($args['loginname'])) {
throw new Exception\Useraccount\UseraccountNotFound();
}
if ($workstation->process && $workstation->process->hasId()) {
@@ -34,12 +35,13 @@ public function readResponse(
}
$message = Response\Message::create($request);
- $message->data = (new Workstation)->writeEntityLogoutByName($args['loginname'], $resolveReferences);
+ $message->data = (new Workstation())->writeEntityLogoutByName($args['loginname'], $resolveReferences);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
- \BO\Zmsdb\Log::writeLogEntry("LOGOUT (WorkstattionDelete::readResponse) ".$args['loginname'],
+ \BO\Zmsdb\Log::writeLogEntry(
+ "LOGOUT (WorkstattionDelete::readResponse) " . $args['loginname'],
0,
Log::PROCESS,
$workstation->getScope()->getId(),
diff --git a/zmsapi/src/Zmsapi/WorkstationGet.php b/zmsapi/src/Zmsapi/WorkstationGet.php
index d53daa82f..e11298a16 100644
--- a/zmsapi/src/Zmsapi/WorkstationGet.php
+++ b/zmsapi/src/Zmsapi/WorkstationGet.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(1)->getValue();
- $workstation = (new Helper\User($request, $resolveReferences))->checkRights();
-
- // Check if the password field exists and remove it from the response
- if (isset($workstation['useraccount']['password'])) {
- unset($workstation['useraccount']['password']);
- }
-
- $message = Response\Message::create($request);
- $message->data = $workstation;
-
- $response = Render::withLastModified($response, time(), '0');
- $response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
- return $response;
- }
- }
-
\ No newline at end of file
+ use BO\Slim\Render;
+ use BO\Mellon\Validator;
+
+class WorkstationGet extends BaseController
+{
+ /**
+ * @SuppressWarnings(Param)
+ * @return String
+ */
+ public function readResponse(
+ \Psr\Http\Message\RequestInterface $request,
+ \Psr\Http\Message\ResponseInterface $response,
+ array $args
+ ) {
+ $resolveReferences = Validator::param('resolveReferences')->isNumber()->setDefault(1)->getValue();
+ $workstation = (new Helper\User($request, $resolveReferences))->checkRights();
+
+ // Check if the password field exists and remove it from the response
+ if (isset($workstation['useraccount']['password'])) {
+ unset($workstation['useraccount']['password']);
+ }
+
+ $message = Response\Message::create($request);
+ $message->data = $workstation;
+
+ $response = Render::withLastModified($response, time(), '0');
+ $response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
+ return $response;
+ }
+}
diff --git a/zmsapi/src/Zmsapi/WorkstationListByCluster.php b/zmsapi/src/Zmsapi/WorkstationListByCluster.php
index 6cbe27a6b..450cafad6 100644
--- a/zmsapi/src/Zmsapi/WorkstationListByCluster.php
+++ b/zmsapi/src/Zmsapi/WorkstationListByCluster.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
- $cluster = (new \BO\Zmsdb\Cluster)->readEntity($args['id'], 0);
+ $cluster = (new \BO\Zmsdb\Cluster())->readEntity($args['id'], 0);
if (! $cluster) {
throw new Exception\Cluster\ClusterNotFound();
}
- $workstationList = (new Workstation)->readLoggedInListByCluster($cluster->id, \App::$now, $resolveReferences);
+ $workstationList = (new Workstation())->readLoggedInListByCluster($cluster->id, \App::$now, $resolveReferences);
$message = Response\Message::create($request);
$message->data = $workstationList;
diff --git a/zmsapi/src/Zmsapi/WorkstationListByScope.php b/zmsapi/src/Zmsapi/WorkstationListByScope.php
index 53a3846d7..15dd62e3d 100644
--- a/zmsapi/src/Zmsapi/WorkstationListByScope.php
+++ b/zmsapi/src/Zmsapi/WorkstationListByScope.php
@@ -1,4 +1,5 @@
isNumber()->setDefault(0)->getValue();
- $scope = (new \BO\Zmsdb\Scope)->readEntity($args['id'], 0);
+ $scope = (new \BO\Zmsdb\Scope())->readEntity($args['id'], 0);
if (! $scope) {
throw new Exception\Scope\ScopeNotFound();
}
- $workstationList = (new Workstation)->readLoggedInListByScope($scope->id, \App::$now, $resolveReferences);
+ $workstationList = (new Workstation())->readLoggedInListByScope($scope->id, \App::$now, $resolveReferences);
$message = Response\Message::create($request);
$message->data = $workstationList;
diff --git a/zmsapi/src/Zmsapi/WorkstationLogin.php b/zmsapi/src/Zmsapi/WorkstationLogin.php
index 7b24af794..323df8a64 100644
--- a/zmsapi/src/Zmsapi/WorkstationLogin.php
+++ b/zmsapi/src/Zmsapi/WorkstationLogin.php
@@ -1,4 +1,5 @@
data = $workstation;
@@ -49,12 +50,12 @@ public static function getLoggedInWorkstation($request, $entity, $resolveReferen
Helper\UserAuth::testUseraccountExists($entity->getId());
$useraccount = Helper\UserAuth::getVerifiedUseraccount($entity);
Helper\UserAuth::testPasswordMatching($useraccount, $entity->password);
-
+
$workstation = (new Helper\User($request, $resolveReferences))->readWorkstation();
Helper\User::testWorkstationIsOveraged($workstation);
-
+
static::testLoginHash($workstation);
- $workstation = (new Workstation)->writeEntityLoginByName(
+ $workstation = (new Workstation())->writeEntityLoginByName(
$useraccount->id,
$useraccount->password,
\App::getNow(),
@@ -62,7 +63,8 @@ public static function getLoggedInWorkstation($request, $entity, $resolveReferen
$resolveReferences
);
- \BO\Zmsdb\Log::writeLogEntry("LOGIN (WorkstattionLogin::getLoggedInWorkstation) ".$useraccount->id,
+ \BO\Zmsdb\Log::writeLogEntry(
+ "LOGIN (WorkstattionLogin::getLoggedInWorkstation) " . $useraccount->id,
0,
Log::PROCESS,
$workstation->getScope()->getId(),
@@ -76,7 +78,7 @@ public static function testLoginHash($workstation)
{
$useraccount = $workstation->getUseraccount();
if (isset($useraccount->id)) {
- $logInHash = (new Workstation)->readLoggedInHashByName($useraccount->id);
+ $logInHash = (new Workstation())->readLoggedInHashByName($useraccount->id);
if (null !== $logInHash) {
$exception = new \BO\Zmsapi\Exception\Useraccount\UserAlreadyLoggedIn();
$exception->data = $workstation;
diff --git a/zmsapi/src/Zmsapi/WorkstationOAuth.php b/zmsapi/src/Zmsapi/WorkstationOAuth.php
index c4b74e9be..4ca65eb41 100644
--- a/zmsapi/src/Zmsapi/WorkstationOAuth.php
+++ b/zmsapi/src/Zmsapi/WorkstationOAuth.php
@@ -2,11 +2,11 @@
namespace BO\Zmsapi;
-use \BO\Slim\Render;
-use \BO\Mellon\Validator;
-use \BO\Zmsdb\Workstation;
-use \BO\Zmsdb\Useraccount;
-use \BO\Zmsentities\Useraccount as UseraccountEntity;
+use BO\Slim\Render;
+use BO\Mellon\Validator;
+use BO\Zmsdb\Workstation;
+use BO\Zmsdb\Useraccount;
+use BO\Zmsentities\Useraccount as UseraccountEntity;
/**
* @SuppressWarnings(Coupling)
@@ -26,7 +26,7 @@ public function readResponse(
$resolveReferences = $validator->getParameter('resolveReferences')->isNumber()->setDefault(2)->getValue();
$state = $validator->getParameter('state')->isString()->isSmallerThan(40)->isBiggerThan(30)->getValue();
$input = Validator::input()->isJson()->assertValid()->getValue();
- $entity = (new UseraccountEntity)->createFromOpenIdData($input);
+ $entity = (new UseraccountEntity())->createFromOpenIdData($input);
$entity->testValid();
if (null === $state || $request->getHeaderLine('X-Authkey') !== $state) {
@@ -51,12 +51,12 @@ public function readResponse(
protected function getLoggedInWorkstationByOidc($request, $entity, $resolveReferences)
{
Helper\UserAuth::testUseraccountExists($entity->getId());
-
+
$workstation = (new Helper\User($request, $resolveReferences))->readWorkstation();
Helper\User::testWorkstationIsOveraged($workstation);
-
+
WorkstationLogin::testLoginHash($workstation);
- $workstation = (new Workstation)->writeEntityLoginByOidc(
+ $workstation = (new Workstation())->writeEntityLoginByOidc(
$entity->id,
$request->getHeaderLine('X-Authkey'),
\App::getNow(),
@@ -68,7 +68,7 @@ protected function getLoggedInWorkstationByOidc($request, $entity, $resolveRefer
protected function writeOAuthWorkstation(UseraccountEntity $entity, $state, $resolveReferences)
{
- $useraccount = (new Useraccount)->writeEntity($entity);
+ $useraccount = (new Useraccount())->writeEntity($entity);
$query = new Workstation();
$workstation = $query->writeEntityLoginByName(
$useraccount->getId(),
diff --git a/zmsapi/src/Zmsapi/WorkstationPassword.php b/zmsapi/src/Zmsapi/WorkstationPassword.php
index c7edfa233..fd52e2aa9 100644
--- a/zmsapi/src/Zmsapi/WorkstationPassword.php
+++ b/zmsapi/src/Zmsapi/WorkstationPassword.php
@@ -1,4 +1,5 @@
data = (new Query)->writeUpdatedEntity($useraccount->getId(), $useraccount);
+ $message->data = (new Query())->writeUpdatedEntity($useraccount->getId(), $useraccount);
$response = Render::withLastModified($response, time(), '0');
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
diff --git a/zmsapi/src/Zmsapi/WorkstationProcess.php b/zmsapi/src/Zmsapi/WorkstationProcess.php
index 8755408a2..c8beb3dbd 100644
--- a/zmsapi/src/Zmsapi/WorkstationProcess.php
+++ b/zmsapi/src/Zmsapi/WorkstationProcess.php
@@ -1,4 +1,5 @@
queue['callCount']++;
$process->status = 'called';
-
- $workstation->process = (new Workstation)->writeAssignedProcess($workstation, $process, \App::$now);
+
+ $workstation->process = (new Workstation())->writeAssignedProcess($workstation, $process, \App::$now);
$message = Response\Message::create($request);
$message->data = $workstation;
diff --git a/zmsapi/src/Zmsapi/WorkstationProcessDelete.php b/zmsapi/src/Zmsapi/WorkstationProcessDelete.php
index 179b1100d..8130b2e7a 100644
--- a/zmsapi/src/Zmsapi/WorkstationProcessDelete.php
+++ b/zmsapi/src/Zmsapi/WorkstationProcessDelete.php
@@ -1,4 +1,5 @@
getUseraccount()
);
$workstation->process->setStatusBySettings();
- (new Workstation)->writeRemovedProcess($workstation);
+ (new Workstation())->writeRemovedProcess($workstation);
unset($workstation->process);
$message = Response\Message::create($request);
@@ -46,4 +47,4 @@ public function readResponse(
$response = Render::withJson($response, $message->setUpdatedMetaData(), $message->getStatuscode());
return $response;
}
-}
\ No newline at end of file
+}
diff --git a/zmsapi/src/Zmsapi/WorkstationProcessGet.php b/zmsapi/src/Zmsapi/WorkstationProcessGet.php
index 209a77d19..73c82f400 100644
--- a/zmsapi/src/Zmsapi/WorkstationProcessGet.php
+++ b/zmsapi/src/Zmsapi/WorkstationProcessGet.php
@@ -1,4 +1,5 @@
getUseraccount()
);
- (new Workstation)->writeRemovedProcess($workstation);
+ (new Workstation())->writeRemovedProcess($workstation);
unset($workstation->process);
$message = Response\Message::create($request);
diff --git a/zmsapi/src/Zmsapi/WorkstationProcessWaitingnumber.php b/zmsapi/src/Zmsapi/WorkstationProcessWaitingnumber.php
index a2670fb90..8457f107e 100644
--- a/zmsapi/src/Zmsapi/WorkstationProcessWaitingnumber.php
+++ b/zmsapi/src/Zmsapi/WorkstationProcessWaitingnumber.php
@@ -1,4 +1,5 @@
getUseraccount()->rights = $currentWorkstation->getUseraccount()->rights;
- $workstation = (new Workstation)->updateEntity($entity, $resolveReferences);
+ $workstation = (new Workstation())->updateEntity($entity, $resolveReferences);
$message = Response\Message::create($request);
$message->data = $workstation;
diff --git a/zmscalldisplay/.gitignore b/zmscalldisplay/.gitignore
index 1d1bfae14..7ba2e4e03 100644
--- a/zmscalldisplay/.gitignore
+++ b/zmscalldisplay/.gitignore
@@ -19,4 +19,5 @@ vendor.update
.cache
.parcel-cache
.phpunit.result.cache
+coverage
diff --git a/zmscalldisplay/package-lock.json b/zmscalldisplay/package-lock.json
index b77120104..225e9008c 100644
--- a/zmscalldisplay/package-lock.json
+++ b/zmscalldisplay/package-lock.json
@@ -191,6 +191,7 @@
"arm64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"darwin"
@@ -204,6 +205,7 @@
"x64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"darwin"
@@ -217,6 +219,7 @@
"arm"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"linux"
@@ -230,6 +233,7 @@
"arm64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"linux"
@@ -243,6 +247,7 @@
"x64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"linux"
@@ -256,6 +261,7 @@
"x64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"win32"
@@ -354,21 +360,22 @@
]
},
"node_modules/@parcel/bundler-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.12.0.tgz",
- "integrity": "sha512-3ybN74oYNMKyjD6V20c9Gerdbh7teeNvVMwIoHIQMzuIFT6IGX53PyOLlOKRLbjxMc0TMimQQxIt2eQqxR5LsA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.13.3.tgz",
+ "integrity": "sha512-mOuWeth0bZzRv1b9Lrvydis/hAzJyePy0gwa0tix3/zyYBvw0JY+xkXVR4qKyD/blc1Ra2qOlfI2uD3ucnsdXA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/graph": "3.2.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/graph": "3.3.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -376,37 +383,39 @@
}
},
"node_modules/@parcel/cache": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.12.0.tgz",
- "integrity": "sha512-FX5ZpTEkxvq/yvWklRHDESVRz+c7sLTXgFuzz6uEnBcXV38j6dMSikflNpHA6q/L4GKkCqRywm9R6XQwhwIMyw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.13.3.tgz",
+ "integrity": "sha512-Vz5+K5uCt9mcuQAMDo0JdbPYDmVdB8Nvu/A2vTEK2rqZPxvoOTczKeMBA4JqzKqGURHPRLaJCvuR8nDG+jhK9A==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/fs": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/fs": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/utils": "2.13.3",
"lmdb": "2.8.5"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/codeframe": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.12.0.tgz",
- "integrity": "sha512-v2VmneILFiHZJTxPiR7GEF1wey1/IXPdZMcUlNXBiPZyWDfcuNgGGVQkx/xW561rULLIvDPharOMdxz5oHOKQg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.13.3.tgz",
+ "integrity": "sha512-L/PQf+PT0xM8k9nc0B+PxxOYO2phQYnbuifu9o4pFRiqVmCtHztP+XMIvRJ2gOEXy3pgAImSPFVJ3xGxMFky4g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "chalk": "^4.1.0"
+ "chalk": "^4.1.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -414,16 +423,17 @@
}
},
"node_modules/@parcel/compressor-raw": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.12.0.tgz",
- "integrity": "sha512-h41Q3X7ZAQ9wbQ2csP8QGrwepasLZdXiuEdpUryDce6rF9ZiHoJ97MRpdLxOhOPyASTw/xDgE1xyaPQr0Q3f5A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.13.3.tgz",
+ "integrity": "sha512-C6vjDlgTLjYc358i7LA/dqcL0XDQZ1IHXFw6hBaHHOfxPKW2T4bzUI6RURyToEK9Q1X7+ggDKqgdLxwp4veCFg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -431,85 +441,87 @@
}
},
"node_modules/@parcel/config-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.12.0.tgz",
- "integrity": "sha512-dPNe2n9eEsKRc1soWIY0yToMUPirPIa2QhxcCB3Z5RjpDGIXm0pds+BaiqY6uGLEEzsjhRO0ujd4v2Rmm0vuFg==",
- "dev": true,
- "dependencies": {
- "@parcel/bundler-default": "2.12.0",
- "@parcel/compressor-raw": "2.12.0",
- "@parcel/namer-default": "2.12.0",
- "@parcel/optimizer-css": "2.12.0",
- "@parcel/optimizer-htmlnano": "2.12.0",
- "@parcel/optimizer-image": "2.12.0",
- "@parcel/optimizer-svgo": "2.12.0",
- "@parcel/optimizer-swc": "2.12.0",
- "@parcel/packager-css": "2.12.0",
- "@parcel/packager-html": "2.12.0",
- "@parcel/packager-js": "2.12.0",
- "@parcel/packager-raw": "2.12.0",
- "@parcel/packager-svg": "2.12.0",
- "@parcel/packager-wasm": "2.12.0",
- "@parcel/reporter-dev-server": "2.12.0",
- "@parcel/resolver-default": "2.12.0",
- "@parcel/runtime-browser-hmr": "2.12.0",
- "@parcel/runtime-js": "2.12.0",
- "@parcel/runtime-react-refresh": "2.12.0",
- "@parcel/runtime-service-worker": "2.12.0",
- "@parcel/transformer-babel": "2.12.0",
- "@parcel/transformer-css": "2.12.0",
- "@parcel/transformer-html": "2.12.0",
- "@parcel/transformer-image": "2.12.0",
- "@parcel/transformer-js": "2.12.0",
- "@parcel/transformer-json": "2.12.0",
- "@parcel/transformer-postcss": "2.12.0",
- "@parcel/transformer-posthtml": "2.12.0",
- "@parcel/transformer-raw": "2.12.0",
- "@parcel/transformer-react-refresh-wrap": "2.12.0",
- "@parcel/transformer-svg": "2.12.0"
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.13.3.tgz",
+ "integrity": "sha512-WUsx83ic8DgLwwnL1Bua4lRgQqYjxiTT+DBxESGk1paNm1juWzyfPXEQDLXwiCTcWMQGiXQFQ8OuSISauVQ8dQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/bundler-default": "2.13.3",
+ "@parcel/compressor-raw": "2.13.3",
+ "@parcel/namer-default": "2.13.3",
+ "@parcel/optimizer-css": "2.13.3",
+ "@parcel/optimizer-htmlnano": "2.13.3",
+ "@parcel/optimizer-image": "2.13.3",
+ "@parcel/optimizer-svgo": "2.13.3",
+ "@parcel/optimizer-swc": "2.13.3",
+ "@parcel/packager-css": "2.13.3",
+ "@parcel/packager-html": "2.13.3",
+ "@parcel/packager-js": "2.13.3",
+ "@parcel/packager-raw": "2.13.3",
+ "@parcel/packager-svg": "2.13.3",
+ "@parcel/packager-wasm": "2.13.3",
+ "@parcel/reporter-dev-server": "2.13.3",
+ "@parcel/resolver-default": "2.13.3",
+ "@parcel/runtime-browser-hmr": "2.13.3",
+ "@parcel/runtime-js": "2.13.3",
+ "@parcel/runtime-react-refresh": "2.13.3",
+ "@parcel/runtime-service-worker": "2.13.3",
+ "@parcel/transformer-babel": "2.13.3",
+ "@parcel/transformer-css": "2.13.3",
+ "@parcel/transformer-html": "2.13.3",
+ "@parcel/transformer-image": "2.13.3",
+ "@parcel/transformer-js": "2.13.3",
+ "@parcel/transformer-json": "2.13.3",
+ "@parcel/transformer-postcss": "2.13.3",
+ "@parcel/transformer-posthtml": "2.13.3",
+ "@parcel/transformer-raw": "2.13.3",
+ "@parcel/transformer-react-refresh-wrap": "2.13.3",
+ "@parcel/transformer-svg": "2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/core": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.12.0.tgz",
- "integrity": "sha512-s+6pwEj+GfKf7vqGUzN9iSEPueUssCCQrCBUlcAfKrJe0a22hTUCjewpB0I7lNrCIULt8dkndD+sMdOrXsRl6Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.13.3.tgz",
+ "integrity": "sha512-SRZFtqGiaKHlZ2YAvf+NHvBFWS3GnkBvJMfOJM7kxJRK3M1bhbwJa/GgSdzqro5UVf9Bfj6E+pkdrRQIOZ7jMQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@mischnic/json-sourcemap": "^0.1.0",
- "@parcel/cache": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/graph": "3.2.0",
- "@parcel/logger": "2.12.0",
- "@parcel/package-manager": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/profiler": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/cache": "2.13.3",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3",
+ "@parcel/feature-flags": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/graph": "3.3.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/package-manager": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/profiler": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
- "abortcontroller-polyfill": "^1.1.9",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
"base-x": "^3.0.8",
"browserslist": "^4.6.6",
"clone": "^2.1.1",
- "dotenv": "^7.0.0",
- "dotenv-expand": "^5.1.0",
+ "dotenv": "^16.4.5",
+ "dotenv-expand": "^11.0.6",
"json5": "^2.2.0",
"msgpackr": "^1.9.9",
"nullthrows": "^1.1.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -517,16 +529,17 @@
}
},
"node_modules/@parcel/diagnostic": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.12.0.tgz",
- "integrity": "sha512-8f1NOsSFK+F4AwFCKynyIu9Kr/uWHC+SywAv4oS6Bv3Acig0gtwUjugk0C9UaB8ztBZiW5TQZhw+uPZn9T/lJA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.13.3.tgz",
+ "integrity": "sha512-C70KXLBaXLJvr7XCEVu8m6TqNdw1gQLxqg5BQ8roR62R4vWWDnOq8PEksxDi4Y8Z/FF4i3Sapv6tRx9iBNxDEg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@mischnic/json-sourcemap": "^0.1.0",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -534,12 +547,27 @@
}
},
"node_modules/@parcel/events": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.12.0.tgz",
- "integrity": "sha512-nmAAEIKLjW1kB2cUbCYSmZOGbnGj8wCzhqnK727zCCWaA25ogzAtt657GPOeFyqW77KyosU728Tl63Fc8hphIA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.13.3.tgz",
+ "integrity": "sha512-ZkSHTTbD/E+53AjUzhAWTnMLnxLEU5yRw0H614CaruGh+GjgOIKyukGeToF5Gf/lvZ159VrJCGE0Z5EpgHVkuQ==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/feature-flags": {
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/feature-flags/-/feature-flags-2.13.3.tgz",
+ "integrity": "sha512-UZm14QpamDFoUut9YtCZSpG1HxPs07lUwUCpsAYL0PpxASD3oWJQxIJGfDZPa2272DarXDG9adTKrNXvkHZblw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -547,38 +575,42 @@
}
},
"node_modules/@parcel/fs": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.12.0.tgz",
- "integrity": "sha512-NnFkuvou1YBtPOhTdZr44WN7I60cGyly2wpHzqRl62yhObyi1KvW0SjwOMa0QGNcBOIzp4G0CapoZ93hD0RG5Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.13.3.tgz",
+ "integrity": "sha512-+MPWAt0zr+TCDSlj1LvkORTjfB/BSffsE99A9AvScKytDSYYpY2s0t4vtV9unSh0FHMS2aBCZNJ4t7KL+DcPIg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/rust": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/feature-flags": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/types-internal": "2.13.3",
+ "@parcel/utils": "2.13.3",
"@parcel/watcher": "^2.0.7",
- "@parcel/workers": "2.12.0"
+ "@parcel/workers": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/graph": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-3.2.0.tgz",
- "integrity": "sha512-xlrmCPqy58D4Fg5umV7bpwDx5Vyt7MlnQPxW68vae5+BA4GSWetfZt+Cs5dtotMG2oCHzZxhIPt7YZ7NRyQzLA==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-3.3.3.tgz",
+ "integrity": "sha512-pxs4GauEdvCN8nRd6wG3st6LvpHske3GfqGwUSR0P0X0pBPI1/NicvXz6xzp3rgb9gPWfbKXeI/2IOTfIxxVfg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
+ "@parcel/feature-flags": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -586,16 +618,17 @@
}
},
"node_modules/@parcel/logger": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.12.0.tgz",
- "integrity": "sha512-cJ7Paqa7/9VJ7C+KwgJlwMqTQBOjjn71FbKk0G07hydUEBISU2aDfmc/52o60ErL9l+vXB26zTrIBanbxS8rVg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.13.3.tgz",
+ "integrity": "sha512-8YF/ZhsQgd7ohQ2vEqcMD1Ag9JlJULROWRPGgGYLGD+twuxAiSdiFBpN3f+j4gQN4PYaLaIS/SwUFx11J243fQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0"
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -603,15 +636,16 @@
}
},
"node_modules/@parcel/markdown-ansi": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.12.0.tgz",
- "integrity": "sha512-WZz3rzL8k0H3WR4qTHX6Ic8DlEs17keO9gtD4MNGyMNQbqQEvQ61lWJaIH0nAtgEetu0SOITiVqdZrb8zx/M7w==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.13.3.tgz",
+ "integrity": "sha512-B4rUdlNUulJs2xOQuDbN7Hq5a9roq8IZUcJ1vQ8PAv+zMGb7KCfqIIr/BSCDYGhayfAGBVWW8x55Kvrl1zrDYw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "chalk": "^4.1.0"
+ "chalk": "^4.1.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -619,18 +653,19 @@
}
},
"node_modules/@parcel/namer-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.12.0.tgz",
- "integrity": "sha512-9DNKPDHWgMnMtqqZIMiEj/R9PNWW16lpnlHjwK3ciRlMPgjPJ8+UNc255teZODhX0T17GOzPdGbU/O/xbxVPzA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.13.3.tgz",
+ "integrity": "sha512-A2a5A5fuyNcjSGOS0hPcdQmOE2kszZnLIXof7UMGNkNkeC62KAG8WcFZH5RNOY3LT5H773hq51zmc2Y2gE5Rnw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -638,21 +673,22 @@
}
},
"node_modules/@parcel/node-resolver-core": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.3.0.tgz",
- "integrity": "sha512-rhPW9DYPEIqQBSlYzz3S0AjXxjN6Ub2yS6tzzsW/4S3Gpsgk/uEq4ZfxPvoPf/6TgZndVxmKwpmxaKtGMmf3cA==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.4.3.tgz",
+ "integrity": "sha512-IEnMks49egEic1ITBp59VQyHzkSQUXqpU9hOHwqN3KoSTdZ6rEgrXcS3pa6tdXay4NYGlcZ88kFCE8i/xYoVCg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@mischnic/json-sourcemap": "^0.1.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -660,22 +696,23 @@
}
},
"node_modules/@parcel/optimizer-css": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.12.0.tgz",
- "integrity": "sha512-ifbcC97fRzpruTjaa8axIFeX4MjjSIlQfem3EJug3L2AVqQUXnM1XO8L0NaXGNLTW2qnh1ZjIJ7vXT/QhsphsA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.13.3.tgz",
+ "integrity": "sha512-A8o9IVCv919vhv69SkLmyW2WjJR5WZgcMqV6L1uiGF8i8z18myrMhrp2JuSHx29PRT9uNyzNC4Xrd4StYjIhJg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"browserslist": "^4.6.6",
"lightningcss": "^1.22.1",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -683,232 +720,795 @@
}
},
"node_modules/@parcel/optimizer-htmlnano": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.12.0.tgz",
- "integrity": "sha512-MfPMeCrT8FYiOrpFHVR+NcZQlXAptK2r4nGJjfT+ndPBhEEZp4yyL7n1y7HfX9geg5altc4WTb4Gug7rCoW8VQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.13.3.tgz",
+ "integrity": "sha512-K4Uvg0Sy2pECP7pdvvbud++F0pfcbNkq+IxTrgqBX5HJnLEmRZwgdvZEKF43oMEolclMnURMQRGjRplRaPdbXg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"htmlnano": "^2.0.0",
"nullthrows": "^1.1.1",
- "posthtml": "^0.16.5",
- "svgo": "^2.4.0"
+ "posthtml": "^0.16.5"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
- "node_modules/@parcel/optimizer-htmlnano/node_modules/css-select": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
- "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/css-declaration-sorter": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz",
+ "integrity": "sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==",
"dev": true,
- "license": "BSD-2-Clause",
+ "license": "ISC",
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": "^14 || ^16 || >=18"
+ },
+ "peerDependencies": {
+ "postcss": "^8.0.9"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/cssnano": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.0.6.tgz",
+ "integrity": "sha512-54woqx8SCbp8HwvNZYn68ZFAepuouZW4lTwiMVnBErM3VkO7/Sd4oTOt3Zz3bPx3kxQ36aISppyXj2Md4lg8bw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
"dependencies": {
- "boolbase": "^1.0.0",
- "css-what": "^6.0.1",
- "domhandler": "^4.3.1",
- "domutils": "^2.8.0",
- "nth-check": "^2.0.1"
+ "cssnano-preset-default": "^7.0.6",
+ "lilconfig": "^3.1.2"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
},
"funding": {
- "url": "https://github.com/sponsors/fb55"
+ "type": "opencollective",
+ "url": "https://opencollective.com/cssnano"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
}
},
- "node_modules/@parcel/optimizer-htmlnano/node_modules/css-tree": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
- "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/cssnano-preset-default": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.6.tgz",
+ "integrity": "sha512-ZzrgYupYxEvdGGuqL+JKOY70s7+saoNlHSCK/OGn1vB2pQK8KSET8jvenzItcY+kA7NoWvfbb/YhlzuzNKjOhQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "css-declaration-sorter": "^7.2.0",
+ "cssnano-utils": "^5.0.0",
+ "postcss-calc": "^10.0.2",
+ "postcss-colormin": "^7.0.2",
+ "postcss-convert-values": "^7.0.4",
+ "postcss-discard-comments": "^7.0.3",
+ "postcss-discard-duplicates": "^7.0.1",
+ "postcss-discard-empty": "^7.0.0",
+ "postcss-discard-overridden": "^7.0.0",
+ "postcss-merge-longhand": "^7.0.4",
+ "postcss-merge-rules": "^7.0.4",
+ "postcss-minify-font-values": "^7.0.0",
+ "postcss-minify-gradients": "^7.0.0",
+ "postcss-minify-params": "^7.0.2",
+ "postcss-minify-selectors": "^7.0.4",
+ "postcss-normalize-charset": "^7.0.0",
+ "postcss-normalize-display-values": "^7.0.0",
+ "postcss-normalize-positions": "^7.0.0",
+ "postcss-normalize-repeat-style": "^7.0.0",
+ "postcss-normalize-string": "^7.0.0",
+ "postcss-normalize-timing-functions": "^7.0.0",
+ "postcss-normalize-unicode": "^7.0.2",
+ "postcss-normalize-url": "^7.0.0",
+ "postcss-normalize-whitespace": "^7.0.0",
+ "postcss-ordered-values": "^7.0.1",
+ "postcss-reduce-initial": "^7.0.2",
+ "postcss-reduce-transforms": "^7.0.0",
+ "postcss-svgo": "^7.0.1",
+ "postcss-unique-selectors": "^7.0.3"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/cssnano-utils": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-5.0.0.tgz",
+ "integrity": "sha512-Uij0Xdxc24L6SirFr25MlwC2rCFX6scyUmuKpzI+JQ7cyqDEwD42fJ0xfB3yLfOnRDU5LKGgjQ9FA6LYh76GWQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/htmlnano": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/htmlnano/-/htmlnano-2.1.1.tgz",
+ "integrity": "sha512-kAERyg/LuNZYmdqgCdYvugyLWNFAm8MWXpQMz1pLpetmCbFwoMxvkSoaAMlFrOC4OKTWI4KlZGT/RsNxg4ghOw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "mdn-data": "2.0.14",
- "source-map": "^0.6.1"
+ "cosmiconfig": "^9.0.0",
+ "posthtml": "^0.16.5",
+ "timsort": "^0.3.0"
},
+ "peerDependencies": {
+ "cssnano": "^7.0.0",
+ "postcss": "^8.3.11",
+ "purgecss": "^6.0.0",
+ "relateurl": "^0.2.7",
+ "srcset": "5.0.1",
+ "svgo": "^3.0.2",
+ "terser": "^5.10.0",
+ "uncss": "^0.17.3"
+ },
+ "peerDependenciesMeta": {
+ "cssnano": {
+ "optional": true
+ },
+ "postcss": {
+ "optional": true
+ },
+ "purgecss": {
+ "optional": true
+ },
+ "relateurl": {
+ "optional": true
+ },
+ "srcset": {
+ "optional": true
+ },
+ "svgo": {
+ "optional": true
+ },
+ "terser": {
+ "optional": true
+ },
+ "uncss": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/lilconfig": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+ "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
"engines": {
- "node": ">=8.0.0"
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antonk52"
}
},
- "node_modules/@parcel/optimizer-htmlnano/node_modules/csso": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
- "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-calc": {
+ "version": "10.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.1.1.tgz",
+ "integrity": "sha512-NYEsLHh8DgG/PRH2+G9BTuUdtf9ViS+vdoQ0YA5OQdGsfN4ztiwtDWNtBl9EKeqNMFnIu8IKZ0cLxEQ5r5KVMw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-selector-parser": "^7.0.0",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12 || ^20.9 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.38"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-calc/node_modules/postcss-selector-parser": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+ "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
"dev": true,
"license": "MIT",
+ "optional": true,
+ "peer": true,
"dependencies": {
- "css-tree": "^1.1.2"
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
},
"engines": {
- "node": ">=8.0.0"
+ "node": ">=4"
}
},
- "node_modules/@parcel/optimizer-htmlnano/node_modules/mdn-data": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
- "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-colormin": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.2.tgz",
+ "integrity": "sha512-YntRXNngcvEvDbEjTdRWGU606eZvB5prmHG4BF0yLmVpamXbpsRJzevyy6MZVyuecgzI2AWAlvFi8DAeCqwpvA==",
"dev": true,
- "license": "CC0-1.0"
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "caniuse-api": "^3.0.0",
+ "colord": "^2.9.3",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-convert-values": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.4.tgz",
+ "integrity": "sha512-e2LSXPqEHVW6aoGbjV9RsSSNDO3A0rZLCBxN24zvxF25WknMPpX8Dm9UxxThyEbaytzggRuZxaGXqaOhxQ514Q==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-discard-comments": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.3.tgz",
+ "integrity": "sha512-q6fjd4WU4afNhWOA2WltHgCbkRhZPgQe7cXF74fuVB/ge4QbM9HEaOIzGSiMvM+g/cOsNAUGdf2JDzqA2F8iLA==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-selector-parser": "^6.1.2"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-discard-duplicates": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.1.tgz",
+ "integrity": "sha512-oZA+v8Jkpu1ct/xbbrntHRsfLGuzoP+cpt0nJe5ED2FQF8n8bJtn7Bo28jSmBYwqgqnqkuSXJfSUEE7if4nClQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-discard-empty": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-7.0.0.tgz",
+ "integrity": "sha512-e+QzoReTZ8IAwhnSdp/++7gBZ/F+nBq9y6PomfwORfP7q9nBpK5AMP64kOt0bA+lShBFbBDcgpJ3X4etHg4lzA==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-discard-overridden": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-7.0.0.tgz",
+ "integrity": "sha512-GmNAzx88u3k2+sBTZrJSDauR0ccpE24omTQCVmaTTZFz1du6AasspjaUPMJ2ud4RslZpoFKyf+6MSPETLojc6w==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-merge-longhand": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.4.tgz",
+ "integrity": "sha512-zer1KoZA54Q8RVHKOY5vMke0cCdNxMP3KBfDerjH/BYHh4nCIh+1Yy0t1pAEQF18ac/4z3OFclO+ZVH8azjR4A==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0",
+ "stylehacks": "^7.0.4"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-merge-rules": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.4.tgz",
+ "integrity": "sha512-ZsaamiMVu7uBYsIdGtKJ64PkcQt6Pcpep/uO90EpLS3dxJi6OXamIobTYcImyXGoW0Wpugh7DSD3XzxZS9JCPg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "caniuse-api": "^3.0.0",
+ "cssnano-utils": "^5.0.0",
+ "postcss-selector-parser": "^6.1.2"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-minify-font-values": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-7.0.0.tgz",
+ "integrity": "sha512-2ckkZtgT0zG8SMc5aoNwtm5234eUx1GGFJKf2b1bSp8UflqaeFzR50lid4PfqVI9NtGqJ2J4Y7fwvnP/u1cQog==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-minify-gradients": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-7.0.0.tgz",
+ "integrity": "sha512-pdUIIdj/C93ryCHew0UgBnL2DtUS3hfFa5XtERrs4x+hmpMYGhbzo6l/Ir5de41O0GaKVpK1ZbDNXSY6GkXvtg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "colord": "^2.9.3",
+ "cssnano-utils": "^5.0.0",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-minify-params": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.2.tgz",
+ "integrity": "sha512-nyqVLu4MFl9df32zTsdcLqCFfE/z2+f8GE1KHPxWOAmegSo6lpV2GNy5XQvrzwbLmiU7d+fYay4cwto1oNdAaQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "cssnano-utils": "^5.0.0",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-minify-selectors": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.4.tgz",
+ "integrity": "sha512-JG55VADcNb4xFCf75hXkzc1rNeURhlo7ugf6JjiiKRfMsKlDzN9CXHZDyiG6x/zGchpjQS+UAgb1d4nqXqOpmA==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "postcss-selector-parser": "^6.1.2"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-charset": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-7.0.0.tgz",
+ "integrity": "sha512-ABisNUXMeZeDNzCQxPxBCkXexvBrUHV+p7/BXOY+ulxkcjUZO0cp8ekGBwvIh2LbCwnWbyMPNJVtBSdyhM2zYQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-display-values": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.0.tgz",
+ "integrity": "sha512-lnFZzNPeDf5uGMPYgGOw7v0BfB45+irSRz9gHQStdkkhiM0gTfvWkWB5BMxpn0OqgOQuZG/mRlZyJxp0EImr2Q==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-positions": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-7.0.0.tgz",
+ "integrity": "sha512-I0yt8wX529UKIGs2y/9Ybs2CelSvItfmvg/DBIjTnoUSrPxSV7Z0yZ8ShSVtKNaV/wAY+m7bgtyVQLhB00A1NQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-repeat-style": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.0.tgz",
+ "integrity": "sha512-o3uSGYH+2q30ieM3ppu9GTjSXIzOrRdCUn8UOMGNw7Af61bmurHTWI87hRybrP6xDHvOe5WlAj3XzN6vEO8jLw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-string": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-7.0.0.tgz",
+ "integrity": "sha512-w/qzL212DFVOpMy3UGyxrND+Kb0fvCiBBujiaONIihq7VvtC7bswjWgKQU/w4VcRyDD8gpfqUiBQ4DUOwEJ6Qg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-timing-functions": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.0.tgz",
+ "integrity": "sha512-tNgw3YV0LYoRwg43N3lTe3AEWZ66W7Dh7lVEpJbHoKOuHc1sLrzMLMFjP8SNULHaykzsonUEDbKedv8C+7ej6g==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-unicode": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.2.tgz",
+ "integrity": "sha512-ztisabK5C/+ZWBdYC+Y9JCkp3M9qBv/XFvDtSw0d/XwfT3UaKeW/YTm/MD/QrPNxuecia46vkfEhewjwcYFjkg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-url": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-7.0.0.tgz",
+ "integrity": "sha512-+d7+PpE+jyPX1hDQZYG+NaFD+Nd2ris6r8fPTBAjE8z/U41n/bib3vze8x7rKs5H1uEw5ppe9IojewouHk0klQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-normalize-whitespace": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.0.tgz",
+ "integrity": "sha512-37/toN4wwZErqohedXYqWgvcHUGlT8O/m2jVkAfAe9Bd4MzRqlBmXrJRePH0e9Wgnz2X7KymTgTOaaFizQe3AQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-ordered-values": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.1.tgz",
+ "integrity": "sha512-irWScWRL6nRzYmBOXReIKch75RRhNS86UPUAxXdmW/l0FcAsg0lvAXQCby/1lymxn/o0gVa6Rv/0f03eJOwHxw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "cssnano-utils": "^5.0.0",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
+ },
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-reduce-initial": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.2.tgz",
+ "integrity": "sha512-pOnu9zqQww7dEKf62Nuju6JgsW2V0KRNBHxeKohU+JkHd/GAH5uvoObqFLqkeB2n20mr6yrlWDvo5UBU5GnkfA==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "caniuse-api": "^3.0.0"
+ },
+ "engines": {
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
+ }
},
- "node_modules/@parcel/optimizer-htmlnano/node_modules/svgo": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
- "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-reduce-transforms": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.0.tgz",
+ "integrity": "sha512-pnt1HKKZ07/idH8cpATX/ujMbtOGhUfE+m8gbqwJE05aTaNw8gbo34a2e3if0xc0dlu75sUOiqvwCGY3fzOHew==",
"dev": true,
"license": "MIT",
+ "optional": true,
+ "peer": true,
"dependencies": {
- "@trysound/sax": "0.2.0",
- "commander": "^7.2.0",
- "css-select": "^4.1.3",
- "css-tree": "^1.1.3",
- "csso": "^4.2.0",
- "picocolors": "^1.0.0",
- "stable": "^0.1.8"
- },
- "bin": {
- "svgo": "bin/svgo"
+ "postcss-value-parser": "^4.2.0"
},
"engines": {
- "node": ">=10.13.0"
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
}
},
- "node_modules/@parcel/optimizer-image": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.12.0.tgz",
- "integrity": "sha512-bo1O7raeAIbRU5nmNVtx8divLW9Xqn0c57GVNGeAK4mygnQoqHqRZ0mR9uboh64pxv6ijXZHPhKvU9HEpjPjBQ==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-svgo": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.0.1.tgz",
+ "integrity": "sha512-0WBUlSL4lhD9rA5k1e5D8EN5wCEyZD6HJk0jIvRxl+FDVOMlJ7DePHYWGGVc5QRqrJ3/06FTXM0bxjmJpmTPSA==",
"dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0"
+ "postcss-value-parser": "^4.2.0",
+ "svgo": "^3.3.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/parcel"
+ "node": "^18.12.0 || ^20.9.0 || >= 18"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "postcss": "^8.4.31"
}
},
- "node_modules/@parcel/optimizer-svgo": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.12.0.tgz",
- "integrity": "sha512-Kyli+ZZXnoonnbeRQdoWwee9Bk2jm/49xvnfb+2OO8NN0d41lblBoRhOyFiScRnJrw7eVl1Xrz7NTkXCIO7XFQ==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/postcss-unique-selectors": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.3.tgz",
+ "integrity": "sha512-J+58u5Ic5T1QjP/LDV9g3Cx4CNOgB5vz+kM6+OxHHhFACdcDeKhBXjQmB7fnIZM12YSTvsL0Opwco83DmacW2g==",
"dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
- "svgo": "^2.4.0"
+ "postcss-selector-parser": "^6.1.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
},
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/parcel"
+ "peerDependencies": {
+ "postcss": "^8.4.31"
}
},
- "node_modules/@parcel/optimizer-svgo/node_modules/css-select": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
- "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/srcset": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/srcset/-/srcset-5.0.1.tgz",
+ "integrity": "sha512-/P1UYbGfJVlxZag7aABNRrulEXAwCSDo7fklafOQrantuPTDmYgijJMks2zusPCVzgW9+4P69mq7w6pYuZpgxw==",
"dev": true,
- "license": "BSD-2-Clause",
- "dependencies": {
- "boolbase": "^1.0.0",
- "css-what": "^6.0.1",
- "domhandler": "^4.3.1",
- "domutils": "^2.8.0",
- "nth-check": "^2.0.1"
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
},
"funding": {
- "url": "https://github.com/sponsors/fb55"
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/@parcel/optimizer-svgo/node_modules/css-tree": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
- "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+ "node_modules/@parcel/optimizer-htmlnano/node_modules/stylehacks": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.4.tgz",
+ "integrity": "sha512-i4zfNrGMt9SB4xRK9L83rlsFCgdGANfeDAYacO1pkqcE7cRHPdWHwnKZVz7WY17Veq/FvyYsRAU++Ga+qDFIww==",
"dev": true,
"license": "MIT",
+ "optional": true,
+ "peer": true,
"dependencies": {
- "mdn-data": "2.0.14",
- "source-map": "^0.6.1"
+ "browserslist": "^4.23.3",
+ "postcss-selector-parser": "^6.1.2"
},
"engines": {
- "node": ">=8.0.0"
+ "node": "^18.12.0 || ^20.9.0 || >=22.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.4.31"
}
},
- "node_modules/@parcel/optimizer-svgo/node_modules/csso": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
- "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+ "node_modules/@parcel/optimizer-image": {
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.13.3.tgz",
+ "integrity": "sha512-wlDUICA29J4UnqkKrWiyt68g1e85qfYhp4zJFcFJL0LX1qqh1QwsLUz3YJ+KlruoqPxJSFEC8ncBEKiVCsqhEQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "css-tree": "^1.1.2"
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3"
},
"engines": {
- "node": ">=8.0.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ },
+ "peerDependencies": {
+ "@parcel/core": "^2.13.3"
}
},
- "node_modules/@parcel/optimizer-svgo/node_modules/mdn-data": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
- "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
- "dev": true,
- "license": "CC0-1.0"
- },
- "node_modules/@parcel/optimizer-svgo/node_modules/svgo": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
- "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+ "node_modules/@parcel/optimizer-svgo": {
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.13.3.tgz",
+ "integrity": "sha512-piIKxQKzhZK54dJR6yqIcq+urZmpsfgUpLCZT3cnWlX4ux5+S2iN66qqZBs0zVn+a58LcWcoP4Z9ieiJmpiu2w==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@trysound/sax": "0.2.0",
- "commander": "^7.2.0",
- "css-select": "^4.1.3",
- "css-tree": "^1.1.3",
- "csso": "^4.2.0",
- "picocolors": "^1.0.0",
- "stable": "^0.1.8"
- },
- "bin": {
- "svgo": "bin/svgo"
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3"
},
"engines": {
- "node": ">=10.13.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/optimizer-swc": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.12.0.tgz",
- "integrity": "sha512-iBi6LZB3lm6WmbXfzi8J3DCVPmn4FN2lw7DGXxUXu7MouDPVWfTsM6U/5TkSHJRNRogZ2gqy5q9g34NPxHbJcw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.13.3.tgz",
+ "integrity": "sha512-zNSq6oWqLlW8ksPIDjM0VgrK6ZAJbPQCDvs1V+p0oX3CzEe85lT5VkRpnfrN1+/vvEJNGL8e60efHKpI+rXGTA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
- "@swc/core": "^1.3.36",
+ "@parcel/utils": "2.13.3",
+ "@swc/core": "^1.7.26",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -916,48 +1516,50 @@
}
},
"node_modules/@parcel/package-manager": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.12.0.tgz",
- "integrity": "sha512-0nvAezcjPx9FT+hIL+LS1jb0aohwLZXct7jAh7i0MLMtehOi0z1Sau+QpgMlA9rfEZZ1LIeFdnZZwqSy7Ccspw==",
- "dev": true,
- "dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/node-resolver-core": "3.3.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
- "@swc/core": "^1.3.36",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.13.3.tgz",
+ "integrity": "sha512-FLNI5OrZxymGf/Yln0E/kjnGn5sdkQAxW7pQVdtuM+5VeN75yibJRjsSGv88PvJ+KvpD2ANgiIJo1RufmoPcww==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/node-resolver-core": "3.4.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
+ "@swc/core": "^1.7.26",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/packager-css": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.12.0.tgz",
- "integrity": "sha512-j3a/ODciaNKD19IYdWJT+TP+tnhhn5koBGBWWtrKSu0UxWpnezIGZetit3eE+Y9+NTePalMkvpIlit2eDhvfJA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.13.3.tgz",
+ "integrity": "sha512-ghDqRMtrUwaDERzFm9le0uz2PTeqqsjsW0ihQSZPSAptElRl9o5BR+XtMPv3r7Ui0evo+w35gD55oQCJ28vCig==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"lightningcss": "^1.22.1",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -965,20 +1567,21 @@
}
},
"node_modules/@parcel/packager-html": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.12.0.tgz",
- "integrity": "sha512-PpvGB9hFFe+19NXGz2ApvPrkA9GwEqaDAninT+3pJD57OVBaxB8U+HN4a5LICKxjUppPPqmrLb6YPbD65IX4RA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.13.3.tgz",
+ "integrity": "sha512-jDLnKSA/EzVEZ3/aegXO3QJ/Ij732AgBBkIQfeC8tUoxwVz5b3HiPBAjVjcUSfZs7mdBSHO+ELWC3UD+HbsIrQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -986,23 +1589,24 @@
}
},
"node_modules/@parcel/packager-js": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.12.0.tgz",
- "integrity": "sha512-viMF+FszITRRr8+2iJyk+4ruGiL27Y6AF7hQ3xbJfzqnmbOhGFtLTQwuwhOLqN/mWR2VKdgbLpZSarWaO3yAMg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.13.3.tgz",
+ "integrity": "sha512-0pMHHf2zOn7EOJe88QJw5h/wcV1bFfj6cXVcE55Wa8GX3V+SdCgolnlvNuBcRQ1Tlx0Xkpo+9hMFVIQbNQY6zw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
"globals": "^13.2.0",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1010,16 +1614,17 @@
}
},
"node_modules/@parcel/packager-raw": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.12.0.tgz",
- "integrity": "sha512-tJZqFbHqP24aq1F+OojFbQIc09P/u8HAW5xfndCrFnXpW4wTgM3p03P0xfw3gnNq+TtxHJ8c3UFE5LnXNNKhYA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.13.3.tgz",
+ "integrity": "sha512-AWu4UB+akBdskzvT3KGVHIdacU9f7cI678DQQ1jKQuc9yZz5D0VFt3ocFBOmvDfEQDF0uH3jjtJR7fnuvX7Biw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1027,19 +1632,20 @@
}
},
"node_modules/@parcel/packager-svg": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.12.0.tgz",
- "integrity": "sha512-ldaGiacGb2lLqcXas97k8JiZRbAnNREmcvoY2W2dvW4loVuDT9B9fU777mbV6zODpcgcHWsLL3lYbJ5Lt3y9cg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.13.3.tgz",
+ "integrity": "sha512-tKGRiFq/4jh5u2xpTstNQ7gu+RuZWzlWqpw5NaFmcKe6VQe5CMcS499xTFoREAGnRvevSeIgC38X1a+VOo+/AA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
"posthtml": "^0.16.4"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1047,16 +1653,17 @@
}
},
"node_modules/@parcel/packager-wasm": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-wasm/-/packager-wasm-2.12.0.tgz",
- "integrity": "sha512-fYqZzIqO9fGYveeImzF8ll6KRo2LrOXfD+2Y5U3BiX/wp9wv17dz50QLDQm9hmTcKGWxK4yWqKQh+Evp/fae7A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-wasm/-/packager-wasm-2.13.3.tgz",
+ "integrity": "sha512-SZB56/b230vFrSehVXaUAWjJmWYc89gzb8OTLkBm7uvtFtov2J1R8Ig9TTJwinyXE3h84MCFP/YpQElSfoLkJw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">=12.0.0",
- "parcel": "^2.12.0"
+ "node": ">=16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1064,15 +1671,16 @@
}
},
"node_modules/@parcel/plugin": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.12.0.tgz",
- "integrity": "sha512-nc/uRA8DiMoe4neBbzV6kDndh/58a4wQuGKw5oEoIwBCHUvE2W8ZFSu7ollSXUGRzfacTt4NdY8TwS73ScWZ+g==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.13.3.tgz",
+ "integrity": "sha512-cterKHHcwg6q11Gpif/aqvHo056TR+yDVJ3fSdiG2xr5KD1VZ2B3hmofWERNNwjMcnR1h9Xq40B7jCKUhOyNFA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/types": "2.12.0"
+ "@parcel/types": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -1080,17 +1688,19 @@
}
},
"node_modules/@parcel/profiler": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.12.0.tgz",
- "integrity": "sha512-q53fvl5LDcFYzMUtSusUBZSjQrKjMlLEBgKeQHFwkimwR1mgoseaDBDuNz0XvmzDzF1UelJ02TUKCGacU8W2qA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.13.3.tgz",
+ "integrity": "sha512-ok6BwWSLvyHe5TuSXjSacYnDStFgP5Y30tA9mbtWSm0INDsYf+m5DqzpYPx8U54OaywWMK8w3MXUClosJX3aPA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3",
+ "@parcel/types-internal": "2.13.3",
"chrome-trace-event": "^1.0.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -1098,20 +1708,21 @@
}
},
"node_modules/@parcel/reporter-cli": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.12.0.tgz",
- "integrity": "sha512-TqKsH4GVOLPSCanZ6tcTPj+rdVHERnt5y4bwTM82cajM21bCX1Ruwp8xOKU+03091oV2pv5ieB18pJyRF7IpIw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.13.3.tgz",
+ "integrity": "sha512-EA5tKt/6bXYNMEavSs35qHlFdx6cZmRazlZxPBgxPePQYoouNAPMNLUOEQozaPhz9f5fvNDN7EHOFaAWcdO2LA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
- "chalk": "^4.1.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "chalk": "^4.1.2",
"term-size": "^2.2.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1119,17 +1730,18 @@
}
},
"node_modules/@parcel/reporter-dev-server": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.12.0.tgz",
- "integrity": "sha512-tIcDqRvAPAttRlTV28dHcbWT5K2r/MBFks7nM4nrEDHWtnrCwimkDmZTc1kD8QOCCjGVwRHcQybpHvxfwol6GA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.13.3.tgz",
+ "integrity": "sha512-ZNeFp6AOIQFv7mZIv2P5O188dnZHNg0ymeDVcakfZomwhpSva2dFNS3AnvWo4eyWBlUxkmQO8BtaxeWTs7jAuA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0"
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1137,19 +1749,20 @@
}
},
"node_modules/@parcel/reporter-tracer": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.12.0.tgz",
- "integrity": "sha512-g8rlu9GxB8Ut/F8WGx4zidIPQ4pcYFjU9bZO+fyRIPrSUFH2bKijCnbZcr4ntqzDGx74hwD6cCG4DBoleq2UlQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.13.3.tgz",
+ "integrity": "sha512-aBsVPI8jLZTDkFYrI69GxnsdvZKEYerkPsu935LcX9rfUYssOnmmUP+3oI+8fbg+qNjJuk9BgoQ4hCp9FOphMQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"chrome-trace-event": "^1.0.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1157,17 +1770,18 @@
}
},
"node_modules/@parcel/resolver-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.12.0.tgz",
- "integrity": "sha512-uuhbajTax37TwCxu7V98JtRLiT6hzE4VYSu5B7Qkauy14/WFt2dz6GOUXPgVsED569/hkxebPx3KCMtZW6cHHA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.13.3.tgz",
+ "integrity": "sha512-urBZuRALWT9pFMeWQ8JirchLmsQEyI9lrJptiwLbJWrwvmlwSUGkcstmPwoNRf/aAQjICB7ser/247Vny0pFxA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/node-resolver-core": "3.3.0",
- "@parcel/plugin": "2.12.0"
+ "@parcel/node-resolver-core": "3.4.3",
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1175,17 +1789,18 @@
}
},
"node_modules/@parcel/runtime-browser-hmr": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.12.0.tgz",
- "integrity": "sha512-4ZLp2FWyD32r0GlTulO3+jxgsA3oO1P1b5oO2IWuWilfhcJH5LTiazpL5YdusUjtNn9PGN6QLAWfxmzRIfM+Ow==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.13.3.tgz",
+ "integrity": "sha512-EAcPojQFUNUGUrDk66cu3ySPO0NXRVS5CKPd4QrxPCVVbGzde4koKu8krC/TaGsoyUqhie8HMnS70qBP0GFfcQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0"
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1193,19 +1808,20 @@
}
},
"node_modules/@parcel/runtime-js": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.12.0.tgz",
- "integrity": "sha512-sBerP32Z1crX5PfLNGDSXSdqzlllM++GVnVQVeM7DgMKS8JIFG3VLi28YkX+dYYGtPypm01JoIHCkvwiZEcQJg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.13.3.tgz",
+ "integrity": "sha512-62OucNAnxb2Q0uyTFWW/0Hvv2DJ4b5H6neh/YFu2/wmxaZ37xTpEuEcG2do7KW54xE5DeLP+RliHLwi4NvR3ww==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1213,19 +1829,20 @@
}
},
"node_modules/@parcel/runtime-react-refresh": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.12.0.tgz",
- "integrity": "sha512-SCHkcczJIDFTFdLTzrHTkQ0aTrX3xH6jrA4UsCBL6ji61+w+ohy4jEEe9qCgJVXhnJfGLE43HNXek+0MStX+Mw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.13.3.tgz",
+ "integrity": "sha512-PYZ1klpJVwqE3WuifILjtF1dugtesHEuJcXYZI85T6UoRSD5ctS1nAIpZzT14Ga1lRt/jd+eAmhWL1l3m/Vk1Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"react-error-overlay": "6.0.9",
- "react-refresh": "^0.9.0"
+ "react-refresh": ">=0.9 <=0.14"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1233,18 +1850,19 @@
}
},
"node_modules/@parcel/runtime-service-worker": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.12.0.tgz",
- "integrity": "sha512-BXuMBsfiwpIEnssn+jqfC3jkgbS8oxeo3C7xhSQsuSv+AF2FwY3O3AO1c1RBskEW3XrBLNINOJujroNw80VTKA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.13.3.tgz",
+ "integrity": "sha512-BjMhPuT7Us1+YIo31exPRwomPiL+jrZZS5UUAwlEW2XGHDceEotzRM94LwxeFliCScT4IOokGoxixm19qRuzWg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1252,12 +1870,13 @@
}
},
"node_modules/@parcel/rust": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/rust/-/rust-2.12.0.tgz",
- "integrity": "sha512-005cldMdFZFDPOjbDVEXcINQ3wT4vrxvSavRWI3Az0e3E18exO/x/mW9f648KtXugOXMAqCEqhFHcXECL9nmMw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/rust/-/rust-2.13.3.tgz",
+ "integrity": "sha512-dLq85xDAtzr3P5200cvxk+8WXSWauYbxuev9LCPdwfhlaWo/JEj6cu9seVdWlkagjGwkoV1kXC+GGntgUXOLAQ==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -1277,23 +1896,24 @@
}
},
"node_modules/@parcel/transformer-babel": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.12.0.tgz",
- "integrity": "sha512-zQaBfOnf/l8rPxYGnsk/ufh/0EuqvmnxafjBIpKZ//j6rGylw5JCqXSb1QvvAqRYruKeccxGv7+HrxpqKU6V4A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.13.3.tgz",
+ "integrity": "sha512-ikzK9f5WTFrdQsPitQgjCPH6HmVU8AQPRemIJ2BndYhtodn5PQut5cnSvTrqax8RjYvheEKCQk/Zb/uR7qgS3g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"browserslist": "^4.6.6",
"json5": "^2.2.0",
"nullthrows": "^1.1.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1301,22 +1921,23 @@
}
},
"node_modules/@parcel/transformer-css": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.12.0.tgz",
- "integrity": "sha512-vXhOqoAlQGATYyQ433Z1DXKmiKmzOAUmKysbYH3FD+LKEKLMEl/pA14goqp00TW+A/EjtSKKyeMyHlMIIUqj4Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.13.3.tgz",
+ "integrity": "sha512-zbrNURGph6JeVADbGydyZ7lcu/izj41kDxQ9xw4RPRW/3rofQiTU0OTREi+uBWiMENQySXVivEdzHA9cA+aLAA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"browserslist": "^4.6.6",
"lightningcss": "^1.22.1",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1324,104 +1945,95 @@
}
},
"node_modules/@parcel/transformer-html": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.12.0.tgz",
- "integrity": "sha512-5jW4dFFBlYBvIQk4nrH62rfA/G/KzVzEDa6S+Nne0xXhglLjkm64Ci9b/d4tKZfuGWUbpm2ASAq8skti/nfpXw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.13.3.tgz",
+ "integrity": "sha512-Yf74FkL9RCCB4+hxQRVMNQThH9+fZ5w0NLiQPpWUOcgDEEyxTi4FWPQgEBsKl/XK2ehdydbQB9fBgPQLuQxwPg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5",
- "posthtml-parser": "^0.10.1",
+ "posthtml-parser": "^0.12.1",
"posthtml-render": "^3.0.0",
"semver": "^7.5.2",
"srcset": "4"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
- "node_modules/@parcel/transformer-html/node_modules/srcset": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
- "integrity": "sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=12"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/@parcel/transformer-image": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.12.0.tgz",
- "integrity": "sha512-8hXrGm2IRII49R7lZ0RpmNk27EhcsH+uNKsvxuMpXPuEnWgC/ha/IrjaI29xCng1uGur74bJF43NUSQhR4aTdw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.13.3.tgz",
+ "integrity": "sha512-wL1CXyeFAqbp2wcEq/JD3a/tbAyVIDMTC6laQxlIwnVV7dsENhK1qRuJZuoBdixESeUpFQSmmQvDIhcfT/cUUg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/transformer-js": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.12.0.tgz",
- "integrity": "sha512-OSZpOu+FGDbC/xivu24v092D9w6EGytB3vidwbdiJ2FaPgfV7rxS0WIUjH4I0OcvHAcitArRXL0a3+HrNTdQQw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.13.3.tgz",
+ "integrity": "sha512-KqfNGn1IHzDoN2aPqt4nDksgb50Xzcny777C7A7hjlQ3cmkjyJrixYjzzsPaPSGJ+kJpknh3KE8unkQ9mhFvRQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
"@swc/helpers": "^0.5.0",
"browserslist": "^4.6.6",
"nullthrows": "^1.1.1",
- "regenerator-runtime": "^0.13.7",
+ "regenerator-runtime": "^0.14.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/transformer-json": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.12.0.tgz",
- "integrity": "sha512-Utv64GLRCQILK5r0KFs4o7I41ixMPllwOLOhkdjJKvf1hZmN6WqfOmB1YLbWS/y5Zb/iB52DU2pWZm96vLFQZQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.13.3.tgz",
+ "integrity": "sha512-rrq0ab6J0w9ePtsxi0kAvpCmrUYXXAx1Z5PATZakv89rSYbHBKEdXxyCoKFui/UPVCUEGVs5r0iOFepdHpIyeA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
+ "@parcel/plugin": "2.13.3",
"json5": "^2.2.0"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1429,23 +2041,24 @@
}
},
"node_modules/@parcel/transformer-postcss": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.12.0.tgz",
- "integrity": "sha512-FZqn+oUtiLfPOn67EZxPpBkfdFiTnF4iwiXPqvst3XI8H+iC+yNgzmtJkunOOuylpYY6NOU5jT8d7saqWSDv2Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.13.3.tgz",
+ "integrity": "sha512-AIiWpU0QSFBrPcYIqAnhqB8RGE6yHFznnxztfg1t2zMSOnK3xoU6xqYKv8H/MduShGGrC3qVOeDfM8MUwzL3cw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
"clone": "^2.1.1",
"nullthrows": "^1.1.1",
"postcss-value-parser": "^4.2.0",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1453,22 +2066,23 @@
}
},
"node_modules/@parcel/transformer-posthtml": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.12.0.tgz",
- "integrity": "sha512-z6Z7rav/pcaWdeD+2sDUcd0mmNZRUvtHaUGa50Y2mr+poxrKilpsnFMSiWBT+oOqPt7j71jzDvrdnAF4XkCljg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.13.3.tgz",
+ "integrity": "sha512-5GSLyccpHASwFAu3uJ83gDIBSvfsGdVmhJvy0Vxe+K1Fklk2ibhvvtUHMhB7mg6SPHC+R9jsNc3ZqY04ZLeGjw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5",
- "posthtml-parser": "^0.10.1",
+ "posthtml-parser": "^0.12.1",
"posthtml-render": "^3.0.0",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1476,16 +2090,17 @@
}
},
"node_modules/@parcel/transformer-raw": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.12.0.tgz",
- "integrity": "sha512-Ht1fQvXxix0NncdnmnXZsa6hra20RXYh1VqhBYZLsDfkvGGFnXIgO03Jqn4Z8MkKoa0tiNbDhpKIeTjyclbBxQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.13.3.tgz",
+ "integrity": "sha512-BFsAbdQF0l8/Pdb7dSLJeYcd8jgwvAUbHgMink2MNXJuRUvDl19Gns8jVokU+uraFHulJMBj40+K/RTd33in4g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1493,18 +2108,19 @@
}
},
"node_modules/@parcel/transformer-react-refresh-wrap": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.12.0.tgz",
- "integrity": "sha512-GE8gmP2AZtkpBIV5vSCVhewgOFRhqwdM5Q9jNPOY5PKcM3/Ff0qCqDiTzzGLhk0/VMBrdjssrfZkVx6S/lHdJw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.13.3.tgz",
+ "integrity": "sha512-mOof4cRyxsZRdg8kkWaFtaX98mHpxUhcGPU+nF9RQVa9q737ItxrorsPNR9hpZAyE2TtFNflNW7RoYsgvlLw8w==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
- "react-refresh": "^0.9.0"
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "react-refresh": ">=0.9 <=0.14"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1512,18 +2128,19 @@
}
},
"node_modules/@parcel/transformer-sass": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-sass/-/transformer-sass-2.12.0.tgz",
- "integrity": "sha512-xLLoSLPST+2AHJwFRLl4foArDjjy6P1RChP3TxMU2MVS1sbKGJnfFhFpHAacH8ASjuGtu5rbpfpHRZePlvoZxw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-sass/-/transformer-sass-2.13.3.tgz",
+ "integrity": "sha512-M8Ntscr+RGoQJ2ymIvT+f/1THea/6pVLJY2ky2N+fhtM6/iFx/7WnpJKL37IKAGIOn5AhqDqc0tPjK6H9moIbA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
"sass": "^1.38.0"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1531,23 +2148,24 @@
}
},
"node_modules/@parcel/transformer-svg": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.12.0.tgz",
- "integrity": "sha512-cZJqGRJ4JNdYcb+vj94J7PdOuTnwyy45dM9xqbIMH+HSiiIkfrMsdEwYft0GTyFTdsnf+hdHn3tau7Qa5hhX+A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.13.3.tgz",
+ "integrity": "sha512-9jm7ZF4KHIrGLWlw/SFUz5KKJ20nxHvjFAmzde34R9Wu+F1BOjLZxae7w4ZRwvIc+UVOUcBBQFmhSVwVDZg6Dw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5",
- "posthtml-parser": "^0.10.1",
+ "posthtml-parser": "^0.12.1",
"posthtml-render": "^3.0.0",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1555,37 +2173,47 @@
}
},
"node_modules/@parcel/types": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.12.0.tgz",
- "integrity": "sha512-8zAFiYNCwNTQcglIObyNwKfRYQK5ELlL13GuBOrSMxueUiI5ylgsGbTS1N7J3dAGZixHO8KhHGv5a71FILn9rQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.13.3.tgz",
+ "integrity": "sha512-+RpFHxx8fy8/dpuehHUw/ja9PRExC3wJoIlIIF42E7SLu2SvlTHtKm6EfICZzxCXNEBzjoDbamCRcN0nmTPlhw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/types-internal": "2.13.3",
+ "@parcel/workers": "2.13.3"
+ }
+ },
+ "node_modules/@parcel/types-internal": {
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/types-internal/-/types-internal-2.13.3.tgz",
+ "integrity": "sha512-Lhx0n+9RCp+Ipktf/I+CLm3zE9Iq9NtDd8b2Vr5lVWyoT8AbzBKIHIpTbhLS4kjZ80L3I6o93OYjqAaIjsqoZw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/cache": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/package-manager": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/feature-flags": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/workers": "2.12.0",
"utility-types": "^3.10.0"
}
},
"node_modules/@parcel/utils": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.12.0.tgz",
- "integrity": "sha512-z1JhLuZ8QmDaYoEIuUCVZlhcFrS7LMfHrb2OCRui5SQFntRWBH2fNM6H/fXXUkT9SkxcuFP2DUA6/m4+Gkz72g==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.13.3.tgz",
+ "integrity": "sha512-yxY9xw2wOUlJaScOXYZmMGoZ4Ck4Kqj+p6Koe5kLkkWM1j98Q0Dj2tf/mNvZi4yrdnlm+dclCwNRnuE8Q9D+pw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/codeframe": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/markdown-ansi": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/codeframe": "2.13.3",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/markdown-ansi": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "chalk": "^4.1.0",
+ "chalk": "^4.1.2",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -1888,27 +2516,28 @@
}
},
"node_modules/@parcel/workers": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.12.0.tgz",
- "integrity": "sha512-zv5We5Jmb+ZWXlU6A+AufyjY4oZckkxsZ8J4dvyWL0W8IQvGO1JB4FGeryyttzQv3RM3OxcN/BpTGPiDG6keBw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.13.3.tgz",
+ "integrity": "sha512-oAHmdniWTRwwwsKbcF4t3VjOtKN+/W17Wj5laiYB+HLkfsjGTfIQPj3sdXmrlBAGpI4omIcvR70PHHXnfdTfwA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/profiler": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/profiler": "2.13.3",
+ "@parcel/types-internal": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@rtsao/scc": {
@@ -2154,12 +2783,6 @@
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
"dev": true
},
- "node_modules/abortcontroller-polyfill": {
- "version": "1.7.5",
- "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz",
- "integrity": "sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==",
- "dev": true
- },
"node_modules/acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -2549,6 +3172,7 @@
"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6.0"
}
@@ -2618,6 +3242,7 @@
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
"integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"env-paths": "^2.2.1",
"import-fresh": "^3.3.0",
@@ -2643,13 +3268,15 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
- "dev": true
+ "dev": true,
+ "license": "Python-2.0"
},
"node_modules/cosmiconfig/node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"argparse": "^2.0.1"
},
@@ -2671,16 +3298,103 @@
"node": ">= 8"
}
},
- "node_modules/css-declaration-sorter": {
- "version": "6.4.1",
- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
- "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+ "node_modules/css-declaration-sorter": {
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+ "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+ "dev": true,
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ },
+ "peerDependencies": {
+ "postcss": "^8.0.9"
+ }
+ },
+ "node_modules/css-select": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+ "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "boolbase": "^1.0.0",
+ "css-what": "^6.1.0",
+ "domhandler": "^5.0.2",
+ "domutils": "^3.0.1",
+ "nth-check": "^2.0.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/fb55"
+ }
+ },
+ "node_modules/css-select/node_modules/dom-serializer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+ "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.2",
+ "entities": "^4.2.0"
+ },
+ "funding": {
+ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+ }
+ },
+ "node_modules/css-select/node_modules/domhandler": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+ "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "domelementtype": "^2.3.0"
+ },
+ "engines": {
+ "node": ">= 4"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domhandler?sponsor=1"
+ }
+ },
+ "node_modules/css-select/node_modules/domutils": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+ "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "dom-serializer": "^2.0.0",
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domutils?sponsor=1"
+ }
+ },
+ "node_modules/css-tree": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+ "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
"dev": true,
- "engines": {
- "node": "^10 || ^12 || >=14"
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "mdn-data": "2.0.30",
+ "source-map-js": "^1.0.1"
},
- "peerDependencies": {
- "postcss": "^8.0.9"
+ "engines": {
+ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
}
},
"node_modules/css-what": {
@@ -2784,6 +3498,48 @@
"postcss": "^8.2.15"
}
},
+ "node_modules/csso": {
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+ "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "css-tree": "~2.2.0"
+ },
+ "engines": {
+ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+ "npm": ">=7.0.0"
+ }
+ },
+ "node_modules/csso/node_modules/css-tree": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+ "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "mdn-data": "2.0.28",
+ "source-map-js": "^1.0.1"
+ },
+ "engines": {
+ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+ "npm": ">=7.0.0"
+ }
+ },
+ "node_modules/csso/node_modules/mdn-data": {
+ "version": "2.0.28",
+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+ "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+ "dev": true,
+ "license": "CC0-1.0",
+ "optional": true,
+ "peer": true
+ },
"node_modules/data-view-buffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
@@ -2981,19 +3737,33 @@
}
},
"node_modules/dotenv": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
- "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
+ "version": "16.4.7",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+ "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
"dev": true,
+ "license": "BSD-2-Clause",
"engines": {
- "node": ">=6"
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://dotenvx.com"
}
},
"node_modules/dotenv-expand": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
- "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
- "dev": true
+ "version": "11.0.7",
+ "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
+ "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "dotenv": "^16.4.5"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://dotenvx.com"
+ }
},
"node_modules/electron-to-chromium": {
"version": "1.5.51",
@@ -3021,10 +3791,11 @@
}
},
"node_modules/entities": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
- "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
"dev": true,
+ "license": "BSD-2-Clause",
"engines": {
"node": ">=0.12"
},
@@ -3037,6 +3808,7 @@
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6"
}
@@ -3046,6 +3818,7 @@
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"is-arrayish": "^0.2.1"
}
@@ -3840,57 +4613,10 @@
"node": ">= 0.4"
}
},
- "node_modules/htmlnano": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/htmlnano/-/htmlnano-2.1.1.tgz",
- "integrity": "sha512-kAERyg/LuNZYmdqgCdYvugyLWNFAm8MWXpQMz1pLpetmCbFwoMxvkSoaAMlFrOC4OKTWI4KlZGT/RsNxg4ghOw==",
- "dev": true,
- "dependencies": {
- "cosmiconfig": "^9.0.0",
- "posthtml": "^0.16.5",
- "timsort": "^0.3.0"
- },
- "peerDependencies": {
- "cssnano": "^7.0.0",
- "postcss": "^8.3.11",
- "purgecss": "^6.0.0",
- "relateurl": "^0.2.7",
- "srcset": "5.0.1",
- "svgo": "^3.0.2",
- "terser": "^5.10.0",
- "uncss": "^0.17.3"
- },
- "peerDependenciesMeta": {
- "cssnano": {
- "optional": true
- },
- "postcss": {
- "optional": true
- },
- "purgecss": {
- "optional": true
- },
- "relateurl": {
- "optional": true
- },
- "srcset": {
- "optional": true
- },
- "svgo": {
- "optional": true
- },
- "terser": {
- "optional": true
- },
- "uncss": {
- "optional": true
- }
- }
- },
"node_modules/htmlparser2": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
- "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
+ "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
"dev": true,
"funding": [
"https://github.com/fb55/htmlparser2?sponsor=1",
@@ -3899,11 +4625,58 @@
"url": "https://github.com/sponsors/fb55"
}
],
+ "license": "MIT",
"dependencies": {
- "domelementtype": "^2.0.1",
- "domhandler": "^4.2.2",
- "domutils": "^2.8.0",
- "entities": "^3.0.1"
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3",
+ "domutils": "^3.1.0",
+ "entities": "^4.5.0"
+ }
+ },
+ "node_modules/htmlparser2/node_modules/dom-serializer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+ "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.2",
+ "entities": "^4.2.0"
+ },
+ "funding": {
+ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+ }
+ },
+ "node_modules/htmlparser2/node_modules/domhandler": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+ "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "domelementtype": "^2.3.0"
+ },
+ "engines": {
+ "node": ">= 4"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domhandler?sponsor=1"
+ }
+ },
+ "node_modules/htmlparser2/node_modules/domutils": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+ "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "dom-serializer": "^2.0.0",
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domutils?sponsor=1"
}
},
"node_modules/ignore": {
@@ -3998,7 +4771,8 @@
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/is-bigint": {
"version": "1.0.4",
@@ -4119,7 +4893,8 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz",
"integrity": "sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA==",
- "dev": true
+ "dev": true,
+ "license": "ISC"
},
"node_modules/is-negative-zero": {
"version": "2.0.3",
@@ -4298,7 +5073,8 @@
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/json-schema-traverse": {
"version": "0.4.1",
@@ -4347,10 +5123,11 @@
}
},
"node_modules/lightningcss": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.28.1.tgz",
- "integrity": "sha512-KRDkHlLlNj3DWh79CDt93fPlRJh2W1AuHV0ZSZAMMuN7lqlsZTV5842idfS1urWG8q9tc17velp1gCXhY7sLnQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.1.tgz",
+ "integrity": "sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==",
"dev": true,
+ "license": "MPL-2.0",
"dependencies": {
"detect-libc": "^1.0.3"
},
@@ -4362,26 +5139,27 @@
"url": "https://opencollective.com/parcel"
},
"optionalDependencies": {
- "lightningcss-darwin-arm64": "1.28.1",
- "lightningcss-darwin-x64": "1.28.1",
- "lightningcss-freebsd-x64": "1.28.1",
- "lightningcss-linux-arm-gnueabihf": "1.28.1",
- "lightningcss-linux-arm64-gnu": "1.28.1",
- "lightningcss-linux-arm64-musl": "1.28.1",
- "lightningcss-linux-x64-gnu": "1.28.1",
- "lightningcss-linux-x64-musl": "1.28.1",
- "lightningcss-win32-arm64-msvc": "1.28.1",
- "lightningcss-win32-x64-msvc": "1.28.1"
+ "lightningcss-darwin-arm64": "1.29.1",
+ "lightningcss-darwin-x64": "1.29.1",
+ "lightningcss-freebsd-x64": "1.29.1",
+ "lightningcss-linux-arm-gnueabihf": "1.29.1",
+ "lightningcss-linux-arm64-gnu": "1.29.1",
+ "lightningcss-linux-arm64-musl": "1.29.1",
+ "lightningcss-linux-x64-gnu": "1.29.1",
+ "lightningcss-linux-x64-musl": "1.29.1",
+ "lightningcss-win32-arm64-msvc": "1.29.1",
+ "lightningcss-win32-x64-msvc": "1.29.1"
}
},
"node_modules/lightningcss-darwin-arm64": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.28.1.tgz",
- "integrity": "sha512-VG3vvzM0m/rguCdm76DdobNeNJnHK+jWcdkNLFWHLh9YCotRvbRIt45JxwcHlIF8TDqWStVLTdghq5NaigVCBQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.29.1.tgz",
+ "integrity": "sha512-HtR5XJ5A0lvCqYAoSv2QdZZyoHNttBpa5EP9aNuzBQeKGfbyH5+UipLWvVzpP4Uml5ej4BYs5I9Lco9u1fECqw==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"darwin"
@@ -4395,13 +5173,14 @@
}
},
"node_modules/lightningcss-darwin-x64": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.28.1.tgz",
- "integrity": "sha512-O7ORdislvKfMohFl4Iq7fxKqdJOuuxArcglVI3amuFO5DJ0wfV3Gxgi1JRo49slfr7OVzJQEHLG4muTWYM5cTQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.29.1.tgz",
+ "integrity": "sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"darwin"
@@ -4415,13 +5194,14 @@
}
},
"node_modules/lightningcss-freebsd-x64": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.28.1.tgz",
- "integrity": "sha512-b7sF89B31kYYijxVcFO7l5u6UNA862YstNu+3YbLl/IQKzveL4a5cwR5cdpG+OOhErg/c2u9WCmzZoX2I5GBvw==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.29.1.tgz",
+ "integrity": "sha512-0SUW22fv/8kln2LnIdOCmSuXnxgxVC276W5KLTwoehiO0hxkacBxjHOL5EtHD8BAXg2BvuhsJPmVMasvby3LiQ==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"freebsd"
@@ -4435,13 +5215,14 @@
}
},
"node_modules/lightningcss-linux-arm-gnueabihf": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.28.1.tgz",
- "integrity": "sha512-p61kXwvhUDLLzkWHjzSFfUBW/F0iy3jr3CWi3k8SKULtJEsJXTI9DqRm9EixxMSe2AMBQBt4auTYiQL4B1N51A==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.29.1.tgz",
+ "integrity": "sha512-sD32pFvlR0kDlqsOZmYqH/68SqUMPNj+0pucGxToXZi4XZgZmqeX/NkxNKCPsswAXU3UeYgDSpGhu05eAufjDg==",
"cpu": [
"arm"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4455,13 +5236,14 @@
}
},
"node_modules/lightningcss-linux-arm64-gnu": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.28.1.tgz",
- "integrity": "sha512-iO+fN9hOMmzfwqcG2/BgUtMKD48H2JO/SXU44fyIwpY2veb65QF5xiRrQ9l1FwIxbGK3231KBYCtAqv+xf+NsQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.29.1.tgz",
+ "integrity": "sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4475,13 +5257,14 @@
}
},
"node_modules/lightningcss-linux-arm64-musl": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.28.1.tgz",
- "integrity": "sha512-dnMHeXEmCUzHHZjaDpQBYuBKcN9nPC3nPFKl70bcj5Bkn5EmkcgEqm5p035LKOgvAwk1XwLpQCML6pXmCwz0NQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.29.1.tgz",
+ "integrity": "sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4495,13 +5278,14 @@
}
},
"node_modules/lightningcss-linux-x64-gnu": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.28.1.tgz",
- "integrity": "sha512-7vWDISaMUn+oo2TwRdf2hl/BLdPxvywv9JKEqNZB/0K7bXwV4XE9wN/C2sAp1gGuh6QBA8lpjF4JIPt3HNlCHA==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.1.tgz",
+ "integrity": "sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4515,13 +5299,14 @@
}
},
"node_modules/lightningcss-linux-x64-musl": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.28.1.tgz",
- "integrity": "sha512-IHCu9tVGP+x5BCpA2rF3D04DBokcBza/a8AuHQU+1AiMKubuMegPwcL7RatBgK4ztFHeYnnD5NdhwhRfYMAtNA==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.29.1.tgz",
+ "integrity": "sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4535,13 +5320,14 @@
}
},
"node_modules/lightningcss-win32-arm64-msvc": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.28.1.tgz",
- "integrity": "sha512-Erm72kHmMg/3h350PTseskz+eEGBM17Fuu79WW2Qqt0BfWSF1jHHc12lkJCWMYl5jcBHPs5yZdgNHtJ7IJS3Uw==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.29.1.tgz",
+ "integrity": "sha512-QoOVnkIEFfbW4xPi+dpdft/zAKmgLgsRHfJalEPYuJDOWf7cLQzYg0DEh8/sn737FaeMJxHZRc1oBreiwZCjog==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"win32"
@@ -4555,13 +5341,14 @@
}
},
"node_modules/lightningcss-win32-x64-msvc": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.28.1.tgz",
- "integrity": "sha512-ZPQtvx+uQBzrSdHH8p4H3M9Alue+x369TPZAA3b4K3d92FPhpZCuBG04+HQzspam9sVeID9mI6f3VRAs2ezaEA==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.29.1.tgz",
+ "integrity": "sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"win32"
@@ -4587,7 +5374,8 @@
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/lmdb": {
"version": "2.8.5",
@@ -4595,6 +5383,7 @@
"integrity": "sha512-9bMdFfc80S+vSldBmG3HOuLVHnxRdNTlpzR6QDnzqCQtCzGUEAGTzBKYMeIM+I/sU4oZfgbcbS7X7F65/z/oxQ==",
"dev": true,
"hasInstallScript": true,
+ "license": "MIT",
"dependencies": {
"msgpackr": "^1.9.5",
"node-addon-api": "^6.1.0",
@@ -4618,7 +5407,8 @@
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
"integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/lodash.memoize": {
"version": "4.1.2",
@@ -4644,6 +5434,15 @@
"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
"dev": true
},
+ "node_modules/mdn-data": {
+ "version": "2.0.30",
+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+ "dev": true,
+ "license": "CC0-1.0",
+ "optional": true,
+ "peer": true
+ },
"node_modules/micromatch": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -4741,9 +5540,9 @@
}
},
"node_modules/nanoid": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
- "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+ "version": "3.3.8",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+ "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
"dev": true,
"funding": [
{
@@ -4751,6 +5550,7 @@
"url": "https://github.com/sponsors/ai"
}
],
+ "license": "MIT",
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -4775,6 +5575,7 @@
"resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.1.1.tgz",
"integrity": "sha512-+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"detect-libc": "^2.0.1"
},
@@ -4789,6 +5590,7 @@
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
"integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
"dev": true,
+ "license": "Apache-2.0",
"engines": {
"node": ">=8"
}
@@ -4948,40 +5750,53 @@
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
"integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/parcel": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/parcel/-/parcel-2.12.0.tgz",
- "integrity": "sha512-W+gxAq7aQ9dJIg/XLKGcRT0cvnStFAQHPaI0pvD0U2l6IVLueUAm3nwN7lkY62zZNmlvNx6jNtE4wlbS+CyqSg==",
- "dev": true,
- "dependencies": {
- "@parcel/config-default": "2.12.0",
- "@parcel/core": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/package-manager": "2.12.0",
- "@parcel/reporter-cli": "2.12.0",
- "@parcel/reporter-dev-server": "2.12.0",
- "@parcel/reporter-tracer": "2.12.0",
- "@parcel/utils": "2.12.0",
- "chalk": "^4.1.0",
- "commander": "^7.0.0",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/parcel/-/parcel-2.13.3.tgz",
+ "integrity": "sha512-8GrC8C7J8mwRpAlk7EJ7lwdFTbCN+dcXH2gy5AsEs9pLfzo9wvxOTx6W0fzSlvCOvZOita+8GdfYlGfEt0tRgA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/config-default": "2.13.3",
+ "@parcel/core": "2.13.3",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3",
+ "@parcel/feature-flags": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/package-manager": "2.13.3",
+ "@parcel/reporter-cli": "2.13.3",
+ "@parcel/reporter-dev-server": "2.13.3",
+ "@parcel/reporter-tracer": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "chalk": "^4.1.2",
+ "commander": "^12.1.0",
"get-port": "^4.2.0"
},
"bin": {
"parcel": "lib/bin.js"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
+ "node_modules/parcel/node_modules/commander": {
+ "version": "12.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+ "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/parent-module": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -4999,6 +5814,7 @@
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.0.0",
"error-ex": "^1.3.1",
@@ -5064,9 +5880,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.49",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
- "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+ "version": "8.5.2",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
+ "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
"dev": true,
"funding": [
{
@@ -5084,7 +5900,7 @@
],
"license": "MIT",
"dependencies": {
- "nanoid": "^3.3.7",
+ "nanoid": "^3.3.8",
"picocolors": "^1.1.1",
"source-map-js": "^1.2.1"
},
@@ -5594,6 +6410,7 @@
"resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz",
"integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"posthtml-parser": "^0.11.0",
"posthtml-render": "^3.0.0"
@@ -5603,15 +6420,16 @@
}
},
"node_modules/posthtml-parser": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz",
- "integrity": "sha512-PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg==",
+ "version": "0.12.1",
+ "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.12.1.tgz",
+ "integrity": "sha512-rYFmsDLfYm+4Ts2Oh4DCDSZPtdC1BLnRXAobypVzX9alj28KGl65dIFtgDY9zB57D0TC4Qxqrawuq/2et1P0GA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "htmlparser2": "^7.1.1"
+ "htmlparser2": "^9.0.0"
},
"engines": {
- "node": ">=12"
+ "node": ">=16"
}
},
"node_modules/posthtml-render": {
@@ -5619,6 +6437,7 @@
"resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz",
"integrity": "sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"is-json": "^2.0.1"
},
@@ -5626,11 +6445,45 @@
"node": ">=12"
}
},
+ "node_modules/posthtml/node_modules/entities": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+ "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "engines": {
+ "node": ">=0.12"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/entities?sponsor=1"
+ }
+ },
+ "node_modules/posthtml/node_modules/htmlparser2": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+ "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+ "dev": true,
+ "funding": [
+ "https://github.com/fb55/htmlparser2?sponsor=1",
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/fb55"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "domelementtype": "^2.0.1",
+ "domhandler": "^4.2.2",
+ "domutils": "^2.8.0",
+ "entities": "^3.0.1"
+ }
+ },
"node_modules/posthtml/node_modules/posthtml-parser": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz",
"integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"htmlparser2": "^7.1.1"
},
@@ -5675,13 +6528,15 @@
"version": "6.0.9",
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
"integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/react-refresh": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
- "integrity": "sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ==",
+ "version": "0.14.2",
+ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+ "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=0.10.0"
}
@@ -5700,10 +6555,11 @@
}
},
"node_modules/regenerator-runtime": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
- "dev": true
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+ "dev": true,
+ "license": "MIT"
},
"node_modules/regexp.prototype.flags": {
"version": "1.5.3",
@@ -5842,9 +6698,9 @@
}
},
"node_modules/sass": {
- "version": "1.83.1",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
- "integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
+ "version": "1.84.0",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.84.0.tgz",
+ "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5987,6 +6843,19 @@
"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
"dev": true
},
+ "node_modules/srcset": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
+ "integrity": "sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
@@ -6131,6 +7000,34 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/svgo": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
+ "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "@trysound/sax": "0.2.0",
+ "commander": "^7.2.0",
+ "css-select": "^5.1.0",
+ "css-tree": "^2.3.1",
+ "css-what": "^6.1.0",
+ "csso": "^5.0.5",
+ "picocolors": "^1.0.0"
+ },
+ "bin": {
+ "svgo": "bin/svgo"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/svgo"
+ }
+ },
"node_modules/table": {
"version": "6.8.2",
"resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
@@ -6191,7 +7088,8 @@
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
"integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/to-regex-range": {
"version": "5.0.1",
@@ -6397,6 +7295,7 @@
"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz",
"integrity": "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">= 4"
}
@@ -6411,7 +7310,8 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
"integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/which": {
"version": "2.0.2",
diff --git a/zmscalldisplay/phpunit.xml b/zmscalldisplay/phpunit.xml
index d4fd86860..be73c8d34 100644
--- a/zmscalldisplay/phpunit.xml
+++ b/zmscalldisplay/phpunit.xml
@@ -21,8 +21,15 @@
- ./src
+ ./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
-
diff --git a/zmscalldisplay/src/Zmscalldisplay/Application.php b/zmscalldisplay/src/Zmscalldisplay/Application.php
index 4dcbac5ec..abcc4ef35 100644
--- a/zmscalldisplay/src/Zmscalldisplay/Application.php
+++ b/zmscalldisplay/src/Zmscalldisplay/Application.php
@@ -1,15 +1,16 @@
getEntity(false)->getScopeList()->count()) {
$scopeId = $this->getEntity(false)->getScopeList()->getFirst()->getId();
$scope = \App::$http
- ->readGetResult('/scope/'. $scopeId .'/', ['keepLessData' => ['status']])
+ ->readGetResult('/scope/' . $scopeId . '/', ['keepLessData' => ['status']])
->getEntity();
}
return $scope;
diff --git a/zmscalldisplay/src/Zmscalldisplay/Helper/EntryFromOldRoute.php b/zmscalldisplay/src/Zmscalldisplay/Helper/EntryFromOldRoute.php
index 917722314..36e4ec35f 100644
--- a/zmscalldisplay/src/Zmscalldisplay/Helper/EntryFromOldRoute.php
+++ b/zmscalldisplay/src/Zmscalldisplay/Helper/EntryFromOldRoute.php
@@ -6,6 +6,7 @@
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
*
*/
+
namespace BO\Zmscalldisplay\Helper;
use BO\Mellon\Validator;
diff --git a/zmscalldisplay/src/Zmscalldisplay/Helper/TemplateFinder.php b/zmscalldisplay/src/Zmscalldisplay/Helper/TemplateFinder.php
index a94ff0330..505061056 100644
--- a/zmscalldisplay/src/Zmscalldisplay/Helper/TemplateFinder.php
+++ b/zmscalldisplay/src/Zmscalldisplay/Helper/TemplateFinder.php
@@ -6,6 +6,7 @@
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
*
*/
+
namespace BO\Zmscalldisplay\Helper;
use BO\Zmscalldisplay\Exception\TemplateNotFound;
@@ -88,7 +89,7 @@ protected function getTemplateBySettings($calldisplay)
*/
protected function getExistingTemplate(BaseEntity $entity)
{
- $path = $this->subPath .'/calldisplay_'. $entity->getEntityName() .'_'. $entity->getId() .'.twig';
+ $path = $this->subPath . '/calldisplay_' . $entity->getEntityName() . '_' . $entity->getId() . '.twig';
if ($entity->hasId() && $this->isTemplateReadable($path)) {
return $path;
}
@@ -110,6 +111,6 @@ protected function isTemplateReadable($path)
*/
public function getTemplatePath()
{
- return realpath(__DIR__) .'/../../../templates';
+ return realpath(__DIR__) . '/../../../templates';
}
}
diff --git a/zmscalldisplay/src/Zmscalldisplay/Helper/TwigExceptionHandler.php b/zmscalldisplay/src/Zmscalldisplay/Helper/TwigExceptionHandler.php
index bc7f08f96..542d6598a 100644
--- a/zmscalldisplay/src/Zmscalldisplay/Helper/TwigExceptionHandler.php
+++ b/zmscalldisplay/src/Zmscalldisplay/Helper/TwigExceptionHandler.php
@@ -2,8 +2,8 @@
namespace BO\Zmscalldisplay\Helper;
-use \Psr\Http\Message\RequestInterface;
-use \Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
class TwigExceptionHandler extends \BO\Slim\TwigExceptionHandler
{
diff --git a/zmscalldisplay/src/Zmscalldisplay/Index.php b/zmscalldisplay/src/Zmscalldisplay/Index.php
index 52c852a25..d1c5d85d5 100644
--- a/zmscalldisplay/src/Zmscalldisplay/Index.php
+++ b/zmscalldisplay/src/Zmscalldisplay/Index.php
@@ -1,10 +1,12 @@
chunk(10)[0];
- } else if ($displayNumber === 2) {
+ } elseif ($displayNumber === 2) {
$queueList = $queueList->chunk(10)[1] ?? new \BO\Zmsentities\Collection\QueueList();
}
@@ -48,7 +50,7 @@ public function readResponse(
if ($callDisplayInfo->getClusterList()->count() > 0 && $callDisplayInfo->getClusterList()->getFirst()->callDisplayText) {
$displayInfo = $callDisplayInfo->getClusterList()->getFirst()->callDisplayText;
- } else if (
+ } elseif (
$callDisplayInfo->getScopeList()->count() > 0
&& $callDisplayInfo->getScopeList()->getFirst()->preferences['queue']['callDisplayText']
) {
diff --git a/zmscalldisplay/src/Zmscalldisplay/RedirectOld.php b/zmscalldisplay/src/Zmscalldisplay/RedirectOld.php
index 14782fff5..89b200e16 100644
--- a/zmscalldisplay/src/Zmscalldisplay/RedirectOld.php
+++ b/zmscalldisplay/src/Zmscalldisplay/RedirectOld.php
@@ -6,6 +6,7 @@
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
*
*/
+
namespace BO\Zmscalldisplay;
use Psr\Http\Message\RequestInterface;
diff --git a/zmscitizenapi/.gitignore b/zmscitizenapi/.gitignore
index dbf690fac..bdb73a8be 100644
--- a/zmscitizenapi/.gitignore
+++ b/zmscitizenapi/.gitignore
@@ -14,4 +14,5 @@ cache
vendor.old
vendor.update
VERSION
-.phpunit.result.cache
\ No newline at end of file
+.phpunit.result.cache
+coverage
\ No newline at end of file
diff --git a/zmscitizenapi/composer.lock b/zmscitizenapi/composer.lock
index ca402f35f..2482400d2 100644
--- a/zmscitizenapi/composer.lock
+++ b/zmscitizenapi/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "081a28bb42348afcfeb3908f7a84c0bd",
+ "content-hash": "83e577f19cea26a1371db39fbe7d5e6f",
"packages": [
{
"name": "aronduby/dump",
@@ -122,11 +122,11 @@
},
{
"name": "eappointment/mellon",
- "version": "dev-feature-MPDZBS-877-zmscitizenapi",
+ "version": "dev-next",
"dist": {
"type": "path",
"url": "../mellon",
- "reference": "faff0b320f53873e8ba4716a8d5b07c931c15c8b"
+ "reference": "3b53777853798ec388f9fa2f2d42b1310ff3062c"
},
"require": {
"ext-json": ">=0",
@@ -170,11 +170,11 @@
},
{
"name": "eappointment/zmsclient",
- "version": "dev-feature-MPDZBS-877-zmscitizenapi",
+ "version": "dev-next",
"dist": {
"type": "path",
"url": "../zmsclient",
- "reference": "249f1aa96e13e3c2379353bf33539f0174fced53"
+ "reference": "f37d3a5ad27043e12c9d5ebd3dc40c7b660456d6"
},
"require": {
"aronduby/dump": "^0.9",
@@ -197,7 +197,7 @@
"phpmd/phpmd": "@stable",
"phpspec/prophecy-phpunit": "^2.0.0",
"phpunit/phpunit": "^9.5.4",
- "squizlabs/php_codesniffer": "^3.5.8"
+ "squizlabs/php_codesniffer": "*"
},
"type": "library",
"autoload": {
@@ -228,11 +228,11 @@
},
{
"name": "eappointment/zmsentities",
- "version": "dev-feature-MPDZBS-877-zmscitizenapi",
+ "version": "dev-next",
"dist": {
"type": "path",
"url": "../zmsentities",
- "reference": "faff0b320f53873e8ba4716a8d5b07c931c15c8b"
+ "reference": "4c07e846593be4b45f201db71b48a45f9b6e1efe"
},
"require": {
"eappointment/mellon": "@dev",
@@ -254,7 +254,7 @@
"league/json-reference": "^1.0",
"phpmd/phpmd": "@stable",
"phpunit/phpunit": "^9.6",
- "squizlabs/php_codesniffer": "^3.5.8",
+ "squizlabs/php_codesniffer": "*",
"yuloh/json-guard-cli": "^0.3.0"
},
"type": "library",
@@ -286,11 +286,11 @@
},
{
"name": "eappointment/zmsslim",
- "version": "dev-feature-MPDZBS-877-zmscitizenapi",
+ "version": "dev-next",
"dist": {
"type": "path",
"url": "../zmsslim",
- "reference": "faff0b320f53873e8ba4716a8d5b07c931c15c8b"
+ "reference": "13a59e7a34592936e535a28e485c504f8719b5f0"
},
"require": {
"eappointment/mellon": "@dev",
@@ -2942,20 +2942,20 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-ctype": "*"
@@ -2966,8 +2966,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -3001,7 +3001,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
},
"funding": [
{
@@ -3017,7 +3017,7 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -4142,29 +4142,27 @@
},
{
"name": "doctrine/deprecations",
- "version": "1.1.3",
+ "version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
+ "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
- "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
+ "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^9",
- "phpstan/phpstan": "1.4.10 || 1.10.15",
- "phpstan/phpstan-phpunit": "^1.0",
+ "doctrine/coding-standard": "^9 || ^12",
+ "phpstan/phpstan": "1.4.10 || 2.0.3",
+ "phpstan/phpstan-phpunit": "^1.0 || ^2",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "psalm/plugin-phpunit": "0.18.4",
- "psr/log": "^1 || ^2 || ^3",
- "vimeo/psalm": "4.30.0 || 5.12.0"
+ "psr/log": "^1 || ^2 || ^3"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -4172,7 +4170,7 @@
"type": "library",
"autoload": {
"psr-4": {
- "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+ "Doctrine\\Deprecations\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -4183,9 +4181,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
+ "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
},
- "time": "2024-01-30T19:34:25+00:00"
+ "time": "2024-12-07T21:18:45+00:00"
},
{
"name": "doctrine/instantiator",
@@ -4798,16 +4796,16 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "5.4.1",
+ "version": "5.6.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c"
+ "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
- "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
+ "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
"shasum": ""
},
"require": {
@@ -4816,17 +4814,17 @@
"php": "^7.4 || ^8.0",
"phpdocumentor/reflection-common": "^2.2",
"phpdocumentor/type-resolver": "^1.7",
- "phpstan/phpdoc-parser": "^1.7",
+ "phpstan/phpdoc-parser": "^1.7|^2.0",
"webmozart/assert": "^1.9.1"
},
"require-dev": {
- "mockery/mockery": "~1.3.5",
+ "mockery/mockery": "~1.3.5 || ~1.6.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-mockery": "^1.1",
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^9.5",
- "vimeo/psalm": "^5.13"
+ "psalm/phar": "^5.26"
},
"type": "library",
"extra": {
@@ -4856,29 +4854,29 @@
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"support": {
"issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
- "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1"
+ "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1"
},
- "time": "2024-05-21T05:55:05+00:00"
+ "time": "2024-12-07T09:39:29+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.8.2",
+ "version": "1.10.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+ "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
- "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a",
+ "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a",
"shasum": ""
},
"require": {
"doctrine/deprecations": "^1.0",
"php": "^7.3 || ^8.0",
"phpdocumentor/reflection-common": "^2.0",
- "phpstan/phpdoc-parser": "^1.13"
+ "phpstan/phpdoc-parser": "^1.18|^2.0"
},
"require-dev": {
"ext-tokenizer": "*",
@@ -4914,9 +4912,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0"
},
- "time": "2024-02-23T11:10:43+00:00"
+ "time": "2024-11-09T15:12:26+00:00"
},
{
"name": "phpmd/phpmd",
@@ -5003,26 +5001,27 @@
},
{
"name": "phpspec/prophecy",
- "version": "v1.19.0",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87"
+ "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87",
- "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93",
+ "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.2 || ^2.0",
- "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*",
+ "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*",
"phpdocumentor/reflection-docblock": "^5.2",
"sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0",
"sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0"
},
"require-dev": {
+ "friendsofphp/php-cs-fixer": "^3.40",
"phpspec/phpspec": "^6.0 || ^7.0",
"phpstan/phpstan": "^1.9",
"phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
@@ -5066,22 +5065,22 @@
],
"support": {
"issues": "https://github.com/phpspec/prophecy/issues",
- "source": "https://github.com/phpspec/prophecy/tree/v1.19.0"
+ "source": "https://github.com/phpspec/prophecy/tree/v1.20.0"
},
- "time": "2024-02-29T11:52:51+00:00"
+ "time": "2024-11-19T13:12:41+00:00"
},
{
"name": "phpspec/prophecy-phpunit",
- "version": "v2.2.0",
+ "version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy-phpunit.git",
- "reference": "16e1247e139434bce0bac09848bc5c8d882940fc"
+ "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/16e1247e139434bce0bac09848bc5c8d882940fc",
- "reference": "16e1247e139434bce0bac09848bc5c8d882940fc",
+ "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/8819516c1b489ecee4c60db5f5432fac1ea8ac6f",
+ "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f",
"shasum": ""
},
"require": {
@@ -5089,6 +5088,9 @@
"phpspec/prophecy": "^1.18",
"phpunit/phpunit": "^9.1 || ^10.1 || ^11.0"
},
+ "require-dev": {
+ "phpstan/phpstan": "^1.10"
+ },
"type": "library",
"extra": {
"branch-alias": {
@@ -5118,36 +5120,36 @@
],
"support": {
"issues": "https://github.com/phpspec/prophecy-phpunit/issues",
- "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.2.0"
+ "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.3.0"
},
- "time": "2024-03-01T08:33:58+00:00"
+ "time": "2024-11-19T13:24:17+00:00"
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.29.0",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc"
+ "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc",
- "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299",
+ "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299",
"shasum": ""
},
"require": {
- "php": "^7.2 || ^8.0"
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
"doctrine/annotations": "^2.0",
- "nikic/php-parser": "^4.15",
+ "nikic/php-parser": "^5.3.0",
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^1.5",
- "phpstan/phpstan-phpunit": "^1.1",
- "phpstan/phpstan-strict-rules": "^1.0",
- "phpunit/phpunit": "^9.5",
+ "phpstan/phpstan": "^2.0",
+ "phpstan/phpstan-phpunit": "^2.0",
+ "phpstan/phpstan-strict-rules": "^2.0",
+ "phpunit/phpunit": "^9.6",
"symfony/process": "^5.2"
},
"type": "library",
@@ -5165,9 +5167,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0"
},
- "time": "2024-05-06T12:04:23+00:00"
+ "time": "2024-10-13T11:29:49+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/zmscitizenapi/phpunit.xml b/zmscitizenapi/phpunit.xml
index 00617d8f7..2aeb4f32d 100644
--- a/zmscitizenapi/phpunit.xml
+++ b/zmscitizenapi/phpunit.xml
@@ -21,7 +21,15 @@
- ./src
+ ./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
diff --git a/zmscitizenapi/routing.php b/zmscitizenapi/routing.php
index 053d7f68d..fc52f6c7a 100644
--- a/zmscitizenapi/routing.php
+++ b/zmscitizenapi/routing.php
@@ -309,6 +309,48 @@ function createLanguageRoutes($app, $path, $controller, $name, $method = 'get'):
"get"
);
+/**
+ * @swagger
+ * /available-appointments-by-office/:
+ * get:
+ * summary: Get available appointments for a specific day grouped by office
+ * tags:
+ * - appointments
+ * parameters:
+ * - name: date
+ * description: Date in format YYYY-MM-DD
+ * in: query
+ * required: true
+ * type: string
+ * - name: officeId
+ * description: Comma separated Office IDs
+ * in: query
+ * required: true
+ * type: string
+ * - name: serviceIds
+ * description: Comma separated Service IDs
+ * in: query
+ * required: true
+ * type: string
+ * responses:
+ * 200:
+ * description: List of available appointments grouped by office id
+ * schema:
+ * type: object
+ * properties:
+ * meta:
+ * $ref: "schema/metaresult.json"
+ * data:
+ * $ref: "schema/citizenapi/availableAppointments.json"
+ */
+createLanguageRoutes(
+ \App::$slim,
+ '/available-appointments-by-office/',
+ '\BO\Zmscitizenapi\Controllers\Availability\AvailableAppointmentsListByOfficeController',
+ "AvailableAppointmentsListByOfficeController",
+ "get"
+);
+
/**
* @swagger
* /appointment/:
diff --git a/zmscitizenapi/src/Zmscitizenapi/Application.php b/zmscitizenapi/src/Zmscitizenapi/Application.php
index d4432a7c1..5635b48ce 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Application.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Application.php
@@ -1,4 +1,5 @@
readResponse($request, $noCacheResponse, $args);
} catch (\RuntimeException $e) {
- // Extract error details from the exception message
+ // Extract error details from the exception message
[$errorCode, $errorMessage] = explode(': ', $e->getMessage(), 2);
- return $this->createJsonResponse(
- $response,
- [
- 'errors' => [
- [
- 'errorCode' => $errorCode,
- 'errorMessage' => $errorMessage,
- 'statusCode' => $e->getCode()
- ]
+ return $this->createJsonResponse($response, [
+ 'errors' => [
+ [
+ 'errorCode' => $errorCode,
+ 'errorMessage' => $errorMessage,
+ 'statusCode' => $e->getCode()
]
- ],
- $e->getCode() ?: 500
- );
+ ]
+ ], $e->getCode() ?: 500);
}
}
@@ -67,11 +64,10 @@ protected function createJsonResponse(ResponseInterface $response, array $conten
if ($statusCode < 100 || $statusCode > 599) {
throw new \InvalidArgumentException('Invalid HTTP status code');
}
-
+
$response = $response->withStatus($statusCode)
->withHeader('Content-Type', 'application/json; charset=utf-8');
-
- // Translate any errors using the stored language
+// Translate any errors using the stored language
if (isset($content['errors'])) {
foreach ($content['errors'] as &$error) {
if (isset($error['errorCode'])) {
@@ -79,16 +75,14 @@ protected function createJsonResponse(ResponseInterface $response, array $conten
}
}
}
-
+
try {
$json = json_encode($content, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
} catch (\JsonException $e) {
throw new \RuntimeException('Failed to encode JSON response: ' . $e->getMessage(), 0, $e);
}
-
+
$response->getBody()->write($json);
-
return $response;
}
-
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentByIdController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentByIdController.php
index 761c777d4..181335f3d 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentByIdController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentByIdController.php
@@ -1,4 +1,5 @@
service = new AppointmentByIdService();
@@ -25,21 +25,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getAppointmentById($request->getQueryParams());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentCancelController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentCancelController.php
index c3124c96b..f1ca8a59e 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentCancelController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentCancelController.php
@@ -1,4 +1,5 @@
service = new AppointmentCancelService();
@@ -23,30 +23,21 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerPostRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
-
+
$result = $this->service->processCancel($request->getParsedBody());
-
- // Handle array errors from validation
+// Handle array errors from validation
if (is_array($result) && isset($result['errors'])) {
foreach ($result['errors'] as &$error) {
if (isset($error['errorCode'])) {
$error = ErrorMessages::get($error['errorCode'], $this->language);
}
}
- return $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- );
+ return $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']));
}
-
+
// Handle successful response
return $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentConfirmController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentConfirmController.php
index fa1059012..bf977f828 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentConfirmController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentConfirmController.php
@@ -1,4 +1,5 @@
service = new AppointmentConfirmService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerPostRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->processConfirm($request->getParsedBody());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentPreconfirmController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentPreconfirmController.php
index 93374b4a6..1878a9358 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentPreconfirmController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentPreconfirmController.php
@@ -1,4 +1,5 @@
service = new AppointmentPreconfirmService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerPostRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->processPreconfirm($request->getParsedBody());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentReserveController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentReserveController.php
index aa2ec7ae0..157280bf5 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentReserveController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentReserveController.php
@@ -1,4 +1,5 @@
service = new AppointmentReserveService();
@@ -23,31 +23,22 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerPostRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->processReservation($request->getParsedBody());
-
- // Handle array errors from validation
+// Handle array errors from validation
if (is_array($result) && isset($result['errors'])) {
- // Translate each error message
+// Translate each error message
foreach ($result['errors'] as &$error) {
if (isset($error['errorCode'])) {
$error = ErrorMessages::get($error['errorCode'], $this->language);
}
}
- return $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- );
+ return $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']));
}
// Handle successful response
return $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentUpdateController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentUpdateController.php
index b29e00fa0..fc5a41c29 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentUpdateController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Appointment/AppointmentUpdateController.php
@@ -1,4 +1,5 @@
service = new AppointmentUpdateService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerPostRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->processUpdate($request->getParsedBody());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableAppointmentsListByOfficeController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableAppointmentsListByOfficeController.php
new file mode 100644
index 000000000..fa66f464d
--- /dev/null
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableAppointmentsListByOfficeController.php
@@ -0,0 +1,34 @@
+service = new AvailableAppointmentsListService();
+ }
+
+ public function readResponse(RequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
+ {
+ $requestErrors = ValidationService::validateServerGetRequest($request);
+ if (!empty($requestErrors['errors'])) {
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
+ }
+
+ $result = $this->service->getAvailableAppointmentsListByOffice($request->getQueryParams());
+ return is_array($result) && isset($result['errors'])
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
+ : $this->createJsonResponse($response, $result->toArray(), 200);
+ }
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableAppointmentsListController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableAppointmentsListController.php
index 6f6e40839..c424fc510 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableAppointmentsListController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableAppointmentsListController.php
@@ -1,4 +1,5 @@
service = new AvailableAppointmentsListService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getAvailableAppointmentsList($request->getQueryParams());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableDaysListController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableDaysListController.php
index cdb64ed39..ff4ce42db 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableDaysListController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Availability/AvailableDaysListController.php
@@ -1,4 +1,5 @@
service = new AvailableDaysListService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getAvailableDaysList($request->getQueryParams());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficeListByServiceController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficeListByServiceController.php
index 544557d6f..0c7cb8e2c 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficeListByServiceController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficeListByServiceController.php
@@ -1,4 +1,5 @@
service = new OfficeListByServiceService();
@@ -22,22 +22,13 @@ public function __construct()
public function readResponse(RequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
{
$requestErrors = ValidationService::validateServerGetRequest($request);
- if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
- }
+ if (!empty($requestErrors['errors'])) {
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
+ }
$result = $this->service->getOfficeList($request->getQueryParams());
-
- return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ return is_array($result) && isset($result['errors'])
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesListController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesListController.php
index 741907c34..f9349db0e 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesListController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesListController.php
@@ -1,4 +1,5 @@
service = new OfficesListService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getOfficesList();
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsController.php
index e7ef20124..4c3ec5fbe 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsController.php
@@ -1,4 +1,5 @@
showUnpublished = !empty($showUnpublishedOnDomain)
&& strpos($domain, $showUnpublishedOnDomain) !== false;
-
}
public function readResponse(RequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
@@ -52,5 +52,14 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
)
: $this->createJsonResponse($response, $result->toArray(), 200);
+ $requestErrors = ValidationService::validateServerGetRequest($request);
+ if (!empty($requestErrors['errors'])) {
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
+ }
+
+ $result = $this->service->getServicesAndOfficesList();
+ return is_array($result) && isset($result['errors'])
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
+ : $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopeByIdController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopeByIdController.php
index 7a7387103..c9871fbd0 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopeByIdController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopeByIdController.php
@@ -1,4 +1,5 @@
service = new ScopeByIdService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getScope($request->getQueryParams());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopesListController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopesListController.php
index 3c5182d4c..f480186e7 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopesListController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Scope/ScopesListController.php
@@ -1,4 +1,5 @@
service = new ScopesListService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getScopesList();
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Security/CaptchaController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Security/CaptchaController.php
index 0465f7fa9..03e49cac4 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Security/CaptchaController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Security/CaptchaController.php
@@ -1,4 +1,5 @@
service = new CaptchaService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getCaptcha();
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result, 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServiceListByOfficeController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServiceListByOfficeController.php
index e75a43bf5..7a56d3a41 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServiceListByOfficeController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServiceListByOfficeController.php
@@ -1,4 +1,5 @@
service = new ServiceListByOfficeService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getServiceList($request->getQueryParams());
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServicesListController.php b/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServicesListController.php
index 4e109a8fa..8b9ee37fb 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServicesListController.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Controllers/Service/ServicesListController.php
@@ -1,4 +1,5 @@
service = new ServicesListService();
@@ -23,21 +23,12 @@ public function readResponse(RequestInterface $request, ResponseInterface $respo
{
$requestErrors = ValidationService::validateServerGetRequest($request);
if (!empty($requestErrors['errors'])) {
- return $this->createJsonResponse(
- $response,
- $requestErrors,
- ErrorMessages::get('invalidRequest', $this->language)['statusCode']
- );
+ return $this->createJsonResponse($response, $requestErrors, ErrorMessages::get('invalidRequest', $this->language)['statusCode']);
}
$result = $this->service->getServicesList();
-
return is_array($result) && isset($result['errors'])
- ? $this->createJsonResponse(
- $response,
- $result,
- ErrorMessages::getHighestStatusCode($result['errors'])
- )
+ ? $this->createJsonResponse($response, $result, ErrorMessages::getHighestStatusCode($result['errors']))
: $this->createJsonResponse($response, $result->toArray(), 200);
}
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Helper/ClientIpHelper.php b/zmscitizenapi/src/Zmscitizenapi/Helper/ClientIpHelper.php
index cdf9e16c2..f95e7397f 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Helper/ClientIpHelper.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Helper/ClientIpHelper.php
@@ -1,4 +1,5 @@
getMessage());
}
}
-
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Helper/ErrorHandler.php b/zmscitizenapi/src/Zmscitizenapi/Helper/ErrorHandler.php
index af7838317..69b96fdc4 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Helper/ErrorHandler.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Helper/ErrorHandler.php
@@ -21,14 +21,14 @@ public function __invoke(
bool $logErrorDetails
): ResponseInterface {
$statusCode = $this->getStatusCode($exception);
-
+
if ($logErrors) {
$this->logError($exception, $request, $displayErrorDetails, $logErrorDetails);
}
$response = new \Slim\Psr7\Response();
$payload = $this->formatErrorPayload($exception, $displayErrorDetails);
-
+
$response->getBody()->write(json_encode($payload));
return $response
@@ -89,4 +89,4 @@ private function logError(
'ip' => ClientIpHelper::getClientIp()
]);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Localization/ErrorMessages.php b/zmscitizenapi/src/Zmscitizenapi/Localization/ErrorMessages.php
index ac88c8001..96ba2fc30 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Localization/ErrorMessages.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Localization/ErrorMessages.php
@@ -1,4 +1,5 @@
[
'errorCode' => 'notImplemented',
@@ -324,8 +311,7 @@ class ErrorMessages
]
];
-
- // German messages
+// German messages
public const DE = [
'notImplemented' => [
'errorCode' => 'notImplemented',
@@ -613,7 +599,6 @@ class ErrorMessages
]
];
-
public const UA = [
'notImplemented' => [
'errorCode' => 'notImplemented',
@@ -896,8 +881,7 @@ class ErrorMessages
'errorMessage' => 'Порушення політики безпеки.'
]
];
-
- /**
+/**
* Get an error message by key with fallback logic.
*
* @param string $key The error message key.
@@ -907,20 +891,17 @@ class ErrorMessages
public static function get(string $key, ?string $language = null): array
{
$language = LanguageMiddleware::normalizeLanguage($language);
-
$messages = match ($language) {
'en' => self::EN,
'de' => self::DE,
'ua' => self::UA,
default => constant('self::' . strtoupper(LanguageMiddleware::getDefaultLanguage())),
};
-
if (isset($messages[$key])) {
return $messages[$key];
}
$fallbackMessages = constant('self::' . strtoupper(LanguageMiddleware::getFallbackLanguage()));
-
if (isset($fallbackMessages[$key])) {
return $fallbackMessages[$key];
}
@@ -946,7 +927,7 @@ public static function get(string $key, ?string $language = null): array
/**
* Get the highest status code from an array of errors.
- *
+ *
* @param array $errors Array of error messages
* @return int The highest status code found, or HTTP_OK (200) if no errors
* @throws \InvalidArgumentException If any error has an invalid structure
@@ -967,5 +948,4 @@ public static function getHighestStatusCode(array $errors): int
return max($errorCodes);
}
-
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/CorsMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/CorsMiddleware.php
index c84823b01..e681e2622 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/CorsMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/CorsMiddleware.php
@@ -1,4 +1,5 @@
logger = $logger;
$this->whitelist = \App::getCorsAllowedOrigins();
}
- public function process(
- ServerRequestInterface $request,
- RequestHandlerInterface $handler
- ): ResponseInterface {
+ public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+ {
try {
$origin = $request->getHeaderLine('Origin');
-
- // Allow requests without Origin header (direct browser access)
+// Allow requests without Origin header (direct browser access)
if (empty($origin)) {
- /*$this->logger->logInfo('Direct browser request - no Origin header', [
+/*$this->logger->logInfo('Direct browser request - no Origin header', [
'uri' => (string)$request->getUri(),
'headers' => $request->getHeaders()
]);*/
return $handler->handle($request);
}
-
+
if (!$this->isOriginAllowed($origin)) {
- $this->logger->logInfo(sprintf(
- 'CORS blocked - Origin %s not allowed. URI: %s',
- $origin,
- $request->getUri()
- ));
-
+ $this->logger->logInfo(sprintf('CORS blocked - Origin %s not allowed. URI: %s', $origin, $request->getUri()));
$response = \App::$slim->getResponseFactory()->createResponse();
$language = $request->getAttribute('language');
$response = $response->withStatus(ErrorMessages::get(self::ERROR_CORS, $language)['statusCode'])
->withHeader('Content-Type', 'application/json');
-
$response->getBody()->write(json_encode([
'errors' => [ErrorMessages::get(self::ERROR_CORS, $language)]
]));
-
return $response;
}
-
+
// Handle preflight OPTIONS requests
if ($request->getMethod() === 'OPTIONS') {
$response = \App::$slim->getResponseFactory()->createResponse(200);
@@ -67,7 +57,7 @@ public function process(
->withHeader('Access-Control-Allow-Credentials', 'true')
->withHeader('Access-Control-Max-Age', '86400');
}
-
+
$response = $handler->handle($request);
return $response
->withHeader('Access-Control-Allow-Origin', $origin)
@@ -85,4 +75,4 @@ private function isOriginAllowed(string $origin): bool
{
return in_array($origin, $this->whitelist, true);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/CsrfMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/CsrfMiddleware.php
index 82a232baf..0be048de0 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/CsrfMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/CsrfMiddleware.php
@@ -1,4 +1,5 @@
logger = $logger;
$config = \App::getCsrfConfig();
$this->tokenLength = $config['tokenLength'];
$this->sessionKey = $config['sessionKey'];
-
if (session_status() === PHP_SESSION_NONE) {
session_start();
}
}
- public function process(
- ServerRequestInterface $request,
- RequestHandlerInterface $handler
- ): ResponseInterface {
+ public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+ {
try {
if (in_array($request->getMethod(), self::SAFE_METHODS, true)) {
$this->ensureTokenExists();
@@ -47,16 +45,13 @@ public function process(
$this->logger->logInfo('CSRF token missing', [
'uri' => (string)$request->getUri()
]);
-
$response = \App::$slim->getResponseFactory()->createResponse();
$language = $request->getAttribute('language');
$response = $response->withStatus(ErrorMessages::get(self::ERROR_TOKEN_MISSING, $language)['statusCode'])
- ->withHeader('Content-Type', 'application/json');
-
+ ->withHeader('Content-Type', 'application/json');
$response->getBody()->write(json_encode([
- 'errors' => [ErrorMessages::get(self::ERROR_TOKEN_MISSING, $language)]
+ 'errors' => [ErrorMessages::get(self::ERROR_TOKEN_MISSING, $language)]
]));
-
return $response;
}
@@ -64,16 +59,13 @@ public function process(
$this->logger->logInfo('Invalid CSRF token', [
'uri' => (string)$request->getUri()
]);
-
$response = \App::$slim->getResponseFactory()->createResponse();
$language = $request->getAttribute('language');
$response = $response->withStatus(ErrorMessages::get(self::ERROR_TOKEN_INVALID, $language)['statusCode'])
->withHeader('Content-Type', 'application/json');
-
$response->getBody()->write(json_encode([
'errors' => [ErrorMessages::get(self::ERROR_TOKEN_INVALID, $language)]
]));
-
return $response;
}
@@ -89,7 +81,7 @@ private function validateToken(string $token): bool
if (strlen($token) !== $this->tokenLength || !ctype_xdigit($token)) {
return false;
}
-
+
$storedToken = $this->getStoredToken();
if (empty($storedToken)) {
return false;
@@ -122,4 +114,4 @@ public function getToken(): string
$this->ensureTokenExists();
return $this->getStoredToken();
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/IpFilterMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/IpFilterMiddleware.php
index b0b43e2d8..549dbc033 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/IpFilterMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/IpFilterMiddleware.php
@@ -1,4 +1,5 @@
logger = $logger;
$this->blacklist = \App::getIpBlacklist();
}
- public function process(
- ServerRequestInterface $request,
- RequestHandlerInterface $handler
- ): ResponseInterface {
+ public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+ {
try {
$ip = ClientIpHelper::getClientIp();
$uri = (string)$request->getUri();
@@ -40,73 +37,68 @@ public function process(
]);
return $handler->handle($request);
}
-
+
$blacklist = $this->parseIpList($this->blacklist ?: null);
if ($this->isIpInList($ip, $blacklist)) {
$this->logger->logInfo('Access denied - IP blacklisted', [
'ip' => $ip,
'uri' => $uri
]);
-
$language = $request->getAttribute('language');
-
$error = ErrorMessages::get(self::ERROR_BLACKLISTED, $language);
-
$response = \App::$slim->getResponseFactory()->createResponse();
$response = $response->withStatus($error['statusCode'])
- ->withHeader('Content-Type', 'application/json');
-
- // Write JSON response
- $responseBody = json_encode([
- 'errors' => [$error]
- ]);
+ ->withHeader('Content-Type', 'application/json');
+ // Write JSON response
+ $responseBody = json_encode([
+ 'errors' => [$error]
+ ]);
$response->getBody()->write($responseBody);
-
return $response;
}
-
+
return $handler->handle($request);
-
} catch (\Throwable $e) {
$this->logger->logError($e, $request);
throw $e;
}
}
-
+
private function parseIpList(?string $ipList): array
{
if (empty($ipList)) {
return [];
}
-
+
$list = array_map('trim', explode(',', $ipList));
return array_filter($list, function ($entry) {
+
if (strpos($entry, '/') !== false) {
list($ip, $bits) = explode('/', $entry);
- return filter_var($ip, FILTER_VALIDATE_IP) &&
- is_numeric($bits) &&
- (int)$bits >= 0 &&
+ return filter_var($ip, FILTER_VALIDATE_IP) &&
+ is_numeric($bits) &&
+ (int)$bits >= 0 &&
(int)$bits <= (strpos($ip, ':') !== false ? self::IPV6_BITS : self::IPV4_BITS);
}
return filter_var($entry, FILTER_VALIDATE_IP);
});
}
-
+
private function isIpInList(string $ip, array $list): bool
{
if (empty($list)) {
return false;
}
-
+
foreach ($list as $range) {
if ($this->isIpInRange($ip, $range)) {
return true;
}
}
-
+
return false;
}
-
+
private function isIpInRange(string $ip, string $range): bool
{
$flags = FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6;
@@ -116,37 +108,36 @@ private function isIpInRange(string $ip, string $range): bool
if (strpos($range, '/') !== false) {
list($subnet, $bits) = explode('/', $range);
-
if (!filter_var($subnet, FILTER_VALIDATE_IP, $flags)) {
return false;
}
-
+
$ipBin = @inet_pton($ip);
$subnetBin = @inet_pton($subnet);
-
- if ($ipBin === false || $subnetBin === false ||
- strlen($ipBin) !== strlen($subnetBin)) {
+
+ if (
+ $ipBin === false || $subnetBin === false ||
+ strlen($ipBin) !== strlen($subnetBin)
+ ) {
return false;
}
-
+
$bits = (int)$bits;
$maxBits = strlen($ipBin) === 4 ? self::IPV4_BITS : self::IPV6_BITS;
-
if ($bits < 0 || $bits > $maxBits) {
return false;
}
-
+
$bytes = strlen($ipBin);
$mask = str_repeat("\xFF", (int)($bits / 8));
-
if ($bits % 8) {
$mask .= chr(0xFF << (8 - ($bits % 8)));
}
-
+
$mask = str_pad($mask, $bytes, "\x00");
return ($ipBin & $mask) === ($subnetBin & $mask);
}
-
+
return $ip === $range;
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/LanguageMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/LanguageMiddleware.php
index 282553513..bb6b04b35 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/LanguageMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/LanguageMiddleware.php
@@ -1,4 +1,5 @@
logger = $logger;
@@ -26,19 +26,19 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
{
$uri = $request->getUri()->getPath();
$parts = explode('/', trim($uri, '/'));
-
- if (count($parts) >= 3 &&
- $parts[0] === 'terminvereinbarung' &&
- $parts[1] === 'api' &&
- $parts[2] === 'citizen') {
-
+
+ if (
+ count($parts) >= 3 &&
+ $parts[0] === 'terminvereinbarung' &&
+ $parts[1] === 'api' &&
+ $parts[2] === 'citizen'
+ ) {
$language = isset($parts[3]) && in_array($parts[3], self::SUPPORTED_LANGUAGES)
? $parts[3]
: self::DEFAULT_LANGUAGE;
-
$request = $request->withAttribute('language', $language);
}
-
+
return $handler->handle($request);
}
@@ -79,4 +79,4 @@ public static function normalizeLanguage(?string $language): string
$language = strtolower($language ?? self::DEFAULT_LANGUAGE);
return in_array($language, self::SUPPORTED_LANGUAGES) ? $language : self::DEFAULT_LANGUAGE;
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/MaintenanceMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/MaintenanceMiddleware.php
index 4ace13696..982f4a00d 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/MaintenanceMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/MaintenanceMiddleware.php
@@ -1,4 +1,5 @@
getAttribute('language');
-
$error = ErrorMessages::get(self::ERROR_UNAVAILABLE, $language);
-
$response = \App::$slim->getResponseFactory()->createResponse();
$response = $response->withStatus(self::HTTP_UNAVAILABLE)
->withHeader('Content-Type', 'application/json');
-
- // Write JSON response
+// Write JSON response
$responseBody = json_encode([
'errors' => [$error]
]);
$response->getBody()->write($responseBody);
-
return $response;
}
return $handler->handle($request);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/RateLimitingMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/RateLimitingMiddleware.php
index a925969fa..7de9d1301 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/RateLimitingMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/RateLimitingMiddleware.php
@@ -1,4 +1,5 @@
cache = $cache;
$this->logger = $logger;
-
$config = \App::getRateLimit();
$this->maxRequests = $config['maxRequests'];
$this->cacheExpiry = $config['cacheExpiry'];
@@ -38,20 +36,16 @@ public function __construct(CacheInterface $cache, LoggerService $logger)
$this->backoffMax = $config['backoffMax'];
$this->lockTimeout = $config['lockTimeout'];
}
-
- public function process(
- ServerRequestInterface $request,
- RequestHandlerInterface $handler
- ): ResponseInterface {
+
+ public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+ {
try {
$ip = ClientIpHelper::getClientIp();
$key = 'rate_limit_' . md5($ip);
$lockKey = $key . '_lock';
-
- // Try to acquire rate limit with retries and exponential backoff
+// Try to acquire rate limit with retries and exponential backoff
$attempt = 0;
$limited = false;
-
while ($attempt < $this->maxRetries) {
try {
if ($this->acquireLock($lockKey)) {
@@ -65,78 +59,66 @@ public function process(
} catch (\Throwable $e) {
$this->logger->logError($e, $request);
}
-
+
$attempt++;
if ($attempt < $this->maxRetries) {
- // Exponential backoff with jitter
- $backoffMs = min(
- $this->backoffMax,
- (int)($this->backoffMin * min(pow(2, $attempt), PHP_INT_MAX / $this->backoffMin))
- );
+ // Exponential backoff with jitter
+ $backoffMs = min($this->backoffMax, (int)($this->backoffMin * min(pow(2, $attempt), PHP_INT_MAX / $this->backoffMin)));
$jitterMs = random_int(0, (int)($backoffMs * 0.1));
$sleepMs = $backoffMs + $jitterMs;
- usleep($sleepMs * 1000); // Convert to microseconds
+ usleep($sleepMs * 1000);
+ // Convert to microseconds
}
}
-
+
if ($limited) {
- $this->logger->logInfo(sprintf(
- 'Rate limit exceeded for IP %s. URI: %s',
- $ip,
- $request->getUri()
- ));
-
+ $this->logger->logInfo(sprintf('Rate limit exceeded for IP %s. URI: %s', $ip, $request->getUri()));
return $this->createRateLimitResponse($request);
}
-
+
$response = $handler->handle($request);
- // Subtract one extra to account for the current request
+// Subtract one extra to account for the current request
$remaining = max(0, $this->maxRequests - $this->getCurrentRequestCount($key) - 1);
-
return $response
->withHeader('X-RateLimit-Limit', (string)$this->maxRequests)
->withHeader('X-RateLimit-Remaining', (string)max(0, $remaining))
->withHeader('X-RateLimit-Reset', (string)$this->getResetTime($key));
-
} catch (\Throwable $e) {
$this->logger->logError($e, $request);
throw $e;
}
}
-
+
private function checkAndIncrementLimit(string $key): bool
{
$requestData = $this->cache->get($key);
-
if ($requestData === null) {
- // First request
+ // First request
$this->cache->set($key, [
'count' => 1,
'timestamp' => time()
], $this->cacheExpiry);
return false;
}
-
+
if (!is_array($requestData)) {
- // Handle corrupted data
+// Handle corrupted data
$this->cache->delete($key);
return false;
}
-
+
$count = (int)($requestData['count'] ?? 0);
-
if ($count >= $this->maxRequests) {
return true;
}
-
+
// Update the counter atomically
$requestData['count'] = $count + 1;
$requestData['timestamp'] = time();
$this->cache->set($key, $requestData, $this->cacheExpiry);
-
return false;
}
-
+
private function getCurrentRequestCount(string $key): int
{
$requestData = $this->cache->get($key);
@@ -145,7 +127,7 @@ private function getCurrentRequestCount(string $key): int
}
return (int)($requestData['count'] ?? 0);
}
-
+
private function getResetTime(string $key): int
{
$requestData = $this->cache->get($key);
@@ -154,21 +136,19 @@ private function getResetTime(string $key): int
}
return (int)($requestData['timestamp'] ?? time()) + $this->cacheExpiry;
}
-
+
private function createRateLimitResponse($request): ResponseInterface
{
$response = \App::$slim->getResponseFactory()->createResponse();
$language = $request->getAttribute('language');
- $response = $response->withStatus(ErrorMessages::get(self::ERROR_RATE_LIMIT, $language )['statusCode'])
+ $response = $response->withStatus(ErrorMessages::get(self::ERROR_RATE_LIMIT, $language)['statusCode'])
->withHeader('Content-Type', 'application/json');
-
$response->getBody()->write(json_encode([
- 'errors' => [ErrorMessages::get(self::ERROR_RATE_LIMIT, $language )]
+ 'errors' => [ErrorMessages::get(self::ERROR_RATE_LIMIT, $language)]
]));
-
return $response;
}
-
+
private function acquireLock(string $lockKey): bool
{
// Try to acquire lock by setting it only if it doesn't exist
@@ -177,12 +157,12 @@ private function acquireLock(string $lockKey): bool
}
return false;
}
-
+
private function releaseLock(string $lockKey): void
{
$this->cache->delete($lockKey);
}
-
+
/**
* For testing purposes - allows checking if a lock exists
*/
@@ -191,4 +171,4 @@ public function isLocked(string $ip): bool
$lockKey = 'rate_limit_' . md5($ip) . '_lock';
return $this->cache->has($lockKey);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestLoggingMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestLoggingMiddleware.php
index b580bd58a..352eea549 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestLoggingMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestLoggingMiddleware.php
@@ -1,4 +1,5 @@
handle($request);
-
$responseToLog = clone $response;
$responseToLog->getBody()->rewind();
-
$this->logger->logRequest($request, $responseToLog);
-
return $response;
} catch (\Throwable $e) {
$this->logger->logError($e, $request);
throw $e;
}
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSanitizerMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSanitizerMiddleware.php
index 1dd11ccfc..aff95ad94 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSanitizerMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSanitizerMiddleware.php
@@ -1,4 +1,5 @@
logger = $logger;
@@ -23,14 +23,11 @@ public function __construct(LoggerService $logger)
$this->maxStringLength = $config['maxStringLength'];
}
- public function process(
- ServerRequestInterface $request,
- RequestHandlerInterface $handler
- ): ResponseInterface {
+ public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+ {
try {
$request = $this->sanitizeRequest($request);
-
- /*$this->logger->logInfo('Request sanitized', [
+/*$this->logger->logInfo('Request sanitized', [
'uri' => (string) $request->getUri()
]);*/
@@ -47,8 +44,7 @@ private function sanitizeRequest(ServerRequestInterface $request): ServerRequest
$queryParams = $request->getQueryParams();
$sanitizedQueryParams = $this->sanitizeData($queryParams);
$request = $request->withQueryParams($sanitizedQueryParams);
-
- // Sanitize parsed body
+// Sanitize parsed body
$parsedBody = $request->getParsedBody();
if (is_array($parsedBody)) {
$sanitizedParsedBody = $this->sanitizeData($parsedBody);
@@ -115,7 +111,6 @@ private function sanitizeString(string $value): string
}
$value = preg_replace('/[\x00-\x1F\x7F]/u', '', $value);
-
$value = trim($value);
if (!mb_check_encoding($value, 'UTF-8')) {
$this->logger->logWarning('Invalid string encoding detected.', ['value' => $value]);
@@ -123,4 +118,4 @@ private function sanitizeString(string $value): string
}
return $value;
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSizeLimitMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSizeLimitMiddleware.php
index dc617eff8..9deb7093d 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSizeLimitMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/RequestSizeLimitMiddleware.php
@@ -1,4 +1,5 @@
logger = $logger;
@@ -23,33 +23,23 @@ public function __construct(LoggerService $logger)
$this->maxSize = $config['maxSize'];
}
- public function process(
- ServerRequestInterface $request,
- RequestHandlerInterface $handler
- ): ResponseInterface {
+ public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+ {
try {
$contentLength = $request->getHeaderLine('Content-Length');
if ($contentLength === '') {
return $handler->handle($request);
}
$contentLength = (int)$contentLength;
-
if ($contentLength > $this->maxSize) {
- $this->logger->logInfo(sprintf(
- 'Request too large: %d bytes. URI: %s',
- $contentLength,
- $request->getUri()
- ));
-
+ $this->logger->logInfo(sprintf('Request too large: %d bytes. URI: %s', $contentLength, $request->getUri()));
$response = \App::$slim->getResponseFactory()->createResponse();
$language = $request->getAttribute('language');
$response = $response->withStatus(ErrorMessages::get(self::ERROR_TOO_LARGE, $language)['statusCode'])
->withHeader('Content-Type', 'application/json');
-
$response->getBody()->write(json_encode([
'errors' => [ErrorMessages::get(self::ERROR_TOO_LARGE, $language)]
]));
-
return $response;
}
@@ -59,4 +49,4 @@ public function process(
throw $e;
}
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Middleware/SecurityHeadersMiddleware.php b/zmscitizenapi/src/Zmscitizenapi/Middleware/SecurityHeadersMiddleware.php
index 96a1a9246..85bd60d33 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Middleware/SecurityHeadersMiddleware.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Middleware/SecurityHeadersMiddleware.php
@@ -1,4 +1,5 @@
'geolocation=(), microphone=(), camera=()',
'X-Permitted-Cross-Domain-Policies' => 'none'
];
-
private LoggerService $logger;
-
public function __construct(LoggerService $logger)
{
$this->logger = $logger;
}
- public function process(
- ServerRequestInterface $request,
- RequestHandlerInterface $handler
- ): ResponseInterface {
+ public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+ {
try {
$response = $handler->handle($request);
-
foreach ($this->securityHeaders as $header => $value) {
$response = $response->withHeader($header, $value);
}
-
+
/*$this->logger->logInfo('Security headers added', [
'uri' => (string)$request->getUri()
]);*/
-
+
return $response;
} catch (\Throwable $e) {
$this->logger->logError($e, $request);
-
$response = \App::$slim->getResponseFactory()->createResponse();
$language = $request->getAttribute('language');
$response = $response->withStatus(ErrorMessages::get('securityHeaderViolation', $language)['statusCode'])
->withHeader('Content-Type', 'application/json');
-
$response->getBody()->write(json_encode([
'errors' => [ErrorMessages::get('securityHeaderViolation', $language)]
]));
-
return $response;
}
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointments.php b/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointments.php
index eff4654cc..79a485a02 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointments.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointments.php
@@ -1,4 +1,5 @@
appointmentTimestamps = array_map('intval', $appointmentTimestamps);
-
$this->ensureValid();
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointmentsByOffice.php b/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointmentsByOffice.php
new file mode 100644
index 000000000..3c5bb1c1c
--- /dev/null
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/AvailableAppointmentsByOffice.php
@@ -0,0 +1,58 @@
+officeAppointments = $officeAppointments;
+ $this->ensureValid();
+ }
+
+ private function ensureValid(): void
+ {
+ if (!$this->testValid()) {
+ throw new InvalidArgumentException('The provided data is invalid according to the schema.');
+ }
+ }
+
+ /**
+ * Converts the model data back into an array for serialization.
+ *
+ * @return array
+ */
+ public function toArray(): array
+ {
+ return [
+ 'offices' => array_map(function ($appointments, $officeId) {
+
+ return [
+ 'officeId' => $officeId,
+ 'appointments' => $appointments
+ ];
+ }, $this->officeAppointments, array_keys($this->officeAppointments))
+ ];
+ }
+
+ /**
+ * Implementation of JsonSerializable.
+ */
+ public function jsonSerialize(): mixed
+ {
+ return $this->toArray();
+ }
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/AvailableDays.php b/zmscitizenapi/src/Zmscitizenapi/Models/AvailableDays.php
index fa0877dbb..ed4a11979 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/AvailableDays.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/AvailableDays.php
@@ -1,4 +1,5 @@
availableDays = $availableDays;
-
$this->ensureValid();
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/AltchaCaptcha.php b/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/AltchaCaptcha.php
index 0c0f5afd9..a249ba2b7 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/AltchaCaptcha.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/AltchaCaptcha.php
@@ -1,4 +1,5 @@
apiUrl = \App::$ALTCHA_CAPTCHA_ENDPOINT;
$this->secretKey = \App::$ALTCHA_CAPTCHA_SECRET_KEY;
$this->puzzle = \App::$ALTCHA_CAPTCHA_ENDPOINT_PUZZLE;
-
$this->ensureValid();
}
@@ -78,9 +72,7 @@ public function verifyCaptcha(string $solution): bool
'solution' => $solution
]
]);
-
$responseBody = json_decode((string)$response->getBody(), true);
-
if (json_last_error() !== JSON_ERROR_NONE || !isset($responseBody['valid'])) {
return false;
}
@@ -90,4 +82,4 @@ public function verifyCaptcha(string $solution): bool
return false;
}
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/FriendlyCaptcha.php b/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/FriendlyCaptcha.php
index 9a91570be..9e089465a 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/FriendlyCaptcha.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Captcha/FriendlyCaptcha.php
@@ -1,4 +1,5 @@
apiUrl = \App::$FRIENDLY_CAPTCHA_ENDPOINT;
$this->secretKey = \App::$FRIENDLY_CAPTCHA_SECRET_KEY;
$this->puzzle = \App::$FRIENDLY_CAPTCHA_ENDPOINT_PUZZLE;
-
$this->ensureValid();
}
@@ -78,16 +72,14 @@ public function verifyCaptcha(string $solution): bool
'solution' => $solution
]
]);
-
$responseBody = json_decode((string)$response->getBody(), true);
-
if (json_last_error() !== JSON_ERROR_NONE || !isset($responseBody['success'])) {
return false;
}
-
+
return $responseBody['success'] === true;
} catch (RequestException $e) {
return false;
}
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/CaptchaInterface.php b/zmscitizenapi/src/Zmscitizenapi/Models/CaptchaInterface.php
index 3a6a17268..b373e9144 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/CaptchaInterface.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/CaptchaInterface.php
@@ -1,4 +1,5 @@
offices[] = $office;
} catch (\Exception $e) {
- error_log("Invalid Office encountered: " . $e->getMessage()); //Gracefully handle
+ error_log("Invalid Office encountered: " . $e->getMessage());
+ //Gracefully handle
}
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceAndRelationList.php b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceAndRelationList.php
index 2c78f21f5..3e4d6cb0a 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceAndRelationList.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceAndRelationList.php
@@ -1,4 +1,5 @@
offices = $offices;
$this->services = $services;
$this->relations = $relations;
-
$this->ensureValid();
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceRelationList.php b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceRelationList.php
index af8049e9b..c0a8a9f94 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceRelationList.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/OfficeServiceRelationList.php
@@ -1,4 +1,5 @@
relations[] = $relation;
} catch (\Exception $e) {
- error_log("Invalid OfficeServiceRelation encountered: " . $e->getMessage()); //Gracefully handle
+ error_log("Invalid OfficeServiceRelation encountered: " . $e->getMessage());
+ //Gracefully handle
}
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ServiceList.php b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ServiceList.php
index d0c4f8058..82c35a2ed 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ServiceList.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ServiceList.php
@@ -1,4 +1,5 @@
services[] = $service;
} catch (\Exception $e) {
- error_log("Invalid Service encountered: " . $e->getMessage()); //Gracefully handle
+ error_log("Invalid Service encountered: " . $e->getMessage());
+ //Gracefully handle
}
-
}
$this->ensureValid();
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ThinnedScopeList.php b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ThinnedScopeList.php
index 4d902613a..68ebe3c6f 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ThinnedScopeList.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Collections/ThinnedScopeList.php
@@ -1,4 +1,5 @@
scopes[] = $scope;
} catch (\Exception $e) {
- error_log("Invalid ThinnedScope encountered: " . $e->getMessage()); //Gracefully handle
+ error_log("Invalid ThinnedScope encountered: " . $e->getMessage());
+ //Gracefully handle
}
}
@@ -54,5 +54,4 @@ public function getScopes(): array
{
return $this->scopes;
}
-
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Combinable.php b/zmscitizenapi/src/Zmscitizenapi/Models/Combinable.php
index 223fdf094..dc0ab3f25 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Combinable.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Combinable.php
@@ -1,4 +1,5 @@
*/
+/** @var array
*/
private array $combinations = [];
-
- /**
+/**
* Constructor.
*
* @param array $combinations An associative array of combinations (serviceId => providerIds).
@@ -22,9 +21,7 @@ class Combinable extends Entity implements JsonSerializable
public function __construct(array $combinations = [])
{
foreach ($combinations as $id => $providerIds) {
-
$this->combinations[(int)$id] = array_map('intval', $providerIds);
-
$this->ensureValid();
}
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Office.php b/zmscitizenapi/src/Zmscitizenapi/Models/Office.php
index ed4715801..6cdcd67a7 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Office.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Office.php
@@ -1,4 +1,5 @@
id = $id;
$this->name = $name;
$this->address = $address;
+ $this->showAlternativeLocations = $showAlternativeLocations;
$this->displayNameAlternatives = $displayNameAlternatives;
$this->organization = $organization;
$this->organizationUnit = $organizationUnit;
$this->slotTimeInMinutes = $slotTimeInMinutes;
$this->geo = $geo;
$this->scope = $scope;
-
$this->ensureValid();
}
@@ -81,6 +65,7 @@ public function toArray(): array
'id' => $this->id,
'name' => $this->name,
'address' => $this->address,
+ 'showAlternativeLocations' => $this->showAlternativeLocations,
'displayNameAlternatives' => $this->displayNameAlternatives,
'organization' => $this->organization,
'organizationUnit' => $this->organizationUnit,
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/OfficeServiceRelation.php b/zmscitizenapi/src/Zmscitizenapi/Models/OfficeServiceRelation.php
index a43b02e4c..3c3b708f3 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/OfficeServiceRelation.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/OfficeServiceRelation.php
@@ -1,4 +1,5 @@
officeId = $officeId;
$this->serviceId = $serviceId;
$this->slots = $slots;
-
$this->ensureValid();
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ProcessFreeSlots.php b/zmscitizenapi/src/Zmscitizenapi/Models/ProcessFreeSlots.php
index 0095d13c4..f0e8a3472 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/ProcessFreeSlots.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/ProcessFreeSlots.php
@@ -1,4 +1,5 @@
appointmentTimestamps = array_map('intval', $appointmentTimestamps);
-
$this->ensureValid();
}
@@ -52,4 +49,4 @@ public function jsonSerialize(): mixed
{
return $this->toArray();
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/Service.php b/zmscitizenapi/src/Zmscitizenapi/Models/Service.php
index dd2b550a0..dc02a6522 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/Service.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/Service.php
@@ -1,4 +1,5 @@
name = $name;
$this->maxQuantity = $maxQuantity;
$this->combinable = $combinable;
-
$this->ensureValid();
}
@@ -73,4 +67,4 @@ public function jsonSerialize(): mixed
{
return $this->toArray();
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedContact.php b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedContact.php
index a5c8cfa43..0619a8b2e 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedContact.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedContact.php
@@ -1,4 +1,5 @@
city = $city ?? '';
$this->country = $country ?? '';
$this->name = $name ?? '';
@@ -35,7 +27,6 @@ public function __construct(
$this->region = $region ?? '';
$this->street = $street ?? '';
$this->streetNumber = $streetNumber ?? '';
-
$this->ensureValid();
}
@@ -67,4 +58,4 @@ public function jsonSerialize(): mixed
{
return $this->toArray();
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProcess.php b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProcess.php
index 2ce6d560c..c2af10a7f 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProcess.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProcess.php
@@ -1,4 +1,5 @@
processId = $processId;
$this->timestamp = $timestamp;
$this->authKey = $authKey;
@@ -84,7 +56,6 @@ public function __construct(
$this->serviceId = $serviceId;
$this->serviceCount = $serviceCount;
$this->status = $status;
-
$this->ensureValid();
}
@@ -124,4 +95,4 @@ public function jsonSerialize(): mixed
{
return $this->toArray();
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProvider.php b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProvider.php
index 506724f50..7dc56d4a0 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProvider.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedProvider.php
@@ -1,4 +1,5 @@
id = $id;
$this->name = $name;
$this->lat = $lat;
$this->lon = $lon;
$this->source = $source;
$this->contact = $contact;
-
$this->ensureValid();
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php
index b8ac1c7ec..d4a2a8ecd 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Models/ThinnedScope.php
@@ -1,4 +1,5 @@
id = $id;
$this->provider = $provider;
$this->shortName = $shortName;
@@ -64,7 +44,6 @@ public function __construct(
$this->customTextfieldLabel = $customTextfieldLabel;
$this->captchaActivatedRequired = $captchaActivatedRequired;
$this->displayInfo = $displayInfo;
-
$this->ensureValid();
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentByIdService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentByIdService.php
index ff8ee7b25..6c33b1ae1 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentByIdService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentByIdService.php
@@ -1,4 +1,5 @@
extractClientData($queryParams);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
@@ -42,4 +42,4 @@ private function getAppointment(?int $processId, ?string $authKey): ThinnedProce
{
return ZmsApiFacadeService::getThinnedProcessById($processId, $authKey);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php
index ddeb475c4..f1b61474c 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentCancelService.php
@@ -1,4 +1,5 @@
extractClientData($body);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
}
- $process = $this->getProcess(
- $clientData->processId,
- $clientData->authKey
- );
-
+ $process = $this->getProcess($clientData->processId, $clientData->authKey);
if (is_array($process) && !empty($process['errors'])) {
return $process;
}
@@ -39,7 +35,6 @@ public function processCancel(array $body): ThinnedProcess|array
// Send cancellation email before cancelling the appointment
$this->sendCancellationEmail($process);
-
return $this->cancelProcess($process);
}
@@ -57,10 +52,7 @@ private function extractClientData(array $body): object
private function validateClientData(object $data): array
{
- return ValidationService::validateGetProcessById(
- $data->processId,
- $data->authKey
- );
+ return ValidationService::validateGetProcessById($data->processId, $data->authKey);
}
private function getProcess(int $processId, string $authKey): ThinnedProcess|array
@@ -78,7 +70,6 @@ private function cancelProcess(ThinnedProcess $process): ThinnedProcess|array
{
$processEntity = MapperService::thinnedProcessToProcess($process);
$result = ZmsApiFacadeService::cancelAppointment($processEntity);
-
if (is_array($result) && !empty($result['errors'])) {
return $result;
}
@@ -91,4 +82,4 @@ private function sendCancellationEmail(ThinnedProcess $process): void
$processEntity = MapperService::thinnedProcessToProcess($process);
ZmsApiFacadeService::sendCancelationEmail($processEntity);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentConfirmService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentConfirmService.php
index a4094f795..db953efc7 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentConfirmService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentConfirmService.php
@@ -1,4 +1,5 @@
extractClientData($body);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
}
- $reservedProcess = $this->getReservedProcess(
- $clientData->processId,
- $clientData->authKey
- );
-
+ $reservedProcess = $this->getReservedProcess($clientData->processId, $clientData->authKey);
if (is_array($reservedProcess) && !empty($reservedProcess['errors'])) {
return $reservedProcess;
}
@@ -55,10 +51,7 @@ private function extractClientData(array $body): object
private function validateClientData(object $data): array
{
- return ValidationService::validateGetProcessById(
- $data->processId,
- $data->authKey
- );
+ return ValidationService::validateGetProcessById($data->processId, $data->authKey);
}
private function getReservedProcess(int $processId, string $authKey): ThinnedProcess|array
@@ -70,7 +63,6 @@ private function confirmProcess(ThinnedProcess $process): ThinnedProcess|array
{
$processEntity = MapperService::thinnedProcessToProcess($process);
$result = ZmsApiFacadeService::confirmAppointment($processEntity);
-
if (is_array($result) && !empty($result['errors'])) {
return $result;
}
@@ -83,4 +75,4 @@ private function sendConfirmationEmail(ThinnedProcess $process): void
$processEntity = MapperService::thinnedProcessToProcess($process);
ZmsApiFacadeService::sendConfirmationEmail($processEntity);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentPreconfirmService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentPreconfirmService.php
index 1a4109f84..017e0c3ff 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentPreconfirmService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentPreconfirmService.php
@@ -1,4 +1,5 @@
extractClientData($body);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
}
- $reservedProcess = $this->getReservedProcess(
- $clientData->processId,
- $clientData->authKey
- );
-
+ $reservedProcess = $this->getReservedProcess($clientData->processId, $clientData->authKey);
if (is_array($reservedProcess) && !empty($reservedProcess['errors'])) {
return $reservedProcess;
}
@@ -56,10 +52,7 @@ private function extractClientData(array $body): object
private function validateClientData(object $data): array
{
- return ValidationService::validateGetProcessById(
- $data->processId,
- $data->authKey
- );
+ return ValidationService::validateGetProcessById($data->processId, $data->authKey);
}
private function getReservedProcess(int $processId, string $authKey): ThinnedProcess|array
@@ -71,7 +64,6 @@ private function preconfirmProcess(ThinnedProcess $process): ThinnedProcess|arra
{
$processEntity = MapperService::thinnedProcessToProcess($process);
$result = ZmsApiFacadeService::preconfirmAppointment($processEntity);
-
if (is_array($result) && !empty($result['errors'])) {
return $result;
}
@@ -84,4 +76,4 @@ private function sendPreconfirmationEmail(ThinnedProcess $process): void
$processEntity = MapperService::thinnedProcessToProcess($process);
ZmsApiFacadeService::sendPreconfirmationEmail($processEntity);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentReserveService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentReserveService.php
index 0f3e704bc..445953b57 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentReserveService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentReserveService.php
@@ -1,4 +1,5 @@
extractClientData($body);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
@@ -26,32 +26,18 @@ public function processReservation(array $body): ThinnedProcess|array
return $captchaErrors;
}
- $errors = ValidationService::validateServiceLocationCombination(
- $clientData->officeId,
- $clientData->serviceIds
- );
+ $errors = ValidationService::validateServiceLocationCombination($clientData->officeId, $clientData->serviceIds);
if (!empty($errors['errors'])) {
return $errors;
}
- $selectedProcess = $this->findMatchingProcess(
- $clientData->officeId,
- $clientData->serviceIds,
- $clientData->serviceCounts,
- $clientData->timestamp
- );
-
+ $selectedProcess = $this->findMatchingProcess($clientData->officeId, $clientData->serviceIds, $clientData->serviceCounts, $clientData->timestamp);
$errors = ValidationService::validateGetProcessNotFound($selectedProcess);
if (!empty($errors['errors'])) {
return $errors;
}
- return $this->reserveAppointment(
- $selectedProcess,
- $clientData->serviceIds,
- $clientData->serviceCounts,
- $clientData->officeId
- );
+ return $this->reserveAppointment($selectedProcess, $clientData->serviceIds, $clientData->serviceCounts, $clientData->officeId);
}
private function extractClientData(array $body): object
@@ -67,12 +53,7 @@ private function extractClientData(array $body): object
private function validateClientData(object $data): array
{
- return ValidationService::validatePostAppointmentReserve(
- $data->officeId,
- $data->serviceIds,
- $data->serviceCounts,
- $data->timestamp
- );
+ return ValidationService::validatePostAppointmentReserve($data->officeId, $data->serviceIds, $data->serviceCounts, $data->timestamp);
}
private function verifyCaptcha(?int $officeId, ?string $captchaSolution): array
@@ -81,7 +62,6 @@ private function verifyCaptcha(?int $officeId, ?string $captchaSolution): array
$captchaRequired = \App::$CAPTCHA_ENABLED === true &&
isset($providerScope->captchaActivatedRequired) &&
$providerScope->captchaActivatedRequired === "1";
-
if (!$captchaRequired) {
return [];
}
@@ -108,19 +88,9 @@ private function verifyCaptcha(?int $officeId, ?string $captchaSolution): array
return [];
}
- private function findMatchingProcess(
- int $officeId,
- array $serviceIds,
- array $serviceCounts,
- int $timestamp
- ): ?Process {
- $freeAppointments = ZmsApiFacadeService::getFreeAppointments(
- $officeId,
- $serviceIds,
- $serviceCounts,
- DateTimeFormatHelper::getInternalDateFromTimestamp($timestamp)
- );
-
+ private function findMatchingProcess(int $officeId, array $serviceIds, array $serviceCounts, int $timestamp): ?Process
+ {
+ $freeAppointments = ZmsApiFacadeService::getFreeAppointments($officeId, $serviceIds, $serviceCounts, DateTimeFormatHelper::getInternalDateFromTimestamp($timestamp));
foreach ($freeAppointments as $process) {
if (!isset($process->appointments) || empty($process->appointments)) {
continue;
@@ -139,12 +109,7 @@ private function findMatchingProcess(
'requests' => $requestIds,
'appointments' => [$appointment]
];
-
- $process->withUpdatedData(
- $processData,
- new \DateTime("@$timestamp"),
- $process->scope
- );
+ $process->withUpdatedData($processData, new \DateTime("@$timestamp"), $process->scope);
return $process;
}
}
@@ -153,23 +118,17 @@ private function findMatchingProcess(
return null;
}
- private function reserveAppointment(
- Process $process,
- array $serviceIds,
- array $serviceCounts,
- int $officeId
- ): ThinnedProcess {
+ private function reserveAppointment(Process $process, array $serviceIds, array $serviceCounts, int $officeId): ThinnedProcess
+ {
$process->clients = [
[
'email' => 'test@muenchen.de'
]
];
$reservedProcess = ZmsApiFacadeService::reserveTimeslot($process, $serviceIds, $serviceCounts);
-
if ($reservedProcess && $reservedProcess->scope && $reservedProcess->scope->id) {
$scopeId = $reservedProcess->scope->id;
$scope = ZmsApiFacadeService::getScopeById((int) $scopeId);
-
if (!isset($scope['errors']) && isset($scope) && !empty($scope)) {
$reservedProcess->scope = $scope;
$reservedProcess->officeId = $officeId;
@@ -178,4 +137,4 @@ private function reserveAppointment(
return $reservedProcess;
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentUpdateService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentUpdateService.php
index 2cb6bc7fd..4e2853fe2 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentUpdateService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Appointment/AppointmentUpdateService.php
@@ -1,4 +1,5 @@
extractClientData($body);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
}
- $reservedProcess = $this->getReservedProcess(
- $clientData->processId,
- $clientData->authKey
- );
-
+ $reservedProcess = $this->getReservedProcess($clientData->processId, $clientData->authKey);
if (is_array($reservedProcess) && !empty($reservedProcess['errors'])) {
return $reservedProcess;
}
$updatedProcess = $this->updateProcessWithClientData($reservedProcess, $clientData);
-
return $this->saveProcessUpdate($updatedProcess);
}
@@ -51,14 +46,7 @@ private function extractClientData(array $body): object
private function validateClientData(object $data): array
{
- return ValidationService::validateUpdateAppointmentInputs(
- $data->processId,
- $data->authKey,
- $data->familyName,
- $data->email,
- $data->telephone,
- $data->customTextfield
- );
+ return ValidationService::validateUpdateAppointmentInputs($data->processId, $data->authKey, $data->familyName, $data->email, $data->telephone, $data->customTextfield);
}
private function getReservedProcess(int $processId, string $authKey): ThinnedProcess|array
@@ -72,7 +60,6 @@ private function updateProcessWithClientData(ThinnedProcess $process, object $da
$process->email = $data->email ?? $process->email ?? null;
$process->telephone = $data->telephone ?? $process->telephone ?? null;
$process->customTextfield = $data->customTextfield ?? $process->customTextfield ?? null;
-
return $process;
}
@@ -80,11 +67,10 @@ private function saveProcessUpdate(ThinnedProcess $process): ThinnedProcess|arra
{
$processEntity = MapperService::thinnedProcessToProcess($process);
$result = ZmsApiFacadeService::updateClientData($processEntity);
-
if (is_array($result) && !empty($result['errors'])) {
return $result;
}
return MapperService::processToThinnedProcess($result);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableAppointmentsListService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableAppointmentsListService.php
index 2642fe899..c55033a9b 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableAppointmentsListService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableAppointmentsListService.php
@@ -1,9 +1,11 @@
extractClientData($queryParams);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
@@ -25,33 +26,36 @@ private function extractClientData(array $queryParams): object
{
return (object) [
'date' => isset($queryParams['date']) ? (string) $queryParams['date'] : null,
- 'officeId' => isset($queryParams['officeId']) ? (int) $queryParams['officeId'] : null,
+ 'officeIds' => isset($queryParams['officeId'])
+ ? array_map('trim', explode(',', (string) $queryParams['officeId']))
+ : [],
'serviceIds' => isset($queryParams['serviceId'])
- ? array_map('trim', explode(',', $queryParams['serviceId']))
+ ? array_map('trim', explode(',', (string) $queryParams['serviceId']))
: [],
'serviceCounts' => isset($queryParams['serviceCount'])
- ? array_map('trim', explode(',', $queryParams['serviceCount']))
+ ? array_map('trim', explode(',', (string) $queryParams['serviceCount']))
: []
];
}
private function validateClientData(object $data): array
{
- return ValidationService::validateGetAvailableAppointments(
- $data->date,
- $data->officeId,
- $data->serviceIds,
- $data->serviceCounts
- );
+ return ValidationService::validateGetAvailableAppointments($data->date, $data->officeIds, $data->serviceIds, $data->serviceCounts);
+ }
+
+ private function getAvailableAppointments(object $data, ?bool $groupByOffice = false): array|AvailableAppointments|AvailableAppointmentsByOffice
+ {
+ return ZmsApiFacadeService::getAvailableAppointments($data->date, $data->officeIds, $data->serviceIds, $data->serviceCounts, $groupByOffice);
}
- private function getAvailableAppointments(object $data): array|AvailableAppointments
+ public function getAvailableAppointmentsListByOffice($queryParams): AvailableAppointmentsByOffice|array
{
- return ZmsApiFacadeService::getAvailableAppointments(
- $data->date,
- $data->officeId,
- $data->serviceIds,
- $data->serviceCounts
- );
+ $clientData = $this->extractClientData($queryParams);
+ $errors = $this->validateClientData($clientData);
+ if (!empty($errors['errors'])) {
+ return $errors;
+ }
+
+ return $this->getAvailableAppointments($clientData, true);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableDaysListService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableDaysListService.php
index 6d0e26870..aaab09c1c 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableDaysListService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Availability/AvailableDaysListService.php
@@ -1,4 +1,5 @@
extractClientData($queryParams);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
@@ -23,18 +23,15 @@ public function getAvailableDaysList(array $queryParams): AvailableDays|array
private function extractClientData(array $queryParams): object
{
+ $queryParams['officeId'] = isset($queryParams['officeId']) ? (string) $queryParams['officeId'] : '';
+ $queryParams['serviceId'] = isset($queryParams['serviceId']) ? (string) $queryParams['serviceId'] : '';
$serviceCount = $queryParams['serviceCount'] ?? '';
$serviceCounts = !empty($serviceCount)
- ? array_map('trim', explode(',', $serviceCount))
+ ? array_map('trim', explode(',', (string) $serviceCount))
: [];
-
return (object) [
- 'officeId' => isset($queryParams['officeId']) && is_numeric($queryParams['officeId'])
- ? (int)$queryParams['officeId']
- : null,
- 'serviceId' => isset($queryParams['serviceId']) && is_numeric($queryParams['serviceId'])
- ? (int)$queryParams['serviceId']
- : null,
+ 'officeIds' => array_map('trim', explode(',', $queryParams['officeId'])),
+ 'serviceIds' => array_map('trim', explode(',', $queryParams['serviceId'])),
'serviceCounts' => $serviceCounts,
'startDate' => $queryParams['startDate'] ?? null,
'endDate' => $queryParams['endDate'] ?? null
@@ -43,24 +40,11 @@ private function extractClientData(array $queryParams): object
private function validateClientData(object $data): array
{
- return ValidationService::validateGetBookableFreeDays(
- $data->officeId,
- $data->serviceId,
- $data->startDate,
- $data->endDate,
- $data->serviceCounts
- );
+ return ValidationService::validateGetBookableFreeDays($data->officeIds, $data->serviceIds, $data->startDate, $data->endDate, $data->serviceCounts);
}
- private function getAvailableDays(object $data): array|AvailableDays
+ private function getAvailableDays(object $data): AvailableDays|array
{
- return ZmsApiFacadeService::getBookableFreeDays(
- $data->officeId,
- $data->serviceId,
- $data->serviceCounts,
- $data->startDate,
- $data->endDate
- );
+ return ZmsApiFacadeService::getBookableFreeDays($data->officeIds, $data->serviceIds, $data->serviceCounts, $data->startDate, $data->endDate);
}
}
-
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ExceptionService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ExceptionService.php
index 44543725f..936718718 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ExceptionService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ExceptionService.php
@@ -1,4 +1,5 @@
getUri();
- // Normalize path by removing double slashes
+// Normalize path by removing double slashes
$path = preg_replace('#/+#', '/', $uri->getPath());
-
- // Filter out query params that look like paths
- $queryParams = array_filter(
- $request->getQueryParams(),
- function ($key, $value) {
+// Filter out query params that look like paths
+ $queryParams = array_filter($request->getQueryParams(), function ($key, $value) {
+
// Remove if key or value starts with slash or contains multiple slashes
return !preg_match('#^/|//#', $key) && !preg_match('#^/|//#', $value);
- },
- ARRAY_FILTER_USE_BOTH
- );
-
+ }, ARRAY_FILTER_USE_BOTH);
$queryParts = [];
foreach ($queryParams as $key => $value) {
$encodedKey = urlencode($key);
@@ -131,7 +114,6 @@ function ($key, $value) {
$queryParts[] = "$encodedKey=$encodedValue";
}
$queryString = implode('&', $queryParts);
-
$data = [
'timestamp' => date('Y-m-d H:i:s'),
'method' => $request->getMethod(),
@@ -139,23 +121,16 @@ function ($key, $value) {
'status' => $response->getStatusCode(),
'ip' => ClientIpHelper::getClientIp(),
'headers' => self::filterSensitiveHeaders($request->getHeaders())
- ];
-
+ ];
if ($response->getStatusCode() >= 400) {
$body = '';
$stream = $response->getBody();
-
if ($stream->isSeekable()) {
try {
$stream->seek(0, SEEK_END);
$size = $stream->tell();
$stream->rewind();
-
- $maxSafeSize = min(
- self::$config['responseLength'],
- (int)(self::$config['messageSize'] * 0.75)
- );
-
+ $maxSafeSize = min(self::$config['responseLength'], (int)(self::$config['messageSize'] * 0.75));
if ($size > $maxSafeSize) {
$data['response'] = [
'error' => 'Response body too large to log',
@@ -164,7 +139,6 @@ function ($key, $value) {
} else {
$body = (string)$stream;
$stream->rewind();
-
try {
$decodedBody = json_decode($body, true);
if (
@@ -175,7 +149,7 @@ function ($key, $value) {
$englishErrors = [];
foreach ($decodedBody['errors'] as $error) {
if (isset($error['errorCode'])) {
- $englishErrors[] = ErrorMessages::get($error['errorCode'], 'en');
+ $englishErrors[] = ErrorMessages::get($error['errorCode'], 'en');
} else {
$englishErrors[] = $error;
}
@@ -184,28 +158,25 @@ function ($key, $value) {
}
} catch (\Throwable $e) {
$data['response'] = [
- 'error' => 'Failed to decode response body',
- 'message' => $e->getMessage()
+ 'error' => 'Failed to decode response body',
+ 'message' => $e->getMessage()
];
}
}
} catch (\RuntimeException $e) {
$data['response'] = [
- 'error' => 'Failed to read response body',
- 'message' => $e->getMessage()
+ 'error' => 'Failed to read response body',
+ 'message' => $e->getMessage()
];
}
} else {
$data['response'] = [
- 'error' => 'Response body not seekable'
+ 'error' => 'Response body not seekable'
];
}
}
-
- self::writeLog(
- $response->getStatusCode() >= 400 ? LOG_ERR : LOG_INFO,
- self::encodeJson($data)
- );
+
+ self::writeLog($response->getStatusCode() >= 400 ? LOG_ERR : LOG_INFO, self::encodeJson($data));
}
private static function checkRateLimit(): bool
@@ -218,30 +189,27 @@ private static function checkRateLimit(): bool
$attempt = 0;
$key = self::CACHE_COUNTER_KEY;
$lockKey = $key . '_lock';
-
while ($attempt < self::$config['maxRetries']) {
try {
if (self::acquireLock($lockKey)) {
try {
$data = Application::$cache->get($key);
-
if ($data === null) {
- // First log in this window
+ // First log in this window
Application::$cache->set($key, [
'count' => 1,
'timestamp' => time()
], self::$config['cacheTtl']);
- return true;
+ return true;
}
if (!is_array($data) || !isset($data['count'], $data['timestamp'])) {
- // Handle corrupted data
+ // Handle corrupted data
Application::$cache->delete($key);
return true;
}
$count = (int)$data['count'];
-
if ($count >= self::$config['maxRequests']) {
error_log('Log rate limit exceeded');
return false;
@@ -250,7 +218,6 @@ private static function checkRateLimit(): bool
// Update the counter atomically
$data['count'] = $count + 1;
Application::$cache->set($key, $data, self::$config['cacheTtl']);
-
return true;
} finally {
self::releaseLock($lockKey);
@@ -259,13 +226,10 @@ private static function checkRateLimit(): bool
} catch (\Throwable $e) {
error_log('Rate limiting error: ' . $e->getMessage());
}
-
+
$attempt++;
if ($attempt < self::$config['maxRetries']) {
- $backoffMs = min(
- self::$config['backoffMax'],
- (int)(self::$config['backoffMin'] * pow(2, $attempt))
- );
+ $backoffMs = min(self::$config['backoffMax'], (int)(self::$config['backoffMin'] * pow(2, $attempt)));
$jitterMs = random_int(0, (int)($backoffMs * 0.1));
usleep(($backoffMs + $jitterMs) * 1000);
}
@@ -293,7 +257,6 @@ private static function writeLog(int $priority, string $message): void
{
// Initialize syslog connection if needed
self::init();
-
if (!self::$logOpened) {
error_log('Syslog not available, falling back to error_log');
error_log($message);
@@ -317,12 +280,8 @@ private static function writeLog(int $priority, string $message): void
}
}
- private static function formatErrorMessage(
- \Throwable $exception,
- ?RequestInterface $request,
- ?ResponseInterface $response,
- array $context
- ): string {
+ private static function formatErrorMessage(\Throwable $exception, ?RequestInterface $request, ?ResponseInterface $response, array $context): string
+ {
$data = [
'timestamp' => date('Y-m-d H:i:s'),
'exception' => get_class($exception),
@@ -330,13 +289,8 @@ private static function formatErrorMessage(
'code' => $exception->getCode(),
'file' => $exception->getFile(),
'line' => $exception->getLine(),
- 'trace' => implode("\n", array_slice(
- explode("\n", $exception->getTraceAsString()),
- 0,
- self::$config['stackLines']
- ))
+ 'trace' => implode("\n", array_slice(explode("\n", $exception->getTraceAsString()), 0, self::$config['stackLines']))
];
-
if ($request) {
$data['request'] = [
'method' => $request->getMethod(),
@@ -350,46 +304,38 @@ private static function formatErrorMessage(
'status' => $response->getStatusCode(),
'headers' => self::filterSensitiveHeaders($response->getHeaders())
];
-
- // Only include response body for errors
+// Only include response body for errors
if ($response->getStatusCode() >= 400) {
$body = '';
$stream = $response->getBody();
-
if ($stream->isSeekable()) {
try {
$stream->seek(0, SEEK_END);
$size = $stream->tell();
$stream->rewind();
-
- $maxSafeSize = min(
- self::$config['responseLength'],
- (int)(self::$config['messageSize'] * 0.75)
- );
-
+ $maxSafeSize = min(self::$config['responseLength'], (int)(self::$config['messageSize'] * 0.75));
if ($size > $maxSafeSize) {
- $data['response']['body'] = [
+ $data['response']['body'] = [
'error' => 'Response body too large to log',
'size' => $size
- ];
+ ];
} else {
- $body = (string)$stream;
- $stream->rewind();
-
- $decodedBody = json_decode($body, true);
+ $body = (string)$stream;
+ $stream->rewind();
+ $decodedBody = json_decode($body, true);
if (
json_last_error() === JSON_ERROR_NONE &&
- isset($decodedBody['errors']) &&
- is_array($decodedBody['errors'])
+ isset($decodedBody['errors']) &&
+ is_array($decodedBody['errors'])
) {
- // Only log if response contains an errors array
+ // Only log if response contains an errors array
$data['response']['body'] = $decodedBody;
}
}
} catch (\Throwable $e) {
$data['response']['body'] = [
- 'error' => 'Failed to decode response body',
- 'message' => $e->getMessage()
+ 'error' => 'Failed to decode response body',
+ 'message' => $e->getMessage()
];
}
} else {
@@ -413,7 +359,6 @@ private static function formatMessage(string $message, array $context): string
'timestamp' => date('Y-m-d H:i:s'),
'message' => $message
];
-
if ($context) {
$data['context'] = $context;
}
@@ -438,9 +383,10 @@ private static function filterSensitiveHeaders(array $headers): array
private static function encodeJson(array $data): string
{
try {
- $json = json_encode($data,
- JSON_UNESCAPED_SLASHES |
- JSON_UNESCAPED_UNICODE |
+ $json = json_encode(
+ $data,
+ JSON_UNESCAPED_SLASHES |
+ JSON_UNESCAPED_UNICODE |
JSON_INVALID_UTF8_SUBSTITUTE
);
if ($json === false) {
@@ -455,4 +401,4 @@ private static function encodeJson(array $data): string
], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
}
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/MapperService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/MapperService.php
index f0ae19778..2eabcfe75 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Core/MapperService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Core/MapperService.php
@@ -1,4 +1,5 @@
getScopes() as $scope) {
if ($scope->provider && $scope->provider->id === $providerId) {
@@ -43,19 +47,23 @@ public static function mapScopeForProvider(int $providerId, ?ThinnedScopeList $s
break;
}
}
-
+
return $matchingScope;
}
+ /**
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @TODO: Extract mapping logic into specialized mapper classes for each entity type
+ */
public static function mapOfficesWithScope(ProviderList $providerList, bool $showUnpublished = false): OfficeList
{
$offices = [];
$scopes = ZmsApiFacadeService::getScopes();
-
if (!$scopes instanceof ThinnedScopeList) {
return new OfficeList();
}
-
+
foreach ($providerList as $provider) {
$providerScope = self::mapScopeForProvider((int) $provider->id, $scopes);
@@ -67,6 +75,7 @@ public static function mapOfficesWithScope(ProviderList $providerList, bool $sho
id: isset($provider->id) ? (int) $provider->id : 0,
name: isset($provider->displayName) ? $provider->displayName : (isset($provider->name) ? $provider->name : null),
address: isset($provider->data['address']) ? $provider->data['address'] : null,
+ showAlternativeLocations: isset($provider->data['showAlternativeLocations']) ? $provider->data['showAlternativeLocations'] : null,
displayNameAlternatives: $provider->data['displayNameAlternatives'] ?? [],
organization: $provider->data['organization'] ?? null,
organizationUnit: $provider->data['organizationUnit'] ?? null,
@@ -84,9 +93,9 @@ public static function mapOfficesWithScope(ProviderList $providerList, bool $sho
captchaActivatedRequired: isset($providerScope->captchaActivatedRequired) ? (bool) $providerScope->captchaActivatedRequired : null,
displayInfo: isset($providerScope->displayInfo) ? $providerScope->displayInfo : null
) : null
- );
+ );
}
-
+
return new OfficeList($offices);
}
@@ -105,68 +114,54 @@ public static function mapCombinable(array $serviceCombinations): ?Combinable
public static function mapServicesWithCombinations(
RequestList $requestList,
RequestRelationList $relationList,
- bool $showUnpublished = false): ServiceList
- {
+ bool $showUnpublished = false
+ ): ServiceList {
/** @var array> $servicesProviderIds */
$servicesProviderIds = [];
-
foreach ($relationList as $relation) {
$serviceId = $relation->request->id;
$servicesProviderIds[$serviceId] ??= [];
$servicesProviderIds[$serviceId][] = $relation->provider->id;
}
-
+
/** @var Service[] $services */
$services = [];
-
$requestArray = iterator_to_array($requestList);
usort($requestArray, function ($a, $b) {
- return $a->getId() <=> $b->getId(); // Sorting by service ID (ascending order)
+
+ return $a->getId() <=> $b->getId();
+ // Sorting by service ID (ascending order)
});
-
foreach ($requestArray as $service) {
- if (! $showUnpublished
+ if (
+ ! $showUnpublished
&& isset($service->getAdditionalData()['public'])
- && !$service->getAdditionalData()['public'])
- {
+ && !$service->getAdditionalData()['public']
+ ) {
continue;
}
/** @var array> $serviceCombinations */
$serviceCombinations = [];
$combinableData = $service->getAdditionalData()['combinable'] ?? [];
-
foreach ($combinableData as $combinationServiceId) {
- $commonProviders = array_intersect(
- $servicesProviderIds[$service->getId()] ?? [],
- $servicesProviderIds[$combinationServiceId] ?? []
- );
+ $commonProviders = array_intersect($servicesProviderIds[$service->getId()] ?? [], $servicesProviderIds[$combinationServiceId] ?? []);
$serviceCombinations[$combinationServiceId] = !empty($commonProviders) ? array_values($commonProviders) : [];
}
-
+
$combinable = self::mapCombinable($serviceCombinations);
-
- $services[] = new Service(
- id: (int) $service->getId(),
- name: $service->getName(),
- maxQuantity: $service->getAdditionalData()['maxQuantity'] ?? 1,
- combinable: $combinable ?? new Combinable()
- );
+ $services[] = new Service(id: (int) $service->getId(), name: $service->getName(), maxQuantity: $service->getAdditionalData()['maxQuantity'] ?? 1, combinable: $combinable ?? new Combinable());
}
return new ServiceList($services);
}
-
+
public static function mapRelations(RequestRelationList $relationList): OfficeServiceRelationList
{
$relations = [];
foreach ($relationList as $relation) {
- $relations[] = new OfficeServiceRelation(
- officeId: (int) $relation->provider->id,
- serviceId: (int) $relation->request->id,
- slots: intval($relation->slots)
- );
+ $relations[] = new OfficeServiceRelation(officeId: (int) $relation->provider->id, serviceId: (int) $relation->request->id, slots: intval($relation->slots));
}
return new OfficeServiceRelationList($relations);
@@ -177,47 +172,35 @@ public static function scopeToThinnedScope(Scope $scope): ThinnedScope
if (!$scope || !isset($scope->id)) {
return new ThinnedScope();
}
-
+
$thinnedProvider = null;
try {
if (isset($scope->provider)) {
$provider = $scope->provider;
$contact = $provider->contact ?? null;
- $thinnedProvider = new ThinnedProvider(
- id: isset($provider->id) ? (int) $provider->id : null,
- name: $provider->name ?? null,
- source: $provider->source ?? null,
- contact: $contact ? self::contactToThinnedContact($contact) : null
- );
+ $thinnedProvider = new ThinnedProvider(id: isset($provider->id) ? (int) $provider->id : null, name: $provider->name ?? null, source: $provider->source ?? null, contact: $contact ? self::contactToThinnedContact($contact) : null);
}
} catch (\BO\Zmsentities\Exception\ScopeMissingProvider $e) {
$thinnedProvider = null;
}
-
- return new ThinnedScope(
- id: (int) ($scope->id ?? 0),
- provider: $thinnedProvider,
- shortName: $scope->shortName ?? null,
- telephoneActivated: isset($scope->data['telephoneActivated']) ? (bool) $scope->data['telephoneActivated'] : null,
- telephoneRequired: isset($scope->data['telephoneRequired']) ? (bool) $scope->data['telephoneRequired'] : null,
- customTextfieldActivated: isset($scope->data['customTextfieldActivated']) ? (bool) $scope->data['customTextfieldActivated'] : null,
- customTextfieldRequired: isset($scope->data['customTextfieldRequired']) ? (bool) $scope->data['customTextfieldRequired'] : null,
- customTextfieldLabel: $scope->data['customTextfieldLabel'] ?? null,
- captchaActivatedRequired: isset($scope->data['captchaActivatedRequired']) ? (bool) $scope->data['captchaActivatedRequired'] : null,
- displayInfo: $scope->data['displayInfo'] ?? null
- );
+
+ return new ThinnedScope(id: (int) ($scope->id ?? 0), provider: $thinnedProvider, shortName: $scope->shortName ?? null, telephoneActivated: isset($scope->data['telephoneActivated']) ? (bool) $scope->data['telephoneActivated'] : null, telephoneRequired: isset($scope->data['telephoneRequired']) ? (bool) $scope->data['telephoneRequired'] : null, customTextfieldActivated: isset($scope->data['customTextfieldActivated']) ? (bool) $scope->data['customTextfieldActivated'] : null, customTextfieldRequired: isset($scope->data['customTextfieldRequired']) ? (bool) $scope->data['customTextfieldRequired'] : null, customTextfieldLabel: $scope->data['customTextfieldLabel'] ?? null, captchaActivatedRequired: isset($scope->data['captchaActivatedRequired']) ? (bool) $scope->data['captchaActivatedRequired'] : null, displayInfo: $scope->data['displayInfo'] ?? null);
}
+ /**
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @TODO: Break down process mapping into smaller, focused methods
+ */
public static function processToThinnedProcess(Process $myProcess): ThinnedProcess
{
if (!$myProcess || !isset($myProcess->id)) {
return new ThinnedProcess();
}
-
+
$subRequestCounts = [];
$mainServiceId = null;
$mainServiceCount = 0;
-
$requests = $myProcess->getRequests() ?? [];
if ($requests) {
$requests = is_array($requests) ? $requests : iterator_to_array($requests);
@@ -238,47 +221,30 @@ public static function processToThinnedProcess(Process $myProcess): ThinnedProce
}
}
}
-
- return new ThinnedProcess(
- processId: isset($myProcess->id) ? (int) $myProcess->id : 0,
- timestamp: (isset($myProcess->appointments[0]) && isset($myProcess->appointments[0]->date)) ? strval($myProcess->appointments[0]->date) : null,
- authKey: isset($myProcess->authKey) ? $myProcess->authKey : null,
- familyName: (isset($myProcess->clients[0]) && isset($myProcess->clients[0]->familyName)) ? $myProcess->clients[0]->familyName : null,
- customTextfield: isset($myProcess->customTextfield) ? $myProcess->customTextfield : null,
- email: (isset($myProcess->clients[0]) && isset($myProcess->clients[0]->email)) ? $myProcess->clients[0]->email : null,
- telephone: (isset($myProcess->clients[0]) && isset($myProcess->clients[0]->telephone)) ? $myProcess->clients[0]->telephone : null,
- officeName: (isset($myProcess->scope->contact) && isset($myProcess->scope->contact->name)) ? $myProcess->scope->contact->name : null,
- officeId: (isset($myProcess->scope->provider) && isset($myProcess->scope->provider->id)) ? (int) $myProcess->scope->provider->id : 0,
- scope: isset($myProcess->scope) ? self::scopeToThinnedScope($myProcess->scope) : null,
- subRequestCounts: isset($subRequestCounts) ? array_values($subRequestCounts) : [],
- serviceId: isset($mainServiceId) ? (int) $mainServiceId : 0,
- serviceCount: isset($mainServiceCount) ? $mainServiceCount : 0,
- status: (isset($myProcess->queue) && isset($myProcess->queue->status)) ? $myProcess->queue->status : null
- );
+
+ return new ThinnedProcess(processId: isset($myProcess->id) ? (int) $myProcess->id : 0, timestamp: (isset($myProcess->appointments[0]) && isset($myProcess->appointments[0]->date)) ? strval($myProcess->appointments[0]->date) : null, authKey: isset($myProcess->authKey) ? $myProcess->authKey : null, familyName: (isset($myProcess->clients[0]) && isset($myProcess->clients[0]->familyName)) ? $myProcess->clients[0]->familyName : null, customTextfield: isset($myProcess->customTextfield) ? $myProcess->customTextfield : null, email: (isset($myProcess->clients[0]) && isset($myProcess->clients[0]->email)) ? $myProcess->clients[0]->email : null, telephone: (isset($myProcess->clients[0]) && isset($myProcess->clients[0]->telephone)) ? $myProcess->clients[0]->telephone : null, officeName: (isset($myProcess->scope->contact) && isset($myProcess->scope->contact->name)) ? $myProcess->scope->contact->name : null, officeId: (isset($myProcess->scope->provider) && isset($myProcess->scope->provider->id)) ? (int) $myProcess->scope->provider->id : 0, scope: isset($myProcess->scope) ? self::scopeToThinnedScope($myProcess->scope) : null, subRequestCounts: isset($subRequestCounts) ? array_values($subRequestCounts) : [], serviceId: isset($mainServiceId) ? (int) $mainServiceId : 0, serviceCount: isset($mainServiceCount) ? $mainServiceCount : 0, status: (isset($myProcess->queue) && isset($myProcess->queue->status)) ? $myProcess->queue->status : null);
}
-
+
public static function thinnedProcessToProcess(ThinnedProcess $thinnedProcess): Process
{
if (!$thinnedProcess || !isset($thinnedProcess->processId)) {
return new Process();
}
-
+
$processEntity = new Process();
$processEntity->id = $thinnedProcess->processId;
$processEntity->authKey = $thinnedProcess->authKey ?? null;
- $processEntity->customTextfield = $thinnedProcess->customTextfield ?? null; // Moved to Process level
-
+ $processEntity->customTextfield = $thinnedProcess->customTextfield ?? null;
+ // Moved to Process level
+
$client = new Client();
$client->familyName = $thinnedProcess->familyName ?? null;
$client->email = $thinnedProcess->email ?? null;
$client->telephone = $thinnedProcess->telephone ?? null;
-
$processEntity->clients = [$client];
-
$appointment = new Appointment();
$appointment->date = $thinnedProcess->timestamp ?? null;
$processEntity->appointments = [$appointment];
-
$scope = new Scope();
if (isset($thinnedProcess->officeName)) {
$scope->contact = new Contact();
@@ -290,17 +256,15 @@ public static function thinnedProcessToProcess(ThinnedProcess $thinnedProcess):
$scope->provider->source = \App::$source_name;
}
$processEntity->scope = $scope;
-
if (isset($thinnedProcess->status)) {
$processEntity->queue = new \stdClass();
$processEntity->queue->status = $thinnedProcess->status;
$processEntity->status = $thinnedProcess->status;
}
-
+
$mainServiceId = $thinnedProcess->serviceId ?? null;
$mainServiceCount = $thinnedProcess->serviceCount ?? 0;
$subRequestCounts = $thinnedProcess->subRequestCounts ?? [];
-
$requests = [];
for ($i = 0; $i < $mainServiceCount; $i++) {
$request = new Request();
@@ -317,11 +281,9 @@ public static function thinnedProcessToProcess(ThinnedProcess $thinnedProcess):
}
}
$processEntity->requests = $requests;
-
$processEntity->lastChange = time();
$processEntity->createIP = ClientIpHelper::getClientIp();
$processEntity->createTimestamp = time();
-
return $processEntity;
}
@@ -334,26 +296,10 @@ public static function thinnedProcessToProcess(ThinnedProcess $thinnedProcess):
public static function contactToThinnedContact($contact): ThinnedContact
{
if (is_array($contact)) {
- return new ThinnedContact(
- city: $contact['city'] ?? null,
- country: $contact['country'] ?? null,
- name: $contact['name'] ?? null,
- postalCode: $contact['postalCode'] ?? null,
- region: $contact['region'] ?? null,
- street: $contact['street'] ?? null,
- streetNumber: $contact['streetNumber'] ?? null
- );
+ return new ThinnedContact(city: $contact['city'] ?? null, country: $contact['country'] ?? null, name: $contact['name'] ?? null, postalCode: $contact['postalCode'] ?? null, region: $contact['region'] ?? null, street: $contact['street'] ?? null, streetNumber: $contact['streetNumber'] ?? null);
}
-
- return new ThinnedContact(
- city: $contact->city ?? null,
- country: $contact->country ?? null,
- name: $contact->name ?? null,
- postalCode: $contact->postalCode ?? null,
- region: $contact->region ?? null,
- street: $contact->street ?? null,
- streetNumber: $contact->streetNumber ?? null
- );
+
+ return new ThinnedContact(city: $contact->city ?? null, country: $contact->country ?? null, name: $contact->name ?? null, postalCode: $contact->postalCode ?? null, region: $contact->region ?? null, street: $contact->street ?? null, streetNumber: $contact->streetNumber ?? null);
}
/**
@@ -364,14 +310,6 @@ public static function contactToThinnedContact($contact): ThinnedContact
*/
public static function providerToThinnedProvider(Provider $provider): ThinnedProvider
{
- return new ThinnedProvider(
- id: isset($provider->id) ? (int) $provider->id : null,
- name: isset($provider->name) ? $provider->name : null,
- source: isset($provider->source) ? $provider->source : null,
- lon: isset($provider->data['geo']['lon']) ? (float)$provider->data['geo']['lon'] : null,
- lat: isset($provider->data['geo']['lat']) ? (float)$provider->data['geo']['lat'] : null,
- contact: isset($provider->contact) ? self::contactToThinnedContact($provider->contact) : null,
- );
+ return new ThinnedProvider(id: isset($provider->id) ? (int) $provider->id : null, name: isset($provider->name) ? $provider->name : null, source: isset($provider->source) ? $provider->source : null, lon: isset($provider->data['geo']['lon']) ? (float) $provider->data['geo']['lon'] : null, lat: isset($provider->data['geo']['lat']) ? (float) $provider->data['geo']['lat'] : null, contact: isset($provider->contact) ? self::contactToThinnedContact($provider->contact) : null,);
}
-
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ValidationService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ValidationService.php
index 9bec1ce5e..bea5a227c 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ValidationService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ValidationService.php
@@ -1,4 +1,5 @@
getMethod() !== "GET") {
return ['errors' => [self::getError('invalidRequest')]];
}
-
+
return [];
}
@@ -53,11 +59,11 @@ public static function validateServerPostRequest(?ServerRequestInterface $reques
if ($request->getMethod() !== "POST") {
return ['errors' => [self::getError('invalidRequest')]];
}
-
+
if ($request->getParsedBody() === null) {
return ['errors' => [self::getError('invalidRequest')]];
}
-
+
return [];
}
@@ -78,26 +84,23 @@ public static function validateServiceLocationCombination(int $officeId, array $
}
$invalidServiceIds = array_diff($serviceIds, $availableServiceIds);
-
- return empty($invalidServiceIds)
- ? []
+ return empty($invalidServiceIds)
+ ? []
: ['errors' => [self::getError('invalidLocationAndServiceCombination')]];
}
- public static function validateGetBookableFreeDays(
- ?int $officeId,
- ?int $serviceId,
- ?string $startDate,
- ?string $endDate,
- ?array $serviceCounts
- ): array {
+ /**
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ * @TODO: Extract validation rules into separate rule objects using the specification pattern
+ */
+ public static function validateGetBookableFreeDays(?array $officeIds, ?array $serviceIds, ?string $startDate, ?string $endDate, ?array $serviceCounts): array
+ {
$errors = [];
-
- if (!self::isValidOfficeId($officeId)) {
+ if (!self::isValidOfficeIds($officeIds)) {
$errors[] = self::getError('invalidOfficeId');
}
- if (!self::isValidServiceId($serviceId)) {
+ if (!self::isValidServiceIds($serviceIds)) {
$errors[] = self::getError('invalidServiceId');
}
@@ -129,7 +132,6 @@ public static function validateGetBookableFreeDays(
public static function validateGetProcessById(?int $processId, ?string $authKey): array
{
$errors = [];
-
if (!self::isValidProcessId($processId)) {
$errors[] = self::getError('invalidProcessId');
}
@@ -141,19 +143,14 @@ public static function validateGetProcessById(?int $processId, ?string $authKey)
return ['errors' => $errors];
}
- public static function validateGetAvailableAppointments(
- ?string $date,
- ?int $officeId,
- ?array $serviceIds,
- ?array $serviceCounts
- ): array {
+ public static function validateGetAvailableAppointments(?string $date, ?array $officeIds, ?array $serviceIds, ?array $serviceCounts): array
+ {
$errors = [];
-
if (!$date || !self::isValidDate($date)) {
$errors[] = self::getError('invalidDate');
}
- if (!self::isValidOfficeId($officeId)) {
+ if (!self::isValidOfficeIds($officeIds)) {
$errors[] = self::getError('invalidOfficeId');
}
@@ -168,14 +165,9 @@ public static function validateGetAvailableAppointments(
return ['errors' => $errors];
}
- public static function validatePostAppointmentReserve(
- ?int $officeId,
- ?array $serviceIds,
- ?array $serviceCounts,
- ?int $timestamp
- ): array {
+ public static function validatePostAppointmentReserve(?int $officeId, ?array $serviceIds, ?array $serviceCounts, ?int $timestamp): array
+ {
$errors = [];
-
if (!self::isValidOfficeId($officeId)) {
$errors[] = self::getError('invalidOfficeId');
}
@@ -195,16 +187,9 @@ public static function validatePostAppointmentReserve(
return ['errors' => $errors];
}
- public static function validateUpdateAppointmentInputs(
- ?int $processId,
- ?string $authKey,
- ?string $familyName,
- ?string $email,
- ?string $telephone,
- ?string $customTextfield
- ): array {
+ public static function validateUpdateAppointmentInputs(?int $processId, ?string $authKey, ?string $familyName, ?string $email, ?string $telephone, ?string $customTextfield): array
+ {
$errors = [];
-
if (!self::isValidProcessId($processId)) {
$errors[] = self::getError('invalidProcessId');
}
@@ -310,29 +295,28 @@ public static function validateNoAppointmentsAtLocation(): array
public static function validateServiceArrays(array $serviceIds, array $serviceCounts): array
{
$errors = [];
-
if (empty($serviceIds) || empty($serviceCounts)) {
$errors[] = self::getError('emptyServiceArrays');
}
-
+
if (count($serviceIds) !== count($serviceCounts)) {
$errors[] = self::getError('mismatchedArrays');
}
-
+
foreach ($serviceIds as $id) {
if (!is_numeric($id)) {
$errors[] = self::getError('invalidServiceId');
break;
}
}
-
+
foreach ($serviceCounts as $count) {
if (!is_numeric($count) || $count < 0) {
$errors[] = self::getError('invalidServiceCount');
break;
}
}
-
+
return $errors;
}
@@ -348,7 +332,6 @@ private static function isDateRangeValid(string $startDate, string $endDate): bo
$start = new DateTime($startDate);
$end = new DateTime($endDate);
$diff = $start->diff($end);
-
return $diff->days <= self::MAX_FUTURE_DAYS;
}
@@ -357,14 +340,9 @@ private static function isValidNumericArray(array $array): bool
return !empty($array) && array_filter($array, 'is_numeric') === $array;
}
- private static function isValidOfficeId(?int $officeId): bool
+ private static function isValidOfficeIds(?array $officeIds): bool
{
- return !empty($officeId) && $officeId > 0;
- }
-
- private static function isValidServiceId(?int $serviceId): bool
- {
- return !empty($serviceId) && $serviceId > 0;
+ return !empty($officeIds) && self::isValidNumericArray($officeIds);
}
private static function isValidScopeId(?int $scopeId): bool
@@ -394,7 +372,7 @@ private static function isValidServiceCounts(?array $serviceCounts): bool
}
foreach ($serviceCounts as $count) {
- if (!is_numeric($count) || $count < 0 || !preg_match(self::SERVICE_COUNT_PATTERN, (string)$count)) {
+ if (!is_numeric($count) || $count < 0 || !preg_match(self::SERVICE_COUNT_PATTERN, (string) $count)) {
return false;
}
}
@@ -426,4 +404,14 @@ private static function isValidCustomTextfield(?string $customTextfield): bool
{
return $customTextfield === null || (is_string($customTextfield) && strlen(trim($customTextfield)) > 0);
}
-}
\ No newline at end of file
+
+ private static function isValidOfficeId(?int $officeId): bool
+ {
+ return !empty($officeId) && $officeId > 0;
+ }
+
+ private static function isValidServiceId(?int $serviceId): bool
+ {
+ return !empty($serviceId) && $serviceId > 0;
+ }
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiClientService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiClientService.php
index 3b5cd4c02..03ff722b2 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiClientService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiClientService.php
@@ -1,4 +1,5 @@
get($cacheKey))) {
return $data;
}
@@ -29,7 +28,6 @@ private static function fetchSourceData(): Source
$result = \App::$http->readGetResult('/source/' . \App::$source_name . '/', [
'resolveReferences' => 2,
]);
-
$entity = $result?->getEntity();
if (!$entity instanceof Source) {
return new Source();
@@ -111,7 +109,6 @@ public static function getFreeDays(ProviderList $providers, RequestList $request
$calendar->lastDay = $lastDay;
$calendar->providers = $providers;
$calendar->requests = $requests;
-
$result = \App::$http->readPostResult('/calendar/', $calendar);
$entity = $result?->getEntity();
if (!$entity instanceof Calendar) {
@@ -131,9 +128,7 @@ public static function getFreeTimeslots(ProviderList $providers, RequestList $re
$calendar->lastDay = $lastDay;
$calendar->providers = $providers;
$calendar->requests = $requests;
-
$result = \App::$http->readPostResult('/process/status/free/', $calendar);
-
$collection = $result?->getCollection();
if (!$collection instanceof ProcessList) {
return new ProcessList();
@@ -168,7 +163,6 @@ public static function reserveTimeslot(Process $appointmentProcess, array $servi
$processEntity->lastChange = $appointmentProcess->lastChange ?? time();
$processEntity->createIP = ClientIpHelper::getClientIp();
$processEntity->createTimestamp = time();
-
if (isset($appointmentProcess->queue)) {
$processEntity->queue = $appointmentProcess->queue;
}
@@ -233,7 +227,8 @@ public static function cancelAppointment(Process $process): Process
{
try {
$url = "/process/{$process->id}/{$process->authKey}/";
- $result = \App::$http->readDeleteResult($url, [], null); // Changed to match test expectations
+ $result = \App::$http->readDeleteResult($url, [], null);
+// Changed to match test expectations
$entity = $result?->getEntity();
if (!$entity instanceof Process) {
return new Process();
@@ -322,5 +317,4 @@ public static function getScopesByProviderId(string $source, string|int $provide
ExceptionService::handleException($e, __FUNCTION__);
}
}
-
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php
index 20f68e80b..a3095127b 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Core/ZmsApiFacadeService.php
@@ -1,14 +1,17 @@
getProvider()) {
@@ -56,29 +61,7 @@ public static function getOffices(): OfficeList
foreach ($providerList as $provider) {
$matchingScope = $scopeMap[$provider->source . '_' . $provider->id] ?? null;
-
- $offices[] = new Office(
- id: (int) $provider->id,
- name: $provider->displayName ?? $provider->name,
- address: $provider->data['address'] ?? null,
- displayNameAlternatives: $provider->data['displayNameAlternatives'] ?? [],
- organization: $provider->data['organization'] ?? null,
- organizationUnit: $provider->data['organizationUnit'] ?? null,
- slotTimeInMinutes: $provider->data['slotTimeInMinutes'] ?? null,
- geo: $provider->data['geo'] ?? null,
- scope: $matchingScope ? new ThinnedScope(
- id: (int) $matchingScope->id,
- provider: MapperService::providerToThinnedProvider($provider),
- shortName: $matchingScope->getShortName(),
- telephoneActivated: (bool) $matchingScope->getTelephoneActivated(),
- telephoneRequired: (bool) $matchingScope->getTelephoneRequired(),
- customTextfieldActivated: (bool) $matchingScope->getCustomTextfieldActivated(),
- customTextfieldRequired: (bool) $matchingScope->getCustomTextfieldRequired(),
- customTextfieldLabel: $matchingScope->getCustomTextfieldLabel(),
- captchaActivatedRequired: (bool) $matchingScope->getCaptchaActivatedRequired(),
- displayInfo: $matchingScope->getDisplayInfo()
- ) : null
- );
+ $offices[] = new Office(id: (int) $provider->id, name: $provider->displayName ?? $provider->name, address: $provider->data['address'] ?? null, showAlternativeLocations: $provider->data['showAlternativeLocations'] ?? null, displayNameAlternatives: $provider->data['displayNameAlternatives'] ?? [], organization: $provider->data['organization'] ?? null, organizationUnit: $provider->data['organizationUnit'] ?? null, slotTimeInMinutes: $provider->data['slotTimeInMinutes'] ?? null, geo: $provider->data['geo'] ?? null, scope: $matchingScope ? new ThinnedScope(id: (int) $matchingScope->id, provider: MapperService::providerToThinnedProvider($provider), shortName: $matchingScope->getShortName(), telephoneActivated: (bool) $matchingScope->getTelephoneActivated(), telephoneRequired: (bool) $matchingScope->getTelephoneRequired(), customTextfieldActivated: (bool) $matchingScope->getCustomTextfieldActivated(), customTextfieldRequired: (bool) $matchingScope->getCustomTextfieldRequired(), customTextfieldLabel: $matchingScope->getCustomTextfieldLabel(), captchaActivatedRequired: (bool) $matchingScope->getCaptchaActivatedRequired(), displayInfo: $matchingScope->getDisplayInfo()) : null);
}
return new OfficeList($offices);
@@ -88,7 +71,6 @@ public static function getScopes(): ThinnedScopeList|array
{
$providerList = ZmsApiClientService::getOffices() ?? new ProviderList();
$scopeList = ZmsApiClientService::getScopes() ?? new ScopeList();
-
$scopeMap = [];
foreach ($scopeList as $scope) {
$scopeProvider = $scope->getProvider();
@@ -103,18 +85,7 @@ public static function getScopes(): ThinnedScopeList|array
$key = $provider->source . '_' . $provider->id;
if (isset($scopeMap[$key])) {
$matchingScope = $scopeMap[$key];
- $scopesProjectionList[] = new ThinnedScope(
- id: (int) $matchingScope->id,
- provider: MapperService::providerToThinnedProvider($provider),
- shortName: $matchingScope->getShortName(),
- telephoneActivated: (bool) $matchingScope->getTelephoneActivated(),
- telephoneRequired: (bool) $matchingScope->getTelephoneRequired(),
- customTextfieldActivated: (bool) $matchingScope->getCustomTextfieldActivated(),
- customTextfieldRequired: (bool) $matchingScope->getCustomTextfieldRequired(),
- customTextfieldLabel: $matchingScope->getCustomTextfieldLabel(),
- captchaActivatedRequired: (bool) $matchingScope->getCaptchaActivatedRequired(),
- displayInfo: $matchingScope->getDisplayInfo()
- );
+ $scopesProjectionList[] = new ThinnedScope(id: (int) $matchingScope->id, provider: MapperService::providerToThinnedProvider($provider), shortName: $matchingScope->getShortName(), telephoneActivated: (bool) $matchingScope->getTelephoneActivated(), telephoneRequired: (bool) $matchingScope->getTelephoneRequired(), customTextfieldActivated: (bool) $matchingScope->getCustomTextfieldActivated(), customTextfieldRequired: (bool) $matchingScope->getCustomTextfieldRequired(), customTextfieldLabel: $matchingScope->getCustomTextfieldLabel(), captchaActivatedRequired: (bool) $matchingScope->getCaptchaActivatedRequired(), displayInfo: $matchingScope->getDisplayInfo());
}
}
@@ -125,15 +96,9 @@ public static function getServices(): ServiceList|array
{
$requestList = ZmsApiClientService::getServices() ?? new RequestList();
$services = [];
-
foreach ($requestList as $request) {
$additionalData = $request->getAdditionalData();
-
- $services[] = new Service(
- id: (int) $request->getId(),
- name: $request->getName(),
- maxQuantity: $additionalData['maxQuantity'] ?? 1
- );
+ $services[] = new Service(id: (int) $request->getId(), name: $request->getName(), maxQuantity: $additionalData['maxQuantity'] ?? 1);
}
return new ServiceList($services);
@@ -145,37 +110,31 @@ public static function getServicesAndOffices(bool $showUnpublished = false): Off
$requestList = ZmsApiClientService::getServices() ?? new RequestList();
$relationList = ZmsApiClientService::getRequestRelationList() ?? new RequestRelationList();
- $offices = MapperService::mapOfficesWithScope($providerList, $showUnpublished) ?? new OfficeList;
+ $offices = MapperService::mapOfficesWithScope($providerList, $showUnpublished) ?? new OfficeList();
$services = MapperService::mapServicesWithCombinations(
$requestList,
$relationList,
$showUnpublished
- ) ?? new ServiceList();
+ ) ?? new ServiceList();
$relations = MapperService::mapRelations($relationList) ?? new OfficeServiceRelationList();
-
return new OfficeServiceAndRelationList($offices, $services, $relations);
}
/* Todo add method
* getCombinableServicesByIds
- *
- *
- *
+ *
+ *
+ *
*/
public static function getScopeByOfficeId(int $officeId): ThinnedScope|array
{
- $matchingScope = ZmsApiClientService::getScopesByProviderId(
- \App::$source_name,
- $officeId
- )->getIterator()->current();
-
+ $matchingScope = ZmsApiClientService::getScopesByProviderId(\App::$source_name, $officeId)->getIterator()->current();
if (!$matchingScope instanceof Scope) {
return ['errors' => [self::getError('scopeNotFound')]];
}
$providerList = ZmsApiClientService::getOffices() ?? new ProviderList();
-
$providerMap = [];
foreach ($providerList as $provider) {
$key = $provider->source . '_' . $provider->id;
@@ -184,11 +143,9 @@ public static function getScopeByOfficeId(int $officeId): ThinnedScope|array
$scopeProvider = $matchingScope->getProvider();
$providerKey = $scopeProvider ? ($scopeProvider->source . '_' . $scopeProvider->id) : null;
-
$finalProvider = $providerKey && isset($providerMap[$providerKey])
? $providerMap[$providerKey]
: $scopeProvider;
-
$result = [
'id' => $matchingScope->id,
'provider' => MapperService::providerToThinnedProvider($finalProvider) ?? null,
@@ -201,33 +158,20 @@ public static function getScopeByOfficeId(int $officeId): ThinnedScope|array
'captchaActivatedRequired' => (bool) $matchingScope->getCaptchaActivatedRequired() ?? null,
'displayInfo' => $matchingScope->getDisplayInfo() ?? null,
];
-
- return new ThinnedScope(
- id: (int) $result['id'],
- provider: $result['provider'],
- shortName: $result['shortName'],
- telephoneActivated: $result['telephoneActivated'],
- telephoneRequired: $result['telephoneRequired'],
- customTextfieldActivated: $result['customTextfieldActivated'],
- customTextfieldRequired: $result['customTextfieldRequired'],
- customTextfieldLabel: $result['customTextfieldLabel'],
- captchaActivatedRequired: $result['captchaActivatedRequired'],
- displayInfo: $result['displayInfo']
- );
+ return new ThinnedScope(id: (int) $result['id'], provider: $result['provider'], shortName: $result['shortName'], telephoneActivated: $result['telephoneActivated'], telephoneRequired: $result['telephoneRequired'], customTextfieldActivated: $result['customTextfieldActivated'], customTextfieldRequired: $result['customTextfieldRequired'], customTextfieldLabel: $result['customTextfieldLabel'], captchaActivatedRequired: $result['captchaActivatedRequired'], displayInfo: $result['displayInfo']);
}
/* Todo add method
* getOfficeById
- *
- *
- *
+ *
+ *
+ *
*/
public static function getOfficeListByServiceId(int $serviceId): OfficeList|array
{
$providerList = ZmsApiClientService::getOffices() ?? new ProviderList();
$requestRelationList = ZmsApiClientService::getRequestRelationList() ?? new RequestRelationList();
-
$providerMap = [];
foreach ($providerList as $provider) {
$providerMap[$provider->id] = $provider;
@@ -237,26 +181,18 @@ public static function getOfficeListByServiceId(int $serviceId): OfficeList|arra
foreach ($requestRelationList as $relation) {
if ((int) $relation->request->id === $serviceId) {
$providerId = $relation->provider->id;
-
if (!isset($providerMap[$providerId])) {
continue;
}
$provider = $providerMap[$providerId];
$scope = null;
-
$scopeData = self::getScopeByOfficeId((int) $provider->id);
if ($scopeData instanceof ThinnedScope) {
$scope = $scopeData;
}
- $offices[] = new Office(
- id: (int) $provider->id,
- name: $provider->name,
- address: $provider->address ?? null,
- geo: $provider->geo ?? null,
- scope: $scope
- );
+ $offices[] = new Office(id: (int) $provider->id, name: $provider->name, showAlternativeLocations: $provider->data['showAlternativeLocations'] ?? null, displayNameAlternatives: $provider->data['displayNameAlternatives'] ?? [], organization: $provider->data['organization'] ?? null, organizationUnit: $provider->data['organizationUnit'] ?? null, slotTimeInMinutes: $provider->data['slotTimeInMinutes'] ?? null, address: $provider->address ?? null, geo: $provider->geo ?? null, scope: $scope);
}
}
@@ -272,7 +208,6 @@ public static function getScopeById(?int $scopeId): ThinnedScope|array
{
$scopeList = ZmsApiClientService::getScopes() ?? new ScopeList();
$providerList = ZmsApiClientService::getOffices() ?? new ProviderList();
-
$matchingScope = null;
foreach ($scopeList as $scope) {
if ((int) $scope->id === (int) $scopeId) {
@@ -301,26 +236,13 @@ public static function getScopeById(?int $scopeId): ThinnedScope|array
$matchingProv = ($providerKey && isset($providerMap[$providerKey]))
? $providerMap[$providerKey]
: $scopeProvider;
-
- return new ThinnedScope(
- id: (int) $matchingScope->id,
- provider: MapperService::providerToThinnedProvider($matchingProv),
- shortName: $matchingScope->getShortName() ?? null,
- telephoneActivated: (bool) $matchingScope->getTelephoneActivated() ?? null,
- telephoneRequired: (bool) $matchingScope->getTelephoneRequired() ?? null,
- customTextfieldActivated: (bool) $matchingScope->getCustomTextfieldActivated() ?? null,
- customTextfieldRequired: (bool) $matchingScope->getCustomTextfieldRequired() ?? null,
- customTextfieldLabel: $matchingScope->getCustomTextfieldLabel() ?? null,
- captchaActivatedRequired: (bool) $matchingScope->getCaptchaActivatedRequired() ?? null,
- displayInfo: $matchingScope->getDisplayInfo() ?? null
- );
+ return new ThinnedScope(id: (int) $matchingScope->id, provider: MapperService::providerToThinnedProvider($matchingProv), shortName: $matchingScope->getShortName() ?? null, telephoneActivated: (bool) $matchingScope->getTelephoneActivated() ?? null, telephoneRequired: (bool) $matchingScope->getTelephoneRequired() ?? null, customTextfieldActivated: (bool) $matchingScope->getCustomTextfieldActivated() ?? null, customTextfieldRequired: (bool) $matchingScope->getCustomTextfieldRequired() ?? null, customTextfieldLabel: $matchingScope->getCustomTextfieldLabel() ?? null, captchaActivatedRequired: (bool) $matchingScope->getCaptchaActivatedRequired() ?? null, displayInfo: $matchingScope->getDisplayInfo() ?? null);
}
public static function getServicesByOfficeId(int $officeId): ServiceList|array
{
$requestList = ZmsApiClientService::getServices() ?? new RequestList();
$requestRelationList = ZmsApiClientService::getRequestRelationList() ?? new RequestRelationList();
-
$requestMap = [];
foreach ($requestList as $request) {
$requestMap[$request->id] = $request;
@@ -330,14 +252,9 @@ public static function getServicesByOfficeId(int $officeId): ServiceList|array
foreach ($requestRelationList as $relation) {
if ((int) $relation->provider->id === $officeId) {
$requestId = $relation->request->id;
-
if (isset($requestMap[$requestId])) {
$request = $requestMap[$requestId];
- $services[] = new Service(
- id: (int) $request->id,
- name: $request->name,
- maxQuantity: $request->getAdditionalData()['maxQuantity'] ?? 1
- );
+ $services[] = new Service(id: (int) $request->id, name: $request->name, maxQuantity: $request->getAdditionalData()['maxQuantity'] ?? 1);
}
}
}
@@ -354,7 +271,6 @@ public static function getOfficesThatProvideService(int $serviceId): OfficeList|
{
$providerList = ZmsApiClientService::getOffices() ?? new ProviderList();
$requestRelationList = ZmsApiClientService::getRequestRelationList() ?? new RequestRelationList();
-
$providerIds = [];
foreach ($requestRelationList as $relation) {
if ((int) $relation->request->id === $serviceId) {
@@ -371,17 +287,7 @@ public static function getOfficesThatProvideService(int $serviceId): OfficeList|
) {
$scope = self::getScopeByOfficeId((int) $provider->id);
if (!is_array($scope)) {
- $offices[] = new Office(
- id: (int) $provider->id,
- name: $provider->displayName ?? $provider->name,
- address: $provider->data['address'] ?? null,
- displayNameAlternatives: $provider->data['displayNameAlternatives'] ?? [],
- organization: $provider->data['organization'] ?? null,
- organizationUnit: $provider->data['organizationUnit'] ?? null,
- slotTimeInMinutes: $provider->data['slotTimeInMinutes'] ?? null,
- geo: $provider->data['geo'] ?? null,
- scope: $scope instanceof ThinnedScope ? $scope : null
- );
+ $offices[] = new Office(id: (int) $provider->id, name: $provider->displayName ?? $provider->name, address: $provider->data['address'] ?? null, showAlternativeLocations: $provider->data['showAlternativeLocations'] ?? null, displayNameAlternatives: $provider->data['displayNameAlternatives'] ?? [], organization: $provider->data['organization'] ?? null, organizationUnit: $provider->data['organizationUnit'] ?? null, slotTimeInMinutes: $provider->data['slotTimeInMinutes'] ?? null, geo: $provider->data['geo'] ?? null, scope: $scope instanceof ThinnedScope ? $scope : null);
}
}
}
@@ -397,20 +303,19 @@ public static function getOfficesThatProvideService(int $serviceId): OfficeList|
public static function getServicesProvidedAtOffice(int $officeId): RequestList|array
{
$requestRelationList = ZmsApiClientService::getRequestRelationList() ?? new RequestRelationList();
-
$requestRelationArray = [];
foreach ($requestRelationList as $relation) {
$requestRelationArray[] = $relation;
}
$serviceIds = array_filter($requestRelationArray, function ($relation) use ($officeId) {
+
return $relation->provider->id === $officeId || (string) $relation->provider->id === (string) $officeId;
});
-
$serviceIds = array_map(function ($relation) {
+
return $relation->request->id;
}, $serviceIds);
-
$requestList = ZmsApiClientService::getServices() ?? new RequestList();
$requestArray = [];
foreach ($requestList as $request) {
@@ -418,9 +323,9 @@ public static function getServicesProvidedAtOffice(int $officeId): RequestList|a
}
$filteredRequests = array_filter($requestArray, function ($request) use ($serviceIds) {
+
return in_array($request->id, $serviceIds);
});
-
$resultRequestList = new RequestList();
foreach ($filteredRequests as $request) {
$resultRequestList->addEntity($request);
@@ -429,25 +334,30 @@ public static function getServicesProvidedAtOffice(int $officeId): RequestList|a
return $resultRequestList;
}
- public static function getBookableFreeDays(int $officeId, int $serviceId, array $serviceCounts, string $startDate, string $endDate): AvailableDays|array
+ public static function getBookableFreeDays(array $officeIds, array $serviceIds, array $serviceCounts, string $startDate, string $endDate): AvailableDays|array
{
-
$firstDay = DateTimeFormatHelper::getInternalDateFromISO($startDate);
$lastDay = DateTimeFormatHelper::getInternalDateFromISO($endDate);
+ $services = [];
+ $providers = [];
+ $serviceNumber = 0;
+ foreach ($serviceIds as $serviceId) {
+ $services[] = [
+ 'id' => $serviceId,
+ 'source' => \App::$source_name,
+ 'slotCount' => $serviceCounts[$serviceNumber],
+ ];
+ $serviceNumber++;
+ }
- $freeDays = ZmsApiClientService::getFreeDays(
- new ProviderList([['id' => $officeId, 'source' => \App::$source_name]]),
- new RequestList([
- [
- 'id' => $serviceId,
- 'source' => \App::$source_name,
- 'slotCount' => $serviceCounts,
- ]
- ]),
- $firstDay,
- $lastDay,
- ) ?? new Calendar();
+ foreach ($officeIds as $officeId) {
+ $providers[] = [
+ 'id' => $officeId,
+ 'source' => \App::$source_name,
+ ];
+ }
+ $freeDays = ZmsApiClientService::getFreeDays(new ProviderList($providers), new RequestList($services), $firstDay, $lastDay,) ?? new Calendar();
$daysCollection = $freeDays->days;
$formattedDays = [];
foreach ($daysCollection as $day) {
@@ -460,20 +370,14 @@ public static function getBookableFreeDays(int $officeId, int $serviceId, array
}
return new AvailableDays($formattedDays);
-
}
- public static function getFreeAppointments(
- int $officeId,
- array $serviceIds,
- array $serviceCounts,
- array $date
- ): ProcessList|array {
+ public static function getFreeAppointments(int $officeId, array $serviceIds, array $serviceCounts, array $date): ProcessList|array
+ {
$office = [
'id' => $officeId,
'source' => \App::$source_name
];
-
$requests = [];
foreach ($serviceIds as $index => $serviceId) {
$service = [
@@ -484,88 +388,77 @@ public static function getFreeAppointments(
$requests = array_merge($requests, array_fill(0, $service['slotCount'], $service));
}
- return ZmsApiClientService::getFreeTimeslots(
- new ProviderList([$office]),
- new RequestList($requests),
- $date,
- $date
- );
+ return ZmsApiClientService::getFreeTimeslots(new ProviderList([$office]), new RequestList($requests), $date, $date);
}
- public static function getAvailableAppointments(
- ?string $date,
- ?int $officeId,
- ?array $serviceIds,
- ?array $serviceCounts
- ): AvailableAppointments|array {
-
+ public static function getAvailableAppointments(string $date, array $officeIds, array $serviceIds, array $serviceCounts, ?bool $groupByOffice = false): AvailableAppointments|AvailableAppointmentsByOffice|array
+ {
$requests = [];
+ $providers = [];
foreach ($serviceIds as $index => $serviceId) {
$slotCount = isset($serviceCounts[$index]) ? intval($serviceCounts[$index]) : 1;
for ($i = 0; $i < $slotCount; $i++) {
$requests[] = [
'id' => $serviceId,
- 'source' => \App::$source_name,
- 'slotCount' => 1,
+ 'source' => \App::$source_name
];
}
}
- $freeSlots = ZmsApiClientService::getFreeTimeslots(
- new ProviderList([['id' => $officeId, 'source' => \App::$source_name]]),
- new RequestList($requests),
- DateTimeFormatHelper::getInternalDateFromISO($date),
- DateTimeFormatHelper::getInternalDateFromISO($date)
- ) ?? new ProcessList();
+ foreach ($officeIds as $officeId) {
+ $providers[] = [
+ 'id' => $officeId,
+ 'source' => \App::$source_name
+ ];
+ }
+ $freeSlots = ZmsApiClientService::getFreeTimeslots(new ProviderList($providers), new RequestList($requests), DateTimeFormatHelper::getInternalDateFromISO($date), DateTimeFormatHelper::getInternalDateFromISO($date)) ?? new ProcessList();
$timestamps = self::processFreeSlots($freeSlots);
if (!empty($timestamps['errors'])) {
return $timestamps;
}
- return isset($timestamps->toArray()['appointmentTimestamps'])
- ? new AvailableAppointments($timestamps->toArray()['appointmentTimestamps'])
- : new AvailableAppointments();
+ if ($groupByOffice) {
+ return new AvailableAppointmentsByOffice($timestamps);
+ }
+ return new AvailableAppointments(array_values($timestamps)[0]);
}
- private static function processFreeSlots(ProcessList $freeSlots): ProcessFreeSlots|array
+ private static function processFreeSlots(ProcessList $freeSlots): array
{
-
$errors = ValidationService::validateGetProcessFreeSlots($freeSlots);
if (is_array($errors) && !empty($errors['errors'])) {
return $errors;
}
$currentTimestamp = time();
-
- $appointmentTimestamps = array_reduce(
- iterator_to_array($freeSlots),
- function ($timestamps, $slot) use ($currentTimestamp) {
- if (isset($slot->appointments) && is_iterable($slot->appointments)) {
- foreach ($slot->appointments as $appointment) {
- if (isset($appointment->date)) {
- $timestamp = (int) $appointment->date;
- if ($timestamp > $currentTimestamp) {
- $timestamps[$timestamp] = true;
- }
+ $appointmentTimestamps = array_reduce(iterator_to_array($freeSlots), function ($timestamps, $slot) use ($currentTimestamp) {
+
+ if (isset($slot->appointments) && is_iterable($slot->appointments)) {
+ $providerId = (int) $slot->scope->provider->id;
+ foreach ($slot->appointments as $appointment) {
+ if (isset($appointment->date)) {
+ $timestamp = (int) $appointment->date;
+ if ($timestamp > $currentTimestamp) {
+ $timestamps[$providerId][$timestamp] = true;
}
}
}
- return $timestamps;
- },
- []
- );
-
- $appointmentTimestamps = array_keys($appointmentTimestamps);
- sort($appointmentTimestamps);
+ }
+ return $timestamps;
+ }, []);
+ foreach ($appointmentTimestamps as $providerId => &$timestamps) {
+ $timestamps = array_keys($timestamps);
+ asort($timestamps);
+ }
$errors = ValidationService::validateGetProcessByIdTimestamps($appointmentTimestamps);
if (is_array($errors) && !empty($errors['errors'])) {
return $errors;
}
- return new ProcessFreeSlots($appointmentTimestamps);
+ return $appointmentTimestamps;
}
public static function reserveTimeslot(Process $appointmentProcess, array $serviceIds, array $serviceCounts): ThinnedProcess|array
@@ -582,16 +475,13 @@ public static function getThinnedProcessById(?int $processId, ?string $authKey):
{
$process = ZmsApiClientService::getProcessById($processId, $authKey);
-
$thinnedProcess = MapperService::processToThinnedProcess($process);
-
$errors = ValidationService::validateGetProcessNotFound($process);
if (is_array($errors) && !empty($errors['errors'])) {
return $errors;
}
$providerList = ZmsApiClientService::getOffices() ?? new ProviderList();
-
$providerMap = [];
foreach ($providerList as $provider) {
$key = $provider->getSource() . '_' . $provider->id;
@@ -603,29 +493,12 @@ public static function getThinnedProcessById(?int $processId, ?string $authKey):
$scopeProvider = $process->scope->getProvider();
$providerKey = $scopeProvider ? ($scopeProvider->getSource() . '_' . $scopeProvider->id) : null;
$matchingProvider = $providerKey && isset($providerMap[$providerKey]) ? $providerMap[$providerKey] : $scopeProvider;
-
$thinnedProvider = MapperService::providerToThinnedProvider($matchingProvider);
-
-
- $thinnedScope = new ThinnedScope(
- id: (int) $process->scope->id,
- provider: $thinnedProvider,
- shortName: $process->scope->getShortName() ?? null,
- telephoneActivated: (bool) $process->scope->getTelephoneActivated() ?? false,
- telephoneRequired: (bool) $process->scope->getTelephoneRequired() ?? false,
- customTextfieldActivated: (bool) $process->scope->getCustomTextfieldActivated() ?? false,
- customTextfieldRequired: (bool) $process->scope->getCustomTextfieldRequired() ?? false,
- customTextfieldLabel: $process->scope->getCustomTextfieldLabel() ?? null,
- captchaActivatedRequired: (bool) $process->scope->getCaptchaActivatedRequired() ?? false,
- displayInfo: $process->scope->getDisplayInfo() ?? null
- );
+ $thinnedScope = new ThinnedScope(id: (int) $process->scope->id, provider: $thinnedProvider, shortName: $process->scope->getShortName() ?? null, telephoneActivated: (bool) $process->scope->getTelephoneActivated() ?? false, telephoneRequired: (bool) $process->scope->getTelephoneRequired() ?? false, customTextfieldActivated: (bool) $process->scope->getCustomTextfieldActivated() ?? false, customTextfieldRequired: (bool) $process->scope->getCustomTextfieldRequired() ?? false, customTextfieldLabel: $process->scope->getCustomTextfieldLabel() ?? null, captchaActivatedRequired: (bool) $process->scope->getCaptchaActivatedRequired() ?? false, displayInfo: $process->scope->getDisplayInfo() ?? null);
}
$thinnedProcess->scope = $thinnedScope;
-
return $thinnedProcess;
-
-
}
public static function updateClientData(Process $reservedProcess): Process|array
@@ -690,5 +563,4 @@ public static function sendCancelationEmail(Process $confirmedProcess): Process|
}
return $clientUpdateResult;
}
-
}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficeListByServiceService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficeListByServiceService.php
index abf071b3f..f3214ceac 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficeListByServiceService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficeListByServiceService.php
@@ -1,4 +1,5 @@
extractClientData($queryParams);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
@@ -39,4 +39,4 @@ private function getOfficeListByService(object $data): array|OfficeList
{
return ZmsApiFacadeService::getOfficeListByServiceId($data->serviceId);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficesListService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficesListService.php
index f78031ed0..de228169b 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficesListService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Office/OfficesListService.php
@@ -1,4 +1,5 @@
extractClientData($queryParams);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
@@ -39,4 +39,4 @@ private function getScopeById(object $clientData): array|ThinnedScope
{
return ZmsApiFacadeService::getScopeById($clientData->scopeId);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Scope/ScopesListService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Scope/ScopesListService.php
index bc6482d38..c5ad4e2f6 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Scope/ScopesListService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Scope/ScopesListService.php
@@ -1,4 +1,5 @@
extractClientData($queryParams);
-
$errors = $this->validateClientData($clientData);
if (!empty($errors['errors'])) {
return $errors;
@@ -39,4 +39,4 @@ private function getServicesByOffice(object $clientData): array|ServiceList
{
return ZmsApiFacadeService::getServicesByOfficeId($clientData->officeId);
}
-}
\ No newline at end of file
+}
diff --git a/zmscitizenapi/src/Zmscitizenapi/Services/Service/ServicesListService.php b/zmscitizenapi/src/Zmscitizenapi/Services/Service/ServicesListService.php
index 3a8bc34f7..6b770f708 100644
--- a/zmscitizenapi/src/Zmscitizenapi/Services/Service/ServicesListService.php
+++ b/zmscitizenapi/src/Zmscitizenapi/Services/Service/ServicesListService.php
@@ -1,4 +1,5 @@
9999999,
"name" => "Unittest Source Dienstleister 2",
"address" => null,
- "displayNameAlternatives" => null,
+ "showAlternativeLocations" => true,
+ "displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
"slotTimeInMinutes" => null,
@@ -102,7 +103,8 @@ public function testRenderingRequestRelation()
"id" => 9999998,
"name" => "Unittest Source Dienstleister",
"address" => null,
- "displayNameAlternatives" => null,
+ "showAlternativeLocations" => false,
+ "displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
"slotTimeInMinutes" => null,
@@ -139,7 +141,8 @@ public function testRenderingRequestRelation()
"id" => 9999999,
"name" => "Unittest Source Dienstleister 2",
"address" => null,
- "displayNameAlternatives" => null,
+ "showAlternativeLocations" => true,
+ "displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
"slotTimeInMinutes" => null,
diff --git a/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesListControllerTest.php b/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesListControllerTest.php
index 6194c2988..c34ea6540 100644
--- a/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesListControllerTest.php
+++ b/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesListControllerTest.php
@@ -41,6 +41,7 @@ public function testRendering()
"id" => 9999998,
"name" => "Unittest Source Dienstleister",
"address" => null,
+ "showAlternativeLocations" => false,
"displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
@@ -81,6 +82,7 @@ public function testRendering()
"id" => 9999999,
"name" => "Unittest Source Dienstleister 2",
"address" => null,
+ "showAlternativeLocations" => true,
"displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
diff --git a/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsControllerTest.php b/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsControllerTest.php
index e5fc0f0e1..2d0c68f05 100644
--- a/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsControllerTest.php
+++ b/zmscitizenapi/tests/Zmscitizenapi/Controllers/Office/OfficesServicesRelationsControllerTest.php
@@ -41,6 +41,7 @@ public function testRendering()
"id" => 9999998,
"name" => "Unittest Source Dienstleister",
"address" => null,
+ "showAlternativeLocations" => false,
"displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
@@ -81,6 +82,7 @@ public function testRendering()
"id" => 9999999,
"name" => "Unittest Source Dienstleister 2",
"address" => null,
+ "showAlternativeLocations" => true,
"displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
@@ -162,7 +164,7 @@ public function testDisplayNotPublicRequests()
'response' => $this->readFixture("GET_SourceGet_dldb.json")
]
]);
-
+
$response = $this->render();
$responseBody = json_decode((string) $response->getBody(), true);
$expectedResponse = [
@@ -171,6 +173,7 @@ public function testDisplayNotPublicRequests()
"id" => 9999998,
"name" => "Unittest Source Dienstleister",
"address" => null,
+ "showAlternativeLocations" => false,
"displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
@@ -211,6 +214,7 @@ public function testDisplayNotPublicRequests()
"id" => 9999999,
"name" => "Unittest Source Dienstleister 2",
"address" => null,
+ "showAlternativeLocations" => true,
"displayNameAlternatives" => [],
"organization" => null,
"organizationUnit" => null,
@@ -283,6 +287,7 @@ public function testDisplayNotPublicRequests()
]
]
];
+
$this->assertEquals(200, $response->getStatusCode());
$this->assertEqualsCanonicalizing($expectedResponse, $responseBody);
}
diff --git a/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableAppointmentsListServiceTest.php b/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableAppointmentsListServiceTest.php
index 3e9e2a15a..13f665176 100644
--- a/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableAppointmentsListServiceTest.php
+++ b/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableAppointmentsListServiceTest.php
@@ -155,7 +155,7 @@ private function createMockValidationService(array $returnValue): void
class ValidationService {
public static function validateGetAvailableAppointments(
?string $date,
- ?int $officeId,
+ ?array $officeIds,
array $serviceIds,
array $serviceCounts
): array {
@@ -172,7 +172,7 @@ private function createMockFacade(AvailableAppointments $returnValue): void
class ZmsApiFacadeService {
public static function getAvailableAppointments(
?string $date,
- ?int $officeId,
+ ?array $officeIds,
?array $serviceIds,
?array $serviceCounts
): \BO\Zmscitizenapi\Models\AvailableAppointments|array {
diff --git a/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableDaysListServiceTest.php b/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableDaysListServiceTest.php
index 877f75e61..231dbd5dc 100644
--- a/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableDaysListServiceTest.php
+++ b/zmscitizenapi/tests/Zmscitizenapi/Services/Availability/AvailableDaysListServiceTest.php
@@ -159,8 +159,8 @@ private function createMockValidationService(array $returnValue): void
namespace BO\Zmscitizenapi\Services\Core;
class ValidationService {
public static function validateGetBookableFreeDays(
- ?int $officeId,
- ?int $serviceId,
+ ?array $officeIds,
+ ?array $serviceIds,
?string $startDate,
?string $endDate,
array $serviceCounts
@@ -177,8 +177,8 @@ private function createMockFacade(AvailableDays $returnValue): void
namespace BO\Zmscitizenapi\Services\Core;
class ZmsApiFacadeService {
public static function getBookableFreeDays(
- int $officeId,
- int $serviceId,
+ array $officeIds,
+ array $serviceIds,
array $serviceCounts,
string $startDate,
string $endDate
diff --git a/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ValidationServiceTest.php b/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ValidationServiceTest.php
index f2bcaa44d..953c09017 100644
--- a/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ValidationServiceTest.php
+++ b/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ValidationServiceTest.php
@@ -90,7 +90,7 @@ public function testValidateGetAvailableAppointments(): void
// Test valid input
$result = ValidationService::validateGetAvailableAppointments(
'2025-01-01',
- 1,
+ [1],
[1],
[1]
);
@@ -99,7 +99,7 @@ public function testValidateGetAvailableAppointments(): void
// Test invalid date
$result = ValidationService::validateGetAvailableAppointments(
'invalid',
- 1,
+ [1],
[1],
[1]
);
@@ -111,7 +111,7 @@ public function testValidateGetAvailableAppointments(): void
// Test invalid office ID
$result = ValidationService::validateGetAvailableAppointments(
'2025-01-01',
- 0,
+ [''],
[1],
[1]
);
@@ -123,7 +123,7 @@ public function testValidateGetAvailableAppointments(): void
// Test invalid service IDs
$result = ValidationService::validateGetAvailableAppointments(
'2025-01-01',
- 1,
+ [1],
['invalid'],
[1]
);
@@ -135,7 +135,7 @@ public function testValidateGetAvailableAppointments(): void
// Test invalid service counts
$result = ValidationService::validateGetAvailableAppointments(
'2025-01-01',
- 1,
+ [1],
[1],
['invalid']
);
diff --git a/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ZmsApiFacadeServiceTest.php b/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ZmsApiFacadeServiceTest.php
index 839b7ca39..35c7d8816 100644
--- a/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ZmsApiFacadeServiceTest.php
+++ b/zmscitizenapi/tests/Zmscitizenapi/Services/Core/ZmsApiFacadeServiceTest.php
@@ -64,7 +64,8 @@ public function testGetOfficesSuccess(): void
'city' => 'Test City',
'postal_code' => '12345'
],
- 'geo' => ['lat' => 48.137154, 'lon' => 11.576124]
+ 'geo' => ['lat' => 48.137154, 'lon' => 11.576124],
+ 'showAlternativeLocations' => false
];
$scope = new Scope();
diff --git a/zmscitizenapi/tests/Zmscitizenapi/fixtures/GET_SourceGet_dldb.json b/zmscitizenapi/tests/Zmscitizenapi/fixtures/GET_SourceGet_dldb.json
index 8fe631e44..48d3a8d9d 100644
--- a/zmscitizenapi/tests/Zmscitizenapi/fixtures/GET_SourceGet_dldb.json
+++ b/zmscitizenapi/tests/Zmscitizenapi/fixtures/GET_SourceGet_dldb.json
@@ -24,7 +24,8 @@
"geo": {
"lat": "48.12750898398659",
"lon": "11.604317899956524"
- }
+ },
+ "showAlternativeLocations": false
},
"contact": {
"city": "Berlin",
@@ -46,7 +47,8 @@
"geo": {
"lat": "48.12750898398659",
"lon": "11.604317899956524"
- }
+ },
+ "showAlternativeLocations": true
},
"contact": {
"city": "Berlin",
diff --git a/zmsclient/.gitignore b/zmsclient/.gitignore
index 9b61b1de1..a1a8823e9 100644
--- a/zmsclient/.gitignore
+++ b/zmsclient/.gitignore
@@ -5,3 +5,4 @@ tags
.DS_*
.phpunit.result.cache
clover.xml
+coverage
diff --git a/zmsclient/composer.json b/zmsclient/composer.json
index 2fba06c43..8b5c5a50f 100644
--- a/zmsclient/composer.json
+++ b/zmsclient/composer.json
@@ -54,7 +54,7 @@
"phpunit/phpunit": "^9.5.4",
"phpspec/prophecy-phpunit": "^2.0.0",
"phpmd/phpmd": "@stable",
- "squizlabs/php_codesniffer": "^3.5.8",
+ "squizlabs/php_codesniffer": "*",
"helmich/phpunit-psr7-assert": "^4.3.0"
}
}
diff --git a/zmsclient/composer.lock b/zmsclient/composer.lock
index cc1333479..ce3ef2c4e 100644
--- a/zmsclient/composer.lock
+++ b/zmsclient/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "878caac59a8fd82f523b3fb0db03fd59",
+ "content-hash": "8d97a3b4b1968e4645b0a357086bcd9f",
"packages": [
{
"name": "aronduby/dump",
@@ -3696,16 +3696,16 @@
},
{
"name": "helmich/phpunit-json-assert",
- "version": "v3.5.1",
+ "version": "v3.5.2",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-json-assert.git",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c"
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/f8958119e9e9ea1339d6b4d6fd2df24536261b50",
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50",
"shasum": ""
},
"require": {
@@ -3714,10 +3714,10 @@
"softcreatr/jsonpath": "^0.8"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 11.0"
+ "phpunit/phpunit": "<8.0 || >= 12.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0"
},
"type": "library",
"autoload": {
@@ -3738,7 +3738,7 @@
"description": "PHPUnit assertions for JSON documents",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-json-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.1"
+ "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.2"
},
"funding": [
{
@@ -3750,33 +3750,34 @@
"type": "github"
}
],
- "time": "2023-03-03T14:09:38+00:00"
+ "time": "2024-05-20T11:18:46+00:00"
},
{
"name": "helmich/phpunit-psr7-assert",
- "version": "v4.3.0",
+ "version": "v4.4.1",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-psr7-assert.git",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878"
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/dfe594a09f55ea7f87120363d6720ca1a94c0878",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/f35fa69e07cc16977b52805d3abd873cc16747fd",
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd",
"shasum": ""
},
"require": {
"helmich/phpunit-json-assert": "^3.4",
- "php": "^7.2 || ^8.0",
- "psr/http-message": "^1.0"
+ "php": "^8.0",
+ "psr/http-message": "^1.1 || ^2.0"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 10.0"
+ "phpunit/phpunit": "<8.0 || >= 11.0"
},
"require-dev": {
- "guzzlehttp/psr7": "^1.2",
- "phpunit/phpunit": "^8.0 || ^9.0"
+ "guzzlehttp/psr7": "^2.4",
+ "mockery/mockery": "^1.4.1",
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
},
"type": "library",
"autoload": {
@@ -3797,7 +3798,7 @@
"description": "PHPUnit assertions for testing PSR7-compliant applications",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-psr7-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.3.0"
+ "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.4.1"
},
"funding": [
{
@@ -3809,24 +3810,24 @@
"type": "github"
}
],
- "time": "2020-12-22T06:27:54+00:00"
+ "time": "2023-07-26T19:04:29+00:00"
},
{
"name": "justinrainbow/json-schema",
- "version": "v5.2.13",
+ "version": "5.3.0",
"source": {
"type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+ "url": "https://github.com/jsonrainbow/json-schema.git",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+ "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
@@ -3837,11 +3838,6 @@
"bin/validate-json"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"JsonSchema\\": "src/JsonSchema/"
@@ -3876,10 +3872,10 @@
"schema"
],
"support": {
- "issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+ "issues": "https://github.com/jsonrainbow/json-schema/issues",
+ "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
},
- "time": "2023-09-26T02:20:38+00:00"
+ "time": "2024-07-06T21:00:26+00:00"
},
{
"name": "myclabs/deep-copy",
diff --git a/zmsclient/phpunit.xml b/zmsclient/phpunit.xml
index 93362f937..e986a3d4e 100644
--- a/zmsclient/phpunit.xml
+++ b/zmsclient/phpunit.xml
@@ -1,16 +1,16 @@
-
-
+
@@ -18,6 +18,14 @@
./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
diff --git a/zmsclient/src/Zmsclient/Auth.php b/zmsclient/src/Zmsclient/Auth.php
index 669a868a4..83521193c 100644
--- a/zmsclient/src/Zmsclient/Auth.php
+++ b/zmsclient/src/Zmsclient/Auth.php
@@ -1,4 +1,5 @@
propertyName = $propertyName;
diff --git a/zmsclient/src/Zmsclient/Http.php b/zmsclient/src/Zmsclient/Http.php
index cbd7d333f..6c6804b6f 100644
--- a/zmsclient/src/Zmsclient/Http.php
+++ b/zmsclient/src/Zmsclient/Http.php
@@ -139,7 +139,7 @@ public function getAuthorizedRequest(\Psr\Http\Message\RequestInterface $request
if (null !== $xAuthKey && ! $userInfo) {
$request = $request->withHeader('X-Authkey', $xAuthKey);
} elseif ($userInfo) {
- $request = $request->withHeader('Authorization', 'Basic '. base64_encode($userInfo));
+ $request = $request->withHeader('Authorization', 'Basic ' . base64_encode($userInfo));
}
if (null !== $this->apikeyString) {
$request = $request->withHeader('X-Api-Key', $this->apikeyString);
@@ -223,7 +223,7 @@ public function readDeleteResult($relativeUrl, array $getParameters = null)
if (null !== $getParameters) {
$uri = $uri->withQuery(http_build_query($getParameters));
}
- $request = self::createRequest('DELETE', $uri);
+ $request = self::createRequest('DELETE', $uri);
return $this->readResult($request);
}
@@ -237,10 +237,12 @@ protected function readResult(
try {
$result->getData();
} catch (Exception $exception) {
- if ($try < 3 && in_array($exception->template, [
+ if (
+ $try < 3 && in_array($exception->template, [
"BO\\Zmsdb\\Exception\\Pdo\\DeadLockFound",
"BO\\Zmsdb\\Exception\\Pdo\\LockTimeout",
- ])) {
+ ])
+ ) {
usleep(rand(1000000, 3000000));
return $this->readResult($request, $try + 1);
}
diff --git a/zmsclient/src/Zmsclient/PhpUnit/Base.php b/zmsclient/src/Zmsclient/PhpUnit/Base.php
index 9202c3331..315c4c36d 100644
--- a/zmsclient/src/Zmsclient/PhpUnit/Base.php
+++ b/zmsclient/src/Zmsclient/PhpUnit/Base.php
@@ -5,13 +5,12 @@
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
*
*/
-namespace BO\Zmsclient\PhpUnit;
-
-use \Prophecy\PhpUnit\ProphecyTrait;
-use \Prophecy\Argument;
+namespace BO\Zmsclient\PhpUnit;
-use \BO\Zmsclient\GraphQL\GraphQLInterpreter;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Argument;
+use BO\Zmsclient\GraphQL\GraphQLInterpreter;
abstract class Base extends \BO\Slim\PhpUnit\Base
{
@@ -25,9 +24,8 @@ abstract class Base extends \BO\Slim\PhpUnit\Base
* ],
* ]
*/
-
use ProphecyTrait;
-
+
protected $apiCalls = array();
public function setUp(): void
diff --git a/zmsclient/src/Zmsclient/Psr17/ResponseFactory.php b/zmsclient/src/Zmsclient/Psr17/ResponseFactory.php
index a5e93baea..c6756b178 100644
--- a/zmsclient/src/Zmsclient/Psr17/ResponseFactory.php
+++ b/zmsclient/src/Zmsclient/Psr17/ResponseFactory.php
@@ -1,4 +1,5 @@
10]
* defined with each component's bootstrap.php
diff --git a/zmsclient/src/Zmsclient/Psr7/Uri.php b/zmsclient/src/Zmsclient/Psr7/Uri.php
index 1f26c4344..6540feb84 100644
--- a/zmsclient/src/Zmsclient/Psr7/Uri.php
+++ b/zmsclient/src/Zmsclient/Psr7/Uri.php
@@ -22,7 +22,7 @@ public function __construct(
if ($host !== null) {
parent::__construct($schemeOrUri, $host, $port, $path, $query, $fragment, $user, $password);
} else {
- $temp = (new UriFactory)->createUri($schemeOrUri);
+ $temp = (new UriFactory())->createUri($schemeOrUri);
$this->scheme = $temp->scheme;
$this->host = $temp->host;
$this->port = $temp->port;
diff --git a/zmsclient/src/Zmsclient/SessionHandler.php b/zmsclient/src/Zmsclient/SessionHandler.php
index 17b7ff134..8300128d8 100644
--- a/zmsclient/src/Zmsclient/SessionHandler.php
+++ b/zmsclient/src/Zmsclient/SessionHandler.php
@@ -1,4 +1,5 @@
10) {
- $result[] = "WARN - High amount of DB-Locks: ".$status['database']['locks'];
+ $result[] = "WARN - High amount of DB-Locks: " . $status['database']['locks'];
}
if ($status['database']['threads'] > 30) {
- $result[] = "WARN - High amount of DB-Threads: ".$status['database']['threads'];
+ $result[] = "WARN - High amount of DB-Threads: " . $status['database']['threads'];
}
if ($status['database']['nodeConnections'] > 50) {
$result[] = "WARN - DB connected thread over 50% of available connections";
}
- if (isset($status['processes'])
+ if (
+ isset($status['processes'])
&& isset($status['processes']['lastCalculate'])
&& time() - strtotime($status['processes']['lastCalculate']) > 600
) {
@@ -63,8 +65,8 @@ public static function testStatus(ResponseInterface $response, $status)
if (!count($result)) {
$result = "OK - "
. "DB=" . $status['database']['nodeConnections'] . "%"
- . " Threads=".$status['database']['threads']
- . " Locks=".$status['database']['locks']
+ . " Threads=" . $status['database']['threads']
+ . " Locks=" . $status['database']['locks']
;
} else {
$result = implode('; ', $result);
@@ -90,7 +92,8 @@ public static function getDldbUpdateStats($status)
if (isset($status['sources'])) {
$now = new \DateTimeImmutable();
$lastDldbUpdate = new \DateTimeImmutable($status['sources']['dldb']['last']);
- if (($lastDldbUpdate->getTimestamp() + 7200) < $now->getTimestamp() &&
+ if (
+ ($lastDldbUpdate->getTimestamp() + 7200) < $now->getTimestamp() &&
($lastDldbUpdate->getTimestamp() + 14400) > $now->getTimestamp()
) {
$result = "WARN - Last DLDB Import is more then 2 hours ago";
diff --git a/zmsclient/src/Zmsclient/Ticketprinter.php b/zmsclient/src/Zmsclient/Ticketprinter.php
index 3b091d389..d9c393a01 100644
--- a/zmsclient/src/Zmsclient/Ticketprinter.php
+++ b/zmsclient/src/Zmsclient/Ticketprinter.php
@@ -1,4 +1,5 @@
getBasePath(),
null,
false
@@ -55,7 +56,7 @@ public static function setHomeUrl($url, $request)
setcookie(
self::HOME_URL_COOKIE_NAME,
$url,
- time() + (60*60*24*365*10),
+ time() + (60 * 60 * 24 * 365 * 10),
$request->getBasePath(),
null,
false,
diff --git a/zmsclient/src/Zmsclient/TwigExtension.php b/zmsclient/src/Zmsclient/TwigExtension.php
index f8b5bfa6d..33e963d4b 100644
--- a/zmsclient/src/Zmsclient/TwigExtension.php
+++ b/zmsclient/src/Zmsclient/TwigExtension.php
@@ -1,4 +1,5 @@
HTTP API-Log'
- .' For debugging: This log contains HTTP calls. DISABLE FOR PRODUCTION!
';
+ . ' For debugging: This log contains HTTP calls. DISABLE FOR PRODUCTION!
';
foreach (Http::$log as $entry) {
if ($entry instanceof \Psr\Http\Message\RequestInterface) {
$entry = $this->formatRequest($entry);
@@ -62,7 +63,7 @@ protected function parseBody($body, $allowEmpty = false)
if ($content->hasFailed() && !$allowEmpty) {
$output =
'API-Call failed, JSON parsing with error: ' . $content->getMessages()
- . ' - Snippet: ' .substr(\strip_tags((string)$body), 0, 2000) . '...'
+ . ' - Snippet: ' . substr(\strip_tags((string)$body), 0, 2000) . '...'
;
} else {
$output = $content->getValue();
diff --git a/zmsclient/src/Zmsclient/WorkstationRequests.php b/zmsclient/src/Zmsclient/WorkstationRequests.php
index 489b0cdbd..1fa22b8d6 100644
--- a/zmsclient/src/Zmsclient/WorkstationRequests.php
+++ b/zmsclient/src/Zmsclient/WorkstationRequests.php
@@ -53,7 +53,7 @@ public function setDifferentScope(\BO\Zmsentities\Scope $scope): self
public function readDepartment(): \BO\Zmsentities\Department
{
if (!$this->department) {
- $this->department = $this->http->readGetResult('/scope/'. $this->scope['id'] .'/department/')
+ $this->department = $this->http->readGetResult('/scope/' . $this->scope['id'] . '/department/')
->getEntity();
}
return $this->department ? $this->department : new \BO\Zmsentities\Department();
@@ -62,7 +62,7 @@ public function readDepartment(): \BO\Zmsentities\Department
public function readCluster(): \BO\Zmsentities\Cluster
{
if (!$this->cluster) {
- $this->cluster = $this->http->readGetResult('/scope/'. $this->scope['id'] .'/cluster/')
+ $this->cluster = $this->http->readGetResult('/scope/' . $this->scope['id'] . '/cluster/')
->getEntity();
}
return $this->cluster ? $this->cluster : new \BO\Zmsentities\Cluster();
@@ -71,11 +71,11 @@ public function readCluster(): \BO\Zmsentities\Cluster
public function readProcessListByDate(
\DateTimeInterface $selectedDate,
$gql = ""
- ) : \BO\Zmsentities\Collection\ProcessList {
+ ): \BO\Zmsentities\Collection\ProcessList {
if ($this->workstation->isClusterEnabled()) {
$processList = $this->http
->readGetResult(
- '/cluster/'. $this->readCluster()->id .'/process/'. $selectedDate->format('Y-m-d') .'/',
+ '/cluster/' . $this->readCluster()->id . '/process/' . $selectedDate->format('Y-m-d') . '/',
[
'resolveReferences' => 2,
'gql' => $gql
@@ -85,7 +85,7 @@ public function readProcessListByDate(
} else {
$processList = $this->http
->readGetResult(
- '/scope/'. $this->scope['id'] .'/process/'. $selectedDate->format('Y-m-d') .'/',
+ '/scope/' . $this->scope['id'] . '/process/' . $selectedDate->format('Y-m-d') . '/',
[
'resolveReferences' => 2,
'gql' => $gql
@@ -101,12 +101,12 @@ public function readNextProcess($excludedIds)
{
if ($this->workstation->isClusterEnabled()) {
$process = $this->http
- ->readGetResult('/cluster/'. $this->cluster['id'] .'/queue/next/', ['exclude' => $excludedIds])
+ ->readGetResult('/cluster/' . $this->cluster['id'] . '/queue/next/', ['exclude' => $excludedIds])
->getEntity();
} else {
$process = $this->http
->readGetResult(
- '/scope/'. $this->scope['id'] .'/queue/next/',
+ '/scope/' . $this->scope['id'] . '/queue/next/',
['exclude' => $excludedIds]
)
->getEntity();
diff --git a/zmsdb/.gitignore b/zmsdb/.gitignore
index de8c8f1e2..aaa90612f 100644
--- a/zmsdb/.gitignore
+++ b/zmsdb/.gitignore
@@ -5,4 +5,5 @@ tags
public
.DS_*
testdataset.sql.gz
-.phpunit.result.cache
\ No newline at end of file
+.phpunit.result.cache
+coverage
\ No newline at end of file
diff --git a/zmsdb/.gitlab-ci.yml b/zmsdb/.gitlab-ci.yml
index f8044bd22..8700a788e 100644
--- a/zmsdb/.gitlab-ci.yml
+++ b/zmsdb/.gitlab-ci.yml
@@ -6,7 +6,7 @@ test-php-80:
cache: []
allow_failure: false
services:
- - name: mariadb:10.3
+ - name: mariadb:10.11
alias: mysql
command: ["mysqld", "--general-log=1", "--general-log-file=/var/log/mysql/general.log"]
before_script:
diff --git a/zmsdb/composer.json b/zmsdb/composer.json
index 90773c2ad..afe23f6e2 100644
--- a/zmsdb/composer.json
+++ b/zmsdb/composer.json
@@ -20,6 +20,9 @@
"config": {
"platform": {
"php": "8.0"
+ },
+ "allow-plugins": {
+ "php-http/discovery": true
}
},
"require": {
@@ -31,6 +34,9 @@
"eappointment/zmsentities": "@dev",
"eappointment/zmsdldb": "@dev",
"eappointment/mellon": "@dev",
+ "eappointment/zmsslim": "@dev",
+ "eappointment/zmsclient": "@dev",
+ "eappointment/zmsapi": "@dev",
"ext-pdo": "*",
"aura/sql": "^4",
"solution10/sql": "^1.3"
@@ -72,8 +78,8 @@
},
"require-dev": {
"phpunit/phpunit": "^9.5.4",
- "phpmd/phpmd": "^2.3",
- "squizlabs/php_codesniffer": "^2.4",
+ "phpmd/phpmd": "@stable",
+ "squizlabs/php_codesniffer": "^3.5",
"mockery/mockery": "^0.9.4"
}
-}
\ No newline at end of file
+}
diff --git a/zmsdb/composer.lock b/zmsdb/composer.lock
index e95e32d04..8a0032e9f 100644
--- a/zmsdb/composer.lock
+++ b/zmsdb/composer.lock
@@ -4,8 +4,56 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "4fc1381d1162caddf3094ffa354ea22c",
+ "content-hash": "e23ac42e71a563ebd23edf52d8495dc0",
"packages": [
+ {
+ "name": "aronduby/dump",
+ "version": "0.9.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/aronduby/dump.git",
+ "reference": "8b3eb9b54248d520e7ad2f9f1295e2862056fb28"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/aronduby/dump/zipball/8b3eb9b54248d520e7ad2f9f1295e2862056fb28",
+ "reference": "8b3eb9b54248d520e7ad2f9f1295e2862056fb28",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "": "src/",
+ "D\\": "src/D/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "authors": [
+ {
+ "name": "Aron Duby",
+ "email": "aron.duby@gmail.com"
+ }
+ ],
+ "description": "D::ump - a PHP 5.4 print_r/var_dump replacement base on Krumo",
+ "keywords": [
+ "debug",
+ "debugging",
+ "dump",
+ "krumo",
+ "pretty",
+ "print",
+ "print_r",
+ "var_dump"
+ ],
+ "support": {
+ "issues": "https://github.com/aronduby/dump/issues",
+ "source": "https://github.com/aronduby/dump/tree/0.9.1"
+ },
+ "time": "2016-09-30T05:02:34+00:00"
+ },
{
"name": "aura/sql",
"version": "4.0.0",
@@ -64,13 +112,79 @@
},
"time": "2021-11-24T05:03:25+00:00"
},
+ {
+ "name": "clue/stream-filter",
+ "version": "v1.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/clue/stream-filter.git",
+ "reference": "049509fef80032cb3f051595029ab75b49a3c2f7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/clue/stream-filter/zipball/049509fef80032cb3f051595029ab75b49a3c2f7",
+ "reference": "049509fef80032cb3f051595029ab75b49a3c2f7",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "Clue\\StreamFilter\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering"
+ }
+ ],
+ "description": "A simple and modern approach to stream filtering in PHP",
+ "homepage": "https://github.com/clue/stream-filter",
+ "keywords": [
+ "bucket brigade",
+ "callback",
+ "filter",
+ "php_user_filter",
+ "stream",
+ "stream_filter_append",
+ "stream_filter_register"
+ ],
+ "support": {
+ "issues": "https://github.com/clue/stream-filter/issues",
+ "source": "https://github.com/clue/stream-filter/tree/v1.7.0"
+ },
+ "funding": [
+ {
+ "url": "https://clue.engineering/support",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/clue",
+ "type": "github"
+ }
+ ],
+ "time": "2023-12-20T15:40:13+00:00"
+ },
{
"name": "eappointment/mellon",
- "version": "dev-roave-test-2",
+ "version": "dev-feat-zms-3414-enable-php-code-quality-checks-github-actions",
"dist": {
"type": "path",
"url": "../mellon",
- "reference": "132bd01dbec27ad473955fb9bb3d410515f9c98f"
+ "reference": "6e9ba83636118c9140a962e109145b83da27cb02"
},
"require": {
"ext-json": ">=0",
@@ -112,15 +226,150 @@
"relative": true
}
},
+ {
+ "name": "eappointment/zmsapi",
+ "version": "dev-feat-zms-3414-enable-php-code-quality-checks-github-actions",
+ "dist": {
+ "type": "path",
+ "url": "../zmsapi",
+ "reference": "6e9ba83636118c9140a962e109145b83da27cb02"
+ },
+ "require": {
+ "eappointment/mellon": "@dev",
+ "eappointment/zmsclient": "@dev",
+ "eappointment/zmsdb": "@dev",
+ "eappointment/zmsdldb": "@dev",
+ "eappointment/zmsentities": "@dev",
+ "eappointment/zmsslim": "@dev",
+ "league/climate": "^3.2",
+ "monolog/monolog": "1.*",
+ "ulrichsg/getopt-php": "^2.3"
+ },
+ "require-dev": {
+ "aronduby/dump": "*",
+ "helmich/phpunit-psr7-assert": "^4.3.0",
+ "mockery/mockery": "^0.9.4",
+ "phpmd/phpmd": "@stable",
+ "phpunit/phpunit": "^9.5.4",
+ "squizlabs/php_codesniffer": "*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "BO\\Zmsapi\\": "src/Zmsapi/",
+ "BO\\Zmsapi\\Tests\\": "tests/Zmsapi/"
+ }
+ },
+ "scripts": {
+ "clean": [
+ "rm -f public/doc/assets/*.* && rm -f public/_test/assets/*.*"
+ ],
+ "command": [
+ "bin/configure"
+ ],
+ "wget-files": [
+ "wget https://eappointment.gitlab.io/zmsapi/doc/swagger.json -O public/doc/swagger.json",
+ "wget https://eappointment.gitlab.io/zmsapi/doc/assets/redoc.min.js -O public/doc/assets/redoc.min.js",
+ "wget https://eappointment.gitlab.io/zmsapi/_test/assets/swagger-ui-bundle.js -O public/_test/assets/swagger-ui-bundle.js",
+ "wget https://eappointment.gitlab.io/zmsapi/_test/assets/swagger-ui.css -O public/_test/assets/swagger-ui.css",
+ "wget https://eappointment.gitlab.io/zmsapi/_test/assets/swagger-ui-standalone-preset.js -O public/_test/assets/swagger-ui-standalone-preset.js",
+ "sha256sum --status -c checksums.txt"
+ ],
+ "post-install-cmd": [
+ "@wget-files"
+ ],
+ "post-update-cmd": [
+ "@wget-files"
+ ]
+ },
+ "license": [
+ "EUPL-1.2"
+ ],
+ "authors": [
+ {
+ "name": "Mathias Fischer",
+ "email": "mathias.fischer@berlinonline.de"
+ }
+ ],
+ "description": "This application offers a REST-like interface for ZMS functions and database access.",
+ "transport-options": {
+ "symlink": true,
+ "relative": true
+ }
+ },
+ {
+ "name": "eappointment/zmsclient",
+ "version": "dev-feat-zms-3414-enable-php-code-quality-checks-github-actions",
+ "dist": {
+ "type": "path",
+ "url": "../zmsclient",
+ "reference": "f37d3a5ad27043e12c9d5ebd3dc40c7b660456d6"
+ },
+ "require": {
+ "aronduby/dump": "^0.9",
+ "eappointment/mellon": "@dev",
+ "eappointment/zmsentities": "@dev",
+ "eappointment/zmsslim": "@dev",
+ "ext-curl": ">=0",
+ "ext-json": ">=1.0",
+ "ext-mbstring": ">=0",
+ "ext-pcre": ">=0",
+ "php": ">=7.3.0",
+ "php-http/curl-client": "^2.2",
+ "psr/http-message": "^1.0",
+ "slim/psr7": "^1.5",
+ "tracy/tracy": "^2.9",
+ "twig/twig": "3.*"
+ },
+ "require-dev": {
+ "helmich/phpunit-psr7-assert": "^4.3.0",
+ "phpmd/phpmd": "@stable",
+ "phpspec/prophecy-phpunit": "^2.0.0",
+ "phpunit/phpunit": "^9.5.4",
+ "squizlabs/php_codesniffer": "*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "BO\\Zmsclient\\": "src/Zmsclient/",
+ "BO\\Zmsclient\\Tests\\": "tests/Zmsclient/"
+ }
+ },
+ "scripts": {
+ "command": [
+ "bin/configure"
+ ]
+ },
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Mathias Fischer",
+ "email": "mathias.fischer@berlinonline.de"
+ }
+ ],
+ "description": "Use this library to fetch data from the eappointment API via HTTP.",
+ "transport-options": {
+ "symlink": true,
+ "relative": true
+ }
+ },
{
"name": "eappointment/zmsdldb",
- "version": "dev-roave-test-2",
+ "version": "dev-feat-zms-3414-enable-php-code-quality-checks-github-actions",
"dist": {
"type": "path",
"url": "../zmsdldb",
- "reference": "132bd01dbec27ad473955fb9bb3d410515f9c98f"
+ "reference": "6e9ba83636118c9140a962e109145b83da27cb02"
},
"require": {
+ "eappointment/mellon": "@dev",
+ "eappointment/zmsapi": "@dev",
+ "eappointment/zmsclient": "@dev",
+ "eappointment/zmsdb": "@dev",
+ "eappointment/zmsentities": "@dev",
+ "eappointment/zmsslim": "@dev",
"ext-curl": ">=0",
"ext-json": ">=1.0",
"ext-mbstring": ">=0",
@@ -175,11 +424,11 @@
},
{
"name": "eappointment/zmsentities",
- "version": "dev-roave-test-2",
+ "version": "dev-feat-zms-3414-enable-php-code-quality-checks-github-actions",
"dist": {
"type": "path",
"url": "../zmsentities",
- "reference": "132bd01dbec27ad473955fb9bb3d410515f9c98f"
+ "reference": "6e9ba83636118c9140a962e109145b83da27cb02"
},
"require": {
"eappointment/mellon": "@dev",
@@ -201,7 +450,7 @@
"league/json-reference": "^1.0",
"phpmd/phpmd": "@stable",
"phpunit/phpunit": "^9.6",
- "squizlabs/php_codesniffer": "^3.5.8",
+ "squizlabs/php_codesniffer": "*",
"yuloh/json-guard-cli": "^0.3.0"
},
"type": "library",
@@ -232,111 +481,94 @@
}
},
{
- "name": "giggsey/libphonenumber-for-php",
- "version": "8.13.23",
- "source": {
- "type": "git",
- "url": "https://github.com/giggsey/libphonenumber-for-php.git",
- "reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480"
- },
+ "name": "eappointment/zmsslim",
+ "version": "dev-feat-zms-3414-enable-php-code-quality-checks-github-actions",
"dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/b2dff83693cb46eb4478b193e9d94e2ff6258480",
- "reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480",
- "shasum": ""
+ "type": "path",
+ "url": "../zmsslim",
+ "reference": "6e9ba83636118c9140a962e109145b83da27cb02"
},
"require": {
- "giggsey/locale": "^1.7|^2.0",
- "php": ">=5.3.2",
- "symfony/polyfill-mbstring": "^1.17"
+ "eappointment/mellon": "@dev",
+ "ext-json": "*",
+ "ext-posix": "*",
+ "monolog/monolog": "1.*",
+ "php": ">=7.3.0",
+ "slim/http-cache": "1.*",
+ "slim/psr7": "^1.5",
+ "slim/slim": "4.*",
+ "slim/twig-view": "3.*",
+ "stevenmaguire/oauth2-keycloak": "^4.0",
+ "symfony/translation": "^5.2",
+ "symfony/twig-bridge": "^5.2",
+ "tracy/tracy": "^2.9",
+ "twig/twig": "3.*"
+ },
+ "provide": {
+ "psr/container-implementation": "2.0"
},
"require-dev": {
- "pear/pear-core-minimal": "^1.9",
- "pear/pear_exception": "^1.0",
- "pear/versioncontrol_git": "^0.5",
- "phing/phing": "^2.7",
- "php-coveralls/php-coveralls": "^1.0|^2.0",
- "symfony/console": "^2.8|^3.0|^v4.4|^v5.2",
- "symfony/phpunit-bridge": "^4.2 || ^5"
+ "helmich/phpunit-psr7-assert": "^4.3.0",
+ "phpmd/phpmd": "@stable",
+ "phpunit/phpunit": "^9.5.4",
+ "squizlabs/php_codesniffer": "*"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "8.x-dev"
- }
- },
"autoload": {
"psr-4": {
- "libphonenumber\\": "src/"
- },
- "exclude-from-classmap": [
- "/src/data/",
- "/src/carrier/data/",
- "/src/geocoding/data/",
- "/src/timezone/data/"
+ "BO\\Slim\\": "src/Slim/",
+ "BO\\Slim\\Tests\\": "tests/Slim/"
+ }
+ },
+ "scripts": {
+ "command": [
+ "bin/configure"
]
},
- "notification-url": "https://packagist.org/downloads/",
"license": [
- "Apache-2.0"
+ "MIT"
],
"authors": [
{
- "name": "Joshua Gigg",
- "email": "giggsey@gmail.com",
- "homepage": "https://giggsey.com/"
+ "name": "Mathias Fischer",
+ "email": "mathias.fischer@berlinonline.de"
}
],
- "description": "PHP Port of Google's libphonenumber",
- "homepage": "https://github.com/giggsey/libphonenumber-for-php",
- "keywords": [
- "geocoding",
- "geolocation",
- "libphonenumber",
- "mobile",
- "phonenumber",
- "validation"
- ],
- "support": {
- "issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
- "source": "https://github.com/giggsey/libphonenumber-for-php"
- },
- "time": "2023-10-11T07:12:56+00:00"
+ "description": "Basic configuration for a slim framework",
+ "transport-options": {
+ "symlink": true,
+ "relative": true
+ }
},
{
- "name": "giggsey/locale",
- "version": "2.4",
+ "name": "fig/http-message-util",
+ "version": "1.1.5",
"source": {
"type": "git",
- "url": "https://github.com/giggsey/Locale.git",
- "reference": "a6b33dfc9e8949b7e28133c4628b29cd9f1850bb"
+ "url": "https://github.com/php-fig/http-message-util.git",
+ "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/giggsey/Locale/zipball/a6b33dfc9e8949b7e28133c4628b29cd9f1850bb",
- "reference": "a6b33dfc9e8949b7e28133c4628b29cd9f1850bb",
+ "url": "https://api.github.com/repos/php-fig/http-message-util/zipball/9d94dc0154230ac39e5bf89398b324a86f63f765",
+ "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765",
"shasum": ""
},
"require": {
- "php": ">=7.2"
+ "php": "^5.3 || ^7.0 || ^8.0"
},
- "require-dev": {
- "ext-json": "*",
- "pear/pear-core-minimal": "^1.9",
- "pear/pear_exception": "^1.0",
- "pear/versioncontrol_git": "^0.5",
- "phing/phing": "^2.7",
- "php-coveralls/php-coveralls": "^2.0",
- "phpunit/phpunit": "^8.5|^9.5",
- "symfony/console": "^5.0|^6.0",
- "symfony/filesystem": "^5.0|^6.0",
- "symfony/finder": "^5.0|^6.0",
- "symfony/process": "^5.0|^6.0"
+ "suggest": {
+ "psr/http-message": "The package containing the PSR-7 interfaces"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
- "Giggsey\\Locale\\": "src/"
+ "Fig\\Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -345,9 +577,205 @@
],
"authors": [
{
- "name": "Joshua Gigg",
- "email": "giggsey@gmail.com",
- "homepage": "https://giggsey.com/"
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Utility classes and constants for use with PSR-7 (psr/http-message)",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "issues": "https://github.com/php-fig/http-message-util/issues",
+ "source": "https://github.com/php-fig/http-message-util/tree/1.1.5"
+ },
+ "time": "2020-11-24T22:02:12+00:00"
+ },
+ {
+ "name": "firebase/php-jwt",
+ "version": "v6.10.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/firebase/php-jwt.git",
+ "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+ "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^8.0"
+ },
+ "require-dev": {
+ "guzzlehttp/guzzle": "^7.4",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpunit/phpunit": "^9.5",
+ "psr/cache": "^2.0||^3.0",
+ "psr/http-client": "^1.0",
+ "psr/http-factory": "^1.0"
+ },
+ "suggest": {
+ "ext-sodium": "Support EdDSA (Ed25519) signatures",
+ "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Firebase\\JWT\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Neuman Vong",
+ "email": "neuman+pear@twilio.com",
+ "role": "Developer"
+ },
+ {
+ "name": "Anant Narayanan",
+ "email": "anant@php.net",
+ "role": "Developer"
+ }
+ ],
+ "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+ "homepage": "https://github.com/firebase/php-jwt",
+ "keywords": [
+ "jwt",
+ "php"
+ ],
+ "support": {
+ "issues": "https://github.com/firebase/php-jwt/issues",
+ "source": "https://github.com/firebase/php-jwt/tree/v6.10.2"
+ },
+ "time": "2024-11-24T11:22:49+00:00"
+ },
+ {
+ "name": "giggsey/libphonenumber-for-php",
+ "version": "8.13.23",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/giggsey/libphonenumber-for-php.git",
+ "reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/b2dff83693cb46eb4478b193e9d94e2ff6258480",
+ "reference": "b2dff83693cb46eb4478b193e9d94e2ff6258480",
+ "shasum": ""
+ },
+ "require": {
+ "giggsey/locale": "^1.7|^2.0",
+ "php": ">=5.3.2",
+ "symfony/polyfill-mbstring": "^1.17"
+ },
+ "require-dev": {
+ "pear/pear-core-minimal": "^1.9",
+ "pear/pear_exception": "^1.0",
+ "pear/versioncontrol_git": "^0.5",
+ "phing/phing": "^2.7",
+ "php-coveralls/php-coveralls": "^1.0|^2.0",
+ "symfony/console": "^2.8|^3.0|^v4.4|^v5.2",
+ "symfony/phpunit-bridge": "^4.2 || ^5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "8.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "libphonenumber\\": "src/"
+ },
+ "exclude-from-classmap": [
+ "/src/data/",
+ "/src/carrier/data/",
+ "/src/geocoding/data/",
+ "/src/timezone/data/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Joshua Gigg",
+ "email": "giggsey@gmail.com",
+ "homepage": "https://giggsey.com/"
+ }
+ ],
+ "description": "PHP Port of Google's libphonenumber",
+ "homepage": "https://github.com/giggsey/libphonenumber-for-php",
+ "keywords": [
+ "geocoding",
+ "geolocation",
+ "libphonenumber",
+ "mobile",
+ "phonenumber",
+ "validation"
+ ],
+ "support": {
+ "issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
+ "source": "https://github.com/giggsey/libphonenumber-for-php"
+ },
+ "time": "2023-10-11T07:12:56+00:00"
+ },
+ {
+ "name": "giggsey/locale",
+ "version": "2.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/giggsey/Locale.git",
+ "reference": "a6b33dfc9e8949b7e28133c4628b29cd9f1850bb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/giggsey/Locale/zipball/a6b33dfc9e8949b7e28133c4628b29cd9f1850bb",
+ "reference": "a6b33dfc9e8949b7e28133c4628b29cd9f1850bb",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2"
+ },
+ "require-dev": {
+ "ext-json": "*",
+ "pear/pear-core-minimal": "^1.9",
+ "pear/pear_exception": "^1.0",
+ "pear/versioncontrol_git": "^0.5",
+ "phing/phing": "^2.7",
+ "php-coveralls/php-coveralls": "^2.0",
+ "phpunit/phpunit": "^8.5|^9.5",
+ "symfony/console": "^5.0|^6.0",
+ "symfony/filesystem": "^5.0|^6.0",
+ "symfony/finder": "^5.0|^6.0",
+ "symfony/process": "^5.0|^6.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Giggsey\\Locale\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Joshua Gigg",
+ "email": "giggsey@gmail.com",
+ "homepage": "https://giggsey.com/"
}
],
"description": "Locale functions required by libphonenumber-for-php",
@@ -355,47 +783,1476 @@
"issues": "https://github.com/giggsey/Locale/issues",
"source": "https://github.com/giggsey/Locale/tree/2.4"
},
- "time": "2023-04-13T07:40:58+00:00"
+ "time": "2023-04-13T07:40:58+00:00"
+ },
+ {
+ "name": "guzzlehttp/guzzle",
+ "version": "7.9.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/guzzle.git",
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+ "guzzlehttp/psr7": "^2.7.0",
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-client": "^1.0",
+ "symfony/deprecation-contracts": "^2.2 || ^3.0"
+ },
+ "provide": {
+ "psr/http-client-implementation": "1.0"
+ },
+ "require-dev": {
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "ext-curl": "*",
+ "guzzle/client-integration-tests": "3.0.2",
+ "php-http/message-factory": "^1.1",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20",
+ "psr/log": "^1.1 || ^2.0 || ^3.0"
+ },
+ "suggest": {
+ "ext-curl": "Required for CURL handler support",
+ "ext-intl": "Required for Internationalized Domain Name (IDN) support",
+ "psr/log": "Required for using the Log middleware"
+ },
+ "type": "library",
+ "extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "GuzzleHttp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Jeremy Lindblom",
+ "email": "jeremeamia@gmail.com",
+ "homepage": "https://github.com/jeremeamia"
+ },
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://github.com/sagikazarmark"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
+ }
+ ],
+ "description": "Guzzle is a PHP HTTP client library",
+ "keywords": [
+ "client",
+ "curl",
+ "framework",
+ "http",
+ "http client",
+ "psr-18",
+ "psr-7",
+ "rest",
+ "web service"
+ ],
+ "support": {
+ "issues": "https://github.com/guzzle/guzzle/issues",
+ "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-07-24T11:22:20+00:00"
+ },
+ {
+ "name": "guzzlehttp/promises",
+ "version": "2.0.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/promises.git",
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2.5 || ^8.0"
+ },
+ "require-dev": {
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
+ },
+ "type": "library",
+ "extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Promise\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
+ }
+ ],
+ "description": "Guzzle promises library",
+ "keywords": [
+ "promise"
+ ],
+ "support": {
+ "issues": "https://github.com/guzzle/promises/issues",
+ "source": "https://github.com/guzzle/promises/tree/2.0.4"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-10-17T10:06:22+00:00"
+ },
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "2.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2.5 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.1 || ^2.0",
+ "ralouphie/getallheaders": "^3.0"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "bamarni/composer-bin-plugin": "^1.8.2",
+ "http-interop/http-factory-tests": "0.9.0",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
+ },
+ "suggest": {
+ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+ },
+ "type": "library",
+ "extra": {
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Psr7\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Graham Campbell",
+ "email": "hello@gjcampbell.co.uk",
+ "homepage": "https://github.com/GrahamCampbell"
+ },
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "George Mponos",
+ "email": "gmponos@gmail.com",
+ "homepage": "https://github.com/gmponos"
+ },
+ {
+ "name": "Tobias Nyholm",
+ "email": "tobias.nyholm@gmail.com",
+ "homepage": "https://github.com/Nyholm"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://github.com/sagikazarmark"
+ },
+ {
+ "name": "Tobias Schultze",
+ "email": "webmaster@tubo-world.de",
+ "homepage": "https://github.com/Tobion"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
+ }
+ ],
+ "description": "PSR-7 message implementation that also provides common utility methods",
+ "keywords": [
+ "http",
+ "message",
+ "psr-7",
+ "request",
+ "response",
+ "stream",
+ "uri",
+ "url"
+ ],
+ "support": {
+ "issues": "https://github.com/guzzle/psr7/issues",
+ "source": "https://github.com/guzzle/psr7/tree/2.7.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/GrahamCampbell",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/Nyholm",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-07-18T11:15:46+00:00"
+ },
+ {
+ "name": "league/climate",
+ "version": "3.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/climate.git",
+ "reference": "237f70e1032b16d32ff3f65dcda68706911e1c74"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/climate/zipball/237f70e1032b16d32ff3f65dcda68706911e1c74",
+ "reference": "237f70e1032b16d32ff3f65dcda68706911e1c74",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.3 || ^8.0",
+ "psr/log": "^1.0 || ^2.0 || ^3.0",
+ "seld/cli-prompt": "^1.0"
+ },
+ "require-dev": {
+ "mikey179/vfsstream": "^1.6.12",
+ "mockery/mockery": "^1.6.12",
+ "phpunit/phpunit": "^9.5.10",
+ "squizlabs/php_codesniffer": "^3.10"
+ },
+ "suggest": {
+ "ext-mbstring": "If ext-mbstring is not available you MUST install symfony/polyfill-mbstring"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\CLImate\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Joe Tannenbaum",
+ "email": "hey@joe.codes",
+ "homepage": "http://joe.codes/",
+ "role": "Developer"
+ },
+ {
+ "name": "Craig Duncan",
+ "email": "git@duncanc.co.uk",
+ "homepage": "https://github.com/duncan3dc",
+ "role": "Developer"
+ }
+ ],
+ "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
+ "keywords": [
+ "cli",
+ "colors",
+ "command",
+ "php",
+ "terminal"
+ ],
+ "support": {
+ "issues": "https://github.com/thephpleague/climate/issues",
+ "source": "https://github.com/thephpleague/climate/tree/3.10.0"
+ },
+ "time": "2024-11-18T09:09:55+00:00"
+ },
+ {
+ "name": "league/html-to-markdown",
+ "version": "5.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/html-to-markdown.git",
+ "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0b4066eede55c48f38bcee4fb8f0aa85654390fd",
+ "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-xml": "*",
+ "php": "^7.2.5 || ^8.0"
+ },
+ "require-dev": {
+ "mikehaertl/php-shellcommand": "^1.1.0",
+ "phpstan/phpstan": "^1.8.8",
+ "phpunit/phpunit": "^8.5 || ^9.2",
+ "scrutinizer/ocular": "^1.6",
+ "unleashedtech/php-coding-standard": "^2.7 || ^3.0",
+ "vimeo/psalm": "^4.22 || ^5.0"
+ },
+ "bin": [
+ "bin/html-to-markdown"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.2-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "League\\HTMLToMarkdown\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Colin O'Dell",
+ "email": "colinodell@gmail.com",
+ "homepage": "https://www.colinodell.com",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Nick Cernis",
+ "email": "nick@cern.is",
+ "homepage": "http://modernnerd.net",
+ "role": "Original Author"
+ }
+ ],
+ "description": "An HTML-to-markdown conversion helper for PHP",
+ "homepage": "https://github.com/thephpleague/html-to-markdown",
+ "keywords": [
+ "html",
+ "markdown"
+ ],
+ "support": {
+ "issues": "https://github.com/thephpleague/html-to-markdown/issues",
+ "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.1"
+ },
+ "funding": [
+ {
+ "url": "https://www.colinodell.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.paypal.me/colinpodell/10.00",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/colinodell",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/league/html-to-markdown",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-07-12T21:21:09+00:00"
+ },
+ {
+ "name": "league/json-guard",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/json-guard.git",
+ "reference": "596059d2c013bcea1a8a1386bd0e60d32ef39eb9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/json-guard/zipball/596059d2c013bcea1a8a1386bd0e60d32ef39eb9",
+ "reference": "596059d2c013bcea1a8a1386bd0e60d32ef39eb9",
+ "shasum": ""
+ },
+ "require": {
+ "ext-bcmath": "*",
+ "php": ">=5.6.0",
+ "psr/container": "^1.0"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "json-schema/json-schema-test-suite": "1.2.0",
+ "league/json-reference": "1.0.0",
+ "phpunit/phpunit": "4.*",
+ "scrutinizer/ocular": "~1.1",
+ "squizlabs/php_codesniffer": "~2.3"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/functions.php"
+ ],
+ "psr-4": {
+ "League\\JsonGuard\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Matthew Allan",
+ "email": "matthew.james.allan@gmail.com",
+ "homepage": "https://mattallan.org",
+ "role": "Developer"
+ }
+ ],
+ "description": "A validator for JSON using json-schema.",
+ "homepage": "https://github.com/thephpleague/json-guard",
+ "keywords": [
+ "json",
+ "json-schema",
+ "json-schema.org",
+ "schema",
+ "validation"
+ ],
+ "support": {
+ "issues": "https://github.com/thephpleague/json-guard/issues",
+ "source": "https://github.com/thephpleague/json-guard/tree/master"
+ },
+ "abandoned": true,
+ "time": "2017-05-03T21:12:30+00:00"
+ },
+ {
+ "name": "league/oauth2-client",
+ "version": "2.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/thephpleague/oauth2-client.git",
+ "reference": "3d5cf8d0543731dfb725ab30e4d7289891991e13"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/3d5cf8d0543731dfb725ab30e4d7289891991e13",
+ "reference": "3d5cf8d0543731dfb725ab30e4d7289891991e13",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
+ "php": "^7.1 || >=8.0.0 <8.5.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^1.3.5",
+ "php-parallel-lint/php-parallel-lint": "^1.4",
+ "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+ "squizlabs/php_codesniffer": "^3.11"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "League\\OAuth2\\Client\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Alex Bilbie",
+ "email": "hello@alexbilbie.com",
+ "homepage": "http://www.alexbilbie.com",
+ "role": "Developer"
+ },
+ {
+ "name": "Woody Gilk",
+ "homepage": "https://github.com/shadowhand",
+ "role": "Contributor"
+ }
+ ],
+ "description": "OAuth 2.0 Client Library",
+ "keywords": [
+ "Authentication",
+ "SSO",
+ "authorization",
+ "identity",
+ "idp",
+ "oauth",
+ "oauth2",
+ "single sign on"
+ ],
+ "support": {
+ "issues": "https://github.com/thephpleague/oauth2-client/issues",
+ "source": "https://github.com/thephpleague/oauth2-client/tree/2.8.0"
+ },
+ "time": "2024-12-11T05:05:52+00:00"
+ },
+ {
+ "name": "monolog/monolog",
+ "version": "1.27.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "904713c5929655dc9b97288b69cfeedad610c9a1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1",
+ "reference": "904713c5929655dc9b97288b69cfeedad610c9a1",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0",
+ "psr/log": "~1.0"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0.0"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
+ "php-amqplib/php-amqplib": "~2.4",
+ "php-console/php-console": "^3.1.3",
+ "phpstan/phpstan": "^0.12.59",
+ "phpunit/phpunit": "~4.5",
+ "ruflin/elastica": ">=0.90 <3.0",
+ "sentry/sentry": "^0.13",
+ "swiftmailer/swiftmailer": "^5.3|^6.0"
+ },
+ "suggest": {
+ "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+ "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+ "ext-mongo": "Allow sending log messages to a MongoDB server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+ "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+ "php-console/php-console": "Allow sending log messages to Google Chrome",
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "sentry/sentry": "Allow sending log messages to a Sentry server"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Monolog\\": "src/Monolog"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+ "homepage": "http://github.com/Seldaek/monolog",
+ "keywords": [
+ "log",
+ "logging",
+ "psr-3"
+ ],
+ "support": {
+ "issues": "https://github.com/Seldaek/monolog/issues",
+ "source": "https://github.com/Seldaek/monolog/tree/1.27.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/Seldaek",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2022-06-09T08:53:42+00:00"
+ },
+ {
+ "name": "nategood/httpful",
+ "version": "0.3.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nategood/httpful.git",
+ "reference": "0cded3ea97ba905600de9ceb9ef13f3ab681587c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nategood/httpful/zipball/0cded3ea97ba905600de9ceb9ef13f3ab681587c",
+ "reference": "0cded3ea97ba905600de9ceb9ef13f3ab681587c",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "php": ">=7.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Httpful": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nate Good",
+ "email": "me@nategood.com",
+ "homepage": "http://nategood.com"
+ }
+ ],
+ "description": "A Readable, Chainable, REST friendly, PHP HTTP Client",
+ "homepage": "http://github.com/nategood/httpful",
+ "keywords": [
+ "api",
+ "curl",
+ "http",
+ "requests",
+ "rest",
+ "restful"
+ ],
+ "support": {
+ "issues": "https://github.com/nategood/httpful/issues",
+ "source": "https://github.com/nategood/httpful/tree/v0.3.2"
+ },
+ "time": "2020-01-25T01:13:13+00:00"
+ },
+ {
+ "name": "nikic/fast-route",
+ "version": "v1.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nikic/FastRoute.git",
+ "reference": "181d480e08d9476e61381e04a71b34dc0432e812"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812",
+ "reference": "181d480e08d9476e61381e04a71b34dc0432e812",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35|~5.7"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/functions.php"
+ ],
+ "psr-4": {
+ "FastRoute\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Nikita Popov",
+ "email": "nikic@php.net"
+ }
+ ],
+ "description": "Fast request router for PHP",
+ "keywords": [
+ "router",
+ "routing"
+ ],
+ "support": {
+ "issues": "https://github.com/nikic/FastRoute/issues",
+ "source": "https://github.com/nikic/FastRoute/tree/master"
+ },
+ "time": "2018-02-13T20:26:39+00:00"
+ },
+ {
+ "name": "php-http/curl-client",
+ "version": "2.3.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-http/curl-client.git",
+ "reference": "f3eb48d266341afec0229a7a37a03521d3646b81"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-http/curl-client/zipball/f3eb48d266341afec0229a7a37a03521d3646b81",
+ "reference": "f3eb48d266341afec0229a7a37a03521d3646b81",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "php": "^7.4 || ^8.0",
+ "php-http/discovery": "^1.6",
+ "php-http/httplug": "^2.0",
+ "php-http/message": "^1.2",
+ "psr/http-client": "^1.0",
+ "psr/http-factory-implementation": "^1.0",
+ "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+ },
+ "provide": {
+ "php-http/async-client-implementation": "1.0",
+ "php-http/client-implementation": "1.0",
+ "psr/http-client-implementation": "1.0"
+ },
+ "require-dev": {
+ "guzzlehttp/psr7": "^2.0",
+ "laminas/laminas-diactoros": "^2.0 || ^3.0",
+ "php-http/client-integration-tests": "^3.0",
+ "php-http/message-factory": "^1.1",
+ "phpunit/phpunit": "^7.5 || ^9.4"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Http\\Client\\Curl\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Михаил Красильников",
+ "email": "m.krasilnikov@yandex.ru"
+ }
+ ],
+ "description": "PSR-18 and HTTPlug Async client with cURL",
+ "homepage": "http://php-http.org",
+ "keywords": [
+ "curl",
+ "http",
+ "psr-18"
+ ],
+ "support": {
+ "issues": "https://github.com/php-http/curl-client/issues",
+ "source": "https://github.com/php-http/curl-client/tree/2.3.3"
+ },
+ "time": "2024-10-31T07:36:58+00:00"
+ },
+ {
+ "name": "php-http/discovery",
+ "version": "1.20.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-http/discovery.git",
+ "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d",
+ "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d",
+ "shasum": ""
+ },
+ "require": {
+ "composer-plugin-api": "^1.0|^2.0",
+ "php": "^7.1 || ^8.0"
+ },
+ "conflict": {
+ "nyholm/psr7": "<1.0",
+ "zendframework/zend-diactoros": "*"
+ },
+ "provide": {
+ "php-http/async-client-implementation": "*",
+ "php-http/client-implementation": "*",
+ "psr/http-client-implementation": "*",
+ "psr/http-factory-implementation": "*",
+ "psr/http-message-implementation": "*"
+ },
+ "require-dev": {
+ "composer/composer": "^1.0.2|^2.0",
+ "graham-campbell/phpspec-skip-example-extension": "^5.0",
+ "php-http/httplug": "^1.0 || ^2.0",
+ "php-http/message-factory": "^1.0",
+ "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3",
+ "sebastian/comparator": "^3.0.5 || ^4.0.8",
+ "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "class": "Http\\Discovery\\Composer\\Plugin",
+ "plugin-optional": true
+ },
+ "autoload": {
+ "psr-4": {
+ "Http\\Discovery\\": "src/"
+ },
+ "exclude-from-classmap": [
+ "src/Composer/Plugin.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com"
+ }
+ ],
+ "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations",
+ "homepage": "http://php-http.org",
+ "keywords": [
+ "adapter",
+ "client",
+ "discovery",
+ "factory",
+ "http",
+ "message",
+ "psr17",
+ "psr7"
+ ],
+ "support": {
+ "issues": "https://github.com/php-http/discovery/issues",
+ "source": "https://github.com/php-http/discovery/tree/1.20.0"
+ },
+ "time": "2024-10-02T11:20:13+00:00"
+ },
+ {
+ "name": "php-http/httplug",
+ "version": "2.4.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-http/httplug.git",
+ "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4",
+ "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1 || ^8.0",
+ "php-http/promise": "^1.1",
+ "psr/http-client": "^1.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "require-dev": {
+ "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0",
+ "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Http\\Client\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Eric GELOEN",
+ "email": "geloen.eric@gmail.com"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com",
+ "homepage": "https://sagikazarmark.hu"
+ }
+ ],
+ "description": "HTTPlug, the HTTP client abstraction for PHP",
+ "homepage": "http://httplug.io",
+ "keywords": [
+ "client",
+ "http"
+ ],
+ "support": {
+ "issues": "https://github.com/php-http/httplug/issues",
+ "source": "https://github.com/php-http/httplug/tree/2.4.1"
+ },
+ "time": "2024-09-23T11:39:58+00:00"
+ },
+ {
+ "name": "php-http/message",
+ "version": "1.16.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-http/message.git",
+ "reference": "06dd5e8562f84e641bf929bfe699ee0f5ce8080a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-http/message/zipball/06dd5e8562f84e641bf929bfe699ee0f5ce8080a",
+ "reference": "06dd5e8562f84e641bf929bfe699ee0f5ce8080a",
+ "shasum": ""
+ },
+ "require": {
+ "clue/stream-filter": "^1.5",
+ "php": "^7.2 || ^8.0",
+ "psr/http-message": "^1.1 || ^2.0"
+ },
+ "provide": {
+ "php-http/message-factory-implementation": "1.0"
+ },
+ "require-dev": {
+ "ergebnis/composer-normalize": "^2.6",
+ "ext-zlib": "*",
+ "guzzlehttp/psr7": "^1.0 || ^2.0",
+ "laminas/laminas-diactoros": "^2.0 || ^3.0",
+ "php-http/message-factory": "^1.0.2",
+ "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1",
+ "slim/slim": "^3.0"
+ },
+ "suggest": {
+ "ext-zlib": "Used with compressor/decompressor streams",
+ "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories",
+ "laminas/laminas-diactoros": "Used with Diactoros Factories",
+ "slim/slim": "Used with Slim Framework PSR-7 implementation"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/filters.php"
+ ],
+ "psr-4": {
+ "Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com"
+ }
+ ],
+ "description": "HTTP Message related tools",
+ "homepage": "http://php-http.org",
+ "keywords": [
+ "http",
+ "message",
+ "psr-7"
+ ],
+ "support": {
+ "issues": "https://github.com/php-http/message/issues",
+ "source": "https://github.com/php-http/message/tree/1.16.2"
+ },
+ "time": "2024-10-02T11:34:13+00:00"
+ },
+ {
+ "name": "php-http/promise",
+ "version": "1.3.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-http/promise.git",
+ "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
+ "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1 || ^8.0"
+ },
+ "require-dev": {
+ "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3",
+ "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Http\\Promise\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Joel Wurtz",
+ "email": "joel.wurtz@gmail.com"
+ },
+ {
+ "name": "Márk Sági-Kazár",
+ "email": "mark.sagikazar@gmail.com"
+ }
+ ],
+ "description": "Promise used for asynchronous HTTP requests",
+ "homepage": "http://httplug.io",
+ "keywords": [
+ "promise"
+ ],
+ "support": {
+ "issues": "https://github.com/php-http/promise/issues",
+ "source": "https://github.com/php-http/promise/tree/1.3.1"
+ },
+ "time": "2024-03-15T13:55:21+00:00"
+ },
+ {
+ "name": "psr/container",
+ "version": "1.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/container.git",
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Psr\\Container\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common Container Interface (PHP FIG PSR-11)",
+ "homepage": "https://github.com/php-fig/container",
+ "keywords": [
+ "PSR-11",
+ "container",
+ "container-interface",
+ "container-interop",
+ "psr"
+ ],
+ "support": {
+ "issues": "https://github.com/php-fig/container/issues",
+ "source": "https://github.com/php-fig/container/tree/1.1.1"
+ },
+ "time": "2021-03-05T17:36:06+00:00"
+ },
+ {
+ "name": "psr/http-client",
+ "version": "1.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-client.git",
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.0 || ^8.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Client\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP clients",
+ "homepage": "https://github.com/php-fig/http-client",
+ "keywords": [
+ "http",
+ "http-client",
+ "psr",
+ "psr-18"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-client"
+ },
+ "time": "2023-09-23T14:17:50+00:00"
+ },
+ {
+ "name": "psr/http-factory",
+ "version": "1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+ "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-factory"
+ },
+ "time": "2024-04-15T12:06:14+00:00"
+ },
+ {
+ "name": "psr/http-message",
+ "version": "1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+ "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-message/tree/1.1"
+ },
+ "time": "2023-04-04T09:50:52+00:00"
+ },
+ {
+ "name": "psr/http-server-handler",
+ "version": "1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-server-handler.git",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0",
+ "psr/http-message": "^1.0 || ^2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP server-side request handler",
+ "keywords": [
+ "handler",
+ "http",
+ "http-interop",
+ "psr",
+ "psr-15",
+ "psr-7",
+ "request",
+ "response",
+ "server"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2"
+ },
+ "time": "2023-04-10T20:06:20+00:00"
+ },
+ {
+ "name": "psr/http-server-middleware",
+ "version": "1.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-server-middleware.git",
+ "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+ "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0",
+ "psr/http-message": "^1.0 || ^2.0",
+ "psr/http-server-handler": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Server\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP server-side middleware",
+ "keywords": [
+ "http",
+ "http-interop",
+ "middleware",
+ "psr",
+ "psr-15",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "issues": "https://github.com/php-fig/http-server-middleware/issues",
+ "source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2"
+ },
+ "time": "2023-04-11T06:14:47+00:00"
},
{
- "name": "league/html-to-markdown",
- "version": "5.1.1",
+ "name": "psr/log",
+ "version": "1.1.4",
"source": {
"type": "git",
- "url": "https://github.com/thephpleague/html-to-markdown.git",
- "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd"
+ "url": "https://github.com/php-fig/log.git",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0b4066eede55c48f38bcee4fb8f0aa85654390fd",
- "reference": "0b4066eede55c48f38bcee4fb8f0aa85654390fd",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": ""
},
"require": {
- "ext-dom": "*",
- "ext-xml": "*",
- "php": "^7.2.5 || ^8.0"
- },
- "require-dev": {
- "mikehaertl/php-shellcommand": "^1.1.0",
- "phpstan/phpstan": "^1.8.8",
- "phpunit/phpunit": "^8.5 || ^9.2",
- "scrutinizer/ocular": "^1.6",
- "unleashedtech/php-coding-standard": "^2.7 || ^3.0",
- "vimeo/psalm": "^4.22 || ^5.0"
+ "php": ">=5.3.0"
},
- "bin": [
- "bin/html-to-markdown"
- ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.2-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
"psr-4": {
- "League\\HTMLToMarkdown\\": "src/"
+ "Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -404,82 +2261,95 @@
],
"authors": [
{
- "name": "Colin O'Dell",
- "email": "colinodell@gmail.com",
- "homepage": "https://www.colinodell.com",
- "role": "Lead Developer"
- },
- {
- "name": "Nick Cernis",
- "email": "nick@cern.is",
- "homepage": "http://modernnerd.net",
- "role": "Original Author"
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
}
],
- "description": "An HTML-to-markdown conversion helper for PHP",
- "homepage": "https://github.com/thephpleague/html-to-markdown",
+ "description": "Common interface for logging libraries",
+ "homepage": "https://github.com/php-fig/log",
"keywords": [
- "html",
- "markdown"
+ "log",
+ "psr",
+ "psr-3"
],
"support": {
- "issues": "https://github.com/thephpleague/html-to-markdown/issues",
- "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.1"
+ "source": "https://github.com/php-fig/log/tree/1.1.4"
},
- "funding": [
- {
- "url": "https://www.colinodell.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://www.paypal.me/colinpodell/10.00",
- "type": "custom"
- },
- {
- "url": "https://github.com/colinodell",
- "type": "github"
- },
+ "time": "2021-05-03T11:20:27+00:00"
+ },
+ {
+ "name": "ralouphie/getallheaders",
+ "version": "3.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "php-coveralls/php-coveralls": "^2.1",
+ "phpunit/phpunit": "^5 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
{
- "url": "https://tidelift.com/funding/github/packagist/league/html-to-markdown",
- "type": "tidelift"
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
}
],
- "time": "2023-07-12T21:21:09+00:00"
+ "description": "A polyfill for getallheaders.",
+ "support": {
+ "issues": "https://github.com/ralouphie/getallheaders/issues",
+ "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+ },
+ "time": "2019-03-08T08:55:37+00:00"
},
{
- "name": "league/json-guard",
- "version": "1.0.1",
+ "name": "seld/cli-prompt",
+ "version": "1.0.4",
"source": {
"type": "git",
- "url": "https://github.com/thephpleague/json-guard.git",
- "reference": "596059d2c013bcea1a8a1386bd0e60d32ef39eb9"
+ "url": "https://github.com/Seldaek/cli-prompt.git",
+ "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/json-guard/zipball/596059d2c013bcea1a8a1386bd0e60d32ef39eb9",
- "reference": "596059d2c013bcea1a8a1386bd0e60d32ef39eb9",
+ "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/b8dfcf02094b8c03b40322c229493bb2884423c5",
+ "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5",
"shasum": ""
},
"require": {
- "ext-bcmath": "*",
- "php": ">=5.6.0",
- "psr/container": "^1.0"
+ "php": ">=5.3"
},
"require-dev": {
- "ext-curl": "*",
- "json-schema/json-schema-test-suite": "1.2.0",
- "league/json-reference": "1.0.0",
- "phpunit/phpunit": "4.*",
- "scrutinizer/ocular": "~1.1",
- "squizlabs/php_codesniffer": "~2.3"
+ "phpstan/phpstan": "^0.12.63"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
"autoload": {
- "files": [
- "src/functions.php"
- ],
"psr-4": {
- "League\\JsonGuard\\": "src"
+ "Seld\\CliPrompt\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -488,53 +2358,53 @@
],
"authors": [
{
- "name": "Matthew Allan",
- "email": "matthew.james.allan@gmail.com",
- "homepage": "https://mattallan.org",
- "role": "Developer"
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be"
}
],
- "description": "A validator for JSON using json-schema.",
- "homepage": "https://github.com/thephpleague/json-guard",
+ "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type",
"keywords": [
- "json",
- "json-schema",
- "json-schema.org",
- "schema",
- "validation"
+ "cli",
+ "console",
+ "hidden",
+ "input",
+ "prompt"
],
"support": {
- "issues": "https://github.com/thephpleague/json-guard/issues",
- "source": "https://github.com/thephpleague/json-guard/tree/master"
+ "issues": "https://github.com/Seldaek/cli-prompt/issues",
+ "source": "https://github.com/Seldaek/cli-prompt/tree/1.0.4"
},
- "abandoned": true,
- "time": "2017-05-03T21:12:30+00:00"
+ "time": "2020-12-15T21:32:01+00:00"
},
{
- "name": "nategood/httpful",
- "version": "0.3.2",
+ "name": "slim/http-cache",
+ "version": "1.2.0",
"source": {
"type": "git",
- "url": "https://github.com/nategood/httpful.git",
- "reference": "0cded3ea97ba905600de9ceb9ef13f3ab681587c"
+ "url": "https://github.com/slimphp/Slim-HttpCache.git",
+ "reference": "4c528f167c893a6b116efc9660dc93d20954dabf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nategood/httpful/zipball/0cded3ea97ba905600de9ceb9ef13f3ab681587c",
- "reference": "0cded3ea97ba905600de9ceb9ef13f3ab681587c",
+ "url": "https://api.github.com/repos/slimphp/Slim-HttpCache/zipball/4c528f167c893a6b116efc9660dc93d20954dabf",
+ "reference": "4c528f167c893a6b116efc9660dc93d20954dabf",
"shasum": ""
},
"require": {
- "ext-curl": "*",
- "php": ">=7.2"
+ "php": "^7.2 || ^8.0",
+ "psr/http-message": "^1.1 || ^2.0",
+ "psr/http-server-middleware": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "*"
+ "phpstan/phpstan": "^1.3",
+ "phpunit/phpunit": "^8.5.13 || ^9.3.8",
+ "slim/psr7": "^1.1",
+ "squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"autoload": {
- "psr-0": {
- "Httpful": "src/"
+ "psr-4": {
+ "Slim\\HttpCache\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -543,48 +2413,66 @@
],
"authors": [
{
- "name": "Nate Good",
- "email": "me@nategood.com",
- "homepage": "http://nategood.com"
+ "name": "Josh Lockhart",
+ "email": "hello@joshlockhart.com",
+ "homepage": "http://joshlockhart.com"
}
],
- "description": "A Readable, Chainable, REST friendly, PHP HTTP Client",
- "homepage": "http://github.com/nategood/httpful",
+ "description": "Slim Framework HTTP cache middleware and service provider",
+ "homepage": "https://www.slimframework.com",
"keywords": [
- "api",
- "curl",
- "http",
- "requests",
- "rest",
- "restful"
+ "cache",
+ "framework",
+ "middleware",
+ "slim"
],
"support": {
- "issues": "https://github.com/nategood/httpful/issues",
- "source": "https://github.com/nategood/httpful/tree/v0.3.2"
+ "issues": "https://github.com/slimphp/Slim-HttpCache/issues",
+ "source": "https://github.com/slimphp/Slim-HttpCache/tree/1.2.0"
},
- "time": "2020-01-25T01:13:13+00:00"
+ "time": "2024-07-07T17:27:30+00:00"
},
{
- "name": "psr/container",
- "version": "1.1.1",
+ "name": "slim/psr7",
+ "version": "1.6.1",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/container.git",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+ "url": "https://github.com/slimphp/Slim-Psr7.git",
+ "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/72d2b2bac94ab4575d369f605dbfafbe168d3163",
+ "reference": "72d2b2bac94ab4575d369f605dbfafbe168d3163",
"shasum": ""
},
"require": {
- "php": ">=7.2.0"
+ "fig/http-message-util": "^1.1.5",
+ "php": "^7.4 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0",
+ "ralouphie/getallheaders": "^3.0",
+ "symfony/polyfill-php80": "^1.26"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "adriansuter/php-autoload-override": "^1.3",
+ "ext-json": "*",
+ "http-interop/http-factory-tests": "^0.9.0",
+ "php-http/psr7-integration-tests": "1.1",
+ "phpspec/prophecy": "^1.15",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpstan/phpstan": "^1.8",
+ "phpunit/phpunit": "^9.5",
+ "squizlabs/php_codesniffer": "^3.7"
},
"type": "library",
"autoload": {
"psr-4": {
- "Psr\\Container\\": "src/"
+ "Slim\\Psr7\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -593,51 +2481,187 @@
],
"authors": [
{
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
+ "name": "Josh Lockhart",
+ "email": "hello@joshlockhart.com",
+ "homepage": "http://joshlockhart.com"
+ },
+ {
+ "name": "Andrew Smith",
+ "email": "a.smith@silentworks.co.uk",
+ "homepage": "http://silentworks.co.uk"
+ },
+ {
+ "name": "Rob Allen",
+ "email": "rob@akrabat.com",
+ "homepage": "http://akrabat.com"
+ },
+ {
+ "name": "Pierre Berube",
+ "email": "pierre@lgse.com",
+ "homepage": "http://www.lgse.com"
}
],
- "description": "Common Container Interface (PHP FIG PSR-11)",
- "homepage": "https://github.com/php-fig/container",
+ "description": "Strict PSR-7 implementation",
+ "homepage": "https://www.slimframework.com",
"keywords": [
- "PSR-11",
- "container",
- "container-interface",
- "container-interop",
- "psr"
+ "http",
+ "psr-7",
+ "psr7"
],
"support": {
- "issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.1"
+ "issues": "https://github.com/slimphp/Slim-Psr7/issues",
+ "source": "https://github.com/slimphp/Slim-Psr7/tree/1.6.1"
},
- "time": "2021-03-05T17:36:06+00:00"
+ "time": "2023-04-17T16:02:20+00:00"
},
{
- "name": "psr/log",
- "version": "1.1.4",
+ "name": "slim/slim",
+ "version": "4.14.0",
"source": {
"type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+ "url": "https://github.com/slimphp/Slim.git",
+ "reference": "5943393b88716eb9e82c4161caa956af63423913"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+ "url": "https://api.github.com/repos/slimphp/Slim/zipball/5943393b88716eb9e82c4161caa956af63423913",
+ "reference": "5943393b88716eb9e82c4161caa956af63423913",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "ext-json": "*",
+ "nikic/fast-route": "^1.3",
+ "php": "^7.4 || ^8.0",
+ "psr/container": "^1.0 || ^2.0",
+ "psr/http-factory": "^1.1",
+ "psr/http-message": "^1.1 || ^2.0",
+ "psr/http-server-handler": "^1.0",
+ "psr/http-server-middleware": "^1.0",
+ "psr/log": "^1.1 || ^2.0 || ^3.0"
+ },
+ "require-dev": {
+ "adriansuter/php-autoload-override": "^1.4",
+ "ext-simplexml": "*",
+ "guzzlehttp/psr7": "^2.6",
+ "httpsoft/http-message": "^1.1",
+ "httpsoft/http-server-request": "^1.1",
+ "laminas/laminas-diactoros": "^2.17 || ^3",
+ "nyholm/psr7": "^1.8",
+ "nyholm/psr7-server": "^1.1",
+ "phpspec/prophecy": "^1.19",
+ "phpspec/prophecy-phpunit": "^2.1",
+ "phpstan/phpstan": "^1.11",
+ "phpunit/phpunit": "^9.6",
+ "slim/http": "^1.3",
+ "slim/psr7": "^1.6",
+ "squizlabs/php_codesniffer": "^3.10",
+ "vimeo/psalm": "^5.24"
+ },
+ "suggest": {
+ "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
+ "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
+ "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
+ "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1.x-dev"
+ "autoload": {
+ "psr-4": {
+ "Slim\\": "Slim"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Josh Lockhart",
+ "email": "hello@joshlockhart.com",
+ "homepage": "https://joshlockhart.com"
+ },
+ {
+ "name": "Andrew Smith",
+ "email": "a.smith@silentworks.co.uk",
+ "homepage": "http://silentworks.co.uk"
+ },
+ {
+ "name": "Rob Allen",
+ "email": "rob@akrabat.com",
+ "homepage": "http://akrabat.com"
+ },
+ {
+ "name": "Pierre Berube",
+ "email": "pierre@lgse.com",
+ "homepage": "http://www.lgse.com"
+ },
+ {
+ "name": "Gabriel Manricks",
+ "email": "gmanricks@me.com",
+ "homepage": "http://gabrielmanricks.com"
+ }
+ ],
+ "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
+ "homepage": "https://www.slimframework.com",
+ "keywords": [
+ "api",
+ "framework",
+ "micro",
+ "router"
+ ],
+ "support": {
+ "docs": "https://www.slimframework.com/docs/v4/",
+ "forum": "https://discourse.slimframework.com/",
+ "irc": "irc://irc.freenode.net:6667/slimphp",
+ "issues": "https://github.com/slimphp/Slim/issues",
+ "rss": "https://www.slimframework.com/blog/feed.rss",
+ "slack": "https://slimphp.slack.com/",
+ "source": "https://github.com/slimphp/Slim",
+ "wiki": "https://github.com/slimphp/Slim/wiki"
+ },
+ "funding": [
+ {
+ "url": "https://opencollective.com/slimphp",
+ "type": "open_collective"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/slim/slim",
+ "type": "tidelift"
}
+ ],
+ "time": "2024-06-13T08:54:48+00:00"
+ },
+ {
+ "name": "slim/twig-view",
+ "version": "3.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/slimphp/Twig-View.git",
+ "reference": "df6dd6af6bbe28041be49c9fb8470c2e9b70cd98"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/slimphp/Twig-View/zipball/df6dd6af6bbe28041be49c9fb8470c2e9b70cd98",
+ "reference": "df6dd6af6bbe28041be49c9fb8470c2e9b70cd98",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4 || ^8.0",
+ "psr/http-message": "^1.0",
+ "slim/slim": "^4.9",
+ "symfony/polyfill-php81": "^1.23",
+ "twig/twig": "^3.3"
+ },
+ "require-dev": {
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpstan/phpstan": "^1.3.0",
+ "phpunit/phpunit": "^9.5",
+ "psr/http-factory": "^1.0",
+ "squizlabs/php_codesniffer": "^3.6"
},
+ "type": "library",
"autoload": {
"psr-4": {
- "Psr\\Log\\": "Psr/Log/"
+ "Slim\\Views\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -646,21 +2670,30 @@
],
"authors": [
{
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
+ "name": "Josh Lockhart",
+ "email": "hello@joshlockhart.com",
+ "homepage": "http://joshlockhart.com"
+ },
+ {
+ "name": "Pierre Berube",
+ "email": "pierre@lgse.com",
+ "homepage": "http://www.lgse.com"
}
],
- "description": "Common interface for logging libraries",
- "homepage": "https://github.com/php-fig/log",
+ "description": "Slim Framework 4 view helper built on top of the Twig 3 templating component",
+ "homepage": "https://www.slimframework.com",
"keywords": [
- "log",
- "psr",
- "psr-3"
+ "framework",
+ "slim",
+ "template",
+ "twig",
+ "view"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/1.1.4"
+ "issues": "https://github.com/slimphp/Twig-View/issues",
+ "source": "https://github.com/slimphp/Twig-View/tree/3.3.0"
},
- "time": "2021-05-03T11:20:27+00:00"
+ "time": "2022-01-02T05:14:45+00:00"
},
{
"name": "solution10/sql",
@@ -711,6 +2744,67 @@
},
"time": "2015-07-26T09:26:21+00:00"
},
+ {
+ "name": "stevenmaguire/oauth2-keycloak",
+ "version": "4.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/stevenmaguire/oauth2-keycloak.git",
+ "reference": "05ead6bb6bcd2b6f96dfae87c769dcd3e5f6129d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/stevenmaguire/oauth2-keycloak/zipball/05ead6bb6bcd2b6f96dfae87c769dcd3e5f6129d",
+ "reference": "05ead6bb6bcd2b6f96dfae87c769dcd3e5f6129d",
+ "shasum": ""
+ },
+ "require": {
+ "firebase/php-jwt": "^4.0 || ^5.0 || ^6.0",
+ "league/oauth2-client": "^2.0",
+ "php": "~7.2 || ~8.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "~1.5.0",
+ "phpunit/phpunit": "~9.6.4",
+ "squizlabs/php_codesniffer": "~3.7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Stevenmaguire\\OAuth2\\Client\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Steven Maguire",
+ "email": "stevenmaguire@gmail.com",
+ "homepage": "https://github.com/stevenmaguire"
+ }
+ ],
+ "description": "Keycloak OAuth 2.0 Client Provider for The PHP League OAuth2-Client",
+ "keywords": [
+ "authorisation",
+ "authorization",
+ "client",
+ "keycloak",
+ "oauth",
+ "oauth2"
+ ],
+ "support": {
+ "issues": "https://github.com/stevenmaguire/oauth2-keycloak/issues",
+ "source": "https://github.com/stevenmaguire/oauth2-keycloak/tree/4.0.0"
+ },
+ "time": "2023-03-14T09:43:47+00:00"
+ },
{
"name": "symfony/deprecation-contracts",
"version": "v2.5.2",
@@ -867,6 +2961,75 @@
],
"time": "2023-07-13T09:02:54+00:00"
},
+ {
+ "name": "symfony/options-resolver",
+ "version": "v5.4.45",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/options-resolver.git",
+ "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6",
+ "reference": "74e5b6f0db3e8589e6cfd5efb317a1fc2bb52fb6",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2.5",
+ "symfony/deprecation-contracts": "^2.1|^3",
+ "symfony/polyfill-php73": "~1.0",
+ "symfony/polyfill-php80": "^1.16"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\OptionsResolver\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Provides an improved replacement for the array_replace PHP function",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "config",
+ "configuration",
+ "options"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/options-resolver/tree/v5.4.45"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-09-25T14:11:13+00:00"
+ },
{
"name": "symfony/polyfill-ctype",
"version": "v1.28.0",
@@ -887,17 +3050,173 @@
"provide": {
"ext-ctype": "*"
},
- "suggest": {
- "ext-ctype": "For best performance"
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.28-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Ctype\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Gert de Pagter",
+ "email": "BackEndTea@gmail.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for ctype functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "ctype",
+ "polyfill",
+ "portable"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-01-26T09:26:14+00:00"
+ },
+ {
+ "name": "symfony/polyfill-mbstring",
+ "version": "v1.28.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-mbstring.git",
+ "reference": "42292d99c55abe617799667f454222c54c60e229"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+ "reference": "42292d99c55abe617799667f454222c54c60e229",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "provide": {
+ "ext-mbstring": "*"
+ },
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.28-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for the Mbstring extension",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "mbstring",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-07-28T09:04:16+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php73",
+ "version": "v1.31.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php73.git",
+ "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
+ "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -905,8 +3224,11 @@
"bootstrap.php"
],
"psr-4": {
- "Symfony\\Polyfill\\Ctype\\": ""
- }
+ "Symfony\\Polyfill\\Php73\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -914,24 +3236,24 @@
],
"authors": [
{
- "name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill for ctype functions",
+ "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
- "ctype",
"polyfill",
- "portable"
+ "portable",
+ "shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0"
},
"funding": [
{
@@ -947,31 +3269,25 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
- "name": "symfony/polyfill-mbstring",
+ "name": "symfony/polyfill-php80",
"version": "v1.28.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "42292d99c55abe617799667f454222c54c60e229"
+ "url": "https://github.com/symfony/polyfill-php80.git",
+ "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
- "reference": "42292d99c55abe617799667f454222c54c60e229",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+ "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
- "provide": {
- "ext-mbstring": "*"
- },
- "suggest": {
- "ext-mbstring": "For best performance"
- },
"type": "library",
"extra": {
"branch-alias": {
@@ -987,14 +3303,21 @@
"bootstrap.php"
],
"psr-4": {
- "Symfony\\Polyfill\\Mbstring\\": ""
- }
+ "Symfony\\Polyfill\\Php80\\": ""
+ },
+ "classmap": [
+ "Resources/stubs"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
+ {
+ "name": "Ion Bazan",
+ "email": "ion.bazan@gmail.com"
+ },
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
@@ -1004,17 +3327,16 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill for the Mbstring extension",
+ "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
- "mbstring",
"polyfill",
"portable",
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
},
"funding": [
{
@@ -1030,20 +3352,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-28T09:04:16+00:00"
+ "time": "2023-01-26T09:26:14+00:00"
},
{
- "name": "symfony/polyfill-php80",
+ "name": "symfony/polyfill-php81",
"version": "v1.28.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+ "url": "https://github.com/symfony/polyfill-php81.git",
+ "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b",
+ "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b",
"shasum": ""
},
"require": {
@@ -1064,7 +3386,7 @@
"bootstrap.php"
],
"psr-4": {
- "Symfony\\Polyfill\\Php80\\": ""
+ "Symfony\\Polyfill\\Php81\\": ""
},
"classmap": [
"Resources/stubs"
@@ -1075,10 +3397,6 @@
"MIT"
],
"authors": [
- {
- "name": "Ion Bazan",
- "email": "ion.bazan@gmail.com"
- },
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
@@ -1088,7 +3406,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+ "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
@@ -1097,7 +3415,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0"
},
"funding": [
{
@@ -1411,6 +3729,81 @@
],
"time": "2023-07-20T16:28:53+00:00"
},
+ {
+ "name": "tracy/tracy",
+ "version": "v2.10.9",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nette/tracy.git",
+ "reference": "e7af75205b184ca8895bc57fafd331f8d5022d26"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nette/tracy/zipball/e7af75205b184ca8895bc57fafd331f8d5022d26",
+ "reference": "e7af75205b184ca8895bc57fafd331f8d5022d26",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "ext-session": "*",
+ "php": "8.0 - 8.4"
+ },
+ "conflict": {
+ "nette/di": "<3.0"
+ },
+ "require-dev": {
+ "latte/latte": "^2.5 || ^3.0",
+ "nette/di": "^3.0",
+ "nette/http": "^3.0",
+ "nette/mail": "^3.0 || ^4.0",
+ "nette/tester": "^2.2",
+ "nette/utils": "^3.0 || ^4.0",
+ "phpstan/phpstan": "^1.0",
+ "psr/log": "^1.0 || ^2.0 || ^3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.10-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/Tracy/functions.php"
+ ],
+ "classmap": [
+ "src"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "David Grudl",
+ "homepage": "https://davidgrudl.com"
+ },
+ {
+ "name": "Nette Community",
+ "homepage": "https://nette.org/contributors"
+ }
+ ],
+ "description": "😎 Tracy: the addictive tool to ease debugging PHP code for cool developers. Friendly design, logging, profiler, advanced features like debugging AJAX calls or CLI support. You will love it.",
+ "homepage": "https://tracy.nette.org",
+ "keywords": [
+ "Xdebug",
+ "debug",
+ "debugger",
+ "nette",
+ "profiler"
+ ],
+ "support": {
+ "issues": "https://github.com/nette/tracy/issues",
+ "source": "https://github.com/nette/tracy/tree/v2.10.9"
+ },
+ "time": "2024-11-07T14:48:00+00:00"
+ },
{
"name": "twig/intl-extra",
"version": "v3.7.1",
@@ -1547,6 +3940,55 @@
],
"time": "2023-11-21T18:54:41+00:00"
},
+ {
+ "name": "ulrichsg/getopt-php",
+ "version": "2.4.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/getopt-php/getopt-php.git",
+ "reference": "23e564e947bca79bf867840fead957889e711967"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/getopt-php/getopt-php/zipball/23e564e947bca79bf867840fead957889e711967",
+ "reference": "23e564e947bca79bf867840fead957889e711967",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8",
+ "squizlabs/php_codesniffer": "^2.7"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Ulrichsg\\Getopt\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ulrich Schmidt-Goertz",
+ "email": "ulrich@schmidt-goertz.de"
+ },
+ {
+ "name": "Thomas Flori",
+ "email": "thflori@gmail.com"
+ }
+ ],
+ "description": "Command line arguments parser for PHP 5.3 - 7.1",
+ "homepage": "http://ulrichsg.github.io/getopt-php",
+ "support": {
+ "issues": "https://github.com/getopt-php/getopt-php/issues",
+ "source": "https://github.com/getopt-php/getopt-php/tree/master"
+ },
+ "time": "2017-07-02T15:56:33+00:00"
+ },
{
"name": "vanilla/garden-cli",
"version": "v1.6.3",
@@ -3675,64 +6117,37 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "2.9.2",
+ "version": "3.11.2",
"source": {
"type": "git",
- "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "2acf168de78487db620ab4bc524135a13cfe6745"
+ "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+ "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745",
- "reference": "2acf168de78487db620ab4bc524135a13cfe6745",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079",
+ "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079",
"shasum": ""
},
"require": {
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
- "php": ">=5.1.2"
+ "php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
},
"bin": [
- "scripts/phpcs",
- "scripts/phpcbf"
+ "bin/phpcbf",
+ "bin/phpcs"
],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-master": "3.x-dev"
}
},
- "autoload": {
- "classmap": [
- "CodeSniffer.php",
- "CodeSniffer/CLI.php",
- "CodeSniffer/Exception.php",
- "CodeSniffer/File.php",
- "CodeSniffer/Fixer.php",
- "CodeSniffer/Report.php",
- "CodeSniffer/Reporting.php",
- "CodeSniffer/Sniff.php",
- "CodeSniffer/Tokens.php",
- "CodeSniffer/Reports/",
- "CodeSniffer/Tokenizers/",
- "CodeSniffer/DocGenerators/",
- "CodeSniffer/Standards/AbstractPatternSniff.php",
- "CodeSniffer/Standards/AbstractScopeSniff.php",
- "CodeSniffer/Standards/AbstractVariableSniff.php",
- "CodeSniffer/Standards/IncorrectPatternException.php",
- "CodeSniffer/Standards/Generic/Sniffs/",
- "CodeSniffer/Standards/MySource/Sniffs/",
- "CodeSniffer/Standards/PEAR/Sniffs/",
- "CodeSniffer/Standards/PSR1/Sniffs/",
- "CodeSniffer/Standards/PSR2/Sniffs/",
- "CodeSniffer/Standards/Squiz/Sniffs/",
- "CodeSniffer/Standards/Zend/Sniffs/"
- ]
- },
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
@@ -3740,21 +6155,45 @@
"authors": [
{
"name": "Greg Sherwood",
- "role": "lead"
+ "role": "Former lead"
+ },
+ {
+ "name": "Juliette Reinders Folmer",
+ "role": "Current lead"
+ },
+ {
+ "name": "Contributors",
+ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
}
],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "http://www.squizlabs.com/php-codesniffer",
+ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
"keywords": [
"phpcs",
- "standards"
+ "standards",
+ "static analysis"
],
"support": {
- "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
- "source": "https://github.com/squizlabs/PHP_CodeSniffer",
- "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+ "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+ "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+ "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+ "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
},
- "time": "2018-11-07T22:31:41+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/PHPCSStandards",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/jrfnl",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/php_codesniffer",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2024-12-11T16:04:26+00:00"
},
{
"name": "symfony/config",
@@ -3988,85 +6427,6 @@
],
"time": "2023-05-31T13:04:02+00:00"
},
- {
- "name": "symfony/polyfill-php81",
- "version": "v1.28.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b",
- "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php81\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2023-01-26T09:26:14+00:00"
- },
{
"name": "symfony/service-contracts",
"version": "v2.5.2",
@@ -4206,7 +6566,11 @@
"stability-flags": {
"eappointment/zmsentities": 20,
"eappointment/zmsdldb": 20,
- "eappointment/mellon": 20
+ "eappointment/mellon": 20,
+ "eappointment/zmsslim": 20,
+ "eappointment/zmsclient": 20,
+ "eappointment/zmsapi": 20,
+ "phpmd/phpmd": 0
},
"prefer-stable": false,
"prefer-lowest": false,
diff --git a/zmsdb/migrations/91737550001-add-indexes.sql b/zmsdb/migrations/91737550001-add-indexes.sql
new file mode 100644
index 000000000..5af1bb817
--- /dev/null
+++ b/zmsdb/migrations/91737550001-add-indexes.sql
@@ -0,0 +1,4 @@
+CREATE INDEX scopeID_year_month_day_status_index ON slot(scopeID, year, month, day, status);
+CREATE INDEX ancestorID_ancestorLevel_index ON slot_hiera(ancestorID, ancestorLevel);
+CREATE INDEX scopeID_status_slotID_index ON slot(scopeID, status, slotID);
+CREATE INDEX slotID_index ON slot_process(slotID);
\ No newline at end of file
diff --git a/zmsdb/phpunit.xml b/zmsdb/phpunit.xml
index 1e870bb99..1101c9b88 100644
--- a/zmsdb/phpunit.xml
+++ b/zmsdb/phpunit.xml
@@ -1,28 +1,27 @@
-
-
./tests/Zmsdb/
-
- ./src
+ ./src
../vendor
@@ -31,6 +30,12 @@
../migrations
../public
../bin
+ ./vendor
+ ./tests
+
+
+
+
-
+
\ No newline at end of file
diff --git a/zmsdb/src/Zmsdb/Apiclient.php b/zmsdb/src/Zmsdb/Apiclient.php
index 0d8633029..892b51442 100644
--- a/zmsdb/src/Zmsdb/Apiclient.php
+++ b/zmsdb/src/Zmsdb/Apiclient.php
@@ -1,7 +1,8 @@
addValues([
'key' => $entity->key,
'createIP' => $entity->createIP,
- 'ts' => (new \DateTimeImmutable)->getTimestamp()
+ 'ts' => (new \DateTimeImmutable())->getTimestamp()
]);
if ($this->writeItem($query)) {
$this->updateQuota($entity->key, $entity);
@@ -117,7 +118,7 @@ public function writeQuota($apiKey, $route, $period, $requests)
'route' => $route,
'period' => $period,
'requests' => $requests,
- 'ts' => (new \DateTimeImmutable)->getTimestamp()
+ 'ts' => (new \DateTimeImmutable())->getTimestamp()
]);
$this->writeItem($query);
}
diff --git a/zmsdb/src/Zmsdb/Availability.php b/zmsdb/src/Zmsdb/Availability.php
index e5a54b0ef..470ffa1e7 100644
--- a/zmsdb/src/Zmsdb/Availability.php
+++ b/zmsdb/src/Zmsdb/Availability.php
@@ -1,8 +1,9 @@
workstationCount['public'] = 0;
if ($entity['type'] == 'appointment') {
$entity['description'] = '';
- $entity->id = '__spontan__'. $entity->id;
+ $entity->id = '__spontan__' . $entity->id;
$entity['type'] = 'openinghours';
}
$entity['type'] = ($entity['type'] != 'appointment') ? 'openinghours' : $entity['type'];
@@ -114,7 +115,7 @@ public function readAvailabilityListByScope(
} elseif ($startDate) {
$query->addConditionSkipOld($startDate);
}
-
+
$result = $this->fetchList($query, new Entity());
if (count($result)) {
foreach ($result as $entity) {
diff --git a/zmsdb/src/Zmsdb/Base.php b/zmsdb/src/Zmsdb/Base.php
index e74c722f5..8e090ff7e 100644
--- a/zmsdb/src/Zmsdb/Base.php
+++ b/zmsdb/src/Zmsdb/Base.php
@@ -69,7 +69,7 @@ public function getReader()
return $this->writeDb;
}
if (null === $this->readDb) {
- $this->readDb= Connection\Select::getReadConnection();
+ $this->readDb = Connection\Select::getReadConnection();
}
return $this->readDb;
}
@@ -114,7 +114,7 @@ protected static function pdoExceptionHandler(\Closure $pdoFunction, $parameters
//@codeCoverageIgnoreEnd
$message = "SQL: "
. " Err: "
- .$pdoException->getMessage()
+ . $pdoException->getMessage()
//. " || Statement: "
//.$statement->queryString
//." || Parameters=". var_export($parameters, true)
diff --git a/zmsdb/src/Zmsdb/Calendar.php b/zmsdb/src/Zmsdb/Calendar.php
index 6946b2ed7..c982ef9cd 100644
--- a/zmsdb/src/Zmsdb/Calendar.php
+++ b/zmsdb/src/Zmsdb/Calendar.php
@@ -1,8 +1,9 @@
fetchOne((new Query\Calldisplay(Query\Base::SELECT))
->getQueryImage(), ['name' => "logo.png"]);
}
-
+
$mime = pathinfo($image['name'], PATHINFO_EXTENSION);
$image['mime'] = ($mime == 'jpg') ? 'jpeg' : $mime;
return $image;
diff --git a/zmsdb/src/Zmsdb/Cli/Db.php b/zmsdb/src/Zmsdb/Cli/Db.php
index 7fe50e5b2..f865afd35 100644
--- a/zmsdb/src/Zmsdb/Cli/Db.php
+++ b/zmsdb/src/Zmsdb/Cli/Db.php
@@ -50,7 +50,7 @@ public static function executeSql($query, $dbname = null)
$pdo->exec($query);
}
- public static function startUsingDatabase($dbname = null, $verbose = true) : \BO\Zmsdb\Connection\Pdo
+ public static function startUsingDatabase($dbname = null, $verbose = true): \BO\Zmsdb\Connection\Pdo
{
if (!self::$baseDSN) {
self::$baseDSN = \BO\Zmsdb\Connection\Select::$writeSourceName;
@@ -66,7 +66,7 @@ public static function startUsingDatabase($dbname = null, $verbose = true) : \BO
}
if ($verbose) {
- error_log("Use Connection ".\BO\Zmsdb\Connection\Select::$writeSourceName);
+ error_log("Use Connection " . \BO\Zmsdb\Connection\Select::$writeSourceName);
}
$pdo = \BO\Zmsdb\Connection\Select::getWriteConnection();
@@ -81,7 +81,7 @@ public static function startTestDataImport($fixtures, $filename = 'mysql_zmsbo.s
$pdo->exec("DROP DATABASE IF EXISTS `$dbname_zms`;");
$pdo->exec("CREATE DATABASE IF NOT EXISTS `$dbname_zms`;");
- self::startExecuteSqlFile($fixtures .'/'. $filename);
+ self::startExecuteSqlFile($fixtures . '/' . $filename);
}
public static function startConfigDataImport()
diff --git a/zmsdb/src/Zmsdb/Cluster.php b/zmsdb/src/Zmsdb/Cluster.php
index 689c4ca6a..626f4df4a 100644
--- a/zmsdb/src/Zmsdb/Cluster.php
+++ b/zmsdb/src/Zmsdb/Cluster.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Cluster as Entity;
-use \BO\Zmsentities\Collection\ClusterList as Collection;
+use BO\Zmsentities\Cluster as Entity;
+use BO\Zmsentities\Collection\ClusterList as Collection;
/**
*
@@ -196,7 +196,8 @@ public function readScopeWithShortestWaitingTime($clusterId, \DateTimeInterface
$scope = (new Scope())->readWithWorkstationCount($nextScope->id, $dateTime);
$queueList = (new Scope())->readQueueListWithWaitingTime($scope, $dateTime);
$data = $scope->getWaitingTimeFromQueueList($queueList, $dateTime);
- if ($scope->getCalculatedWorkstationCount() > 0 &&
+ if (
+ $scope->getCalculatedWorkstationCount() > 0 &&
$data &&
($data['waitingTimeEstimate'] <= $preferedWaitingTime || 0 == $preferedWaitingTime)
) {
@@ -254,7 +255,7 @@ public function writeImageData($clusterId, \BO\Zmsentities\Mimepart $entity)
if ($extension == 'jpeg') {
$extension = 'jpg'; //compatibility ZMS1
}
- $imageName = 'c_'. $clusterId .'_bild.'. $extension;
+ $imageName = 'c_' . $clusterId . '_bild.' . $extension;
$this->perform(
(new Query\Scope(Query\Base::REPLACE))->getQueryWriteImageData(),
array(
@@ -277,7 +278,7 @@ public function writeImageData($clusterId, \BO\Zmsentities\Mimepart $entity)
*/
public function readImageData($clusterId)
{
- $imageName = 'c_'. $clusterId .'_bild';
+ $imageName = 'c_' . $clusterId . '_bild';
$imageData = new \BO\Zmsentities\Mimepart();
$fileData = $this->getReader()->fetchAll(
(new Query\Scope(Query\Base::SELECT))->getQueryReadImageData(),
@@ -300,7 +301,7 @@ public function readImageData($clusterId)
*/
public function deleteImage($clusterId)
{
- $imageName = 'c_'. $clusterId .'_bild';
+ $imageName = 'c_' . $clusterId . '_bild';
$result = $this->perform(
(new Query\Scope(Query\Base::DELETE))->getQueryDeleteImage(),
array(
diff --git a/zmsdb/src/Zmsdb/Config.php b/zmsdb/src/Zmsdb/Config.php
index fc4e1fcdd..d25bdf941 100644
--- a/zmsdb/src/Zmsdb/Config.php
+++ b/zmsdb/src/Zmsdb/Config.php
@@ -1,7 +1,8 @@
$itemValue) {
if ($itemValue && $compareEntity->getPreference($key, $itemName) != $itemValue) {
$query->addValues(array(
- 'name' => $key .'__'. $itemName,
+ 'name' => $key . '__' . $itemName,
'value' => $this->getSpecifiedValue($itemValue),
'changeTimestamp' => (new \DateTimeImmutable())->format('Y-m-d H:i:s')
));
diff --git a/zmsdb/src/Zmsdb/Connection/Pdo.php b/zmsdb/src/Zmsdb/Connection/Pdo.php
index 54752dc8c..40aa7d2f3 100644
--- a/zmsdb/src/Zmsdb/Connection/Pdo.php
+++ b/zmsdb/src/Zmsdb/Connection/Pdo.php
@@ -7,5 +7,4 @@
*/
class Pdo extends \Aura\Sql\ExtendedPdo implements PdoInterface
{
-
}
diff --git a/zmsdb/src/Zmsdb/Connection/Select.php b/zmsdb/src/Zmsdb/Connection/Select.php
index a494b5397..31475d246 100644
--- a/zmsdb/src/Zmsdb/Connection/Select.php
+++ b/zmsdb/src/Zmsdb/Connection/Select.php
@@ -326,6 +326,6 @@ public static function writeCommit()
public static function writeCommitWithStartLock()
{
- return self::writeCommit() && (new \BO\Zmsdb\Config)->readProperty('status__calculateSlotsLastRun', true);
+ return self::writeCommit() && (new \BO\Zmsdb\Config())->readProperty('status__calculateSlotsLastRun', true);
}
}
diff --git a/zmsdb/src/Zmsdb/Day.php b/zmsdb/src/Zmsdb/Day.php
index 7d42fa26b..df0371809 100644
--- a/zmsdb/src/Zmsdb/Day.php
+++ b/zmsdb/src/Zmsdb/Day.php
@@ -1,14 +1,14 @@
readEntity($departmentId, 1);
if ($entity) {
- if (0 < $entity->toProperty()->scopes->get()->count()
+ if (
+ 0 < $entity->toProperty()->scopes->get()->count()
|| 0 < $entity->toProperty()->clusters->get()->count()
) {
throw new Exception\Department\ScopeListNotEmpty();
@@ -234,7 +234,7 @@ protected function writeDepartmentDayoffs($departmentId, $dayoffList)
[
'behoerdenid' => $departmentId,
'Feiertag' => $dayoff['name'],
- 'Datum' => (new \DateTimeImmutable('@'. $dayoff['date']))->format('Y-m-d')
+ 'Datum' => (new \DateTimeImmutable('@' . $dayoff['date']))->format('Y-m-d')
]
);
$this->writeItem($query);
diff --git a/zmsdb/src/Zmsdb/EventLog.php b/zmsdb/src/Zmsdb/EventLog.php
index cbaec6d2f..db7f2e60c 100644
--- a/zmsdb/src/Zmsdb/EventLog.php
+++ b/zmsdb/src/Zmsdb/EventLog.php
@@ -1,4 +1,5 @@
readEntity();
+ $config = (new Config())->readEntity();
$costs = $config->getNotificationPreferences()['costs'];
$department = (new Department())->readEntity($subjectid);
diff --git a/zmsdb/src/Zmsdb/ExchangeClientorganisation.php b/zmsdb/src/Zmsdb/ExchangeClientorganisation.php
index 1d9f3a141..dc06890f0 100644
--- a/zmsdb/src/Zmsdb/ExchangeClientorganisation.php
+++ b/zmsdb/src/Zmsdb/ExchangeClientorganisation.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeClientorganisation extends Base
{
@@ -18,7 +18,7 @@ public function readEntity(
\DateTimeInterface $dateend,
$period = 'day'
) {
- $config = (new Config)->readEntity();
+ $config = (new Config())->readEntity();
$costs = $config->getNotificationPreferences()['costs'];
$organisation = (new Organisation())->readEntity($subjectid);
diff --git a/zmsdb/src/Zmsdb/ExchangeClientowner.php b/zmsdb/src/Zmsdb/ExchangeClientowner.php
index ea0376d61..a7fe0b6d2 100644
--- a/zmsdb/src/Zmsdb/ExchangeClientowner.php
+++ b/zmsdb/src/Zmsdb/ExchangeClientowner.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeClientowner extends Base
{
@@ -18,7 +18,7 @@ public function readEntity(
\DateTimeInterface $dateend,
$period = 'day'
) {
- $config = (new Config)->readEntity();
+ $config = (new Config())->readEntity();
$costs = $config->getNotificationPreferences()['costs'];
$owner = (new Owner())->readEntity($subjectid);
diff --git a/zmsdb/src/Zmsdb/ExchangeClientscope.php b/zmsdb/src/Zmsdb/ExchangeClientscope.php
index ff755cb98..bb96104ad 100644
--- a/zmsdb/src/Zmsdb/ExchangeClientscope.php
+++ b/zmsdb/src/Zmsdb/ExchangeClientscope.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeClientscope extends Base
{
@@ -18,7 +18,7 @@ public function readEntity(
\DateTimeInterface $dateend,
$period = 'day'
) {
- $config = (new Config)->readEntity();
+ $config = (new Config())->readEntity();
$costs = $config->getNotificationPreferences()['costs'];
$scope = (new Scope())->readEntity($subjectid);
diff --git a/zmsdb/src/Zmsdb/ExchangeNotificationdepartment.php b/zmsdb/src/Zmsdb/ExchangeNotificationdepartment.php
index 6d8523455..747ec4ef1 100644
--- a/zmsdb/src/Zmsdb/ExchangeNotificationdepartment.php
+++ b/zmsdb/src/Zmsdb/ExchangeNotificationdepartment.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeNotificationdepartment extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeNotificationorganisation.php b/zmsdb/src/Zmsdb/ExchangeNotificationorganisation.php
index b6a1a9768..0c35452f0 100644
--- a/zmsdb/src/Zmsdb/ExchangeNotificationorganisation.php
+++ b/zmsdb/src/Zmsdb/ExchangeNotificationorganisation.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeNotificationorganisation extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeNotificationowner.php b/zmsdb/src/Zmsdb/ExchangeNotificationowner.php
index dda42924f..f2ee7d042 100644
--- a/zmsdb/src/Zmsdb/ExchangeNotificationowner.php
+++ b/zmsdb/src/Zmsdb/ExchangeNotificationowner.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeNotificationowner extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeNotificationscope.php b/zmsdb/src/Zmsdb/ExchangeNotificationscope.php
index 076b0bdd1..d3f919595 100644
--- a/zmsdb/src/Zmsdb/ExchangeNotificationscope.php
+++ b/zmsdb/src/Zmsdb/ExchangeNotificationscope.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeNotificationscope extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeRequestdepartment.php b/zmsdb/src/Zmsdb/ExchangeRequestdepartment.php
index 98cc954c6..fdd53481a 100644
--- a/zmsdb/src/Zmsdb/ExchangeRequestdepartment.php
+++ b/zmsdb/src/Zmsdb/ExchangeRequestdepartment.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeRequestdepartment extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeRequestorganisation.php b/zmsdb/src/Zmsdb/ExchangeRequestorganisation.php
index 06fc2a0da..62fe56a04 100644
--- a/zmsdb/src/Zmsdb/ExchangeRequestorganisation.php
+++ b/zmsdb/src/Zmsdb/ExchangeRequestorganisation.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeRequestorganisation extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeRequestowner.php b/zmsdb/src/Zmsdb/ExchangeRequestowner.php
index b95cb89cd..64fa29bfc 100644
--- a/zmsdb/src/Zmsdb/ExchangeRequestowner.php
+++ b/zmsdb/src/Zmsdb/ExchangeRequestowner.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeRequestowner extends Base
{
@@ -26,7 +26,7 @@ public function readEntity(
$entity->addDictionaryEntry('date', 'string', 'Date of entry');
$entity->addDictionaryEntry('name', 'string', 'Name of request');
$entity->addDictionaryEntry('requestscount', 'number', 'Amount of requests');
- $entity->addDictionaryEntry('processingtime', 'number', 'Average processing time in minutes');
+ $entity->addDictionaryEntry('processingtime', 'number', 'Average processing time in minutes');
$subjectIdList = explode(',', $subjectid);
foreach ($subjectIdList as $subjectid) {
diff --git a/zmsdb/src/Zmsdb/ExchangeRequestscope.php b/zmsdb/src/Zmsdb/ExchangeRequestscope.php
index 32edd15ef..881079b72 100644
--- a/zmsdb/src/Zmsdb/ExchangeRequestscope.php
+++ b/zmsdb/src/Zmsdb/ExchangeRequestscope.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeRequestscope extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeSimpleQuery.php b/zmsdb/src/Zmsdb/ExchangeSimpleQuery.php
index 187195317..63d144150 100644
--- a/zmsdb/src/Zmsdb/ExchangeSimpleQuery.php
+++ b/zmsdb/src/Zmsdb/ExchangeSimpleQuery.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
abstract class ExchangeSimpleQuery extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeSlotscope.php b/zmsdb/src/Zmsdb/ExchangeSlotscope.php
index a8bd39b6a..2f13bc574 100644
--- a/zmsdb/src/Zmsdb/ExchangeSlotscope.php
+++ b/zmsdb/src/Zmsdb/ExchangeSlotscope.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeSlotscope extends Base
{
diff --git a/zmsdb/src/Zmsdb/ExchangeUnassignedscope.php b/zmsdb/src/Zmsdb/ExchangeUnassignedscope.php
index 980398da0..cef43e59e 100644
--- a/zmsdb/src/Zmsdb/ExchangeUnassignedscope.php
+++ b/zmsdb/src/Zmsdb/ExchangeUnassignedscope.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeUnassignedscope extends Base
{
@@ -36,7 +36,7 @@ public function readSubjectList()
$entity->addDataSet(["_", "", "", "Alle Standorte"]);
return $entity;
}
-
+
public function readPeriodList()
{
$entity = new Exchange();
diff --git a/zmsdb/src/Zmsdb/ExchangeUseraccount.php b/zmsdb/src/Zmsdb/ExchangeUseraccount.php
index d57b46498..1ec1653df 100644
--- a/zmsdb/src/Zmsdb/ExchangeUseraccount.php
+++ b/zmsdb/src/Zmsdb/ExchangeUseraccount.php
@@ -2,11 +2,10 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeUseraccount extends Base
{
-
public function readEntity()
{
$entity = new Exchange();
diff --git a/zmsdb/src/Zmsdb/ExchangeWaitingdepartment.php b/zmsdb/src/Zmsdb/ExchangeWaitingdepartment.php
index d485a3d3f..9c09b95f5 100644
--- a/zmsdb/src/Zmsdb/ExchangeWaitingdepartment.php
+++ b/zmsdb/src/Zmsdb/ExchangeWaitingdepartment.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeWaitingdepartment extends Base implements Interfaces\ExchangeSubject
{
@@ -33,7 +33,7 @@ public function readEntity(
$raw = $this
->getReader()
->fetchAll(
- constant("\BO\Zmsdb\Query\ExchangeWaitingdepartment::QUERY_READ_". strtoupper($period)),
+ constant("\BO\Zmsdb\Query\ExchangeWaitingdepartment::QUERY_READ_" . strtoupper($period)),
[
'departmentid' => $subjectid,
'datestart' => $datestart->format('Y-m-d'),
diff --git a/zmsdb/src/Zmsdb/ExchangeWaitingorganisation.php b/zmsdb/src/Zmsdb/ExchangeWaitingorganisation.php
index 9e8b1694c..838c9c7c9 100644
--- a/zmsdb/src/Zmsdb/ExchangeWaitingorganisation.php
+++ b/zmsdb/src/Zmsdb/ExchangeWaitingorganisation.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeWaitingorganisation extends Base implements Interfaces\ExchangeSubject
{
@@ -33,7 +33,7 @@ public function readEntity(
$raw = $this
->getReader()
->fetchAll(
- constant("\BO\Zmsdb\Query\ExchangeWaitingorganisation::QUERY_READ_". strtoupper($period)),
+ constant("\BO\Zmsdb\Query\ExchangeWaitingorganisation::QUERY_READ_" . strtoupper($period)),
[
'organisationid' => $subjectid,
'datestart' => $datestart->format('Y-m-d'),
diff --git a/zmsdb/src/Zmsdb/ExchangeWaitingowner.php b/zmsdb/src/Zmsdb/ExchangeWaitingowner.php
index 01fc52bee..25847f16a 100644
--- a/zmsdb/src/Zmsdb/ExchangeWaitingowner.php
+++ b/zmsdb/src/Zmsdb/ExchangeWaitingowner.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeWaitingowner extends Base implements Interfaces\ExchangeSubject
{
@@ -33,7 +33,7 @@ public function readEntity(
$raw = $this
->getReader()
->fetchAll(
- constant("\BO\Zmsdb\Query\ExchangeWaitingowner::QUERY_READ_". strtoupper($period)),
+ constant("\BO\Zmsdb\Query\ExchangeWaitingowner::QUERY_READ_" . strtoupper($period)),
[
'ownerid' => $subjectid,
'datestart' => $datestart->format('Y-m-d'),
diff --git a/zmsdb/src/Zmsdb/ExchangeWaitingscope.php b/zmsdb/src/Zmsdb/ExchangeWaitingscope.php
index 383742ab4..9d1d808f0 100644
--- a/zmsdb/src/Zmsdb/ExchangeWaitingscope.php
+++ b/zmsdb/src/Zmsdb/ExchangeWaitingscope.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
+use BO\Zmsentities\Exchange;
class ExchangeWaitingscope extends Base implements Interfaces\ExchangeSubject
{
@@ -33,7 +33,7 @@ public function readEntity(
$raw = $this
->getReader()
->fetchAll(
- constant("\BO\Zmsdb\Query\ExchangeWaitingscope::QUERY_READ_". strtoupper($period)),
+ constant("\BO\Zmsdb\Query\ExchangeWaitingscope::QUERY_READ_" . strtoupper($period)),
[
'scopeid' => $subjectid,
'datestart' => $datestart->format('Y-m-d'),
@@ -153,7 +153,7 @@ public function writeWaitingTimeCalculated(
}
$queueList = (new Scope())->readQueueListWithWaitingTime($scope, $now);
-
+
$existingEntry = $this->readByDateTime($scope, $now, $isWithAppointment);
$queueEntry = $queueList->getFakeOrLastWaitingnumber();
$waitingCalculated = $existingEntry['waitingcalculated'] > $queueEntry['waitingTimeEstimate'] ?
@@ -204,7 +204,7 @@ public function writeWaitingTime(
'waitingcalculated' => $existingEntry['waitingcalculated'],
'waitingcount' => $existingEntry['waitingcount'],
'waitingtime' => $waitingTime,
- 'waytime' => $wayTime,
+ 'waytime' => $wayTime,
'scopeid' => $process->scope->id,
'date' => $now->format('Y-m-d'),
'hour' => $now->format('H')
@@ -220,21 +220,21 @@ public function updateWaitingStatistics(
if ($now > (new \DateTime())) {
return $this;
}
-
+
$newWaitingTime = $process->getWaitedMinutes($now);
$newWayTime = $process->getWayMinutes($now);
-
+
$existingEntry = $this->readByDateTime(
$process->scope,
$process->getArrivalTime($now),
$process->isWithAppointment()
);
-
+
$waitingCount = $existingEntry['waitingcount'] + 1;
-
+
$averageWaitingTime = ($existingEntry['waitingtime'] * $existingEntry['waitingcount'] + $newWaitingTime) / $waitingCount;
$averageWayTime = ($existingEntry['waytime'] * $existingEntry['waitingcount'] + $newWayTime) / $waitingCount;
-
+
$this->perform(
Query\ExchangeWaitingscope::getQueryUpdateByDateTime(
$process->getArrivalTime($now),
@@ -250,8 +250,7 @@ public function updateWaitingStatistics(
'hour' => $now->format('H')
]
);
-
+
return $this;
}
-
}
diff --git a/zmsdb/src/Zmsdb/Helper/AnonymizeStatisticDataByCron.php b/zmsdb/src/Zmsdb/Helper/AnonymizeStatisticDataByCron.php
index c5152db99..a8c25eff9 100644
--- a/zmsdb/src/Zmsdb/Helper/AnonymizeStatisticDataByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/AnonymizeStatisticDataByCron.php
@@ -1,53 +1,52 @@
-verbose = $verbose;
-
- // Fetching the configuration setting
- $config = (new ConfigRepository())->readEntity();
-
- // Extracting the retention setting and converting it to an integer
- $envValue = getenv('ZMS_ENV');
- $retentionSetting = explode(',', $config->getPreference('buergerarchiv', 'setRetentionPeriodDays'));
- if ($retentionSetting[0] !== "none") {
- // Ensure it's a positive integer and assign it to timespan
- print("Using retention period set in admin system config {$retentionSetting[0]} days.\n\n");
- $this->timespan = (int)$retentionSetting[0];
- } else {
- // Default to 90 days if the setting is not set or not numeric
- print("Using default retention period 90 days.\n\n");
- $this->timespan = 90;
- }
- }
-
- public function startAnonymizing(\DateTimeImmutable $currentDate, $commit = false)
- {
- // Adjust the currentDate based on the numeric timespan
- $targetDate = $currentDate->modify("-{$this->timespan} days");
- print("Beginning anonymization for entries older than {$targetDate->format('Y-m-d')}.\n\n");
-
- if ($commit) {
- $processStatusArchived = new ProcessStatusArchived();
- $success = $processStatusArchived->anonymizeNames($targetDate);
- if ($success) {
- print("Anonymization process completed successfully.\n\n");
- } else {
- print("An error occurred during the anonymization process.\n\n");
- }
- } else {
- print("Dry run mode - no changes have been made to the database.\n\n");
- }
- }
-}
\ No newline at end of file
+verbose = $verbose;
+
+ // Fetching the configuration setting
+ $config = (new ConfigRepository())->readEntity();
+
+ // Extracting the retention setting and converting it to an integer
+ $retentionSetting = explode(',', $config->getPreference('buergerarchiv', 'setRetentionPeriodDays'));
+ if ($retentionSetting[0] !== "none") {
+ // Ensure it's a positive integer and assign it to timespan
+ print("Using retention period set in admin system config {$retentionSetting[0]} days.\n\n");
+ $this->timespan = (int)$retentionSetting[0];
+ } else {
+ // Default to 90 days if the setting is not set or not numeric
+ print("Using default retention period 90 days.\n\n");
+ $this->timespan = 90;
+ }
+ }
+
+ public function startAnonymizing(\DateTimeImmutable $currentDate, $commit = false)
+ {
+ // Adjust the currentDate based on the numeric timespan
+ $targetDate = $currentDate->modify("-{$this->timespan} days");
+ print("Beginning anonymization for entries older than {$targetDate->format('Y-m-d')}.\n\n");
+
+ if ($commit) {
+ $processStatusArchived = new ProcessStatusArchived();
+ $success = $processStatusArchived->anonymizeNames($targetDate);
+ if ($success) {
+ print("Anonymization process completed successfully.\n\n");
+ } else {
+ print("An error occurred during the anonymization process.\n\n");
+ }
+ } else {
+ print("Dry run mode - no changes have been made to the database.\n\n");
+ }
+ }
+}
diff --git a/zmsdb/src/Zmsdb/Helper/ApiQuotaDeleteByCron.php b/zmsdb/src/Zmsdb/Helper/ApiQuotaDeleteByCron.php
index 825b619a3..af4155ed1 100644
--- a/zmsdb/src/Zmsdb/Helper/ApiQuotaDeleteByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/ApiQuotaDeleteByCron.php
@@ -26,7 +26,7 @@ public function startProcessing($commit)
if ($this->quotaList) {
foreach ($this->quotaList as $quota) {
if ($verbose) {
- error_log("INFO: Processing quota: ". join(', ', $quota));
+ error_log("INFO: Processing quota: " . join(', ', $quota));
}
if ($commit) {
$this->removeQuota($quota['quotaid']);
diff --git a/zmsdb/src/Zmsdb/Helper/AppointmentDeallocateByCron.php b/zmsdb/src/Zmsdb/Helper/AppointmentDeallocateByCron.php
index 1d7830aeb..143875398 100644
--- a/zmsdb/src/Zmsdb/Helper/AppointmentDeallocateByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/AppointmentDeallocateByCron.php
@@ -8,13 +8,13 @@
class AppointmentDeallocateByCron
{
protected $verbose = false;
-
+
protected $limit = 10000;
-
+
protected $loopCount = 500;
protected $time;
-
+
protected $statuslist = [
"deleted"
];
@@ -56,7 +56,7 @@ public function startProcessing($commit)
{
$this->count['deallocated'] = 0;
$this->deallocateProcessList($commit);
- $this->log("\nSUMMARY: Deallocated processes: ".var_export($this->count, true));
+ $this->log("\nSUMMARY: Deallocated processes: " . var_export($this->count, true));
}
protected function deallocateProcessList($commit)
diff --git a/zmsdb/src/Zmsdb/Helper/AppointmentDeleteByCron.php b/zmsdb/src/Zmsdb/Helper/AppointmentDeleteByCron.php
index a8021b56e..d38ba1058 100644
--- a/zmsdb/src/Zmsdb/Helper/AppointmentDeleteByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/AppointmentDeleteByCron.php
@@ -81,7 +81,7 @@ public function startProcessing($commit, $pending = false)
$this->count = array_fill_keys($this->statuslist, 0);
$this->deleteBlockedProcesses($commit);
$this->deleteExpiredProcesses($commit);
- $this->log("\nSUMMARY: Deleted processes: ".var_export($this->count, true));
+ $this->log("\nSUMMARY: Deleted processes: " . var_export($this->count, true));
}
protected function deleteExpiredProcesses($commit)
diff --git a/zmsdb/src/Zmsdb/Helper/ArchivedDataIntoStatisticByCron.php b/zmsdb/src/Zmsdb/Helper/ArchivedDataIntoStatisticByCron.php
index 63296772a..ecf75ef48 100644
--- a/zmsdb/src/Zmsdb/Helper/ArchivedDataIntoStatisticByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/ArchivedDataIntoStatisticByCron.php
@@ -35,7 +35,7 @@ public function startProcessing(\DateTimeImmutable $dateTime, $commit = false)
$this->logMessage("INFO: Processing $scope");
$processList = $this->query->readListForStatistic($dateTime, $scope, $this->limit);
if ($processList->count()) {
- $this->logMessage("INFO: ".count($processList)." processes for $scope");
+ $this->logMessage("INFO: " . count($processList) . " processes for $scope");
$cluster = (new \BO\Zmsdb\Cluster())->readByScopeId($scope->getId());
$department = (new \BO\Zmsdb\Department())->readByScopeId($scope->getId());
if ($department) {
@@ -62,7 +62,7 @@ public function startProcessing(\DateTimeImmutable $dateTime, $commit = false)
$this->logMessage("INFO: No changes for scope $scope");
}
}
- $this->logMessage("\nSUMMARY: number of archived processes: ".count($this->archivedList));
+ $this->logMessage("\nSUMMARY: number of archived processes: " . count($this->archivedList));
}
public function getArchivedList()
@@ -111,11 +111,11 @@ protected function writeProcessInStatisticTable(
);
}
if ($archived) {
- $this->archivedList['scope_'. $scope->getId()][] = $process->archiveId;
+ $this->archivedList['scope_' . $scope->getId()][] = $process->archiveId;
$processDate = $process->getFirstAppointment()->toDateTime()->format('Y-m-d');
$this->logMessage(
"INFO: Process {$process->archiveId} with request {$request->getId()}"
- ." for scope {$scope->getId()} archived on $processDate"
+ . " for scope {$scope->getId()} archived on $processDate"
);
} else {
$this->logMessage(
diff --git a/zmsdb/src/Zmsdb/Helper/CalculateDayOff.php b/zmsdb/src/Zmsdb/Helper/CalculateDayOff.php
index 768c7ebf5..1b8edc3ff 100644
--- a/zmsdb/src/Zmsdb/Helper/CalculateDayOff.php
+++ b/zmsdb/src/Zmsdb/Helper/CalculateDayOff.php
@@ -43,7 +43,7 @@ protected function calculateDayOffByYear($year)
if (strpos($dateExpr, 'E') === 0) {
$dateExpr = ltrim($dateExpr, 'E');
$dtCurr = clone $dateEaster;
- $date = $dtCurr->modify($dateExpr.' day')->format($this->dateFormat);
+ $date = $dtCurr->modify($dateExpr . ' day')->format($this->dateFormat);
$entity = new \BO\Zmsentities\Dayoff([
'name' => $description,
'date' => (new \DateTimeImmutable($date))->getTimestamp()
@@ -67,7 +67,7 @@ protected function calculateEaster($year)
$date = $date->setDate($year, $date->format('m'), $date->format('d'));
}
$easterDate = \easter_date($date->format('Y'));
-
+
return $date->setTimestamp($easterDate);
}
@@ -89,7 +89,7 @@ public function writeDayOffListUntilYear($commit = false, $fromnow = false)
return $list->sortByCustomKey('date');
}
}
-
+
protected function readDayoffList($query, $year)
{
$collection = $query->readCommonByYear($year);
diff --git a/zmsdb/src/Zmsdb/Helper/CalculateSlots.php b/zmsdb/src/Zmsdb/Helper/CalculateSlots.php
index e1d6f93ee..5b852537a 100644
--- a/zmsdb/src/Zmsdb/Helper/CalculateSlots.php
+++ b/zmsdb/src/Zmsdb/Helper/CalculateSlots.php
@@ -22,7 +22,7 @@ public function __construct($verbose = false)
public function log($message)
{
$time = $this->getSpendTime();
- $memory = memory_get_usage()/(1024*1024);
+ $memory = memory_get_usage() / (1024 * 1024);
$text = sprintf("[CalculateSlots %07.3fs %07.1fmb] %s", "$time", $memory, $message);
$this->logList[] = $text;
if ($this->verbose) {
@@ -49,13 +49,13 @@ public function getSpendTime()
protected function readCalculateSkip()
{
- $skip = (new \BO\Zmsdb\Config)->readProperty('status__calculateSlotsSkip');
+ $skip = (new \BO\Zmsdb\Config())->readProperty('status__calculateSlotsSkip');
return $skip;
}
protected function readForceVerbose()
{
- $force = (new \BO\Zmsdb\Config)->readProperty('status__calculateSlotsForceVerbose');
+ $force = (new \BO\Zmsdb\Config())->readProperty('status__calculateSlotsForceVerbose');
if ($force) {
$this->log("Forced verbose, see table config.status__calculateSlotsForceVerbose");
$this->dumpLogs();
@@ -65,13 +65,13 @@ protected function readForceVerbose()
protected function readLastRun()
{
- $updateTimestamp = (new \BO\Zmsdb\Config)->readProperty('status__calculateSlotsLastRun', true);
+ $updateTimestamp = (new \BO\Zmsdb\Config())->readProperty('status__calculateSlotsLastRun', true);
return $updateTimestamp;
}
public function writeMaintenanceQueries()
{
- $sqlList = (new \BO\Zmsdb\Config)->readProperty('status__calculateSlotsMaintenanceSQL');
+ $sqlList = (new \BO\Zmsdb\Config())->readProperty('status__calculateSlotsMaintenanceSQL');
if ($sqlList) {
$pdo = \BO\Zmsdb\Connection\Select::getWriteConnection();
foreach (explode("\n", $sqlList) as $sql) {
@@ -89,18 +89,18 @@ public function writeCalculations(\DateTimeInterface $now, $delete = false)
\BO\Zmsdb\Connection\Select::setTransaction();
\BO\Zmsdb\Connection\Select::getWriteConnection();
$this->readForceVerbose();
- $this->log("Calculate with time ". $now->format('c'));
+ $this->log("Calculate with time " . $now->format('c'));
if ($this->readCalculateSkip()) {
$this->log("Skip calculation due to config setting status.calculateSlotsSkip");
return false;
}
- $startTimestamp = (new \BO\Zmsdb\Config)->readProperty('status__calculateSlotsLastStart', true);
- $updateTimestamp = (new \BO\Zmsdb\Config)->readProperty('status__calculateSlotsLastRun', false);
+ $startTimestamp = (new \BO\Zmsdb\Config())->readProperty('status__calculateSlotsLastStart', true);
+ $updateTimestamp = (new \BO\Zmsdb\Config())->readProperty('status__calculateSlotsLastRun', false);
if ($startTimestamp > $updateTimestamp && ((strtotime($startTimestamp) + (60 * 15)) > $now->getTimestamp())) {
$this->log("Skip calculation, last start on $startTimestamp is not yet finished, waiting 15 minutes.");
return false;
}
- (new \BO\Zmsdb\Config)->replaceProperty('status__calculateSlotsLastStart', $now->format('Y-m-d H:i:s'));
+ (new \BO\Zmsdb\Config())->replaceProperty('status__calculateSlotsLastStart', $now->format('Y-m-d H:i:s'));
\BO\Zmsdb\Connection\Select::writeCommit();
$updateTimestamp = $this->readLastRun();
$this->log("Last Run on time=" . $updateTimestamp);
@@ -128,7 +128,7 @@ public function writeCalculations(\DateTimeInterface $now, $delete = false)
$this->log("Updated Slot-Process-Mapping, mapped $slotsProcessed processes");
}
- (new \BO\Zmsdb\Config)->replaceProperty('status__calculateSlotsLastRun', $now->format('Y-m-d H:i:s'));
+ (new \BO\Zmsdb\Config())->replaceProperty('status__calculateSlotsLastRun', $now->format('Y-m-d H:i:s'));
\BO\Zmsdb\Connection\Select::writeCommit();
$this->log("Slot calculation finished");
@@ -172,7 +172,7 @@ public function writeCanceledSlots(\DateTimeInterface $now, $modify = '+5 minute
$slotQuery = new \BO\Zmsdb\Slot();
if ($slotQuery->writeCanceledByTime($now->modify($modify))) {
\BO\Zmsdb\Connection\Select::writeCommit();
- $this->log("Cancelled slots older than ".$now->modify($modify)->format('c'));
+ $this->log("Cancelled slots older than " . $now->modify($modify)->format('c'));
return true;
}
return false;
@@ -180,7 +180,7 @@ public function writeCanceledSlots(\DateTimeInterface $now, $modify = '+5 minute
public function deleteOldSlots(\DateTimeInterface $now)
{
- $this->log("Maintenance: Delete slots older than ". $now->format('Y-m-d'));
+ $this->log("Maintenance: Delete slots older than " . $now->format('Y-m-d'));
$slotQuery = new \BO\Zmsdb\Slot();
$pdo = \BO\Zmsdb\Connection\Select::getWriteConnection();
$pdo->exec('SET SESSION innodb_lock_wait_timeout=600');
diff --git a/zmsdb/src/Zmsdb/Helper/EventLogCleanUpByCron.php b/zmsdb/src/Zmsdb/Helper/EventLogCleanUpByCron.php
index 14d564fed..87d1a350a 100644
--- a/zmsdb/src/Zmsdb/Helper/EventLogCleanUpByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/EventLogCleanUpByCron.php
@@ -1,4 +1,5 @@
process = $process;
}
- protected function getProviderId() {
+ protected function getProviderId()
+ {
return $this->process->scope->provider['id'];
}
- public function getTemplate($templateName) {
+ public function getTemplate($templateName)
+ {
if (!$this->templates) {
$this->loadTemplates();
}
return $this->templates[$templateName];
}
- public function getTemplates() {
+ public function getTemplates()
+ {
if (!$this->templates) {
$this->loadTemplates();
}
return $this->templates;
}
- protected function loadTemplates() {
+ protected function loadTemplates()
+ {
$this->templates = array(
- 'notification_appointment.twig'=> "template is empty",
- 'notification_confirmation.twig'=> "template is empty",
- 'notification_headsup.twig'=> "template is empty",
- 'notification_reminder.twig'=> "template is empty",
- 'notification_pickup.twig'=> "template is empty",
+ 'notification_appointment.twig' => "template is empty",
+ 'notification_confirmation.twig' => "template is empty",
+ 'notification_headsup.twig' => "template is empty",
+ 'notification_reminder.twig' => "template is empty",
+ 'notification_pickup.twig' => "template is empty",
'notification_deleted.twig' => "template is empty",
- 'mail_queued.twig'=> "template is empty",
- 'mail_confirmation.twig'=> "template is empty",
- 'mail_reminder.twig'=> "template is empty",
- 'mail_pickup.twig'=> "template is empty",
- 'mail_delete.twig'=> "template is empty",
- 'mail_survey.twig'=> "template is empty",
- 'mail_processlist_overview.twig'=> "template is empty",
+ 'mail_queued.twig' => "template is empty",
+ 'mail_confirmation.twig' => "template is empty",
+ 'mail_reminder.twig' => "template is empty",
+ 'mail_pickup.twig' => "template is empty",
+ 'mail_delete.twig' => "template is empty",
+ 'mail_survey.twig' => "template is empty",
+ 'mail_processlist_overview.twig' => "template is empty",
'mail_preconfirmed.twig' => "template is empty",
- 'icsappointment.twig'=> "template is empty",
+ 'icsappointment.twig' => "template is empty",
'icsappointment_delete.twig' => "template is empty",
- 'mail_admin_delete.twig'=> "template is empty",
+ 'mail_admin_delete.twig' => "template is empty",
'mail_admin_update.twig' => "template is empty",
);
$result = (new \BO\Zmsdb\MailTemplates())->readCustomizedListForProvider($this->getProviderId());
- foreach($result as $templateObject) {
+ foreach ($result as $templateObject) {
$this->templates[$templateObject['name']] = $templateObject['value'];
}
-
-
}
-
-
-
-}
\ No newline at end of file
+}
diff --git a/zmsdb/src/Zmsdb/Helper/ProcessStatus.php b/zmsdb/src/Zmsdb/Helper/ProcessStatus.php
index 339716b28..b3c3c927f 100644
--- a/zmsdb/src/Zmsdb/Helper/ProcessStatus.php
+++ b/zmsdb/src/Zmsdb/Helper/ProcessStatus.php
@@ -1,7 +1,8 @@
true,
'reserved' => $this->isReservedProcess($processData),
diff --git a/zmsdb/src/Zmsdb/Helper/ReservedDataDeleteByCron.php b/zmsdb/src/Zmsdb/Helper/ReservedDataDeleteByCron.php
index c7ecfa14f..789398ee4 100644
--- a/zmsdb/src/Zmsdb/Helper/ReservedDataDeleteByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/ReservedDataDeleteByCron.php
@@ -1,5 +1,9 @@
log(
- "\nNow: ". $this->nowTime->format('H:i:s') .
- "\nTime of expiration: ". $expirationTime->format('H:i:s') ." | scope ". $scope->id .
- " | $reservationDuration minutes reservation time (". $processList->count() . " found)" .
+ "\nNow: " . $this->nowTime->format('H:i:s') .
+ "\nTime of expiration: " . $expirationTime->format('H:i:s') . " | scope " . $scope->id .
+ " | $reservationDuration minutes reservation time (" . $processList->count() . " found)" .
"\n-------------------------------------------------------------------"
);
diff --git a/zmsdb/src/Zmsdb/Helper/RestoreDeletedDataByCron.php b/zmsdb/src/Zmsdb/Helper/RestoreDeletedDataByCron.php
index 0d92366f2..127dc83ac 100644
--- a/zmsdb/src/Zmsdb/Helper/RestoreDeletedDataByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/RestoreDeletedDataByCron.php
@@ -17,7 +17,7 @@ public function __construct($verbose = false)
error_log("INFO: Restoring deleted appointments based on delay time");
$this->verbose = true;
}
- $this->scopeList = (new \BO\Zmsdb\Scope)->readList();
+ $this->scopeList = (new \BO\Zmsdb\Scope())->readList();
}
public function startProcessing($commit)
@@ -26,7 +26,7 @@ public function startProcessing($commit)
$time = new \DateTimeImmutable();
$reservationDuration = $scope->toProperty()->preferences->appointment->reservationDuration->get();
$time = $time->setTimestamp($time->getTimestamp() - ($reservationDuration * 60));
- $processList = (new \BO\Zmsdb\Process)->readExpiredReservationsList($time, $scope->id, 10000);
+ $processList = (new \BO\Zmsdb\Process())->readExpiredReservationsList($time, $scope->id, 10000);
foreach ($processList as $process) {
if ($this->verbose) {
diff --git a/zmsdb/src/Zmsdb/Helper/SendMailReminder.php b/zmsdb/src/Zmsdb/Helper/SendMailReminder.php
index f4495f3fa..2f6fe3f1d 100644
--- a/zmsdb/src/Zmsdb/Helper/SendMailReminder.php
+++ b/zmsdb/src/Zmsdb/Helper/SendMailReminder.php
@@ -36,12 +36,12 @@ public function __construct(\DateTimeInterface $now, $sendReminderBeforeMinutes,
$this->loopCount = ($configBatchSize) ? $configBatchSize : $this->loopCount;
$this->dateTime = $now;
$this->defaultReminderInMinutes = $sendReminderBeforeMinutes;
- $this->lastRun = (new MailRepository)->readReminderLastRun($now);
+ $this->lastRun = (new MailRepository())->readReminderLastRun($now);
if ($verbose) {
$this->verbose = true;
$this->log(
- "\nINFO: Send email reminder (Limits: ".
- $configLimit ."|". $configBatchSize .") dependent on last run: ".
+ "\nINFO: Send email reminder (Limits: " .
+ $configLimit . "|" . $configBatchSize . ") dependent on last run: " .
$this->lastRun->format('Y-m-d H:i:s')
);
}
@@ -72,11 +72,11 @@ public function setLoopCount($loopCount)
public function startProcessing($commit)
{
if ($commit) {
- (new MailRepository)->writeReminderLastRun($this->dateTime);
+ (new MailRepository())->writeReminderLastRun($this->dateTime);
}
$this->writeMailReminderList($commit);
- $this->log("\nINFO: Last run ". $this->dateTime->format('Y-m-d H:i:s'));
- $this->log("\nSUMMARY: Sent mail reminder: ".$this->count);
+ $this->log("\nINFO: Last run " . $this->dateTime->format('Y-m-d H:i:s'));
+ $this->log("\nSUMMARY: Sent mail reminder: " . $this->count);
}
protected function writeMailReminderList($commit)
@@ -84,7 +84,7 @@ protected function writeMailReminderList($commit)
// The offset parameter was removed here, because with each loop the processes are searched, which have not
// been processed yet. An offset leads to the fact that with the renewed search the first results are skipped.
$count = $this->writeByCallback($commit, function ($limit) {
- $processList = (new ProcessRepository)->readEmailReminderProcessListByInterval(
+ $processList = (new ProcessRepository())->readEmailReminderProcessListByInterval(
$this->dateTime,
$this->lastRun,
$this->defaultReminderInMinutes,
@@ -101,12 +101,12 @@ protected function writeByCallback($commit, \Closure $callback)
{
$processCount = 0;
while ($processCount < $this->limit) {
- $this->log("***Stack count***: ".$processCount);
+ $this->log("***Stack count***: " . $processCount);
$processList = $callback($this->loopCount);
if (0 == $processList->count()) {
break;
}
-
+
foreach ($processList as $process) {
$this->writeReminder($process, $commit, $processCount);
$processCount++;
@@ -119,25 +119,25 @@ protected function writeReminder(Process $process, $commit, $processCount)
{
$department = (new DepartmentRepository())->readByScopeId($process->getScopeId(), 0);
if ($process->getFirstClient()->hasEmail() && $department->hasMail()) {
- $config = (new ConfigRepository)->readEntity();
+ $config = (new ConfigRepository())->readEntity();
$collection = $this->getProcessListOverview($process, $config);
-
+
$entity = (new Mail())
->setTemplateProvider(new \BO\Zmsdb\Helper\MailTemplateProvider($process))
->toResolvedEntity($collection, $config, 'reminder');
-
+
$this->log(
- "INFO: $processCount. Create mail with process ". $process->getId() .
- " - ". $entity->subject ." for ". $process->getFirstAppointment()
+ "INFO: $processCount. Create mail with process " . $process->getId() .
+ " - " . $entity->subject . " for " . $process->getFirstAppointment()
);
if ($commit) {
- $entity = (new MailRepository)->writeInQueue($entity, $this->dateTime);
+ $entity = (new MailRepository())->writeInQueue($entity, $this->dateTime);
Log::writeProcessLog(
"Write Reminder (Mail::writeInQueue) $entity ",
Log::ACTION_SEND_REMINDER,
$process
);
- $this->log("INFO: Mail has been written in queue successfully with ID ". $entity->getId());
+ $this->log("INFO: Mail has been written in queue successfully with ID " . $entity->getId());
}
}
}
diff --git a/zmsdb/src/Zmsdb/Helper/SendNotificationReminder.php b/zmsdb/src/Zmsdb/Helper/SendNotificationReminder.php
index 77f9b3639..aaf3b6239 100644
--- a/zmsdb/src/Zmsdb/Helper/SendNotificationReminder.php
+++ b/zmsdb/src/Zmsdb/Helper/SendNotificationReminder.php
@@ -30,8 +30,8 @@ public function __construct(\DateTimeInterface $now, $verbose = false)
if ($verbose) {
$this->verbose = true;
$this->log(
- "\nINFO: Send notification reminder (Limits: ".
- $configLimit ."|". $configBatchSize .") dependent on lead time"
+ "\nINFO: Send notification reminder (Limits: " .
+ $configLimit . "|" . $configBatchSize . ") dependent on lead time"
);
}
}
@@ -61,8 +61,8 @@ public function setLoopCount($loopCount)
public function startProcessing($commit)
{
$this->writeNotificationReminderList($commit);
- $this->log("\nINFO: Last run ". $this->dateTime->format('Y-m-d H:i:s'));
- $this->log("SUMMARY: Sent notification reminder: ".$this->count);
+ $this->log("\nINFO: Last run " . $this->dateTime->format('Y-m-d H:i:s'));
+ $this->log("SUMMARY: Sent notification reminder: " . $this->count);
}
protected function writeNotificationReminderList($commit)
@@ -70,7 +70,7 @@ protected function writeNotificationReminderList($commit)
// The offset parameter was removed here, because with each loop the processes are searched, which have not
// been processed yet. An offset leads to the fact that with the renewed search the first results are skipped.
$count = $this->writeByCallback($commit, function ($limit) {
- $processList = (new \BO\Zmsdb\Process)->readNotificationReminderProcessList(
+ $processList = (new \BO\Zmsdb\Process())->readNotificationReminderProcessList(
$this->dateTime,
$limit,
null,
@@ -85,7 +85,7 @@ protected function writeByCallback($commit, \Closure $callback)
{
$processCount = 0;
while ($processCount < $this->limit) {
- $this->log("***Stack count***: ".$processCount);
+ $this->log("***Stack count***: " . $processCount);
$processList = $callback($this->loopCount);
if (0 == $processList->count()) {
break;
@@ -100,20 +100,20 @@ protected function writeByCallback($commit, \Closure $callback)
protected function writeReminder(\BO\Zmsentities\Process $process, $commit, $processCount)
{
- $config = (new \BO\Zmsdb\Config)->readEntity();
- $department = (new \BO\Zmsdb\Department)->readByScopeId($process->getScopeId(), 2);
- $entity = (new \BO\Zmsentities\Notification)->toResolvedEntity($process, $config, $department, 'reminder');
+ $config = (new \BO\Zmsdb\Config())->readEntity();
+ $department = (new \BO\Zmsdb\Department())->readByScopeId($process->getScopeId(), 2);
+ $entity = (new \BO\Zmsentities\Notification())->toResolvedEntity($process, $config, $department, 'reminder');
$this->log("INFO: $processCount Create notification: $entity->message");
if ($commit) {
- $notification = (new \BO\Zmsdb\Notification)->writeInQueue($entity, $this->dateTime);
+ $notification = (new \BO\Zmsdb\Notification())->writeInQueue($entity, $this->dateTime);
Log::writeProcessLog(
"Write Reminder (Notification::writeInQueue) $entity ",
Log::ACTION_SEND_REMINDER,
$process
);
$this->log(
- "INFO: $processCount Notification has been written in queue successfully with ID ".
+ "INFO: $processCount Notification has been written in queue successfully with ID " .
$notification->getId()
);
$this->deleteReminderTimestamp($process, $notification, $processCount, $commit);
@@ -129,7 +129,7 @@ protected function deleteReminderTimestamp(
if ($notification) {
$process->reminderTimestamp = 0;
if ($commit) {
- $process = (new \BO\Zmsdb\Process)->updateEntity($process, $this->dateTime);
+ $process = (new \BO\Zmsdb\Process())->updateEntity($process, $this->dateTime);
}
$this->log("INFO: $processCount Updated $process->id - reminder timestamp removed");
} else {
diff --git a/zmsdb/src/Zmsdb/Helper/SendProcessListToScopeAdmin.php b/zmsdb/src/Zmsdb/Helper/SendProcessListToScopeAdmin.php
index 7afec4810..bfb28355f 100644
--- a/zmsdb/src/Zmsdb/Helper/SendProcessListToScopeAdmin.php
+++ b/zmsdb/src/Zmsdb/Helper/SendProcessListToScopeAdmin.php
@@ -24,7 +24,7 @@ public function __construct($verbose = false, $scopeId = false)
$scope = (new \BO\Zmsdb\Scope())->readEntity($scopeId);
$this->scopeList = (new \BO\Zmsentities\Collection\ScopeList())->addEntity($scope);
} else {
- $this->scopeList = (new \BO\Zmsdb\Scope)->readListWithScopeAdminEmail(1);
+ $this->scopeList = (new \BO\Zmsdb\Scope())->readListWithScopeAdminEmail(1);
}
}
@@ -35,7 +35,7 @@ public function startProcessing($commit)
error_log("INFO: Processing $scope");
}
if ($commit) {
- $processList = (new \BO\Zmsdb\Process)
+ $processList = (new \BO\Zmsdb\Process())
->readProcessListByScopeAndTime($scope->getId(), $this->dateTime, 1);
$processList = $processList
->toQueueList($this->dateTime)
@@ -44,7 +44,7 @@ public function startProcessing($commit)
->toProcessList();
if (0 <= $processList->count()) {
if ($this->sendListToQueue($scope, $processList) && $this->verbose) {
- error_log('INFO: Send processList to:'. $scope->getContactEmail());
+ error_log('INFO: Send processList to:' . $scope->getContactEmail());
}
} else {
error_log("WARNING: Processlist empty for $scope->id");
@@ -55,8 +55,8 @@ public function startProcessing($commit)
protected function sendListToQueue($scope, $processList)
{
- $entity = (new \BO\Zmsentities\Mail)->toScopeAdminProcessList($processList, $scope, $this->dateTime);
- if (! (new \BO\Zmsdb\Mail)->writeInQueueWithDailyProcessList($scope, $entity)) {
+ $entity = (new \BO\Zmsentities\Mail())->toScopeAdminProcessList($processList, $scope, $this->dateTime);
+ if (! (new \BO\Zmsdb\Mail())->writeInQueueWithDailyProcessList($scope, $entity)) {
error_log("WARNING: Mail writing in queue not successfull empty!");
}
}
diff --git a/zmsdb/src/Zmsdb/Helper/TicketprinterDeleteByCron.php b/zmsdb/src/Zmsdb/Helper/TicketprinterDeleteByCron.php
index 42d26f5aa..6b542a0df 100644
--- a/zmsdb/src/Zmsdb/Helper/TicketprinterDeleteByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/TicketprinterDeleteByCron.php
@@ -22,12 +22,12 @@ public function __construct($verbose = false)
);
$this->verbose = true;
}
- $this->scopeList = (new \BO\Zmsdb\Scope)->readList();
+ $this->scopeList = (new \BO\Zmsdb\Scope())->readList();
}
public function startProcessing($commit)
{
- $ticketprinterList = (new \BO\Zmsdb\Ticketprinter)->readExpiredTicketprinterList($this->deleteDateTime);
+ $ticketprinterList = (new \BO\Zmsdb\Ticketprinter())->readExpiredTicketprinterList($this->deleteDateTime);
foreach ($ticketprinterList as $entity) {
if ($this->verbose) {
error_log("INFO: Processing $entity");
diff --git a/zmsdb/src/Zmsdb/Helper/UnconfirmedAppointmentDeleteByCron.php b/zmsdb/src/Zmsdb/Helper/UnconfirmedAppointmentDeleteByCron.php
index cab3b252d..9010bf199 100644
--- a/zmsdb/src/Zmsdb/Helper/UnconfirmedAppointmentDeleteByCron.php
+++ b/zmsdb/src/Zmsdb/Helper/UnconfirmedAppointmentDeleteByCron.php
@@ -25,7 +25,7 @@ public function __construct(\DateTimeInterface $now, $verbose = false)
{
$this->now = $now;
$this->verbose = $verbose;
- $this->scopeList = (new \BO\Zmsdb\Scope)->readList();
+ $this->scopeList = (new \BO\Zmsdb\Scope())->readList();
}
protected function log($message)
@@ -53,7 +53,7 @@ public function setLoopCount($loopCount)
public function startProcessing($commit)
{
$this->deleteUnconfirmedProcesses($commit);
- $this->log("\nSUMMARY: Deleted processes: ".var_export($this->count, true));
+ $this->log("\nSUMMARY: Deleted processes: " . var_export($this->count, true));
}
protected function deleteUnconfirmedProcesses($commit)
diff --git a/zmsdb/src/Zmsdb/Link.php b/zmsdb/src/Zmsdb/Link.php
index 6d75a47a8..7714e946e 100644
--- a/zmsdb/src/Zmsdb/Link.php
+++ b/zmsdb/src/Zmsdb/Link.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Link as Entity;
-use \BO\Zmsentities\Collection\LinkList as Collection;
+use BO\Zmsentities\Link as Entity;
+use BO\Zmsentities\Collection\LinkList as Collection;
class Link extends Base
{
diff --git a/zmsdb/src/Zmsdb/Log.php b/zmsdb/src/Zmsdb/Log.php
index fb7993d90..bbb1ea52d 100644
--- a/zmsdb/src/Zmsdb/Log.php
+++ b/zmsdb/src/Zmsdb/Log.php
@@ -1,8 +1,9 @@
getRequestIds())) {
- $requests = (new Request)->readRequestsByIds($process->getRequestIds());
+ $requests = (new Request())->readRequestsByIds($process->getRequestIds());
}
$data = json_encode(array_filter([
@@ -132,11 +133,12 @@ protected static function backtraceLogEntry()
$trace = debug_backtrace();
$short = '';
foreach ($trace as $step) {
- if (isset($step['file'])
+ if (
+ isset($step['file'])
&& isset($step['line'])
&& !strpos($step['file'], 'Zmsdb')
) {
- return ' ('.basename($step['file'], '.php') .')';
+ return ' (' . basename($step['file'], '.php') . ')';
}
}
return $short;
diff --git a/zmsdb/src/Zmsdb/Mail.php b/zmsdb/src/Zmsdb/Mail.php
index e94b70668..83357592e 100644
--- a/zmsdb/src/Zmsdb/Mail.php
+++ b/zmsdb/src/Zmsdb/Mail.php
@@ -2,10 +2,10 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Mail as Entity;
-use \BO\Zmsentities\Mimepart;
-use \BO\Zmsentities\Process as ProcessEntity;
-use \BO\Zmsentities\Collection\MailList as Collection;
+use BO\Zmsentities\Mail as Entity;
+use BO\Zmsentities\Mimepart;
+use BO\Zmsentities\Process as ProcessEntity;
+use BO\Zmsentities\Collection\MailList as Collection;
/**
*
@@ -13,7 +13,6 @@
*/
class Mail extends Base
{
-
/**
* Fetch status from db
*
@@ -31,7 +30,7 @@ public function readEntity($itemId, $resolveReferences = 1)
}
return $mail;
}
-
+
public function readEntities(array $itemIds, $resolveReferences = 1, $limit = 300, $order = 'ASC')
{
$mailList = new Collection();
@@ -39,7 +38,7 @@ public function readEntities(array $itemIds, $resolveReferences = 1, $limit = 30
$query->addEntityMapping()
->addResolvedReferences($resolveReferences)
->addWhereIn('id', $itemIds)
- ->addOrderBy('createTimestamp', 'ASC')
+ ->addOrderBy('createTimestamp', $order)
->addLimit($limit);
$result = $this->fetchList($query, new Entity());
@@ -50,11 +49,11 @@ public function readEntities(array $itemIds, $resolveReferences = 1, $limit = 30
$mailList->addEntity($entity);
}
}
-
+
return $mailList;
- }
-
-
+ }
+
+
public function readEntitiesIds(array $itemIds, $resolveReferences = 1, $limit = 300, $order = 'ASC')
{
@@ -67,8 +66,7 @@ public function readEntitiesIds(array $itemIds, $resolveReferences = 1, $limit =
->addLimit($limit);
return $this->fetchList($query, new Entity());
-
- }
+ }
public function readList($resolveReferences = 1, $limit = 300, $order = 'ASC')
{
@@ -79,7 +77,7 @@ public function readList($resolveReferences = 1, $limit = 300, $order = 'ASC')
->addOrderBy('createTimestamp', $order)
->addLimit($limit);
$result = $this->fetchList($query, new Entity());
-
+
foreach ($result as $item) {
$entity = new Entity($item);
$entity = $this->readResolvedReferences($entity, $resolveReferences);
@@ -87,7 +85,7 @@ public function readList($resolveReferences = 1, $limit = 300, $order = 'ASC')
$mailList->addEntity($entity);
}
}
-
+
return $mailList;
}
@@ -102,7 +100,6 @@ public function readListIds($resolveReferences = 1, $limit = 300, $order = 'ASC'
->addLimit($limit);
return $this->fetchList($query, new Entity());
-
}
@@ -243,7 +240,7 @@ public function deleteEntities(array $itemIds)
public function readReminderLastRun($now)
{
- $lastRun = (new \BO\Zmsdb\Config)->readProperty('status__mailReminderLastRun', false);
+ $lastRun = (new \BO\Zmsdb\Config())->readProperty('status__mailReminderLastRun', false);
$lastRunDateTime = ($lastRun) ? new \DateTimeImmutable($lastRun) : $now;
return $lastRunDateTime;
}
diff --git a/zmsdb/src/Zmsdb/MailTemplates.php b/zmsdb/src/Zmsdb/MailTemplates.php
index fcd344982..dafc7c7fb 100644
--- a/zmsdb/src/Zmsdb/MailTemplates.php
+++ b/zmsdb/src/Zmsdb/MailTemplates.php
@@ -1,7 +1,8 @@
addEntityMapping()
->addConditionName($templateName);
return $this->fetchOne($query, new Mailtemplate());
}
- public function readTemplateById($templateId) {
+ public function readTemplateById($templateId)
+ {
$query = new Query\Mailtemplate(Query\Base::SELECT);
$query->addEntityMapping()
->addConditionId($templateId);
@@ -116,7 +119,7 @@ public function updateEntity(MailTemplate $config)
foreach ($item as $itemName => $itemValue) {
if ($itemValue && $compareEntity->getPreference($key, $itemName) != $itemValue) {
$query->addValues(array(
- 'name' => $key .'__'. $itemName,
+ 'name' => $key . '__' . $itemName,
'value' => $this->getSpecifiedValue($itemValue),
'changeTimestamp' => (new \DateTimeImmutable())->format('Y-m-d H:i:s')
));
@@ -184,7 +187,8 @@ protected function getSpecifiedValue($value)
return trim($value);
}
- function mergeMailTemplatesWithCustomizations($generalTemplates, $customTemplates) {
+ protected function mergeMailTemplatesWithCustomizations($generalTemplates, $customTemplates)
+ {
$customTemplatesByName = [];
@@ -208,6 +212,4 @@ function mergeMailTemplatesWithCustomizations($generalTemplates, $customTemplate
return $mergedTemplates;
}
-
-
}
diff --git a/zmsdb/src/Zmsdb/Notification.php b/zmsdb/src/Zmsdb/Notification.php
index f47425a3e..a298b4efc 100644
--- a/zmsdb/src/Zmsdb/Notification.php
+++ b/zmsdb/src/Zmsdb/Notification.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Notification as Entity;
-use \BO\Zmsentities\Collection\NotificationList as Collection;
+use BO\Zmsentities\Notification as Entity;
+use BO\Zmsentities\Collection\NotificationList as Collection;
class Notification extends Base
{
diff --git a/zmsdb/src/Zmsdb/Organisation.php b/zmsdb/src/Zmsdb/Organisation.php
index a14f22a08..4fee65891 100644
--- a/zmsdb/src/Zmsdb/Organisation.php
+++ b/zmsdb/src/Zmsdb/Organisation.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Organisation as Entity;
-use \BO\Zmsentities\Collection\OrganisationList as Collection;
+use BO\Zmsentities\Organisation as Entity;
+use BO\Zmsentities\Collection\OrganisationList as Collection;
/**
*
diff --git a/zmsdb/src/Zmsdb/Owner.php b/zmsdb/src/Zmsdb/Owner.php
index dc6903d89..a6a28d238 100644
--- a/zmsdb/src/Zmsdb/Owner.php
+++ b/zmsdb/src/Zmsdb/Owner.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Owner as Entity;
-use \BO\Zmsentities\Collection\OwnerList as Collection;
+use BO\Zmsentities\Owner as Entity;
+use BO\Zmsentities\Collection\OwnerList as Collection;
class Owner extends Base
{
diff --git a/zmsdb/src/Zmsdb/Preferences.php b/zmsdb/src/Zmsdb/Preferences.php
index 9575c7ae7..e9213a9a1 100644
--- a/zmsdb/src/Zmsdb/Preferences.php
+++ b/zmsdb/src/Zmsdb/Preferences.php
@@ -1,4 +1,5 @@
addConditionProcessId($process['id']);
$query->addConditionAuthKey($process['authKey']);
$query->addValuesUpdateProcess($process, $now, 0, $previousStatus);
-
+
if ($this->perform($query->getLockProcessId(), ['processId' => $process->getId()])) {
$this->writeItem($query);
$this->writeRequestsToDb($process);
@@ -125,14 +126,14 @@ public function updateEntityWithSlots(
}
$process = clone $process;
$appointment = $process->getAppointments()->getFirst();
- $slotList = (new Slot)->readByAppointment($appointment, $slotsRequired, true);
+ $slotList = (new Slot())->readByAppointment($appointment, $slotsRequired, true);
$processEntityList = $this->readEntityList($process->getId());
foreach ($processEntityList as $entity) {
if ($process->getId() != $entity->getId()) {
$this->writeDeletedEntity($entity->getId());
}
}
-
+
foreach ($slotList as $slot) {
$newProcess = clone $process;
$newProcess->getFirstAppointment()->setTime($slot->time);
@@ -163,15 +164,15 @@ public function writeNewPickup(
\DateTimeInterface $dateTime,
$newQueueNumber = 0,
\BO\Zmsentities\Useraccount $useraccount = null
- )
- {
+ ) {
$process = Entity::createFromScope($scope, $dateTime);
$process->setStatus('pending');
if (!$newQueueNumber) {
$newQueueNumber = (new Scope())->readWaitingNumberUpdated($scope->id, $dateTime);
}
$process->addQueue($newQueueNumber, $dateTime);
- Log::writeProcessLog("CREATE (Process::writeNewPickup) $process ",
+ Log::writeProcessLog(
+ "CREATE (Process::writeNewPickup) $process ",
Log::ACTION_NEW_PICKUP,
$process,
$useraccount
@@ -184,8 +185,7 @@ public function redirectToScope(
\BO\Zmsentities\Scope $scope,
int $waitingNumber,
?\BO\Zmsentities\Useraccount $useraccount = null
- )
- {
+ ) {
$datetime = \App::$now;
$process->setStatus('confirmed');
@@ -272,7 +272,7 @@ public function writeEntityWithNewAppointment(
Log::ACTION_EDITED,
$process
);
-
+
$status = ($keepReserved) ? Entity::STATUS_RESERVED : ENTITY::STATUS_CONFIRMED;
return $this->updateProcessStatus($processNew, $status, $now, $resolveReferences);
}
@@ -366,7 +366,7 @@ protected function writeNewProcess(
if (!$process->toQueue($dateTime)->withAppointment) {
(new ExchangeWaitingscope())->writeWaitingTimeCalculated($process->scope, $dateTime, false);
}
-
+
return $process;
}
@@ -599,7 +599,7 @@ protected function addSearchConditions(Query\Process $query, $parameter)
public function readProcessListByClusterAndTime($clusterId, \DateTimeInterface $dateTime)
{
$processList = new Collection();
- $cluster = (new Cluster)->readEntity($clusterId, 1);
+ $cluster = (new Cluster())->readEntity($clusterId, 1);
if ($cluster->scopes->count()) {
foreach ($cluster->scopes as $scope) {
$processList->addList($this->readProcessListByScopeAndTime($scope->id, $dateTime));
@@ -639,7 +639,7 @@ public function readProcessListByMailAddress(
int $scopeId = null,
$resolveReferences = 0,
$limit = 2000
- ) : Collection {
+ ): Collection {
$query = new Query\Process(Query\Base::SELECT);
$query
->addResolvedReferences($resolveReferences)
@@ -666,7 +666,7 @@ public function readListByMailAndStatusList(
array $statusList,
$resolveReferences = 1,
$limit = 300
- ) : Collection {
+ ): Collection {
$query = new Query\Process(Query\Base::SELECT);
$query
->addResolvedReferences($resolveReferences)
@@ -730,7 +730,7 @@ public function writeDeletedEntity($processId): bool
}
}
}
-
+
return $status;
}
@@ -792,8 +792,7 @@ public function writeBlockedEntity(
\BO\Zmsentities\Process $process,
bool $releaseSlots = false,
?\BO\Zmsentities\Useraccount $useraccount = null
- )
- {
+ ) {
$amendment = $process->toDerefencedAmendment();
$customTextfield = $process->toDerefencedcustomTextfield();
@@ -887,7 +886,7 @@ public function readUnconfirmedProcessList(
$offset = null,
$resolveReferences = 0
) {
-
+
$selectQuery = new Query\Process(Query\Base::SELECT);
$selectQuery
->addEntityMapping()
diff --git a/zmsdb/src/Zmsdb/ProcessStatusArchived.php b/zmsdb/src/Zmsdb/ProcessStatusArchived.php
index 23098f305..d6ed581f4 100644
--- a/zmsdb/src/Zmsdb/ProcessStatusArchived.php
+++ b/zmsdb/src/Zmsdb/ProcessStatusArchived.php
@@ -1,8 +1,9 @@
updateWaitingStatistics($process, $now);
}
-
+
return $this->readArchivedEntity($archiveId, $resolveReferences);
}
@@ -213,12 +214,11 @@ protected function writeXRequestsArchived($processId, $archiveId)
public function anonymizeNames(\DateTimeInterface $dateTime)
{
$query = new Query\ProcessStatusArchived(Query\Base::UPDATE);
- $query->addConditionOlderThanDate($dateTime);
+ $query->addConditionOlderThanDate($dateTime);
$query->addValues([
'name' => 'ANONYMIZED'
]);
-
+
return $this->writeItem($query);
}
-
}
diff --git a/zmsdb/src/Zmsdb/ProcessStatusFree.php b/zmsdb/src/Zmsdb/ProcessStatusFree.php
index 5de93ef21..956b47b67 100644
--- a/zmsdb/src/Zmsdb/ProcessStatusFree.php
+++ b/zmsdb/src/Zmsdb/ProcessStatusFree.php
@@ -1,8 +1,9 @@
status = 'reserved';
$appointment = $process->getAppointments()->getFirst();
- $slotList = (new Slot)->readByAppointment($appointment, $slotsRequired, (null !== $userAccount));
+ $slotList = (new Slot())->readByAppointment($appointment, $slotsRequired, (null !== $userAccount));
$freeProcessList = $this->readFreeProcesses($process->toCalendar(), $now, $slotType, $slotsRequired);
if (!$freeProcessList->getAppointmentList()->hasAppointment($appointment) || ! $slotList) {
diff --git a/zmsdb/src/Zmsdb/ProcessStatusQueued.php b/zmsdb/src/Zmsdb/ProcessStatusQueued.php
index aa37cae20..3582c09eb 100644
--- a/zmsdb/src/Zmsdb/ProcessStatusQueued.php
+++ b/zmsdb/src/Zmsdb/ProcessStatusQueued.php
@@ -1,8 +1,9 @@
getAdditionalData() ?? [];
-
+
$query->addValues([
'source' => $entity->getSource(),
'id' => $entity->getId(),
@@ -121,7 +121,7 @@ public function writeImportEntity($provider, $source = 'dldb')
'contact__street' => $provider['address']['street'],
'contact__streetNumber' => $provider['address']['house_number'],
'link' => ('dldb' == $source)
- ? 'https://service.berlin.de/standort/'. $provider['id'] .'/'
+ ? 'https://service.berlin.de/standort/' . $provider['id'] . '/'
: ((isset($provider['link'])) ? $provider['link'] : ''),
'data' => json_encode($provider)
]);
diff --git a/zmsdb/src/Zmsdb/Query/Alias.php b/zmsdb/src/Zmsdb/Query/Alias.php
index af82175ad..7d28582fe 100644
--- a/zmsdb/src/Zmsdb/Query/Alias.php
+++ b/zmsdb/src/Zmsdb/Query/Alias.php
@@ -5,6 +5,7 @@
class Alias implements \Solution10\SQL\ExpressionInterface
{
use \Solution10\SQL\Dialect\Quote;
+
protected $name;
protected $alias;
diff --git a/zmsdb/src/Zmsdb/Query/Apiquota.php b/zmsdb/src/Zmsdb/Query/Apiquota.php
index 7c54e0207..4bbfb9a5d 100644
--- a/zmsdb/src/Zmsdb/Query/Apiquota.php
+++ b/zmsdb/src/Zmsdb/Query/Apiquota.php
@@ -24,11 +24,11 @@ public static function getQueryReadApiQuotaExpired($dateTime)
$timeStamp = $dateTime->getTimestamp();
return '
SELECT * FROM apiquota WHERE ts <= (CASE period
- WHEN "month" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME('. $timeStamp .'), INTERVAL -1 MONTH))
- WHEN "week" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME('. $timeStamp .'), INTERVAL -1 WEEK))
- WHEN "day" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME('. $timeStamp .'), INTERVAL -1 DAY))
- WHEN "hour" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME('. $timeStamp .'), INTERVAL -1 HOUR))
- WHEN "minute" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME('. $timeStamp .'), INTERVAL -1 MINUTE))
+ WHEN "month" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(' . $timeStamp . '), INTERVAL -1 MONTH))
+ WHEN "week" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(' . $timeStamp . '), INTERVAL -1 WEEK))
+ WHEN "day" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(' . $timeStamp . '), INTERVAL -1 DAY))
+ WHEN "hour" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(' . $timeStamp . '), INTERVAL -1 HOUR))
+ WHEN "minute" THEN UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(' . $timeStamp . '), INTERVAL -1 MINUTE))
END)
';
}
diff --git a/zmsdb/src/Zmsdb/Query/Base.php b/zmsdb/src/Zmsdb/Query/Base.php
index 1214b5822..b268e8208 100644
--- a/zmsdb/src/Zmsdb/Query/Base.php
+++ b/zmsdb/src/Zmsdb/Query/Base.php
@@ -2,12 +2,12 @@
namespace BO\Zmsdb\Query;
-use \Solution10\SQL\Select;
-use \Solution10\SQL\Insert;
-use \Solution10\SQL\Update;
-use \Solution10\SQL\Delete;
-use \Solution10\SQL\Dialect\MySQL;
-use \Solution10\SQL\Expression;
+use Solution10\SQL\Select;
+use Solution10\SQL\Insert;
+use Solution10\SQL\Update;
+use Solution10\SQL\Delete;
+use Solution10\SQL\Dialect\MySQL;
+use Solution10\SQL\Expression;
/**
* Base class to construct entity specific queries
@@ -106,7 +106,7 @@ public function __construct($queryType, $prefix = '', $name = false, $resolveLev
$this->addTable();
} elseif (self::DELETE === $queryType) {
$this->query = new Delete($dialect);
- $this->query->queryBaseStatement('DELETE '. $this::getAlias() .' FROM');
+ $this->query->queryBaseStatement('DELETE ' . $this::getAlias() . ' FROM');
$this->addTableAlias();
} elseif ($queryType instanceof self) {
$this->query = $queryType->query;
@@ -236,7 +236,7 @@ protected function addTableAlias()
{
$table = $this::getTablename();
$alias = $this::getAlias();
- $this->query->table(self::expression($table .' '. $alias));
+ $this->query->table(self::expression($table . ' ' . $alias));
return $this;
}
diff --git a/zmsdb/src/Zmsdb/Query/Calendar.php b/zmsdb/src/Zmsdb/Query/Calendar.php
index ef06a8bdd..67b22ad7c 100644
--- a/zmsdb/src/Zmsdb/Query/Calendar.php
+++ b/zmsdb/src/Zmsdb/Query/Calendar.php
@@ -8,7 +8,6 @@
*/
class Calendar extends Base
{
-
const QUERY_CALENDAR_BOOKABLEEND = "
SELECT
MAX(CONCAT(slot.year, '-', LPAD(slot.month, 2, '0'), '-', LPAD(slot.day, 2, '0'))) as bookableEnd
diff --git a/zmsdb/src/Zmsdb/Query/Config.php b/zmsdb/src/Zmsdb/Query/Config.php
index 0aa128e25..a57ba593b 100644
--- a/zmsdb/src/Zmsdb/Query/Config.php
+++ b/zmsdb/src/Zmsdb/Query/Config.php
@@ -29,7 +29,7 @@ class Config extends Base
public function addConditionName($itemName)
{
- $this->query->where(self::TABLE .'.name', '=', $itemName);
+ $this->query->where(self::TABLE . '.name', '=', $itemName);
return $this;
}
}
diff --git a/zmsdb/src/Zmsdb/Query/Day.php b/zmsdb/src/Zmsdb/Query/Day.php
index 611e781cd..225d3be3b 100644
--- a/zmsdb/src/Zmsdb/Query/Day.php
+++ b/zmsdb/src/Zmsdb/Query/Day.php
@@ -8,7 +8,6 @@
*/
class Day extends Base
{
-
const QUERY_CREATE_TEMPORARY_SCOPELIST = '
CREATE TEMPORARY TABLE calendarscope (
scopeID INT,
diff --git a/zmsdb/src/Zmsdb/Query/Department.php b/zmsdb/src/Zmsdb/Query/Department.php
index 0b39817b8..fede50333 100644
--- a/zmsdb/src/Zmsdb/Query/Department.php
+++ b/zmsdb/src/Zmsdb/Query/Department.php
@@ -140,7 +140,7 @@ public function reverseEntityMapping(\BO\Zmsentities\Department $entity, $parent
if (null !== $parentId) {
$data['OrganisationsID'] = $parentId;
}
- $data['Adresse'] = (isset($entity->contact['street'])) ?$entity->contact['street'] : '';
+ $data['Adresse'] = (isset($entity->contact['street'])) ? $entity->contact['street'] : '';
$data['Name'] = $entity->name;
$data['Ansprechpartner'] = $entity->getContactPerson();
$data = array_filter(
diff --git a/zmsdb/src/Zmsdb/Query/EventLog.php b/zmsdb/src/Zmsdb/Query/EventLog.php
index b6496f2cd..ca1af09d3 100644
--- a/zmsdb/src/Zmsdb/Query/EventLog.php
+++ b/zmsdb/src/Zmsdb/Query/EventLog.php
@@ -1,4 +1,5 @@
0, ba.AnliegenID, null)) as requestcount
- FROM '. Department::TABLE .' as d
- LEFT JOIN '. Scope::TABLE .' as scope ON d.`BehoerdenID` = scope.`BehoerdenID`
- LEFT JOIN '. ProcessStatusArchived::TABLE .' as a ON scope.`StandortID` = a.`StandortID`
- LEFT JOIN '. self::BATABLE .' as ba ON a.BuergerarchivID = ba.BuergerarchivID
+ FROM ' . Department::TABLE . ' as d
+ LEFT JOIN ' . Scope::TABLE . ' as scope ON d.`BehoerdenID` = scope.`BehoerdenID`
+ LEFT JOIN ' . ProcessStatusArchived::TABLE . ' as a ON scope.`StandortID` = a.`StandortID`
+ LEFT JOIN ' . self::BATABLE . ' as ba ON a.BuergerarchivID = ba.BuergerarchivID
WHERE
d.`BehoerdenID` = :departmentid AND
a.nicht_erschienen=0 AND
@@ -92,30 +92,30 @@ class ExchangeClientdepartment extends Base
periodend,
o.`Organisationsname` AS organisationname,
d.`Name` AS description
- FROM '. Department::TABLE .' AS d
+ FROM ' . Department::TABLE . ' AS d
INNER JOIN
(
SELECT
s.`behoerdenid` as departmentid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by departmentid
)
maxAndminDate ON maxAndminDate.`departmentid` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
GROUP BY d.`BehoerdenID`
ORDER BY d.`BehoerdenID` ASC
';
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Department::TABLE .' AS d
+ FROM ' . Department::TABLE . ' AS d
INNER JOIN (
SELECT
behoerdenid,
DATE_FORMAT(`datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON s.behoerdenid = d.BehoerdenID
WHERE d.`BehoerdenID` = :departmentid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeClientorganisation.php b/zmsdb/src/Zmsdb/Query/ExchangeClientorganisation.php
index 5dd5f65be..2de4ad8d2 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeClientorganisation.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeClientorganisation.php
@@ -37,10 +37,10 @@ class ExchangeClientorganisation extends Base
0 as withappointment,
0 as missedwithappointment,
0 as requestcount
- FROM '. Organisation::TABLE .' o
- LEFT JOIN '. Department::TABLE .' d ON d.`OrganisationsID` = o.`OrganisationsID`
- LEFT JOIN '. Scope::TABLE .' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN '. self::NOTIFICATIONSTABLE .' n ON n.`StandortID` = scope.`StandortID`
+ FROM ' . Organisation::TABLE . ' o
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . self::NOTIFICATIONSTABLE . ' n ON n.`StandortID` = scope.`StandortID`
WHERE o.`OrganisationsID` = :organisationid AND n.`Datum` BETWEEN :datestart AND :dateend
GROUP BY date
@@ -55,10 +55,10 @@ class ExchangeClientorganisation extends Base
SUM(IF(a.`nicht_erschienen`=0 AND a.mitTermin=1,a.AnzahlPersonen,0)) as withappointment,
SUM(IF(a.`nicht_erschienen`=1 AND a.mitTermin=1,a.AnzahlPersonen,0)) as missedwithappointment,
0 as requestcount
- FROM '. Organisation::TABLE .' o
- LEFT JOIN '. Department::TABLE .' d ON d.`OrganisationsID` = o.`OrganisationsID`
- LEFT JOIN '. Scope::TABLE .' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN '. ProcessStatusArchived::TABLE .' a ON a.`StandortID` = scope.`StandortID`
+ FROM ' . Organisation::TABLE . ' o
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . ProcessStatusArchived::TABLE . ' a ON a.`StandortID` = scope.`StandortID`
WHERE o.`OrganisationsID` = :organisationid AND a.`Datum` BETWEEN :datestart AND :dateend
GROUP BY date
@@ -73,11 +73,11 @@ class ExchangeClientorganisation extends Base
0 as withappointment,
0 as missedwithappointment,
COUNT(IF(ba.AnliegenID > 0, ba.AnliegenID, null)) as requestcount
- FROM '. Organisation::TABLE .' o
- LEFT JOIN '. Department::TABLE .' d ON d.`OrganisationsID` = o.`OrganisationsID`
- LEFT JOIN '. Scope::TABLE .' as scope ON d.`BehoerdenID` = scope.`BehoerdenID`
- LEFT JOIN '. ProcessStatusArchived::TABLE .' as a ON scope.`StandortID` = a.`StandortID`
- LEFT JOIN '. self::BATABLE .' as ba ON a.BuergerarchivID = ba.BuergerarchivID
+ FROM ' . Organisation::TABLE . ' o
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' as scope ON d.`BehoerdenID` = scope.`BehoerdenID`
+ LEFT JOIN ' . ProcessStatusArchived::TABLE . ' as a ON scope.`StandortID` = a.`StandortID`
+ LEFT JOIN ' . self::BATABLE . ' as ba ON a.BuergerarchivID = ba.BuergerarchivID
WHERE
o.`OrganisationsID` = :organisationid AND
a.nicht_erschienen=0 AND
@@ -96,14 +96,14 @@ class ExchangeClientorganisation extends Base
periodstart,
periodend,
o.`Organisationsname` AS description
- FROM '. Organisation::TABLE .' AS o
+ FROM ' . Organisation::TABLE . ' AS o
INNER JOIN
(
SELECT
s.`organisationsid` AS organisationsid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by organisationsid
)
maxAndminDate ON maxAndminDate.`organisationsid` = o.`OrganisationsID`
@@ -113,12 +113,12 @@ class ExchangeClientorganisation extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Organisation::TABLE .' AS o
+ FROM ' . Organisation::TABLE . ' AS o
INNER JOIN (
SELECT
organisationsid,
DATE_FORMAT(`datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON s.organisationsid = o.`OrganisationsID`
WHERE o.`OrganisationsID` = :organisationid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeClientowner.php b/zmsdb/src/Zmsdb/Query/ExchangeClientowner.php
index 2e0b17957..6d065836a 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeClientowner.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeClientowner.php
@@ -37,10 +37,10 @@ class ExchangeClientowner extends Base
0 as withappointment,
0 as missedwithappointment,
0 as requestcount
- FROM '. Owner::TABLE .' o
- LEFT JOIN '. Department::TABLE .' d ON d.`KundenID` = o.`KundenID`
- LEFT JOIN '. Scope::TABLE .' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN '. self::NOTIFICATIONSTABLE .' n ON n.`StandortID` = scope.`StandortID`
+ FROM ' . Owner::TABLE . ' o
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`KundenID` = o.`KundenID`
+ LEFT JOIN ' . Scope::TABLE . ' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . self::NOTIFICATIONSTABLE . ' n ON n.`StandortID` = scope.`StandortID`
WHERE o.`KundenID` = :ownerid AND n.`Datum` BETWEEN :datestart AND :dateend
GROUP BY date
@@ -55,10 +55,10 @@ class ExchangeClientowner extends Base
SUM(IF(a.`nicht_erschienen`=0 AND a.mitTermin=1,a.AnzahlPersonen,0)) as withappointment,
SUM(IF(a.`nicht_erschienen`=1 AND a.mitTermin=1,a.AnzahlPersonen,0)) as missedwithappointment,
0 as requestcount
- FROM '. Owner::TABLE .' o
- LEFT JOIN '. Department::TABLE .' d ON d.`KundenID` = o.`KundenID`
- LEFT JOIN '. Scope::TABLE .' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN '. ProcessStatusArchived::TABLE .' a ON a.`StandortID` = scope.`StandortID`
+ FROM ' . Owner::TABLE . ' o
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`KundenID` = o.`KundenID`
+ LEFT JOIN ' . Scope::TABLE . ' scope ON scope.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . ProcessStatusArchived::TABLE . ' a ON a.`StandortID` = scope.`StandortID`
WHERE o.`KundenID` = :ownerid AND a.`Datum` BETWEEN :datestart AND :dateend
GROUP BY date
@@ -73,11 +73,11 @@ class ExchangeClientowner extends Base
0 as withappointment,
0 as missedwithappointment,
COUNT(IF(ba.AnliegenID > 0, ba.AnliegenID, null)) as requestcount
- FROM '. Owner::TABLE .' o
- LEFT JOIN '. Department::TABLE .' d ON d.`KundenID` = o.`KundenID`
- LEFT JOIN '. Scope::TABLE .' as scope ON d.`BehoerdenID` = scope.`BehoerdenID`
- LEFT JOIN '. ProcessStatusArchived::TABLE .' as a ON scope.`StandortID` = a.`StandortID`
- LEFT JOIN '. self::BATABLE .' as ba ON a.BuergerarchivID = ba.BuergerarchivID
+ FROM ' . Owner::TABLE . ' o
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`KundenID` = o.`KundenID`
+ LEFT JOIN ' . Scope::TABLE . ' as scope ON d.`BehoerdenID` = scope.`BehoerdenID`
+ LEFT JOIN ' . ProcessStatusArchived::TABLE . ' as a ON scope.`StandortID` = a.`StandortID`
+ LEFT JOIN ' . self::BATABLE . ' as ba ON a.BuergerarchivID = ba.BuergerarchivID
WHERE
o.`KundenID` = :ownerid AND
a.nicht_erschienen=0 AND
@@ -96,14 +96,14 @@ class ExchangeClientowner extends Base
periodstart,
periodend,
o.`Kundenname` AS description
- FROM '. Owner::TABLE .' AS o
+ FROM ' . Owner::TABLE . ' AS o
INNER JOIN
(
SELECT
s.`kundenid` AS kundenid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by kundenid
)
maxAndminDate ON maxAndminDate.`kundenid` = o.`KundenID`
@@ -113,12 +113,12 @@ class ExchangeClientowner extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Owner::TABLE .' AS o
+ FROM ' . Owner::TABLE . ' AS o
INNER JOIN (
SELECT
kundenid,
DATE_FORMAT(`datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON s.kundenid = o.`KundenID`
WHERE o.`KundenID` = :ownerid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeClientscope.php b/zmsdb/src/Zmsdb/Query/ExchangeClientscope.php
index 593fcc676..98229f58b 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeClientscope.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeClientscope.php
@@ -36,7 +36,7 @@ class ExchangeClientscope extends Base
0 AS withappointment,
0 AS missedwithappointment,
0 AS requestcount
- FROM '. self::NOTIFICATIONSTABLE .'
+ FROM ' . self::NOTIFICATIONSTABLE . '
WHERE `StandortID` = :scopeid AND `Datum` BETWEEN :datestart AND :dateend
GROUP BY date
@@ -51,7 +51,7 @@ class ExchangeClientscope extends Base
SUM(IF(`nicht_erschienen`=0 AND mitTermin=1,AnzahlPersonen,0)) as withappointment,
SUM(IF(`nicht_erschienen`=1 AND mitTermin=1,AnzahlPersonen,0)) as missedwithappointment,
0 AS requestcount
- FROM '. ProcessStatusArchived::TABLE .'
+ FROM ' . ProcessStatusArchived::TABLE . '
WHERE `StandortID` = :scopeid AND `Datum` BETWEEN :datestart AND :dateend
GROUP BY date
@@ -66,8 +66,8 @@ class ExchangeClientscope extends Base
0 AS withappointment,
0 AS missedwithappointment,
COUNT(IF(ba.AnliegenID > 0, ba.AnliegenID, null)) as requestcount
- FROM '. ProcessStatusArchived::TABLE .' a
- LEFT JOIN '. self::BATABLE .' as ba ON a.BuergerarchivID = ba.BuergerarchivID
+ FROM ' . ProcessStatusArchived::TABLE . ' a
+ LEFT JOIN ' . self::BATABLE . ' as ba ON a.BuergerarchivID = ba.BuergerarchivID
WHERE `StandortID` = :scopeid AND `Datum` BETWEEN :datestart AND :dateend AND nicht_erschienen=0
GROUP BY date
) as unionresult
@@ -80,14 +80,14 @@ class ExchangeClientscope extends Base
periodstart,
periodend,
CONCAT(scope.`Bezeichnung`, " ", scope.`standortinfozeile`) AS description
- FROM '. Scope::TABLE .' AS scope
+ FROM ' . Scope::TABLE . ' AS scope
INNER JOIN
(
SELECT
s.standortid as scopeid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by scopeid
)
maxAndminDate ON maxAndminDate.`scopeid` = scope.`StandortID`
@@ -97,12 +97,12 @@ class ExchangeClientscope extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Scope::TABLE .' AS scope
+ FROM ' . Scope::TABLE . ' AS scope
INNER JOIN (
SELECT
`StandortID`,
DATE_FORMAT(`Datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON scope.`StandortID` = s.`standortid`
WHERE scope.`StandortID` = :scopeid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeNotificationdepartment.php b/zmsdb/src/Zmsdb/Query/ExchangeNotificationdepartment.php
index a447fb82b..6634c589d 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeNotificationdepartment.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeNotificationdepartment.php
@@ -17,11 +17,11 @@ class ExchangeNotificationdepartment extends Base
d.`Name` as departmentname,
CONCAT(s.`Bezeichnung`, " ", s.`standortkuerzel`) AS scopename,
IFNULL(SUM(n.`gesendet`), 0) as notificationscount
- FROM '. Department::TABLE .' AS d
- LEFT JOIN '. Organisation::TABLE .' o ON o.`OrganisationsID` = d.`OrganisationsID`
- LEFT JOIN '. Scope::TABLE .' s ON d.`BehoerdenID` = s.`BehoerdenID`
+ FROM ' . Department::TABLE . ' AS d
+ LEFT JOIN ' . Organisation::TABLE . ' o ON o.`OrganisationsID` = d.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' s ON d.`BehoerdenID` = s.`BehoerdenID`
LEFT JOIN
- '. self::TABLE .' n ON s.`StandortID` = n.`StandortID` AND n.`Datum` BETWEEN :datestart AND :dateend
+ ' . self::TABLE . ' n ON s.`StandortID` = n.`StandortID` AND n.`Datum` BETWEEN :datestart AND :dateend
WHERE
s.`BehoerdenID` = :departmentid
GROUP BY scopename
@@ -35,10 +35,10 @@ class ExchangeNotificationdepartment extends Base
MAX(n.`Datum`) AS periodend,
o.`Organisationsname` AS organisationname,
d.`Name` AS description
- FROM '. self::TABLE .' AS n
- LEFT JOIN '. Scope::TABLE .' AS s ON n.`standortid` = s.`StandortID`
- INNER JOIN '. Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ FROM ' . self::TABLE . ' AS n
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON n.`standortid` = s.`StandortID`
+ INNER JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
GROUP BY d.`BehoerdenID`
ORDER BY d.`BehoerdenID` ASC
';
@@ -46,9 +46,9 @@ class ExchangeNotificationdepartment extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT
DATE_FORMAT(n.datum,"%Y-%m") AS date
- FROM '. self::TABLE .' AS n
- LEFT JOIN '. Scope::TABLE .' AS s ON n.`standortid` = s.`StandortID`
- LEFT JOIN '. Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ FROM ' . self::TABLE . ' AS n
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON n.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
WHERE d.`BehoerdenID` = :departmentid
GROUP BY date
ORDER BY date ASC
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeNotificationorganisation.php b/zmsdb/src/Zmsdb/Query/ExchangeNotificationorganisation.php
index 7c79e4c42..45328219b 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeNotificationorganisation.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeNotificationorganisation.php
@@ -17,10 +17,10 @@ class ExchangeNotificationorganisation extends Base
d.`Name` as departmentname,
CONCAT(s.`Bezeichnung`, " ", s.`standortkuerzel`) AS scopename,
IFNULL(SUM(n.`gesendet`), 0) as notificationscount
- FROM '. Organisation::TABLE .' AS o
- LEFT JOIN '. Department::TABLE .' d ON d.`OrganisationsID` = o.`OrganisationsID`
- LEFT JOIN '. Scope::TABLE .' s ON d.`BehoerdenID` = s.`BehoerdenID`
- LEFT JOIN '. self::TABLE .' n ON
+ FROM ' . Organisation::TABLE . ' AS o
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' s ON d.`BehoerdenID` = s.`BehoerdenID`
+ LEFT JOIN ' . self::TABLE . ' n ON
s.`StandortID` = n.`StandortID` AND
n.`Datum` BETWEEN :datestart AND :dateend
WHERE
@@ -35,10 +35,10 @@ class ExchangeNotificationorganisation extends Base
MIN(n.`Datum`) AS periodstart,
MAX(n.`Datum`) AS periodend,
o.`Organisationsname` AS description
- FROM '. self::TABLE .' AS n
- LEFT JOIN '. Scope::TABLE .' AS s ON n.`standortid` = s.`StandortID`
- LEFT JOIN '. Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- INNER JOIN '. Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ FROM ' . self::TABLE . ' AS n
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON n.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ INNER JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
GROUP BY o.`OrganisationsID`
ORDER BY o.`OrganisationsID` ASC
';
@@ -46,10 +46,10 @@ class ExchangeNotificationorganisation extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT
DATE_FORMAT(n.datum,"%Y-%m") AS date
- FROM '. self::TABLE .' AS n
- LEFT JOIN '. Scope::TABLE .' AS s ON n.`standortid` = s.`StandortID`
- LEFT JOIN '. Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- INNER JOIN '. Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ FROM ' . self::TABLE . ' AS n
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON n.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ INNER JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
WHERE o.`OrganisationsID` = :organisationid
GROUP BY date
ORDER BY date ASC
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeNotificationowner.php b/zmsdb/src/Zmsdb/Query/ExchangeNotificationowner.php
index e14d33bc9..6f00b111a 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeNotificationowner.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeNotificationowner.php
@@ -18,11 +18,11 @@ class ExchangeNotificationowner extends Base
IF(d.`Name` <> "", d.`Name`, "test") as departmentname,
IF(s.`Bezeichnung` <> "", CONCAT(s.`Bezeichnung`, " ", s.`standortkuerzel`), "test") AS scopename,
IFNULL(SUM(n.`gesendet`), 0) as notificationscount
- FROM '. Owner::TABLE .' AS o
- LEFT JOIN '. Organisation::TABLE .' org ON org.`KundenID` = o.`KundenID`
- LEFT JOIN '. Department::TABLE .' d ON d.`OrganisationsID` = org.`OrganisationsID`
- LEFT JOIN '. Scope::TABLE .' s ON d.`BehoerdenID` = s.`BehoerdenID`
- LEFT JOIN '. self::TABLE .' n ON
+ FROM ' . Owner::TABLE . ' AS o
+ LEFT JOIN ' . Organisation::TABLE . ' org ON org.`KundenID` = o.`KundenID`
+ LEFT JOIN ' . Department::TABLE . ' d ON d.`OrganisationsID` = org.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' s ON d.`BehoerdenID` = s.`BehoerdenID`
+ LEFT JOIN ' . self::TABLE . ' n ON
s.`StandortID` = n.`StandortID` AND
n.`Datum` BETWEEN :datestart AND :dateend
WHERE
@@ -37,10 +37,10 @@ class ExchangeNotificationowner extends Base
MIN(n.`Datum`) AS periodstart,
MAX(n.`Datum`) AS periodend,
o.`Kundenname` AS description
- FROM '. self::TABLE .' AS n
- LEFT JOIN '. Scope::TABLE .' AS s ON n.`standortid` = s.`StandortID`
- LEFT JOIN '. Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- INNER JOIN '. Owner::TABLE .' AS o ON d.`KundenID` = o.`KundenID`
+ FROM ' . self::TABLE . ' AS n
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON n.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ INNER JOIN ' . Owner::TABLE . ' AS o ON d.`KundenID` = o.`KundenID`
GROUP BY o.`KundenID`
ORDER BY o.`KundenID` ASC
';
@@ -48,10 +48,10 @@ class ExchangeNotificationowner extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT
DATE_FORMAT(n.datum,"%Y-%m") AS date
- FROM '. self::TABLE .' AS n
- LEFT JOIN '. Scope::TABLE .' AS s ON n.`standortid` = s.`StandortID`
- LEFT JOIN '. Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- INNER JOIN '. Owner::TABLE .' AS o ON d.`KundenID` = o.`KundenID`
+ FROM ' . self::TABLE . ' AS n
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON n.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ INNER JOIN ' . Owner::TABLE . ' AS o ON d.`KundenID` = o.`KundenID`
WHERE o.`KundenID` = :ownerid
GROUP BY date
ORDER BY date ASC
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeNotificationscope.php b/zmsdb/src/Zmsdb/Query/ExchangeNotificationscope.php
index 3d2dbd32b..816f8e864 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeNotificationscope.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeNotificationscope.php
@@ -17,10 +17,10 @@ class ExchangeNotificationscope extends Base
d.Name as departmentname,
CONCAT(s.`Bezeichnung`, " ", s.`standortkuerzel`) AS scopename,
IFNULL(SUM(n.gesendet), 0) as notificationscount
- FROM '. self::TABLE .' AS n
- LEFT JOIN '. Scope::TABLE .' s ON n.StandortID = s.StandortID
- LEFT JOIN '. Department::TABLE .' d ON d.BehoerdenID = s.BehoerdenID
- LEFT JOIN '. Organisation::TABLE .' o ON o.OrganisationsID = d.OrganisationsID
+ FROM ' . self::TABLE . ' AS n
+ LEFT JOIN ' . Scope::TABLE . ' s ON n.StandortID = s.StandortID
+ LEFT JOIN ' . Department::TABLE . ' d ON d.BehoerdenID = s.BehoerdenID
+ LEFT JOIN ' . Organisation::TABLE . ' o ON o.OrganisationsID = d.OrganisationsID
WHERE n.`StandortID` = :scopeid AND n.`Datum` BETWEEN :datestart AND :dateend
GROUP BY subjectid
';
@@ -31,8 +31,8 @@ class ExchangeNotificationscope extends Base
MIN(n.`Datum`) AS periodstart,
MAX(n.`Datum`) AS periodend,
s.`Bezeichnung` AS description
- FROM '. self::TABLE .' AS n
- INNER JOIN '. Scope::TABLE .' AS s ON n.`standortid` = s.`StandortID`
+ FROM ' . self::TABLE . ' AS n
+ INNER JOIN ' . Scope::TABLE . ' AS s ON n.`standortid` = s.`StandortID`
GROUP BY s.`StandortID`
ORDER BY s.`StandortID` ASC
';
@@ -40,7 +40,7 @@ class ExchangeNotificationscope extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT
DATE_FORMAT(n.datum,"%Y-%m") AS date
- FROM '. self::TABLE .' AS n
+ FROM ' . self::TABLE . ' AS n
WHERE n.`StandortID` = :scopeid
GROUP BY date
ORDER BY date ASC
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeRequestdepartment.php b/zmsdb/src/Zmsdb/Query/ExchangeRequestdepartment.php
index 7bd8eb228..191451341 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeRequestdepartment.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeRequestdepartment.php
@@ -25,7 +25,7 @@ class ExchangeRequestdepartment extends Base
) as name,
SUM(statistikJoin.requestscount) as requestscount,
AVG(statistikJoin.processingtime) as processingtime
- FROM '. Department::TABLE .' d
+ FROM ' . Department::TABLE . ' d
INNER JOIN (
SELECT
s.anliegenid,
@@ -34,15 +34,15 @@ class ExchangeRequestdepartment extends Base
COUNT(s.anliegenid) as requestscount,
AVG(s.bearbeitungszeit) as processingtime,
s.`datum`
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
WHERE s.behoerdenid = :departmentid AND s.`datum` BETWEEN :datestart AND :dateend
GROUP BY s.`datum`, s.anliegenid
) as statistikJoin ON statistikJoin.`behoerdenid` = d.BehoerdenID
- LEFT JOIN '. self::REQUESTTABLE .' r ON r.id = statistikJoin.anliegenid
+ LEFT JOIN ' . self::REQUESTTABLE . ' r ON r.id = statistikJoin.anliegenid
WHERE d.`behoerdenid` = :departmentid AND statistikJoin.`datum` BETWEEN :datestart AND :dateend
GROUP BY DATE_FORMAT(statistikJoin.`datum`, :groupby), name, statistikJoin.anliegenid
ORDER BY r.name, statistikJoin.anliegenid
- ';
+ ';
const QUERY_SUBJECTS = '
SELECT
@@ -51,30 +51,30 @@ class ExchangeRequestdepartment extends Base
periodend,
o.`Organisationsname` AS organisationname,
d.`Name` AS description
- FROM '. Department::TABLE .' AS d
+ FROM ' . Department::TABLE . ' AS d
INNER JOIN
(
SELECT
s.`behoerdenid` as departmentid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by departmentid
)
maxAndminDate ON maxAndminDate.`departmentid` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
GROUP BY d.`BehoerdenID`
ORDER BY d.`BehoerdenID` ASC
';
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Department::TABLE .' AS d
+ FROM ' . Department::TABLE . ' AS d
INNER JOIN (
SELECT
behoerdenid,
DATE_FORMAT(`datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON s.behoerdenid = d.BehoerdenID
WHERE d.`BehoerdenID` = :departmentid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeRequestorganisation.php b/zmsdb/src/Zmsdb/Query/ExchangeRequestorganisation.php
index dd06dd1c7..e4da3bcc6 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeRequestorganisation.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeRequestorganisation.php
@@ -24,7 +24,7 @@ class ExchangeRequestorganisation extends Base
) as name,
SUM(statistikJoin.requestscount) as requestscount,
AVG(statistikJoin.processingtime) as processingtime
- FROM '. Organisation::TABLE .' o
+ FROM ' . Organisation::TABLE . ' o
INNER JOIN (
SELECT
s.anliegenid,
@@ -32,16 +32,16 @@ class ExchangeRequestorganisation extends Base
COUNT(s.anliegenid) as requestscount,
AVG(s.bearbeitungszeit) as processingtime,
s.`datum`
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
WHERE s.organisationsid = :organisationid AND s.`datum` BETWEEN :datestart AND :dateend
GROUP BY s.`datum`, s.anliegenid
) as statistikJoin ON statistikJoin.`organisationsid` = o.OrganisationsID
- LEFT JOIN '. self::REQUESTTABLE .' r ON r.id = statistikJoin.anliegenid
+ LEFT JOIN ' . self::REQUESTTABLE . ' r ON r.id = statistikJoin.anliegenid
WHERE o.`OrganisationsID` = :organisationid AND statistikJoin.`datum` BETWEEN :datestart AND :dateend
GROUP BY DATE_FORMAT(statistikJoin.`datum`, :groupby), name, statistikJoin.anliegenid
ORDER BY r.name, statistikJoin.anliegenid
';
-
+
const QUERY_SUBJECTS = '
SELECT
@@ -49,14 +49,14 @@ class ExchangeRequestorganisation extends Base
periodstart,
periodend,
o.`Organisationsname` AS description
- FROM '. Organisation::TABLE .' AS o
+ FROM ' . Organisation::TABLE . ' AS o
INNER JOIN
(
SELECT
s.`organisationsid` as organisationid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by organisationid
)
maxAndminDate ON maxAndminDate.`organisationid` = o.`OrganisationsID`
@@ -66,12 +66,12 @@ class ExchangeRequestorganisation extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Organisation::TABLE .' AS o
+ FROM ' . Organisation::TABLE . ' AS o
INNER JOIN (
SELECT
organisationsid,
DATE_FORMAT(`datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON s.organisationsid = o.OrganisationsID
WHERE s.`organisationsid` = :organisationid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeRequestowner.php b/zmsdb/src/Zmsdb/Query/ExchangeRequestowner.php
index bcb5abf30..56cc6d84a 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeRequestowner.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeRequestowner.php
@@ -24,7 +24,7 @@ class ExchangeRequestowner extends Base
) as name,
SUM(statistikJoin.requestscount) as requestscount,
AVG(statistikJoin.processingtime) as processingtime
- FROM '. Organisation::TABLE .' o
+ FROM ' . Organisation::TABLE . ' o
INNER JOIN (
SELECT
s.anliegenid,
@@ -32,15 +32,15 @@ class ExchangeRequestowner extends Base
COUNT(s.anliegenid) as requestscount,
AVG(s.bearbeitungszeit) as processingtime,
s.`datum`
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
WHERE s.kundenid = :ownerid AND s.`datum` BETWEEN :datestart AND :dateend
GROUP BY s.`datum`, s.anliegenid
) as statistikJoin ON statistikJoin.`kundenid` = o.KundenID
- LEFT JOIN '. self::REQUESTTABLE .' r ON r.id = statistikJoin.anliegenid
+ LEFT JOIN ' . self::REQUESTTABLE . ' r ON r.id = statistikJoin.anliegenid
WHERE o.`KundenID` = :ownerid AND statistikJoin.`datum` BETWEEN :datestart AND :dateend
GROUP BY DATE_FORMAT(statistikJoin.`datum`, :groupby), name, statistikJoin.anliegenid
ORDER BY r.name, statistikJoin.anliegenid
- ';
+ ';
const QUERY_SUBJECTS = '
SELECT
@@ -48,14 +48,14 @@ class ExchangeRequestowner extends Base
periodstart,
periodend,
o.`Organisationsname` AS description
- FROM '. Organisation::TABLE .' AS o
+ FROM ' . Organisation::TABLE . ' AS o
INNER JOIN
(
SELECT
s.`kundenid` as ownerid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by ownerid
)
maxAndminDate ON maxAndminDate.`ownerid` = o.`KundenID`
@@ -65,12 +65,12 @@ class ExchangeRequestowner extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Organisation::TABLE .' AS o
+ FROM ' . Organisation::TABLE . ' AS o
INNER JOIN (
SELECT
kundenid,
DATE_FORMAT(`datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON s.kundenid = o.KundenID
WHERE s.`kundenid` = :ownerid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeRequestscope.php b/zmsdb/src/Zmsdb/Query/ExchangeRequestscope.php
index 0fe3518fb..3613eae83 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeRequestscope.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeRequestscope.php
@@ -26,8 +26,8 @@ class ExchangeRequestscope extends Base
) as name,
COUNT(s.anliegenid) as requestscount,
AVG(s.bearbeitungszeit) as processingtime
- FROM '. self::TABLE .' AS s
- LEFT JOIN '. self::REQUESTTABLE .' as r ON r.id = s.anliegenid
+ FROM ' . self::TABLE . ' AS s
+ LEFT JOIN ' . self::REQUESTTABLE . ' as r ON r.id = s.anliegenid
WHERE s.`standortid` = :scopeid AND s.`Datum` BETWEEN :datestart AND :dateend
GROUP BY DATE_FORMAT(s.`datum`, :groupby), s.anliegenid
ORDER BY r.name, s.anliegenid
@@ -39,14 +39,14 @@ class ExchangeRequestscope extends Base
periodstart,
periodend,
CONCAT(scope.`Bezeichnung`, " ", scope.`standortinfozeile`) AS description
- FROM '. Scope::TABLE .' AS scope
+ FROM ' . Scope::TABLE . ' AS scope
INNER JOIN
(
SELECT
s.standortid as scopeid,
MIN(s.`datum`) AS periodstart,
MAX(s.`datum`) AS periodend
- FROM '. self::TABLE .' s
+ FROM ' . self::TABLE . ' s
group by scopeid
)
maxAndminDate ON maxAndminDate.`scopeid` = scope.`StandortID`
@@ -56,12 +56,12 @@ class ExchangeRequestscope extends Base
const QUERY_PERIODLIST_MONTH = '
SELECT date
- FROM '. Scope::TABLE .' AS scope
+ FROM ' . Scope::TABLE . ' AS scope
INNER JOIN (
SELECT
`StandortID`,
DATE_FORMAT(`Datum`,"%Y-%m") AS date
- FROM '. self::TABLE .'
+ FROM ' . self::TABLE . '
) s ON scope.`StandortID` = s.`standortid`
WHERE scope.`StandortID` = :scopeid
GROUP BY date
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeSlotscope.php b/zmsdb/src/Zmsdb/Query/ExchangeSlotscope.php
index f01a0da75..1af066325 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeSlotscope.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeSlotscope.php
@@ -32,7 +32,7 @@ class ExchangeSlotscope extends Base
MIN(CONCAT(year, "-", LPAD(month, 2, 0), "-", LPAD(day, 2, 0))) AS periodstart,
MAX(CONCAT(year, "-", LPAD(month, 2, 0), "-", LPAD(day, 2, 0))) AS periodend,
CONCAT(scope.`Bezeichnung`, " ", scope.`standortinfozeile`) AS description
- FROM '. Scope::TABLE .' AS scope
+ FROM ' . Scope::TABLE . ' AS scope
LEFT JOIN slot AS s ON s.scopeID = scope.StandortID
LEFT JOIN slot_process AS sp USING(slotID)
WHERE sp.slotID IS NOT NULL
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeWaitingdepartment.php b/zmsdb/src/Zmsdb/Query/ExchangeWaitingdepartment.php
index db7e1dd46..d733b4053 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeWaitingdepartment.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeWaitingdepartment.php
@@ -12,10 +12,10 @@ class ExchangeWaitingdepartment extends Base
const QUERY_READ_DAY = '
SELECT
w.`datum`,
- '. ExchangeWaitingscope::WAITING_VALUES .'
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
FROM ' . self::TABLE . ' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
WHERE
d.`BehoerdenID` = :departmentid
AND w.`datum` BETWEEN :datestart AND :dateend
@@ -27,10 +27,10 @@ class ExchangeWaitingdepartment extends Base
const QUERY_READ_MONTH = '
SELECT
DATE_FORMAT(w.`datum`, "%Y-%m") as datum,
- '. ExchangeWaitingscope::WAITING_VALUES .'
- FROM '. self::TABLE .' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
+ FROM ' . self::TABLE . ' as w
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
WHERE
d.`BehoerdenID` = :departmentid AND
w.`datum` BETWEEN :datestart AND :dateend
@@ -41,10 +41,10 @@ class ExchangeWaitingdepartment extends Base
const QUERY_READ_QUARTER = '
SELECT
CONCAT(YEAR(w.`datum`),"-",QUARTER(w.`datum`)) as datum,
- '. ExchangeWaitingscope::WAITING_VALUES .'
- FROM '. self::TABLE .' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
+ FROM ' . self::TABLE . ' as w
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
WHERE
d.`BehoerdenID` = :departmentid AND
w.`datum` BETWEEN :datestart AND :dateend
@@ -60,9 +60,9 @@ class ExchangeWaitingdepartment extends Base
o.`Organisationsname` AS organisationname,
d.`Name` AS description
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
GROUP BY d.`BehoerdenID`
ORDER BY d.`BehoerdenID` ASC, periodstart DESC
';
@@ -71,8 +71,8 @@ class ExchangeWaitingdepartment extends Base
SELECT
`datum`
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
WHERE
d.`BehoerdenID` = :departmentid
ORDER BY `datum` ASC
@@ -82,8 +82,8 @@ class ExchangeWaitingdepartment extends Base
SELECT DISTINCT
DATE_FORMAT(`datum`,"%Y-%m") AS date
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
WHERE
d.`BehoerdenID` = :departmentid
ORDER BY `datum` ASC
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeWaitingorganisation.php b/zmsdb/src/Zmsdb/Query/ExchangeWaitingorganisation.php
index 445bf86d3..f8194ff5e 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeWaitingorganisation.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeWaitingorganisation.php
@@ -12,11 +12,11 @@ class ExchangeWaitingorganisation extends Base
const QUERY_READ_DAY = '
SELECT
w.`datum`,
- '. ExchangeWaitingscope::WAITING_VALUES .'
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
FROM ' . self::TABLE . ' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON o.`OrganisationsID` = d.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON o.`OrganisationsID` = d.`OrganisationsID`
WHERE
o.`OrganisationsID` = :organisationid
AND `datum` BETWEEN :datestart AND :dateend
@@ -28,11 +28,11 @@ class ExchangeWaitingorganisation extends Base
const QUERY_READ_MONTH = '
SELECT
DATE_FORMAT(w.`datum`, "%Y-%m") as datum,
- '. ExchangeWaitingscope::WAITING_VALUES .'
- FROM '. self::TABLE .' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON o.`OrganisationsID` = d.`OrganisationsID`
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
+ FROM ' . self::TABLE . ' as w
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON o.`OrganisationsID` = d.`OrganisationsID`
WHERE
o.`OrganisationsID` = :organisationid AND
w.`datum` BETWEEN :datestart AND :dateend
@@ -43,11 +43,11 @@ class ExchangeWaitingorganisation extends Base
const QUERY_READ_QUARTER = '
SELECT
CONCAT(YEAR(w.`datum`),"-",QUARTER(w.`datum`)) as datum,
- '. ExchangeWaitingscope::WAITING_VALUES .'
- FROM '. self::TABLE .' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON o.`OrganisationsID` = d.`OrganisationsID`
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
+ FROM ' . self::TABLE . ' as w
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON o.`OrganisationsID` = d.`OrganisationsID`
WHERE
o.`OrganisationsID` = :organisationid AND
w.`datum` BETWEEN :datestart AND :dateend
@@ -62,9 +62,9 @@ class ExchangeWaitingorganisation extends Base
MAX(`datum`) AS periodend,
o.`Organisationsname` AS description
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
GROUP BY o.`OrganisationsID`
ORDER BY o.`OrganisationsID` ASC, periodstart DESC
';
@@ -73,9 +73,9 @@ class ExchangeWaitingorganisation extends Base
SELECT
`datum`
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
WHERE
o.`OrganisationsID` = :organisationid
ORDER BY `datum` ASC
@@ -85,9 +85,9 @@ class ExchangeWaitingorganisation extends Base
SELECT DISTINCT
DATE_FORMAT(`datum`,"%Y-%m") AS date
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Organisation::TABLE .' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Organisation::TABLE . ' AS o ON d.`OrganisationsID` = o.`OrganisationsID`
WHERE
o.`OrganisationsID` = :organisationid
ORDER BY `datum` ASC
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeWaitingowner.php b/zmsdb/src/Zmsdb/Query/ExchangeWaitingowner.php
index fee787541..65a68328f 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeWaitingowner.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeWaitingowner.php
@@ -12,11 +12,11 @@ class ExchangeWaitingowner extends Base
const QUERY_READ_DAY = '
SELECT
w.`datum`,
- '. ExchangeWaitingscope::WAITING_VALUES .'
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
FROM ' . self::TABLE . ' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Owner::TABLE .' AS own ON own.`KundenID` = d.`KundenID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Owner::TABLE . ' AS own ON own.`KundenID` = d.`KundenID`
WHERE
own.`KundenID` = :ownerid
AND `datum` BETWEEN :datestart AND :dateend
@@ -28,11 +28,11 @@ class ExchangeWaitingowner extends Base
const QUERY_READ_MONTH = '
SELECT
DATE_FORMAT(w.`datum`, "%Y-%m") as datum,
- '. ExchangeWaitingscope::WAITING_VALUES .'
- FROM '. self::TABLE .' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Owner::TABLE .' AS own ON own.`KundenID` = d.`KundenID`
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
+ FROM ' . self::TABLE . ' as w
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Owner::TABLE . ' AS own ON own.`KundenID` = d.`KundenID`
WHERE
own.`KundenID` = :ownerid
AND w.`datum` BETWEEN :datestart AND :dateend
@@ -43,11 +43,11 @@ class ExchangeWaitingowner extends Base
const QUERY_READ_QUARTER = '
SELECT
CONCAT(YEAR(w.`datum`),"-",QUARTER(w.`datum`)) as datum,
- '. ExchangeWaitingscope::WAITING_VALUES .'
- FROM '. self::TABLE .' as w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Owner::TABLE .' AS own ON own.`KundenID` = d.`KundenID`
+ ' . ExchangeWaitingscope::WAITING_VALUES . '
+ FROM ' . self::TABLE . ' as w
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Owner::TABLE . ' AS own ON own.`KundenID` = d.`KundenID`
WHERE
own.`KundenID` = :ownerid AND
w.`datum` BETWEEN :datestart AND :dateend
@@ -62,9 +62,9 @@ class ExchangeWaitingowner extends Base
MAX(`datum`) AS periodend,
own.`Kundenname` AS description
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Owner::TABLE .' AS own ON own.`KundenID` = d.`KundenID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Owner::TABLE . ' AS own ON own.`KundenID` = d.`KundenID`
GROUP BY own.`KundenID`
ORDER BY own.`KundenID` ASC, periodstart DESC
';
@@ -73,9 +73,9 @@ class ExchangeWaitingowner extends Base
SELECT
`datum`
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Owner::TABLE .' AS own ON own.`KundenID` = d.`KundenID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Owner::TABLE . ' AS own ON own.`KundenID` = d.`KundenID`
WHERE
own.`KundenID` = :ownerid
ORDER BY `datum` ASC
@@ -85,9 +85,9 @@ class ExchangeWaitingowner extends Base
SELECT DISTINCT
DATE_FORMAT(`datum`,"%Y-%m") AS date
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
- LEFT JOIN ' . Department::TABLE .' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
- LEFT JOIN ' . Owner::TABLE .' AS own ON own.`KundenID` = d.`KundenID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Department::TABLE . ' AS d ON s.`BehoerdenID` = d.`BehoerdenID`
+ LEFT JOIN ' . Owner::TABLE . ' AS own ON own.`KundenID` = d.`KundenID`
WHERE
own.`KundenID` = :ownerid
ORDER BY `datum` ASC
diff --git a/zmsdb/src/Zmsdb/Query/ExchangeWaitingscope.php b/zmsdb/src/Zmsdb/Query/ExchangeWaitingscope.php
index 57fbea02f..d9869e25c 100644
--- a/zmsdb/src/Zmsdb/Query/ExchangeWaitingscope.php
+++ b/zmsdb/src/Zmsdb/Query/ExchangeWaitingscope.php
@@ -220,8 +220,8 @@ class ExchangeWaitingscope extends Base
const QUERY_READ_MONTH = "
SELECT
DATE_FORMAT(`datum`, '%Y-%m') as datum,
- ". self::WAITING_VALUES ."
- FROM ". self::TABLE ."
+ " . self::WAITING_VALUES . "
+ FROM " . self::TABLE . "
WHERE
`standortid` = :scopeid AND
`datum` BETWEEN :datestart AND :dateend
@@ -232,8 +232,8 @@ class ExchangeWaitingscope extends Base
const QUERY_READ_QUARTER = "
SELECT
CONCAT(YEAR(w.`datum`),'-',QUARTER(w.`datum`)) as datum,
- ". self::WAITING_VALUES ."
- FROM ". self::TABLE ." w
+ " . self::WAITING_VALUES . "
+ FROM " . self::TABLE . " w
WHERE
w.`standortid` = :scopeid AND
w.`datum` BETWEEN :datestart AND :dateend
@@ -247,14 +247,14 @@ class ExchangeWaitingscope extends Base
periodstart,
periodend,
CONCAT(scope.`Bezeichnung`, " ", scope.`standortinfozeile`) AS description
- FROM '. Scope::TABLE .' AS scope
+ FROM ' . Scope::TABLE . ' AS scope
INNER JOIN
(
SELECT
w.standortid as scopeid,
MIN(w.`datum`) AS periodstart,
MAX(w.`datum`) AS periodend
- FROM '. self::TABLE .' w
+ FROM ' . self::TABLE . ' w
group by scopeid
)
maxAndminDate ON maxAndminDate.`scopeid` = scope.`StandortID`
diff --git a/zmsdb/src/Zmsdb/Query/Link.php b/zmsdb/src/Zmsdb/Query/Link.php
index 72dd2a293..1da2a73ac 100644
--- a/zmsdb/src/Zmsdb/Query/Link.php
+++ b/zmsdb/src/Zmsdb/Query/Link.php
@@ -44,7 +44,7 @@ public function addConditionDepartmentId($departmentId)
$this->query->orWhere('link.behoerdenid', '=', $departmentId);
return $this;
}
-
+
public function reverseEntityMapping(\BO\Zmsentities\Link $entity, $departmentId)
{
$data = array();
diff --git a/zmsdb/src/Zmsdb/Query/Log.php b/zmsdb/src/Zmsdb/Query/Log.php
index e383bf9e4..370f5a969 100644
--- a/zmsdb/src/Zmsdb/Query/Log.php
+++ b/zmsdb/src/Zmsdb/Query/Log.php
@@ -16,8 +16,8 @@ class Log extends Base
const QUERY_DELETE_BY_PROCESS = '
DELETE mq, mp
- FROM '. self::TABLE .' mq
- LEFT JOIN '. Mimepart::TABLE .' mp ON mp.queueId = mq.id
+ FROM ' . self::TABLE . ' mq
+ LEFT JOIN ' . Mimepart::TABLE . ' mp ON mp.queueId = mq.id
WHERE mq.processID=?
';
diff --git a/zmsdb/src/Zmsdb/Query/MailQueue.php b/zmsdb/src/Zmsdb/Query/MailQueue.php
index cabcb98a5..599405d44 100644
--- a/zmsdb/src/Zmsdb/Query/MailQueue.php
+++ b/zmsdb/src/Zmsdb/Query/MailQueue.php
@@ -11,15 +11,15 @@ class MailQueue extends Base
const QUERY_DELETE = '
DELETE mq, mp
- FROM '. self::TABLE .' mq
- LEFT JOIN '. Mimepart::TABLE .' mp ON mp.queueId = mq.id
+ FROM ' . self::TABLE . ' mq
+ LEFT JOIN ' . Mimepart::TABLE . ' mp ON mp.queueId = mq.id
WHERE mq.id=?
';
const QUERY_MULTI_DELETE = '
DELETE mq, mp
- FROM '. self::TABLE .' mq
- LEFT JOIN '. Mimepart::TABLE .' mp ON mp.queueId = mq.id
+ FROM ' . self::TABLE . ' mq
+ LEFT JOIN ' . Mimepart::TABLE . ' mp ON mp.queueId = mq.id
WHERE mq.id IN (?)
';
@@ -45,7 +45,7 @@ public function addConditionItemId($itemId)
public function addOrderBy($parameter, $order = 'ASC')
{
- $this->query->orderBy('mailQueue.'. $parameter, $order);
+ $this->query->orderBy('mailQueue.' . $parameter, $order);
return $this;
}
diff --git a/zmsdb/src/Zmsdb/Query/Mailtemplate.php b/zmsdb/src/Zmsdb/Query/Mailtemplate.php
index b7f348f2e..cb409253c 100644
--- a/zmsdb/src/Zmsdb/Query/Mailtemplate.php
+++ b/zmsdb/src/Zmsdb/Query/Mailtemplate.php
@@ -31,25 +31,25 @@ class Mailtemplate extends Base
public function addConditionName($itemName)
{
- $this->query->where(self::TABLE .'.name', '=', $itemName);
+ $this->query->where(self::TABLE . '.name', '=', $itemName);
return $this;
}
public function addConditionWithoutProvider()
{
- $this->query->where(self::TABLE .'.provider', '=', '')->orWhere(self::TABLE .'.provider', 'IS', null);
+ $this->query->where(self::TABLE . '.provider', '=', '')->orWhere(self::TABLE . '.provider', 'IS', null);
return $this;
}
public function addConditionProviderId($providerId)
{
- $this->query->where(self::TABLE .'.provider', '=', $providerId);
+ $this->query->where(self::TABLE . '.provider', '=', $providerId);
return $this;
}
public function addConditionId($templateId)
{
- $this->query->where(self::TABLE .'.id', '=', $templateId);
+ $this->query->where(self::TABLE . '.id', '=', $templateId);
return $this;
}
@@ -57,7 +57,7 @@ public function addTemplateContent($templateContent)
{
$this->query->values(array(
'mailtemplate.value' => $templateContent
- ));
+ ));
return $this;
}
@@ -70,6 +70,4 @@ public function getEntityMapping()
'provider' => 'mailtemplate.provider'
];
}
-
-
}
diff --git a/zmsdb/src/Zmsdb/Query/Organisation.php b/zmsdb/src/Zmsdb/Query/Organisation.php
index 5b0cf5ec9..4e92bc1bf 100644
--- a/zmsdb/src/Zmsdb/Query/Organisation.php
+++ b/zmsdb/src/Zmsdb/Query/Organisation.php
@@ -85,7 +85,7 @@ public function reverseEntityMapping(\BO\Zmsentities\Organisation $entity, $pare
}
$data['Organisationsname'] = $entity->name;
$data['InfoBezirkID'] = 14;
- $data['Anschrift'] =(isset($entity->contact['street'])) ?$entity->contact['street'] : '';
+ $data['Anschrift'] = (isset($entity->contact['street'])) ? $entity->contact['street'] : '';
$data['kioskpasswortschutz'] = ($entity->getPreference('ticketPrinterProtectionEnabled')) ? 1 : 0;
$data = array_filter($data, function ($value) {
return ($value !== null && $value !== false);
diff --git a/zmsdb/src/Zmsdb/Query/Process.php b/zmsdb/src/Zmsdb/Query/Process.php
index 9b3b460b1..bd83ff6e4 100644
--- a/zmsdb/src/Zmsdb/Query/Process.php
+++ b/zmsdb/src/Zmsdb/Query/Process.php
@@ -3,16 +3,13 @@
namespace BO\Zmsdb\Query;
/**
- *
* @SuppressWarnings(Methods)
* @SuppressWarnings(Complexity)
*/
class Process extends Base implements MappingInterface
{
-
/**
- *
- * @var String TABLE mysql table reference
+ * * @var String TABLE mysql table reference
*/
const TABLE = 'buerger';
@@ -418,7 +415,6 @@ public function addConditionTime($dateTime)
/**
* Identify processes between two dates
- *
*/
public function addConditionTimeframe(\DateTimeInterface $startDate, \DateTimeInterface $endDate)
{
@@ -513,7 +509,8 @@ public function addConditionStatus($status, $scopeId = 0)
if ('queued' == $status) {
$query->andWith('process.Uhrzeit', '=', '00:00:00')
->andWith('process.StandortID', '!=', 0)
- ->andWith('process.AbholortID', '=', 0);;
+ ->andWith('process.AbholortID', '=', 0);
+ ;
}
if ('confirmed' == $status) {
$query
@@ -601,7 +598,6 @@ public function addConditionMail($mailAddress, $exactMatching = false)
return $this;
}
-
public function addConditionCustomTextfield($customText, $exactMatching = false)
{
if ($exactMatching) {
@@ -653,7 +649,6 @@ public function addConditionDeallocate($now)
return $this;
}
-
public function addValuesNewProcess(\BO\Zmsentities\Process $process, $parentProcess = 0, $childProcessCount = 0)
{
$values = [
@@ -825,10 +820,10 @@ protected function addProcessingTimeData($process, \DateTimeInterface $dateTime,
) {
$timeoutTime = $dateTime->format('Y-m-d H:i:s');
$data['timeoutTime'] = $timeoutTime;
- } else if ($process->status == 'processing') {
+ } elseif ($process->status == 'processing') {
$showUpTime = $dateTime->format('Y-m-d H:i:s');
$data['showUpTime'] = $showUpTime;
- } else if ($process->status == 'finished') {
+ } elseif ($process->status == 'finished') {
$finishTime = $dateTime->format('Y-m-d H:i:s');
$data['finishTime'] = $finishTime;
}
@@ -840,7 +835,7 @@ protected function addProcessingTimeData($process, \DateTimeInterface $dateTime,
$processingTimeStr = $process->getProcessingTime();
$previousProcessingTimeInSeconds = 0; // Default to 0 if not set
-
+
if (!empty($processingTimeStr)) {
// Assume the format is HH:MM:SS and parse it
list($hours, $minutes, $seconds) = explode(':', $processingTimeStr);
@@ -852,18 +847,17 @@ protected function addProcessingTimeData($process, \DateTimeInterface $dateTime,
$totalSeconds = ($interval->days * 24 * 60 * 60) + ($interval->h * 60 * 60) + ($interval->i * 60) + $interval->s;
$totalSeconds += $previousProcessingTimeInSeconds;
-
+
$hours = intdiv($totalSeconds, 3600);
$minutes = intdiv($totalSeconds % 3600, 60);
$seconds = $totalSeconds % 60;
-
+
$data['processingTime'] = sprintf('%02d:%02d:%02d', $hours, $minutes, $seconds);
-
} elseif (isset($timeoutTime) && isset($process->showUpTime)) {
$showUpDateTime = new \DateTime($process->showUpTime);
$timeoutDateTime = new \DateTime($timeoutTime);
$processingTimeStr = $process->getProcessingTime();
-
+
$previousProcessingTimeInSeconds = 0; // Default to 0 if not set
if (!empty($processingTimeStr)) {
// Assume the format is HH:MM:SS and parse it
@@ -873,20 +867,19 @@ protected function addProcessingTimeData($process, \DateTimeInterface $dateTime,
}
$interval = $showUpDateTime->diff($timeoutDateTime);
$totalSeconds = ($interval->days * 24 * 60 * 60) + ($interval->h * 60 * 60) + ($interval->i * 60) + $interval->s;
-
+
$totalSeconds += $previousProcessingTimeInSeconds;
-
+
$hours = intdiv($totalSeconds, 3600);
$minutes = intdiv($totalSeconds % 3600, 60);
$seconds = $totalSeconds % 60;
-
+
$data['processingTime'] = sprintf('%02d:%02d:%02d', $hours, $minutes, $seconds);
}
$this->addValues($data);
}
-
protected function addValuesQueueData($process)
{
$data = array();
diff --git a/zmsdb/src/Zmsdb/Query/ProcessStatusArchived.php b/zmsdb/src/Zmsdb/Query/ProcessStatusArchived.php
index ecb7b3e0c..6f04f9761 100644
--- a/zmsdb/src/Zmsdb/Query/ProcessStatusArchived.php
+++ b/zmsdb/src/Zmsdb/Query/ProcessStatusArchived.php
@@ -9,7 +9,6 @@
*/
class ProcessStatusArchived extends Base implements MappingInterface
{
-
/**
*
* @var String TABLE mysql table reference
@@ -19,7 +18,7 @@ class ProcessStatusArchived extends Base implements MappingInterface
const ALIAS = 'process';
const QUERY_INSERT_IN_STATISTIC = '
- INSERT INTO '. self::STATISTIC_TABLE .' SET
+ INSERT INTO ' . self::STATISTIC_TABLE . ' SET
lastbuergerarchivid = :archiveId,
termin = :withAppointment,
datum = :date,
@@ -159,7 +158,7 @@ public function addValuesNewArchive(\BO\Zmsentities\Process $process, \DateTimeI
$totalMinutes = (double) ($hours * 60 + $minutes + $seconds / 60);
$warteZeit = $totalMinutes;
}
-
+
$this->addValues([
'StandortID' => $process->scope['id'],
'name' => $process->getFirstClient()['familyName'],
@@ -174,7 +173,7 @@ public function addValuesNewArchive(\BO\Zmsentities\Process $process, \DateTimeI
'wartezeit' => ($warteZeit > 0) ? $warteZeit : 0,
'AnzahlPersonen' => $process->getClients()->count()
]);
- }
+ }
public function postProcess($data)
{
@@ -188,7 +187,7 @@ public function postProcess($data)
$clientsCount = $data[$this->getPrefixed('__clientsCount')];
unset($data[$this->getPrefixed('__clientsCount')]);
while ($clientsCount-- > 0) {
- $data[$this->getPrefixed('clients__'.$clientsCount.'__familyName')] = 'Unknown';
+ $data[$this->getPrefixed('clients__' . $clientsCount . '__familyName')] = 'Unknown';
}
}
return $data;
@@ -199,7 +198,7 @@ private function getArchivedServices(\BO\Zmsentities\Process $process)
if ($process->getRequests()->count() === 0) {
return '';
}
-
+
$services = $process->getRequests()->getFirst()->name;
if ($process->getRequests()->count() > 1) {
@@ -216,6 +215,4 @@ public function addConditionOlderThanDate(\DateTimeInterface $dateTime)
$this->query->where('Datum', '<', $dateTime->format('Y-m-d'));
return $this;
}
-
-
}
diff --git a/zmsdb/src/Zmsdb/Query/ProcessStatusFree.php b/zmsdb/src/Zmsdb/Query/ProcessStatusFree.php
index 336db5014..64368c431 100644
--- a/zmsdb/src/Zmsdb/Query/ProcessStatusFree.php
+++ b/zmsdb/src/Zmsdb/Query/ProcessStatusFree.php
@@ -7,7 +7,6 @@
*/
class ProcessStatusFree extends Base
{
-
/**
* see also Day::QUERY_DAYLIST_JOIN
*/
diff --git a/zmsdb/src/Zmsdb/Query/RequestRelation.php b/zmsdb/src/Zmsdb/Query/RequestRelation.php
index 226e8ee16..41461c3d6 100644
--- a/zmsdb/src/Zmsdb/Query/RequestRelation.php
+++ b/zmsdb/src/Zmsdb/Query/RequestRelation.php
@@ -11,10 +11,10 @@ class RequestRelation extends Base implements MappingInterface
public function getEntityMapping()
{
return [
- 'request__id' => self::TABLE .'.request__id',
- 'provider__id' => self::TABLE .'.provider__id',
- 'source' => self::TABLE .'.source',
- 'slots' => self::TABLE .'.slots'
+ 'request__id' => self::TABLE . '.request__id',
+ 'provider__id' => self::TABLE . '.provider__id',
+ 'source' => self::TABLE . '.source',
+ 'slots' => self::TABLE . '.slots'
];
}
@@ -22,35 +22,35 @@ public function getReferenceMapping()
{
return [
'request__$ref' => self::expression(
- 'CONCAT("/request/", `'. self::TABLE .'`.`source`, "/", `'. self::TABLE .'`.`request__id`, "/")'
+ 'CONCAT("/request/", `' . self::TABLE . '`.`source`, "/", `' . self::TABLE . '`.`request__id`, "/")'
),
'provider__$ref' => self::expression(
- 'CONCAT("/provider/", `'. self::TABLE .'`.`source`, "/", `'. self::TABLE .'`.`provider__id`, "/")'
+ 'CONCAT("/provider/", `' . self::TABLE . '`.`source`, "/", `' . self::TABLE . '`.`provider__id`, "/")'
)
];
}
public function addConditionRequestId($requestId)
{
- $this->query->where(self::TABLE .'.request__id', '=', $requestId);
+ $this->query->where(self::TABLE . '.request__id', '=', $requestId);
return $this;
}
public function addConditionProviderId($providerId)
{
- $this->query->where(self::TABLE .'.provider__id', '=', $providerId);
+ $this->query->where(self::TABLE . '.provider__id', '=', $providerId);
return $this;
}
public function addConditionBookable()
{
- $this->query->where(self::TABLE .'.bookable', '=', 1);
+ $this->query->where(self::TABLE . '.bookable', '=', 1);
return $this;
}
public function addConditionSource($sourceName)
{
- $this->query->where(self::TABLE .'.source', '=', $sourceName);
+ $this->query->where(self::TABLE . '.source', '=', $sourceName);
return $this;
}
}
diff --git a/zmsdb/src/Zmsdb/Query/Scope.php b/zmsdb/src/Zmsdb/Query/Scope.php
index 72580b6b9..34a1f1c75 100644
--- a/zmsdb/src/Zmsdb/Query/Scope.php
+++ b/zmsdb/src/Zmsdb/Query/Scope.php
@@ -243,7 +243,7 @@ public function addSelectWorkstationCount($dateTime)
SELECT COUNT(*)
FROM nutzer
WHERE nutzer.StandortID = scope.StandortID
- AND nutzer.Datum = "'. $dateTime->format('Y-m-d') .'"
+ AND nutzer.Datum = "' . $dateTime->format('Y-m-d') . '"
AND nutzer.Arbeitsplatznr <> 0
)
)
@@ -389,8 +389,8 @@ public function postProcess($data)
if (!$data[$this->getPrefixed('contact__email')]) {
$data[$this->getPrefixed("preferences__client__adminMailOnAppointment")] = 0;
$data[$this->getPrefixed("preferences__client__adminMailOnDeleted")] = 0;
- $data[$this->getPrefixed("preferences__client__adminMailOnUpdated")] = 0;
- $data[$this->getPrefixed("preferences__client__adminMailOnMailSent")] = 0;
+ $data[$this->getPrefixed("preferences__client__adminMailOnUpdated")] = 0;
+ $data[$this->getPrefixed("preferences__client__adminMailOnMailSent")] = 0;
}
if (!$data[$this->getPrefixed('preferences__client__customTextfieldActivated')]) {
$data[$this->getPrefixed("preferences__client__customTextfieldRequired")] = 0;
diff --git a/zmsdb/src/Zmsdb/Query/SlotList.php b/zmsdb/src/Zmsdb/Query/SlotList.php
index 98d003498..7449fe714 100644
--- a/zmsdb/src/Zmsdb/Query/SlotList.php
+++ b/zmsdb/src/Zmsdb/Query/SlotList.php
@@ -12,7 +12,6 @@
*/
class SlotList extends Base
{
-
const QUERY = 'SELECT
-- collect some important settings, especially from the scope, use the appointment key
diff --git a/zmsdb/src/Zmsdb/Query/Useraccount.php b/zmsdb/src/Zmsdb/Query/Useraccount.php
index d0e42f553..e932a1938 100644
--- a/zmsdb/src/Zmsdb/Query/Useraccount.php
+++ b/zmsdb/src/Zmsdb/Query/Useraccount.php
@@ -128,7 +128,8 @@ public function addConditionDepartmentAndSearch($departmentId, $queryString = nu
return $this;
}
- public function addConditionRoleLevel($roleLevel){
+ public function addConditionRoleLevel($roleLevel)
+ {
$this->query->where('useraccount.Berechtigung', '=', $roleLevel);
return $this;
}
diff --git a/zmsdb/src/Zmsdb/Query/Warehouse.php b/zmsdb/src/Zmsdb/Query/Warehouse.php
index db1beb287..6cbe50ca8 100644
--- a/zmsdb/src/Zmsdb/Query/Warehouse.php
+++ b/zmsdb/src/Zmsdb/Query/Warehouse.php
@@ -23,7 +23,7 @@ class Warehouse extends Base
MAX(`datum`) AS periodend,
CONCAT(`Bezeichnung`, " ", `standortinfozeile`) AS description
FROM ' . self::TABLE . ' AS w
- LEFT JOIN ' . Scope::TABLE .' AS s ON w.`standortid` = s.`StandortID`
+ LEFT JOIN ' . Scope::TABLE . ' AS s ON w.`standortid` = s.`StandortID`
GROUP BY w.`standortid`
ORDER BY w.`standortid` ASC
';
diff --git a/zmsdb/src/Zmsdb/Query/Workstation.php b/zmsdb/src/Zmsdb/Query/Workstation.php
index 549c781a8..64e137af5 100644
--- a/zmsdb/src/Zmsdb/Query/Workstation.php
+++ b/zmsdb/src/Zmsdb/Query/Workstation.php
@@ -15,7 +15,7 @@ class Workstation extends Base implements MappingInterface
const QUERY_LOGIN = '
UPDATE
- '. self::TABLE .'
+ ' . self::TABLE . '
SET
`SessionID`=?,
`sessionExpiry`=?,
@@ -31,7 +31,7 @@ class Workstation extends Base implements MappingInterface
const QUERY_LOGIN_OIDC = '
UPDATE
- '. self::TABLE .'
+ ' . self::TABLE . '
SET
`SessionID`=?,
`sessionExpiry`=?,
@@ -45,7 +45,7 @@ class Workstation extends Base implements MappingInterface
const QUERY_PROCESS_RESET = '
UPDATE
- '. Process::TABLE .'
+ ' . Process::TABLE . '
SET
`NutzerID` = 0,
`aufrufzeit` = "00:00:00"
@@ -55,7 +55,7 @@ class Workstation extends Base implements MappingInterface
const QUERY_LOGOUT = '
UPDATE
- '. self::TABLE .'
+ ' . self::TABLE . '
SET
`SessionID`="",
`sessionExpiry`=NULL,
@@ -71,7 +71,7 @@ class Workstation extends Base implements MappingInterface
SELECT
SessionID as hash
FROM
- '. self::TABLE .'
+ ' . self::TABLE . '
WHERE
`Name` = :loginName
LIMIT 1
@@ -79,7 +79,7 @@ class Workstation extends Base implements MappingInterface
const QUERY_UPDATE_AUTHKEY = '
UPDATE
- '. self::TABLE .'
+ ' . self::TABLE . '
SET
`SessionID`=?,
`sessionExpiry`=?
diff --git a/zmsdb/src/Zmsdb/Query/XRequest.php b/zmsdb/src/Zmsdb/Query/XRequest.php
index 8bbf54848..58849675a 100644
--- a/zmsdb/src/Zmsdb/Query/XRequest.php
+++ b/zmsdb/src/Zmsdb/Query/XRequest.php
@@ -1,9 +1,9 @@
$request['name'],
'group' => (isset($request['group'])) ? $request['group'] : 'Sonstiges',
'link' => ('dldb' == $source)
- ? 'https://service.berlin.de/dienstleistung/'. $request['id'] .'/'
+ ? 'https://service.berlin.de/dienstleistung/' . $request['id'] . '/'
: ((isset($request['link'])) ? $request['link'] : ''),
'data' => json_encode($request)
]);
diff --git a/zmsdb/src/Zmsdb/RequestRelation.php b/zmsdb/src/Zmsdb/RequestRelation.php
index cdd97bc52..b835b68d5 100644
--- a/zmsdb/src/Zmsdb/RequestRelation.php
+++ b/zmsdb/src/Zmsdb/RequestRelation.php
@@ -1,9 +1,9 @@
readListBySource($source, 0, true, $requestId);
-
+
foreach ($providerList as $provider) {
$scopeListByProvider = $this->readByProviderId($provider->getId(), $resolveReferences);
if ($scopeListByProvider->count()) {
@@ -327,7 +327,7 @@ public function readWithWorkstationCount($scopeId, $dateTime, $resolveReferences
public function readQueueListWithWaitingTime($scope, $dateTime, $resolveReferences = 0)
{
$timeAverage = $scope->getPreference('queue', 'processingTimeAverage');
- $scope = (! $timeAverage) ? (new Scope)->readEntity($scope->id) : $scope;
+ $scope = (! $timeAverage) ? (new Scope())->readEntity($scope->id) : $scope;
$queueList = $this->readQueueList($scope->id, $dateTime, $resolveReferences);
$timeAverage = $scope->getPreference('queue', 'processingTimeAverage');
$workstationCount = $scope->getCalculatedWorkstationCount();
@@ -476,7 +476,7 @@ public function writeImageData($scopeId, \BO\Zmsentities\Mimepart $entity)
if ($extension == 'jpeg') {
$extension = 'jpg'; //compatibility ZMS1
}
- $imageName = 's_'. $scopeId .'_bild.'. $extension;
+ $imageName = 's_' . $scopeId . '_bild.' . $extension;
$this->getWriter()->perform(
(new Query\Scope(Query\Base::REPLACE))->getQueryWriteImageData(),
array(
@@ -499,7 +499,7 @@ public function writeImageData($scopeId, \BO\Zmsentities\Mimepart $entity)
*/
public function readImageData($scopeId)
{
- $imageName = 's_'. $scopeId .'_bild';
+ $imageName = 's_' . $scopeId . '_bild';
$imageData = new \BO\Zmsentities\Mimepart();
$fileData = $this->getReader()->fetchAll(
(new Query\Scope(Query\Base::SELECT))->getQueryReadImageData(),
@@ -522,7 +522,7 @@ public function readImageData($scopeId)
*/
public function deleteImage($scopeId)
{
- $imageName = 's_'. $scopeId .'_bild';
+ $imageName = 's_' . $scopeId . '_bild';
return $this->perform((new Query\Scope(Query\Base::DELETE))->getQueryDeleteImage(), array(
'imagename' => "$imageName%"
));
diff --git a/zmsdb/src/Zmsdb/Session.php b/zmsdb/src/Zmsdb/Session.php
index 49961ee01..30eac4ede 100644
--- a/zmsdb/src/Zmsdb/Session.php
+++ b/zmsdb/src/Zmsdb/Session.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Session as Entity;
+use BO\Zmsentities\Session as Entity;
class Session extends Base
{
diff --git a/zmsdb/src/Zmsdb/Slot.php b/zmsdb/src/Zmsdb/Slot.php
index ccb2d8dc3..3ad264245 100644
--- a/zmsdb/src/Zmsdb/Slot.php
+++ b/zmsdb/src/Zmsdb/Slot.php
@@ -1,10 +1,11 @@
readProperty('scope', $scope->id, 'appointment', 'startInDaysDefault');
$endInDaysDefault = (new Preferences())
->readProperty('scope', $scope->id, 'appointment', 'endInDaysDefault');
- if ($scope->preferences['appointment']['startInDaysDefault'] != $startInDaysDefault
+ if (
+ $scope->preferences['appointment']['startInDaysDefault'] != $startInDaysDefault
|| $scope->preferences['appointment']['endInDaysDefault'] != $endInDaysDefault
) {
(new Scope())->replacePreferences($scope); //TODO remove after ZMS1 is deactivated
@@ -83,8 +84,10 @@ public function hasScopeRelevantChanges(
->readChangeDateTime('scope', $scope->id, 'appointment', 'startInDaysDefault');
$endInDaysChange = (new Preferences())
->readChangeDateTime('scope', $scope->id, 'appointment', 'endInDaysDefault');
- if ($startInDaysChange->getTimestamp() > $slotLastChange->getTimestamp()
- || $endInDaysChange->getTimestamp() > $slotLastChange->getTimestamp()) {
+ if (
+ $startInDaysChange->getTimestamp() > $slotLastChange->getTimestamp()
+ || $endInDaysChange->getTimestamp() > $slotLastChange->getTimestamp()
+ ) {
return true;
}
}
@@ -101,7 +104,8 @@ public function isAvailabilityOutdated(
$availability['processingNote'][] = 'outdated: availability change';
return true;
}
- if ($formerChange->hasOutdatedScope()
+ if (
+ $formerChange->hasOutdatedScope()
&& $this->hasScopeRelevantChanges($availability->scope, $slotLastChange)
) {
$availability['processingNote'][] = 'outdated: scope change';
@@ -113,7 +117,8 @@ public function isAvailabilityOutdated(
}
// Be aware, that last slot change and current time might differ serval days
// if the rebuild fails in some way
- if (1
+ if (
+ 1
// First check if the bookable end date on current time was already calculated on last slot change
&& !$formerChange->hasBookableDateTime($proposedChange->getLastBookableDateTime())
// Second check if between last slot change and current time could be a bookable slot
@@ -142,7 +147,8 @@ public function isAvailabilityOutdated(
$availability['processingNote'][] = 'outdated: new slots required';
return true;
}
- if ($availability->getBookableStart($slotLastChange) != $availability->getBookableStart($now)
+ if (
+ $availability->getBookableStart($slotLastChange) != $availability->getBookableStart($now)
// First check, if bookable start from lastChange was not included in bookable time from now
&& !$availability->hasDate($availability->getBookableStart($slotLastChange), $now)
// Second check, if availability had a bookable time on lastChange before bookable start from now
@@ -171,7 +177,7 @@ public function writeByAvailability(
if (!$slotLastChange) {
$slotLastChange = $this->readLastChangedTimeByAvailability($availability);
}
- $availability['processingNote'][] = 'lastchange='.$slotLastChange->format('c');
+ $availability['processingNote'][] = 'lastchange=' . $slotLastChange->format('c');
if (!$this->isAvailabilityOutdated($availability, $now, $slotLastChange)) {
return false;
}
@@ -210,7 +216,7 @@ public function writeByAvailability(
public function writeByScope(\BO\Zmsentities\Scope $scope, \DateTimeInterface $now)
{
$slotLastChange = $this->readLastChangedTimeByScope($scope);
- $availabilityList = (new \BO\Zmsdb\Availability)
+ $availabilityList = (new \BO\Zmsdb\Availability())
->readAvailabilityListByScope($scope, 0, $slotLastChange->modify('-1 day'))
;
$updatedList = new \BO\Zmsentities\Collection\AvailabilityList();
@@ -254,7 +260,7 @@ protected function writeSlotListForDate(
$status = $writeStatus ? $writeStatus : $status;
}
if ($hasAddedSlots) {
- $availability['processingNote'][] = 'Added '.$time->format('Y-m-d');
+ $availability['processingNote'][] = 'Added ' . $time->format('Y-m-d');
}
return $status;
}
diff --git a/zmsdb/src/Zmsdb/Source.php b/zmsdb/src/Zmsdb/Source.php
index eae2a5daa..8c8429834 100644
--- a/zmsdb/src/Zmsdb/Source.php
+++ b/zmsdb/src/Zmsdb/Source.php
@@ -3,15 +3,11 @@
namespace BO\Zmsdb;
use BO\Zmsentities\Collection\ScopeList;
-use \BO\Zmsentities\Source as Entity;
-
-use \BO\Zmsentities\Collection\SourceList as Collection;
-
-use \BO\Zmsentities\Collection\ProviderList;
-
-use \BO\Zmsentities\Collection\RequestList;
-
-use \BO\Zmsentities\Collection\RequestRelationList;
+use BO\Zmsentities\Source as Entity;
+use BO\Zmsentities\Collection\SourceList as Collection;
+use BO\Zmsentities\Collection\ProviderList;
+use BO\Zmsentities\Collection\RequestList;
+use BO\Zmsentities\Collection\RequestRelationList;
/**
*
diff --git a/zmsdb/src/Zmsdb/Source/Dldb.php b/zmsdb/src/Zmsdb/Source/Dldb.php
index 943204e7f..b6c203417 100644
--- a/zmsdb/src/Zmsdb/Source/Dldb.php
+++ b/zmsdb/src/Zmsdb/Source/Dldb.php
@@ -121,4 +121,4 @@ protected function writeLastUpdate()
print("LastImportTimeToConfig: Took $time seconds\n\n");
}
}
-}
\ No newline at end of file
+}
diff --git a/zmsdb/src/Zmsdb/Status.php b/zmsdb/src/Zmsdb/Status.php
index c99c40c84..c6f9a3376 100644
--- a/zmsdb/src/Zmsdb/Status.php
+++ b/zmsdb/src/Zmsdb/Status.php
@@ -2,7 +2,7 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Status as Entity;
+use BO\Zmsentities\Status as Entity;
class Status extends Base
{
@@ -27,7 +27,7 @@ public function readEntity(\DateTimeImmutable $now, $includeProcessStats = true)
$entity['database']['logbin'] =
array_key_exists('log_bin', $configVariables) ? $configVariables['log_bin'] : 'OFF';
$entity['processes'] = $includeProcessStats ? $this->readProcessStats($now) : [];
-
+
if ($includeProcessStats) {
$entity['processes'] = $this->readProcessStats($now);
$outdated = $this->readOutdatedSlots();
@@ -36,11 +36,11 @@ public function readEntity(\DateTimeImmutable $now, $includeProcessStats = true)
$freeSlots = $this->readFreeSlots();
$entity['processes']['freeSlots'] = $freeSlots['cnt'];
}
-
+
$entity['mail'] = $this->readMailStats();
$entity['notification'] = $this->readNotificationStats();
$entity['sources']['dldb']['last'] = $this->readDdldUpdateStats();
- $entity['processes']['lastCalculate'] = $this->readLastCalculateSlots();
+ $entity['processes']['lastCalculate'] = $this->readLastCalculateSlots();
$entity['useraccounts']['activeSessions'] = $this->getTotalActiveSessions();
$entity['useraccounts']['departments'] = $this->getActiveSessionsByBehoerdenWithScopes();
@@ -229,9 +229,9 @@ protected function readProcessStats(\DateTimeImmutable $now)
SUM(CASE WHEN name = "(abgesagt)" THEN 1 ELSE NULL END) as deleted,
SUM(CASE WHEN nicht_erschienen > 0 AND b.StandortID != 0 THEN 1 ELSE NULL END) as missed,
SUM(CASE WHEN vorlaeufigeBuchung = 1 AND b.StandortID != 0 THEN 1 ELSE NULL END) as reserved,
- SUM(CASE WHEN IPTimeStamp > '.intval($midnight).' AND b.StandortID != 0
+ SUM(CASE WHEN IPTimeStamp > ' . intval($midnight) . ' AND b.StandortID != 0
AND vorlaeufigeBuchung = 0 AND Abholer = 0 THEN 1 ELSE NULL END) as sincemidnight,
- SUM(CASE WHEN IPTimeStamp > '.intval($last7days).' AND b.StandortID != 0
+ SUM(CASE WHEN IPTimeStamp > ' . intval($last7days) . ' AND b.StandortID != 0
AND vorlaeufigeBuchung = 0 AND Abholer = 0 THEN 1 ELSE NULL END) as last7days,
FROM_UNIXTIME(MAX(IPTimeStamp)) as lastInsert
FROM buerger AS b
diff --git a/zmsdb/src/Zmsdb/Ticketprinter.php b/zmsdb/src/Zmsdb/Ticketprinter.php
index fb628a060..4591bf964 100644
--- a/zmsdb/src/Zmsdb/Ticketprinter.php
+++ b/zmsdb/src/Zmsdb/Ticketprinter.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Ticketprinter as Entity;
-use \BO\Zmsentities\Collection\TicketprinterList as Collection;
+use BO\Zmsentities\Ticketprinter as Entity;
+use BO\Zmsentities\Collection\TicketprinterList as Collection;
/**
*
@@ -96,8 +96,8 @@ public function readByButtonList(Entity $ticketprinter, \DateTimeImmutable $now)
if ('request' == $button['type']) {
$scopeId = explode('-', $button['request']['id'])[0];
$requestId = explode('-', $button['request']['id'])[1];
- $request = (new Request)->readEntity('dldb', $requestId);
- $scope = (new Scope)->readWithWorkstationCount($scopeId, $now);
+ $request = (new Request())->readEntity('dldb', $requestId);
+ $scope = (new Scope())->readWithWorkstationCount($scopeId, $now);
if (! $request || ! $scope) {
throw new Exception\Ticketprinter\UnvalidButtonList();
@@ -105,7 +105,7 @@ public function readByButtonList(Entity $ticketprinter, \DateTimeImmutable $now)
$ticketprinter->buttons[$key]['scope'] = $scope;
$ticketprinter->buttons[$key]['requestId'] = $requestId;
- $ticketprinter->buttons[$key]['enabled'] = (new Scope)->readIsEnabled($scope->id, $now);
+ $ticketprinter->buttons[$key]['enabled'] = (new Scope())->readIsEnabled($scope->id, $now);
$ticketprinter->buttons[$key]['name'] = $request->getProperty('name');
}
}
diff --git a/zmsdb/src/Zmsdb/Useraccount.php b/zmsdb/src/Zmsdb/Useraccount.php
index 4989f4a7f..597acc105 100644
--- a/zmsdb/src/Zmsdb/Useraccount.php
+++ b/zmsdb/src/Zmsdb/Useraccount.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Useraccount as Entity;
-use \BO\Zmsentities\Collection\UseraccountList as Collection;
+use BO\Zmsentities\Useraccount as Entity;
+use BO\Zmsentities\Collection\UseraccountList as Collection;
/**
* @SuppressWarnings(Public)
@@ -289,7 +289,6 @@ public function readListRole($roleLevel, $resolveReferences = 0)
public function readListByRoleAndDepartment($roleLevel, $departmentId, $resolveReferences = 0)
{
- $collection = new Collection();
$query = new Query\Useraccount(Query\Base::SELECT);
$query->addResolvedReferences($resolveReferences)
->addEntityMapping();
@@ -302,5 +301,4 @@ public function readListByRoleAndDepartment($roleLevel, $departmentId, $resolveR
$statement = $this->fetchStatement($query);
return $this->readListStatement($statement, $resolveReferences);
}
-
}
diff --git a/zmsdb/src/Zmsdb/Warehouse.php b/zmsdb/src/Zmsdb/Warehouse.php
index 5fec6c3bc..a43d161b9 100644
--- a/zmsdb/src/Zmsdb/Warehouse.php
+++ b/zmsdb/src/Zmsdb/Warehouse.php
@@ -2,8 +2,8 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Exchange;
-use \BO\Zmsentities\Scope as ScopeEntity;
+use BO\Zmsentities\Exchange;
+use BO\Zmsentities\Scope as ScopeEntity;
class Warehouse extends Base
{
@@ -112,7 +112,7 @@ class Warehouse extends Base
public function readSubjectsList()
{
- $entity = (new Exchange)->withLessData();
+ $entity = (new Exchange())->withLessData();
$entity->addDictionaryEntry('subject', 'string', 'subject name');
$entity->addDictionaryEntry('description', 'string', 'subject description');
$entity->addDictionaryEntry('right', 'string', 'useraccount right for this subject', 'useraccount.rights');
diff --git a/zmsdb/src/Zmsdb/Workstation.php b/zmsdb/src/Zmsdb/Workstation.php
index 571a4a52e..a82a7c827 100644
--- a/zmsdb/src/Zmsdb/Workstation.php
+++ b/zmsdb/src/Zmsdb/Workstation.php
@@ -2,12 +2,11 @@
namespace BO\Zmsdb;
-use \BO\Zmsentities\Workstation as Entity;
-use \BO\Zmsentities\Useraccount as UseraccountEntity;
-use \BO\Zmsentities\Scope as ScopeEntity;
-use \BO\Zmsentities\Process as ProcessEntity;
-
-use \BO\Zmsentities\Collection\WorkstationList as Collection;
+use BO\Zmsentities\Workstation as Entity;
+use BO\Zmsentities\Useraccount as UseraccountEntity;
+use BO\Zmsentities\Scope as ScopeEntity;
+use BO\Zmsentities\Process as ProcessEntity;
+use BO\Zmsentities\Collection\WorkstationList as Collection;
/**
* @SuppressWarnings(Coupling)
@@ -39,16 +38,16 @@ public function readResolvedReferences(\BO\Zmsentities\Schema\Entity $workstatio
$resolveReferences - 1
);
if ($workstation->scope['id']) {
- $workstation->scope = (new Scope)->readResolvedReferences(
+ $workstation->scope = (new Scope())->readResolvedReferences(
new ScopeEntity($workstation->scope),
$resolveReferences - 1
);
- $workstation->scope->cluster = (new Cluster)->readByScopeId($workstation->scope->id);
+ $workstation->scope->cluster = (new Cluster())->readByScopeId($workstation->scope->id);
$department = (new Department())->readByScopeId($workstation->scope['id']);
$workstation->linkList = (new Link())->readByDepartmentId($department->getId());
}
- $workstation->process = (new Process)->readByWorkstation($workstation, $resolveReferences - 1);
- $config = (new Config)->readEntity();
+ $workstation->process = (new Process())->readByWorkstation($workstation, $resolveReferences - 1);
+ $config = (new Config())->readEntity();
$workstation->support = $config->support;
}
return $workstation;
@@ -86,7 +85,7 @@ public function readLoggedInListByScope($scopeId, \DateTimeInterface $dateTime,
public function readLoggedInListByCluster($clusterId, \DateTimeInterface $dateTime, $resolveReferences = 0)
{
$workstationList = new \BO\Zmsentities\Collection\WorkstationList();
- $cluster = (new Cluster)->readEntity($clusterId, $resolveReferences);
+ $cluster = (new Cluster())->readEntity($clusterId, $resolveReferences);
if ($cluster->toProperty()->scopes->get()) {
foreach ($cluster->scopes as $scope) {
$workstationList->addList($this->readLoggedInListByScope($scope['id'], $dateTime, $resolveReferences));
@@ -205,7 +204,7 @@ public function writeAssignedProcess(
\DateTimeInterface $dateTime
) {
$processEntity = $process;
- $process = (new Process)->updateEntity(
+ $process = (new Process())->updateEntity(
$process,
$dateTime,
0,
diff --git a/zmsdb/tests/Zmsdb/Helper/ReservedDataDeleteByCronTest.php b/zmsdb/tests/Zmsdb/Helper/ReservedDataDeleteByCronTest.php
index 840aee040..91c95726a 100644
--- a/zmsdb/tests/Zmsdb/Helper/ReservedDataDeleteByCronTest.php
+++ b/zmsdb/tests/Zmsdb/Helper/ReservedDataDeleteByCronTest.php
@@ -3,9 +3,7 @@
namespace BO\Zmsdb\Tests;
use \BO\Zmsdb\Helper\ReservedDataDeleteByCron;
-use \BO\Zmsdb\Process as ProcessRepository;
use \BO\Zmsdb\ProcessStatusFree;
-use \BO\Zmsdb\ProcessStatusArchived;
use \BO\Zmsentities\Process as Entity;
class ReservedDataDeleteByCronTest extends Base
diff --git a/zmsdb/tests/Zmsdb/SlotTest.php b/zmsdb/tests/Zmsdb/SlotTest.php
index 2cd249eda..3dd0f7902 100644
--- a/zmsdb/tests/Zmsdb/SlotTest.php
+++ b/zmsdb/tests/Zmsdb/SlotTest.php
@@ -340,9 +340,6 @@ public function testWriteCanceledByTime()
$dateTime = new \DateTimeImmutable('2016-04-01 11:55:00');
$slotList = (new Slot())->readRowsByScopeAndDate($scope, $dateTime->modify('+7days'));
$this->assertEquals($slotList[0]['status'], 'free');
- (new Slot())->writeCanceledByTime($dateTime->modify('+8days'));
- $slotList = (new Slot())->readRowsByScopeAndDate($scope, $dateTime->modify('+7days'));
- $this->assertEquals($slotList[0]['status'], 'cancelled');
$slotList = (new Slot())->readRowsByScopeAndDate($scope, $dateTime->modify('+14days'));
$this->assertEquals($slotList[0]['status'], 'free');
diff --git a/zmsdldb/.gitignore b/zmsdldb/.gitignore
index f4ae45f45..a2f1ba73f 100644
--- a/zmsdldb/.gitignore
+++ b/zmsdldb/.gitignore
@@ -3,4 +3,5 @@ config.php
tags
/vendor/
Makefile
-.DS_*
\ No newline at end of file
+.DS_*
+coverage
\ No newline at end of file
diff --git a/zmsdldb/phpunit.xml b/zmsdldb/phpunit.xml
new file mode 100644
index 000000000..76fc35d97
--- /dev/null
+++ b/zmsdldb/phpunit.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ ./tests/Dldb/
+
+
+
+
+ ./src
+
+
+ ./vendor
+ ./tests
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/zmsdldb/phpunit.xml.dist b/zmsdldb/phpunit.xml.dist
deleted file mode 100644
index a744641f1..000000000
--- a/zmsdldb/phpunit.xml.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ./tests/Dldb/
-
-
-
-
-
-
-
diff --git a/zmsdldb/src/Dldb/AbstractAccess.php b/zmsdldb/src/Dldb/AbstractAccess.php
index 6a685db9b..1c5f00fe2 100644
--- a/zmsdldb/src/Dldb/AbstractAccess.php
+++ b/zmsdldb/src/Dldb/AbstractAccess.php
@@ -1,8 +1,10 @@
getInstanceCompatibilities();
- if ($instanceName
+ if (
+ $instanceName
&& $instanceName != 'Missing'
&& method_exists($accessInstance[$instanceName], $actionType . $actionName)
) {
diff --git a/zmsdldb/src/Dldb/AccessFactory.php b/zmsdldb/src/Dldb/AccessFactory.php
index eece03861..32e96727e 100644
--- a/zmsdldb/src/Dldb/AccessFactory.php
+++ b/zmsdldb/src/Dldb/AccessFactory.php
@@ -4,6 +4,7 @@
* @package 115Mandant
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
**/
+
namespace BO\Dldb;
class AccessFactory
diff --git a/zmsdldb/src/Dldb/Collection/Authorities.php b/zmsdldb/src/Dldb/Collection/Authorities.php
index 3643f885a..e1f6bacd7 100644
--- a/zmsdldb/src/Dldb/Collection/Authorities.php
+++ b/zmsdldb/src/Dldb/Collection/Authorities.php
@@ -1,8 +1,10 @@
$authority) {
@@ -21,7 +22,8 @@ public function __clone()
public function addLocation(\BO\Dldb\Entity\Location $location)
{
- if ($location->offsetExists('authority')
+ if (
+ $location->offsetExists('authority')
&& (($location['authority'] instanceof \BO\Dldb\Entity\Base
&& $location['authority']->offsetExists('id')
&& $location['authority']->offsetExists('authority')
diff --git a/zmsdldb/src/Dldb/Collection/Base.php b/zmsdldb/src/Dldb/Collection/Base.php
index a6cf46f7e..ae7a85d7c 100644
--- a/zmsdldb/src/Dldb/Collection/Base.php
+++ b/zmsdldb/src/Dldb/Collection/Base.php
@@ -1,15 +1,16 @@
setAttribute(\Collator::QUATERNARY, \Collator::ON);
$collator->setAttribute(\Collator::CASE_FIRST, \Collator::ON);
$collator->setAttribute(\Collator::NUMERIC_COLLATION, \Collator::ON);
-
+
$itemList = clone $this;
$itemList->uasort(function ($itemA, $itemB) use ($collator, $field) {
return collator_compare($collator, $itemA[$field], $itemB[$field]);
diff --git a/zmsdldb/src/Dldb/Collection/Boroughs.php b/zmsdldb/src/Dldb/Collection/Boroughs.php
index 8d880afa4..6923772a4 100644
--- a/zmsdldb/src/Dldb/Collection/Boroughs.php
+++ b/zmsdldb/src/Dldb/Collection/Boroughs.php
@@ -1,4 +1,5 @@
$location) {
diff --git a/zmsdldb/src/Dldb/Collection/Offices.php b/zmsdldb/src/Dldb/Collection/Offices.php
index cfe44c78f..b3cf43d32 100644
--- a/zmsdldb/src/Dldb/Collection/Offices.php
+++ b/zmsdldb/src/Dldb/Collection/Offices.php
@@ -1,4 +1,5 @@
1) {
$key = array_shift($keys);
@@ -126,7 +126,7 @@ public static function doubleUnterlineToArray(&$array, $key, $value)
}
$array[array_shift($keys)] = $value;
-
+
return $array;
}
}
diff --git a/zmsdldb/src/Dldb/Entity/Borough.php b/zmsdldb/src/Dldb/Entity/Borough.php
index 8576e0372..61e1b4947 100644
--- a/zmsdldb/src/Dldb/Entity/Borough.php
+++ b/zmsdldb/src/Dldb/Entity/Borough.php
@@ -1,4 +1,5 @@
getArrayCopy();
$servicecompare = explode(',', $serviceCsv);
-
+
$serviceList = array();
foreach ($location['services'] as $serviceinfo) {
$service_id = $serviceinfo['service'];
@@ -90,7 +90,8 @@ public function hasAppointments($serviceCsv = null, $external = false)
$serviceList = $this->getServiceInfoList($serviceCsv);
$servicecount = array();
foreach ($serviceList as $serviceinfo) {
- if (true === static::hasValidOffset($serviceinfo, 'appointment')
+ if (
+ true === static::hasValidOffset($serviceinfo, 'appointment')
&& $serviceinfo['appointment']['allowed']
&& ($external || $serviceinfo['appointment']['external'] === false)
) {
@@ -111,7 +112,7 @@ public function hasAppointments($serviceCsv = null, $external = false)
public function getAppointmentForService($service_id, $external = false)
{
$serviceList = $this->getServiceInfoList($service_id);
-
+
if (!empty($serviceList)) {
$service = end($serviceList);
return $service['appointment'];
diff --git a/zmsdldb/src/Dldb/Entity/Office.php b/zmsdldb/src/Dldb/Entity/Office.php
index 0bf990da7..a87fb8226 100644
--- a/zmsdldb/src/Dldb/Entity/Office.php
+++ b/zmsdldb/src/Dldb/Entity/Office.php
@@ -1,4 +1,5 @@
readDataFile();
-
+
return $data['data'];
} catch (\Exception $e) {
throw $e;
@@ -77,7 +78,7 @@ public function getHash()
{
try {
$data = $this->readDataFile();
-
+
return $data['hash'];
} catch (\Exception $e) {
throw $e;
@@ -88,7 +89,7 @@ public function getData()
{
try {
$data = $this->readDataFile();
-
+
return $data;
} catch (\Exception $e) {
throw $e;
diff --git a/zmsdldb/src/Dldb/File/Borough.php b/zmsdldb/src/Dldb/File/Borough.php
index 681b28517..596430899 100644
--- a/zmsdldb/src/Dldb/File/Borough.php
+++ b/zmsdldb/src/Dldb/File/Borough.php
@@ -1,4 +1,5 @@
access()
diff --git a/zmsdldb/src/Dldb/File/Location.php b/zmsdldb/src/Dldb/File/Location.php
index 714f72d73..8faed0356 100644
--- a/zmsdldb/src/Dldb/File/Location.php
+++ b/zmsdldb/src/Dldb/File/Location.php
@@ -1,12 +1,14 @@
sortByName();
diff --git a/zmsdldb/src/Dldb/File/Setting.php b/zmsdldb/src/Dldb/File/Setting.php
index 4d1e4427a..35c9c80db 100644
--- a/zmsdldb/src/Dldb/File/Setting.php
+++ b/zmsdldb/src/Dldb/File/Setting.php
@@ -1,4 +1,5 @@
entityTypes = $entityTypes;
@@ -43,7 +42,7 @@ public function fetchSearchRow($object_id, $locale, $entity_type)
}
}
- protected function getSearchResults(string $query) : SearchResults
+ protected function getSearchResults(string $query): SearchResults
{
try {
$resultList = new SearchResults();
@@ -54,7 +53,7 @@ protected function getSearchResults(string $query) : SearchResults
$where = [];
foreach ($this->entityIds[$type] as $locale => $ids) {
- $where[] = "(locale = '" . $locale ."' AND id IN (" . implode(',', $ids) . "))";
+ $where[] = "(locale = '" . $locale . "' AND id IN (" . implode(',', $ids) . "))";
}
$sql .= implode(' OR ', $where);
@@ -63,7 +62,7 @@ protected function getSearchResults(string $query) : SearchResults
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($entityClass, $resultList) {
$entity = new $entityClass();
$entity->offsetSet('data_json', $data_json);
-
+
$resultList[] = SearchResult::create($entity);
});
}
@@ -79,7 +78,7 @@ protected function getSearchResults(string $query) : SearchResults
}
}
- public function execute(string $query) : SearchResults
+ public function execute(string $query): SearchResults
{
try {
$query = '+' . implode(' +', explode(' ', $query));
@@ -107,9 +106,9 @@ public function execute(string $query) : SearchResults
$sql .= ' GROUP BY object_id, entity_type, locale';
$stm = $this->mysqlAccess->prepare($sql);
-
+
$stm->execute($sqlArgs);
-
+
$stm->fetchAll(\PDO::FETCH_FUNC, [$this, 'fetchSearchRow']);
$resultList = $this->getSearchResults($query);
diff --git a/zmsdldb/src/Dldb/Helper/Sorter.php b/zmsdldb/src/Dldb/Helper/Sorter.php
index dbd979336..691654cf1 100644
--- a/zmsdldb/src/Dldb/Helper/Sorter.php
+++ b/zmsdldb/src/Dldb/Helper/Sorter.php
@@ -7,7 +7,6 @@
*/
class Sorter
{
-
/**
* @todo check against ISO definition
*/
diff --git a/zmsdldb/src/Dldb/Importer/Base.php b/zmsdldb/src/Dldb/Importer/Base.php
index adeab4d8e..d1b93d7aa 100644
--- a/zmsdldb/src/Dldb/Importer/Base.php
+++ b/zmsdldb/src/Dldb/Importer/Base.php
@@ -13,7 +13,8 @@
abstract class Base implements Options
{
- use PDOTrait, OptionsTrait;
+ use PDOTrait;
+ use OptionsTrait;
protected $fileAccess;
@@ -94,7 +95,8 @@ public function runImport()
public function clearDatabase()
{
try {
- if ($this->checkOptionFlag(static::OPTION_CLEAR_ENTITIY_REFERENCES_TABLES) ||
+ if (
+ $this->checkOptionFlag(static::OPTION_CLEAR_ENTITIY_REFERENCES_TABLES) ||
$this->checkOptionFlag(static::OPTION_CLEAR_ENTITIY_TABLE)
) {
/*
@@ -107,7 +109,7 @@ public function clearDatabase()
];
*/
$tablesToClear = [];
-
+
foreach (array_keys($this->importTypes) as $type) {
$importer = $this->__call(
'get' . $type . 'Importer',
diff --git a/zmsdldb/src/Dldb/Importer/ItemNeedsUpdateTrait.php b/zmsdldb/src/Dldb/Importer/ItemNeedsUpdateTrait.php
index bda205f4f..4829cb857 100644
--- a/zmsdldb/src/Dldb/Importer/ItemNeedsUpdateTrait.php
+++ b/zmsdldb/src/Dldb/Importer/ItemNeedsUpdateTrait.php
@@ -7,7 +7,7 @@
*/
trait ItemNeedsUpdateTrait
{
- public function itemNeedsUpdate(int $objectId, string $locale, string $objectHash, string $type) : bool
+ public function itemNeedsUpdate(int $objectId, string $locale, string $objectHash, string $type): bool
{
try {
$statment = $this->getPDOAccess()->prepare(
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Authorities.php b/zmsdldb/src/Dldb/Importer/MySQL/Authorities.php
index 4d319ac34..a36c5a8f1 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Authorities.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Authorities.php
@@ -6,7 +6,7 @@ class Authorities extends Base
{
protected $entityClass = '\\BO\\Dldb\\Importer\\MySQL\\Entity\\Authority';
- public function runImport() : bool
+ public function runImport(): bool
{
try {
if ($this->needsUpdate()) {
@@ -37,7 +37,7 @@ public function runImport() : bool
} catch (\Exception $e) {
throw $e;
}
-
+
return true;
}
}
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Base.php b/zmsdldb/src/Dldb/Importer/MySQL/Base.php
index 7bd91cb52..1841a9855 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Base.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Base.php
@@ -7,12 +7,13 @@
use BO\Dldb\Importer\PDOTrait;
use BO\Dldb\Importer\ItemNeedsUpdateTrait;
use BO\Dldb\Importer\Options;
-use \BO\Dldb\Importer\MySQL\Entity\Meta as MetaEntity
+use BO\Dldb\Importer\MySQL\Entity\Meta as MetaEntity
;
abstract class Base implements Options
{
- use PDOTrait, OptionsTrait;
+ use PDOTrait;
+ use OptionsTrait;
protected $entityClass = null;
protected $importData = [];
@@ -29,7 +30,7 @@ public function __construct(PDOAccess $mySqlAccess, array $importData = [], stri
$this->setImportData($importData['data']);
$this->setImportHash($importData['hash']);
$this->setLocale($locale);
-
+
$this->setOptions($options);
$this->clearEntity();
} catch (\Exception $e) {
@@ -37,24 +38,24 @@ public function __construct(PDOAccess $mySqlAccess, array $importData = [], stri
}
}
- public function getPDOAccess() : PDOAccess
+ public function getPDOAccess(): PDOAccess
{
return $this->pdoAccess;
}
-
- public function getImportData() : array
+
+ public function getImportData(): array
{
return $this->importData;
}
- public function getIterator() : iterable
+ public function getIterator(): iterable
{
foreach ($this->importData as $item) {
yield $item;
}
}
- public function getCurrentEntitys() : array
+ public function getCurrentEntitys(): array
{
return $this->entitysToDelete;
}
@@ -77,8 +78,8 @@ public function setCurrentEntitys()
FROM meta AS m
JOIN " . $this->entityClass::getTableName() . " AS e ON e.id = m.object_id AND e.locale = ?
WHERE m.locale = ?";
-
-
+
+
$stm = $this->getPDOAccess()->prepare($sql);
$stm->setFetchMode(\PDO::FETCH_OBJ);
$stm->execute([$this->getLocale(),$this->getLocale()]);
@@ -122,13 +123,13 @@ public function createMetaObject()
}
}
- public function getMetaObject() : MetaEntity
+ public function getMetaObject(): MetaEntity
{
$this->createMetaObject();
return $this->metaObject;
}
- public function saveMetaObject() : self
+ public function saveMetaObject(): self
{
$this->getMetaObject()->save();
return $this;
@@ -144,30 +145,30 @@ public function needsUpdate()
return $needsUpdate;
}
- public function setImportData(array $importData = []) : self
+ public function setImportData(array $importData = []): self
{
$this->importData = $importData;
return $this;
}
- public function setLocale(string $locale) : self
+ public function setLocale(string $locale): self
{
$this->locale = $locale;
return $this;
}
- public function getLocale() : string
+ public function getLocale(): string
{
return $this->locale;
}
- public function setImportHash(string $hash) : self
+ public function setImportHash(string $hash): self
{
$this->hash = $hash;
return $this;
}
- public function getImportHash() : string
+ public function getImportHash(): string
{
return $this->hash;
}
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Authority.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Authority.php
index 9bffab61c..f06d2c10e 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Authority.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Authority.php
@@ -39,7 +39,7 @@ protected function setupMapping()
'class' => 'BO\\Dldb\\Importer\\MySQL\\Entity\\AuthorityLocation',
'neededFields' => ['id' => 'authority_id', 'meta.locale' => 'locale'],
'addFields' => [
-
+
],
'deleteFields' => [
'authority_id' => $this->get('id'),
@@ -85,7 +85,7 @@ public function deleteEntity(): bool
}
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
return $this->deleteWith(
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Base.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Base.php
index 6e617ad52..bfc4af908 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Base.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Base.php
@@ -18,8 +18,9 @@
*/
abstract class Base implements \Countable, \ArrayAccess, \JsonSerializable
{
- use ItemNeedsUpdateTrait, PDOTrait;
-
+ use ItemNeedsUpdateTrait;
+ use PDOTrait;
+
protected $fieldMapping = [];
protected $fields = [];
@@ -50,11 +51,11 @@ public function __construct(PDOAccess $mySqlAccess, array $dataRaw = [], bool $s
$this->setupMapping();
$this->preSetup();
-
+
$this->setupFields();
$this->setupReferences();
-
+
$this->postSetup();
}
} catch (\Exception $e) {
@@ -95,7 +96,7 @@ public function setRawData(array $rawData = [])
return $this;
}
- public function getRawData() : array
+ public function getRawData(): array
{
return $this->dataRaw;
}
@@ -105,12 +106,12 @@ public function setStatus(int $status = Base::STATUS_NEW)
$this->status = $status;
}
- public function getStatus() : int
+ public function getStatus(): int
{
return $this->status;
}
- public function getReferenceMapping($setup = false) : array
+ public function getReferenceMapping($setup = false): array
{
try {
if (true === $setup) {
@@ -138,7 +139,7 @@ public function preSetup()
public function postSetup()
{
}
-
+
public function preSetupFields()
{
}
@@ -147,14 +148,14 @@ public function postSetupFields()
{
}
- final public function setupFields() : bool
+ final public function setupFields(): bool
{
try {
if (false === $this->setupFields) {
return true;
}
$this->preSetupFields();
-
+
$values = $this->get(array_keys(array_filter($this->fieldMapping)));
foreach ($values as $key => $value) {
$this->__set($key, $value);
@@ -170,7 +171,7 @@ final public function setupFields() : bool
protected function getReferenceFields()
{
$referenceFields = array_flip(array_keys(array_filter($this->referanceMapping)));
-
+
foreach (array_keys($referenceFields) as $name) {
$referenceFields[$name] = $this->get($name);
}
@@ -188,16 +189,16 @@ final public function setupReferences()
foreach ($values as $name => $references) {
$referenceEntityClass = $this->referanceMapping[$name]['class'];
$addFields = [];
-
+
foreach (($this->referanceMapping[$name]['neededFields'] ?? []) as $sourceKey => $destinationKey) {
$addFields[$destinationKey] = $this->get($sourceKey);
}
$isMultiple = $this->referanceMapping[$name]['multiple'] ?? true;
-
+
if (false === $isMultiple) {
$references = [$references];
}
-
+
$position = 0;
foreach (($references ?? []) as $reference) {
foreach ($this->referanceMapping[$name]['addFields'] as $key => $value) {
@@ -275,7 +276,7 @@ final public function __get($name)
throw new \InvalidArgumentException(__METHOD__ . " {$name} has not been set!");
}
- final public function __isset($name) : bool
+ final public function __isset($name): bool
{
return array_key_exists($name, $this->fields) || array_key_exists($name, $this->references);
}
@@ -290,7 +291,7 @@ final public function __unset($name)
}
}
- final public function offsetExists($offset) : bool
+ final public function offsetExists($offset): bool
{
return $this->__isset($offset);
}
@@ -300,19 +301,19 @@ final public function offsetGet($offset)
return $this->__get($offset);
}
- final public function offsetSet($offset, $value) : Base
+ final public function offsetSet($offset, $value): Base
{
$this->__set($offset, $value);
return $this;
}
- final public function offsetUnset($offset) : Base
+ final public function offsetUnset($offset): Base
{
$this->__unset($offset);
return $this;
}
- final public function count() : int
+ final public function count(): int
{
return count($this->fields);
}
@@ -322,7 +323,7 @@ public function jsonSerialize()
return $this->fields;
}
- public function getFields() : array
+ public function getFields(): array
{
return $this->fields;
}
@@ -337,14 +338,14 @@ public function get($key = null, $default = null)
$keys = [$keys];
}
$values = [];
-
+
foreach ($keys as $key) {
if ('__RAW__' == $key) {
$values[$key] = $this->dataRaw;
continue;
}
$levels = static::arrayAccessByDotPerpareKeys($key);
-
+
$value = $default;
$pointer = &$this->dataRaw;
@@ -353,7 +354,7 @@ public function get($key = null, $default = null)
if (array_key_exists($levels[$i], $pointer)) {
$pointer = &$pointer[$levels[$i]];
$value = $pointer;
-
+
continue;
}
}
@@ -362,7 +363,7 @@ public function get($key = null, $default = null)
return 1 == count($keys) ? $values[$keys[0]] : $values;
}
- protected static function arrayAccessByDotPerpareKeys(string $key = null) : array
+ protected static function arrayAccessByDotPerpareKeys(string $key = null): array
{
if (null === $key) {
return [];
@@ -373,7 +374,7 @@ protected static function arrayAccessByDotPerpareKeys(string $key = null) : arra
}
$keys = array_filter($keys, 'strlen');
$keys = array_map(function ($key) {
- return ((is_numeric($key) && !is_double(1*$key)) ? (int)$key : $key);
+ return ((is_numeric($key) && !is_double(1 * $key)) ? (int)$key : $key);
}, $keys);
return $keys;
@@ -393,7 +394,7 @@ public function save()
}
}
- final public function saveEntitiy() : bool
+ final public function saveEntitiy(): bool
{
try {
if (static::STATUS_NEW !== $this->getStatus()) {
@@ -402,7 +403,7 @@ final public function saveEntitiy() : bool
if (!empty($this->fields)) {
$sql = 'REPLACE INTO ' . static::getTableName() . ' ';
$sql .= '(`' . implode('`, `', array_keys($this->fields)) . '`) ';
-
+
$questionMarks = array_fill(0, count($this->fields), '?');
$sql .= 'VALUES (' . implode(', ', $questionMarks) . ') ';
@@ -410,7 +411,7 @@ final public function saveEntitiy() : bool
$stm = $this->getPDOAccess()->prepare($sql);
$stm->execute(array_values($this->fields));
-
+
#$this->postSave($stm, $this);
if ($stm && 0 < $stm->rowCount()) {
@@ -434,7 +435,7 @@ public function postSave(\PDOStatement $stm, Base $entity)
{
}
- final public function saveReferences() : bool
+ final public function saveReferences(): bool
{
try {
if (static::STATUS_NEW !== $this->getStatus()) {
@@ -451,7 +452,7 @@ final public function saveReferences() : bool
}
}
- public function delete() : bool
+ public function delete(): bool
{
try {
$this->deleteEntity();
@@ -462,7 +463,7 @@ public function delete() : bool
}
}
- abstract public function deleteEntity() : bool;
+ abstract public function deleteEntity(): bool;
public function deleteReferences(): bool
{
@@ -484,7 +485,7 @@ public function deleteReferences(): bool
foreach ($mappingData['deleteFields'] as $sourceKey => $val) {
$addFields[$sourceKey] = $val;
}
-
+
$referencesInstance = new $referenceEntityClass(
$this->getPDOAccess(),
$addFields,
@@ -515,7 +516,7 @@ final public function deleteWith(array $fields): bool
}, array_keys($fields));
$sql .= " WHERE " . implode(' AND ', $where);
}
-
+
$stm = $this->getPDOAccess()->prepare($sql);
$stm->execute(array_values($fields));
if ($stm && 0 < $stm->rowCount()) {
@@ -527,7 +528,7 @@ final public function deleteWith(array $fields): bool
}
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
return $this->deleteWith($addWhere);
@@ -536,7 +537,7 @@ public function clearEntity(array $addWhere = []) : bool
}
}
- public function clearEntityReferences() : bool
+ public function clearEntityReferences(): bool
{
try {
foreach ($this->getReferenceMapping(true) as $name => $mappingData) {
@@ -550,7 +551,7 @@ public function clearEntityReferences() : bool
$clearFields[$key] = $value;
}
}
-
+
$referencesInstance = new $referenceEntityClass(
$this->getPDOAccess(),
[],
@@ -568,14 +569,14 @@ public function clearEntityReferences() : bool
}
}
- public static function getTableName() : string
+ public static function getTableName(): string
{
if (defined('static::TABLENAME')) {
return strtolower(static::TABLENAME);
}
$classNameWithNs = explode("\\", static::class);
$className = end($classNameWithNs);
-
+
return strtolower(preg_replace('/(?entities);
}
@@ -19,7 +19,7 @@ final public function offsetGet($offset)
throw new \InvalidArgumentException(__METHOD__ . " offset({$offset}) has not been set!");
}
- final public function offsetSet($offset, $value) : Collection
+ final public function offsetSet($offset, $value): Collection
{
if (!$value instanceof Base) {
throw new \InvalidArgumentException(
@@ -34,13 +34,13 @@ final public function offsetSet($offset, $value) : Collection
return $this;
}
- final public function offsetUnset($offset) : Collection
+ final public function offsetUnset($offset): Collection
{
unset($this->entities[$offset]);
return $this;
}
- final public function count() : int
+ final public function count(): int
{
return count($this->entities);
}
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Location.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Location.php
index 06aaa3168..a906736a6 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Location.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Location.php
@@ -214,7 +214,7 @@ public function deleteEntity(): bool
}
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
return $this->deleteWith(
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Meta.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Meta.php
index 93ffb1963..b4aecc059 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Meta.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Meta.php
@@ -91,7 +91,7 @@ public function deleteEntity(): bool
}
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
return $this->deleteWith(
@@ -111,13 +111,13 @@ public function itemNeedsUpdateAlt(
string $locale = '',
string $objectHash = '',
string $type = ''
- ) : bool {
+ ): bool {
try {
$statment = $this->getPDOAccess()->prepare(
"SELECT count(1) AS count FROM meta WHERE object_id = ? AND locale = ? AND hash = ? AND type = ?"
);
$fields = $this->get(['object_id', 'locale', 'hash', 'type']);
-
+
$result = $statment->execute(array_values($fields));
$needsUpdate = false;
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Search.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Search.php
index bcd0d7acc..f428d49a4 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Search.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Search.php
@@ -44,7 +44,7 @@ public function deleteEntity(): bool
}
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
#print_r(static::class);
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Service.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Service.php
index de8dbe186..5e116cf21 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Service.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Service.php
@@ -181,7 +181,7 @@ protected function setupMapping()
'type' => 'forms',
],
'clearFields' => [
- 'type' =>'forms',
+ 'type' => 'forms',
'locale' => $this->get('meta.locale')
],
],
@@ -263,7 +263,7 @@ protected function setupMapping()
]
];
}
-
+
public function preSetup()
{
try {
@@ -285,7 +285,7 @@ public function preSetup()
*/
$fields = $this->get(['id', 'meta.locale', 'meta.hash']);
$fields[] = static::getTableName();
-
+
if (is_array($fields[2])) {
error_log(print_r($fields[2]));
}
@@ -314,7 +314,7 @@ public function deleteEntity(): bool
}
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
#print_r((array)$this->get(['meta.locale']));exit;
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Topic.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Topic.php
index 60ea47512..bfeb7c343 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/Topic.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/Topic.php
@@ -172,7 +172,7 @@ protected static function deleteReferencesFn(
throw $e;
}
}
-
+
public function preSetup()
{
try {
@@ -201,7 +201,7 @@ public function deleteEntity(): bool
}
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
return $this->deleteWith(
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Entity/TopicLinks.php b/zmsdldb/src/Dldb/Importer/MySQL/Entity/TopicLinks.php
index f84ec5a91..edc54b106 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Entity/TopicLinks.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Entity/TopicLinks.php
@@ -31,7 +31,7 @@ public function postSetupFields()
array_push($searchValues, ...$titels);
}
*/
-
+
$keywords = $this->get('meta.keywords');
if (!empty($keywords)) {
if (is_string($keywords)) {
@@ -40,11 +40,11 @@ public function postSetupFields()
$keywords = array_filter($keywords);
array_push($searchValues, ...$keywords);
}
-
+
$this->fields['search'] = implode(', ', $searchValues);
}
- public function clearEntity(array $addWhere = []) : bool
+ public function clearEntity(array $addWhere = []): bool
{
try {
return $this->deleteWith(
@@ -54,7 +54,7 @@ public function clearEntity(array $addWhere = []) : bool
throw $e;
}
}
-
+
public function deleteEntity(): bool
{
try {
@@ -75,7 +75,7 @@ public function postSave(\PDOStatement $stm, Base $entity)
$sql = 'REPLACE INTO ' . static::getTableName() . ' ';
$sql .= '(`' . implode('`, `', array_keys($this->fields)) . '`) ';
-
+
$questionMarks = array_fill(0, count($this->fields), '?');
$sql .= 'VALUES (' . implode(', ', $questionMarks) . ') ';
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Locations.php b/zmsdldb/src/Dldb/Importer/MySQL/Locations.php
index 5f27f5812..d4d4982f9 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Locations.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Locations.php
@@ -6,7 +6,7 @@ class Locations extends Base
{
protected $entityClass = '\\BO\\Dldb\\Importer\\MySQL\\Entity\\Location';
- public function runImport() : bool
+ public function runImport(): bool
{
try {
if ($this->needsUpdate()) {
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Services.php b/zmsdldb/src/Dldb/Importer/MySQL/Services.php
index 40cb8d333..a2533d70e 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Services.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Services.php
@@ -6,7 +6,7 @@ class Services extends Base
{
protected $entityClass = '\\BO\\Dldb\\Importer\\MySQL\\Entity\\Service';
- public function runImport() : bool
+ public function runImport(): bool
{
try {
if ($this->needsUpdate()) {
@@ -37,7 +37,7 @@ public function runImport() : bool
} catch (\Exception $e) {
throw $e;
}
-
+
return true;
}
}
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Settings.php b/zmsdldb/src/Dldb/Importer/MySQL/Settings.php
index eb19dd15e..32d4a8d6d 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Settings.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Settings.php
@@ -7,11 +7,11 @@ class Settings extends Base
protected $getCurrentEntitys = false;
protected $entityClass = '\\BO\\Dldb\\Importer\\MySQL\\Entity\\Setting';
- public function runImport() : bool
+ public function runImport(): bool
{
try {
$this->importData = array_shift($this->importData);
-
+
$settings = $this->importData['settings'];
$settings['boroughs'] = json_encode(($this->importData['boroughs'] ?? ''));
$settings['office'] = json_encode(($this->importData['office'] ?? ''));
diff --git a/zmsdldb/src/Dldb/Importer/MySQL/Topics.php b/zmsdldb/src/Dldb/Importer/MySQL/Topics.php
index f544adcee..20f4bde53 100644
--- a/zmsdldb/src/Dldb/Importer/MySQL/Topics.php
+++ b/zmsdldb/src/Dldb/Importer/MySQL/Topics.php
@@ -6,7 +6,7 @@ class Topics extends Base
{
protected $entityClass = '\\BO\\Dldb\\Importer\\MySQL\\Entity\\Topic';
- public function runImport() : bool
+ public function runImport(): bool
{
try {
if ($this->needsUpdate()) {
@@ -37,7 +37,7 @@ public function runImport() : bool
} catch (\Exception $e) {
throw $e;
}
-
+
return true;
}
}
diff --git a/zmsdldb/src/Dldb/Importer/OptionsTrait.php b/zmsdldb/src/Dldb/Importer/OptionsTrait.php
index 47f226384..0cffdec41 100644
--- a/zmsdldb/src/Dldb/Importer/OptionsTrait.php
+++ b/zmsdldb/src/Dldb/Importer/OptionsTrait.php
@@ -5,7 +5,7 @@
trait OptionsTrait
{
protected $options = 0;
-
+
protected function checkOptionFlag($optionFlag = 0)
{
return $this->options & $optionFlag;
@@ -16,7 +16,7 @@ protected function setOptions(int $options = 0)
$this->options = $options;
}
- protected function getOptions() : int
+ protected function getOptions(): int
{
return $this->options;
}
diff --git a/zmsdldb/src/Dldb/Importer/PDOTrait.php b/zmsdldb/src/Dldb/Importer/PDOTrait.php
index 616d1ba00..9f4d16169 100644
--- a/zmsdldb/src/Dldb/Importer/PDOTrait.php
+++ b/zmsdldb/src/Dldb/Importer/PDOTrait.php
@@ -8,13 +8,13 @@ trait PDOTrait
{
protected $pdoAccess;
- public function setPDOAccess(PDOAccess $pdoAccess) : self
+ public function setPDOAccess(PDOAccess $pdoAccess): self
{
$this->pdoAccess = $pdoAccess;
return $this;
}
- public function getPDOAccess() : PDOAccess
+ public function getPDOAccess(): PDOAccess
{
return $this->pdoAccess;
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Base.php b/zmsdldb/src/Dldb/Importer/SQLite/Base.php
index feae06dcc..57dd9b543 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Base.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Base.php
@@ -4,5 +4,4 @@
abstract class Base extends \BO\Dldb\Importer\MySQL\Base
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Authority.php b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Authority.php
index 845b64155..1f20622e0 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Authority.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Authority.php
@@ -4,5 +4,4 @@
class Authority extends \BO\Dldb\Importer\MySQL\Entity\Authority
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Base.php b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Base.php
index 67186de7e..2ace328a5 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Base.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Base.php
@@ -4,5 +4,4 @@
abstract class Base extends \BO\Dldb\Importer\MySQL\Entity\Base
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Contact.php b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Contact.php
index 7a8fe6734..6f225cb35 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Contact.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Contact.php
@@ -4,5 +4,4 @@
class Contact extends \BO\Dldb\Importer\MySQL\Entity\Contact
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Entity/LocationService.php b/zmsdldb/src/Dldb/Importer/SQLite/Entity/LocationService.php
index d154ffd90..29a55966a 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Entity/LocationService.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Entity/LocationService.php
@@ -4,5 +4,4 @@
class LocationService extends \BO\Dldb\Importer\MySQL\Entity\LocationService
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Meta.php b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Meta.php
index 567a06ff8..bfbb0cfdc 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Meta.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Meta.php
@@ -4,5 +4,4 @@
class Meta extends \BO\Dldb\Importer\MySQL\Entity\Meta
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Topic.php b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Topic.php
index e0e74f74a..ff5a6e9ea 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Entity/Topic.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Entity/Topic.php
@@ -4,5 +4,4 @@
class Topic extends \BO\Dldb\Importer\MySQL\Entity\Topic
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/SQLite/Entity/TopicCluster.php b/zmsdldb/src/Dldb/Importer/SQLite/Entity/TopicCluster.php
index 07e42b5e1..0c8fe02ac 100644
--- a/zmsdldb/src/Dldb/Importer/SQLite/Entity/TopicCluster.php
+++ b/zmsdldb/src/Dldb/Importer/SQLite/Entity/TopicCluster.php
@@ -4,5 +4,4 @@
class TopicCluster extends \BO\Dldb\Importer\MySQL\Entity\TopicCluster
{
-
}
diff --git a/zmsdldb/src/Dldb/Importer/Timer.php b/zmsdldb/src/Dldb/Importer/Timer.php
index 976ad26f1..00f427caf 100644
--- a/zmsdldb/src/Dldb/Importer/Timer.php
+++ b/zmsdldb/src/Dldb/Importer/Timer.php
@@ -1,4 +1,5 @@
start();
diff --git a/zmsdldb/src/Dldb/Importer/test_sqlite.php b/zmsdldb/src/Dldb/Importer/test_sqlite.php
index f43e1a9bb..9598a2073 100644
--- a/zmsdldb/src/Dldb/Importer/test_sqlite.php
+++ b/zmsdldb/src/Dldb/Importer/test_sqlite.php
@@ -89,7 +89,7 @@
$sqLiteIporter = new SQLite(
new \BO\Dldb\SQLiteAccess(['databasePath' => __DIR__ . \DIRECTORY_SEPARATOR]),
$fileAccess,
- SQLite::OPTION_CLEAR_ENTITIY_REFERENCES_TABLES|SQLite::OPTION_CLEAR_ENTITIY_TABLE
+ SQLite::OPTION_CLEAR_ENTITIY_REFERENCES_TABLES | SQLite::OPTION_CLEAR_ENTITIY_TABLE
);
try {
$sqLiteIporter->beginTransaction();
diff --git a/zmsdldb/src/Dldb/Indexer/ElasticSearch.php b/zmsdldb/src/Dldb/Indexer/ElasticSearch.php
index 389be6a16..881c05be0 100644
--- a/zmsdldb/src/Dldb/Indexer/ElasticSearch.php
+++ b/zmsdldb/src/Dldb/Indexer/ElasticSearch.php
@@ -1,8 +1,10 @@
locale];
$questionMarks = array_fill(0, count($servicelist), '?');
@@ -33,9 +34,9 @@ public function fetchList($servicelist = [])
FROM authority_service AS aservice
LEFT JOIN authority AS a ON a.id = aservice.authority_id AND a.locale = ?
WHERE aservice.locale = ? AND aservice.service_id IN (" . implode(', ', $questionMarks) . ")";
-
+
array_push($sqlArgs, ...$servicelist);
-
+
$stm = $this->access()->prepare($sql);
$stm->execute($sqlArgs);
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($authorityList) {
@@ -56,7 +57,7 @@ public function fetchList($servicelist = [])
";
array_push($sqlArgs, ...$servicelist);
-
+
$stm = $this->access()->prepare($sql);
$stm->setFetchMode(\PDO::FETCH_OBJ);
$stm->execute($sqlArgs);
@@ -67,10 +68,10 @@ public function fetchList($servicelist = [])
foreach ($locations as $location) {
$locationsIds[] = $location->id;
}
-
+
$locations = $this->access()->fromLocation($this->locale)
->fetchFromCsv(implode(',', $locationsIds), true);
-
+
foreach ($locations as $location) {
$authorityList[$location['authority']['id']]->addLocation($location);
}
@@ -87,7 +88,7 @@ public function fetchList($servicelist = [])
});
$locations = $this->access()->fromLocation($this->locale)->fetchList(false, true);
-
+
foreach ($locations as $location) {
$authorityList[$location['authority']['id']]->addLocation($location);
}
@@ -108,10 +109,10 @@ public function fetchId($authorityid)
try {
$sqlArgs = [$this->locale, $authorityid];
$sqlArgs = ['de', $authorityid];
-
+
$sql = 'SELECT data_json FROM authority WHERE locale = ? AND id = ?';
$stm = $this->access()->prepare($sql);
- $stm->setFetchMode(\PDO::FETCH_CLASS|\PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Authority');
+ $stm->setFetchMode(\PDO::FETCH_CLASS | \PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Authority');
$stm->execute($sqlArgs);
$stm->execute($sqlArgs);
diff --git a/zmsdldb/src/Dldb/MySQL/Borough.php b/zmsdldb/src/Dldb/MySQL/Borough.php
index 0a5461832..81be49a9d 100644
--- a/zmsdldb/src/Dldb/MySQL/Borough.php
+++ b/zmsdldb/src/Dldb/MySQL/Borough.php
@@ -1,4 +1,5 @@
access()->prepare($sql);
- $stm->setFetchMode(\PDO::FETCH_CLASS|\PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Location');
+ $stm->setFetchMode(\PDO::FETCH_CLASS | \PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Location');
$stm->execute($sqlArgs);
if (!$stm || ($stm && $stm->rowCount() == 0)) {
return false;
@@ -78,7 +80,7 @@ public function fetchList($service_csv = false, $mixLanguages = false)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($locationList) {
$location = new \BO\Dldb\MySQL\Entity\Location();
$location->offsetSet('data_json', $data_json);
-
+
$locationList[$location['id']] = $location;
});
@@ -108,10 +110,10 @@ public function fetchListByOffice($office, $mixLanguages = false)
}
$where[] = "l.category_identifier = ?";
$sqlArgs[] = $office;
-
+
$sql .= " " . implode(' ', $join);
$sql .= " WHERE " . implode(' AND ', $where);
-
+
$sql .= " " . $groupBy;
$locationList = new Collection();
@@ -120,7 +122,7 @@ public function fetchListByOffice($office, $mixLanguages = false)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($locationList) {
$location = new \BO\Dldb\MySQL\Entity\Location();
$location->offsetSet('data_json', $data_json);
-
+
$locationList[$location['id']] = $location;
});
@@ -165,7 +167,7 @@ public function fetchFromCsv($location_csv, $mixLanguages = false)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($locationList) {
$location = new \BO\Dldb\MySQL\Entity\Location();
$location->offsetSet('data_json', $data_json);
-
+
$locationList[$location['id']] = $location;
});
@@ -196,7 +198,7 @@ protected function fetchGeoJsonLocations($category, $getAll)
$sql .= ' AND category_identifier = ?';
}
$sql .= ' ORDER BY l.category_identifier, l.name';
-
+
$locationList = new Collection();
$stm = $this->access()->prepare($sql);
@@ -220,7 +222,7 @@ protected function fetchGeoJsonLocations($category, $getAll)
$location->offsetSet('address_json', $address_json);
$location->offsetSet('geo_json', $geo_json);
$location->offsetSet('meta__url', $meta__url);
-
+
$locationList[$location['id']] = $location;
});
@@ -292,7 +294,7 @@ public function readSearchResultList($query, $service_csv = null)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($locationList) {
$location = new \BO\Dldb\MySQL\Entity\Location();
$location->offsetSet('data_json', $data_json);
-
+
$locationList[$location['id']] = $location;
});
@@ -330,7 +332,7 @@ public function fetchLocationsForCompilation($authoritys = [], $locations = [])
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($locationList) {
$location = new \BO\Dldb\MySQL\Entity\Location();
$location->offsetSet('data_json', $data_json);
-
+
$locationList[$location['id']] = $location;
});
diff --git a/zmsdldb/src/Dldb/MySQL/Office.php b/zmsdldb/src/Dldb/MySQL/Office.php
index e037af12d..e726eaf6f 100644
--- a/zmsdldb/src/Dldb/MySQL/Office.php
+++ b/zmsdldb/src/Dldb/MySQL/Office.php
@@ -1,4 +1,5 @@
access()->prepare($sql);
- $stm->setFetchMode(\PDO::FETCH_CLASS|\PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Service');
+ $stm->setFetchMode(\PDO::FETCH_CLASS | \PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Service');
$stm->execute($sqlArgs);
if (!$stm || ($stm && $stm->rowCount() == 0)) {
return false;
@@ -90,7 +92,7 @@ public function fetchList($location_csv = false, $mixLanguages = false)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($serviceList) {
$service = new \BO\Dldb\MySQL\Entity\Service();
$service->offsetSet('data_json', $data_json);
-
+
$serviceList[$service['id']] = $service;
});
@@ -110,7 +112,7 @@ public function fetchFromCsv($service_csv, $mixLanguages = false)
$sqlArgs = [$this->locale];
$where = [];
$join = [];
-
+
if (false === $mixLanguages) {
$where[] = 's.locale = ?';
$sql = 'SELECT data_json FROM service AS s ';
@@ -122,10 +124,10 @@ public function fetchFromCsv($service_csv, $mixLanguages = false)
LEFT JOIN service AS s2 ON s2.id = s.id AND s2.locale = ?
";
}
-
+
$ids = explode(',', $service_csv);
$questionMarks = array_fill(0, count($ids), '?');
-
+
$where[] = 's.id IN (' . implode(', ', $questionMarks) . ')';
array_push($sqlArgs, ...$ids);
@@ -139,7 +141,7 @@ public function fetchFromCsv($service_csv, $mixLanguages = false)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($serviceList) {
$service = new \BO\Dldb\MySQL\Entity\Service();
$service->offsetSet('data_json', $data_json);
-
+
$serviceList[$service['id']] = $service;
});
@@ -162,9 +164,9 @@ public function fetchListRelated($service_id)
$leika[1] = '_';
$leika = implode($leika);
-
- $sqlArgs = [$this->locale, $service['leika'], $leika.'%'];
-
+
+ $sqlArgs = [$this->locale, $service['leika'], $leika . '%'];
+
$sql = 'SELECT data_json FROM service WHERE locale = ? AND leika != ? AND leika LIKE ?';
$serviceList = new Collection();
@@ -174,10 +176,10 @@ public function fetchListRelated($service_id)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($serviceList) {
$service = new \BO\Dldb\MySQL\Entity\Service();
$service->offsetSet('data_json', $data_json);
-
+
$serviceList[$service['id']] = $service;
});
-
+
return $serviceList;
} catch (\Exception $e) {
throw $e;
@@ -213,7 +215,7 @@ public function readSearchResultList($query, $service_csv = null)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($serviceList) {
$service = new \BO\Dldb\MySQL\Entity\Service();
$service->offsetSet('data_json', $data_json);
-
+
$serviceList[$service['id']] = $service;
});
@@ -261,7 +263,7 @@ public function fetchServicesForCompilation($authoritys = [], $locations = [], $
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($serviceList) {
$service = new \BO\Dldb\MySQL\Entity\Service();
$service->offsetSet('data_json', $data_json);
-
+
$serviceList[$service['id']] = $service;
});
diff --git a/zmsdldb/src/Dldb/MySQL/Setting.php b/zmsdldb/src/Dldb/MySQL/Setting.php
index 4c7df61dd..897b9974b 100644
--- a/zmsdldb/src/Dldb/MySQL/Setting.php
+++ b/zmsdldb/src/Dldb/MySQL/Setting.php
@@ -1,4 +1,5 @@
access()->prepare($sql);
$stm->execute([(string)$name]);
-
+
$settingValue = $stm->fetchColumn();
return $settingValue ?? null;
diff --git a/zmsdldb/src/Dldb/MySQL/Topic.php b/zmsdldb/src/Dldb/MySQL/Topic.php
index 6a315dfae..38058bf76 100644
--- a/zmsdldb/src/Dldb/MySQL/Topic.php
+++ b/zmsdldb/src/Dldb/MySQL/Topic.php
@@ -1,4 +1,5 @@
fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($topiclist) {
$topic = new \BO\Dldb\MySQL\Entity\Topic();
$topic->offsetSet('data_json', $data_json);
-
+
$topiclist[$topic['id']] = $topic;
});
-
+
return $topiclist;
} catch (\Exception $e) {
throw $e;
@@ -49,9 +50,9 @@ public function fetchPath($topic_path)
$sql = 'SELECT data_json FROM topic WHERE locale = ? AND path = ?';
$stm = $this->access()->prepare($sql);
- $stm->setFetchMode(\PDO::FETCH_CLASS|\PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Topic');
+ $stm->setFetchMode(\PDO::FETCH_CLASS | \PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Topic');
$stm->execute($sqlArgs);
-
+
if (!$stm || ($stm && $stm->rowCount() == 0)) {
return false;
}
@@ -73,9 +74,9 @@ public function fetchId($topicId)
$sql = 'SELECT data_json FROM topic WHERE locale = ? AND id = ?';
$stm = $this->access()->prepare($sql);
- $stm->setFetchMode(\PDO::FETCH_CLASS|\PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Topic');
+ $stm->setFetchMode(\PDO::FETCH_CLASS | \PDO::FETCH_PROPS_LATE, '\\BO\\Dldb\\MySQL\\Entity\\Topic');
$stm->execute($sqlArgs);
-
+
if (!$stm || ($stm && $stm->rowCount() == 0)) {
return false;
}
@@ -115,7 +116,7 @@ public function readSearchResultList($query)
$stm->fetchAll(\PDO::FETCH_FUNC, function ($data_json) use ($topiclist) {
$topic = new \BO\Dldb\MySQL\Entity\Topic();
$topic->offsetSet('data_json', $data_json);
-
+
$topiclist[$topic['id']] = $topic;
});
diff --git a/zmsdldb/src/Dldb/MySQLAccess.php b/zmsdldb/src/Dldb/MySQLAccess.php
index 4876ef228..0a4be5a62 100644
--- a/zmsdldb/src/Dldb/MySQLAccess.php
+++ b/zmsdldb/src/Dldb/MySQLAccess.php
@@ -1,4 +1,5 @@
[A-Za-z_0-9]+)/', $method, $matches)) {
$locale = $args[0] ?? 'de';
$instance = $this->loadAccessor($matches['accessor'], $locale);
-
+
return $instance;
}
}
diff --git a/zmsdldb/src/Dldb/Plz/Coordinates.php b/zmsdldb/src/Dldb/Plz/Coordinates.php
index 732c9c291..960bd459f 100644
--- a/zmsdldb/src/Dldb/Plz/Coordinates.php
+++ b/zmsdldb/src/Dldb/Plz/Coordinates.php
@@ -1,4 +1,5 @@
container = $container;
@@ -59,20 +59,20 @@ public function getFunctions()
public function dump($item)
{
- return '' . print_r($item, 1).'
';
+ return '' . print_r($item, 1) . '
';
}
public function currentRoute($lang = null)
{
if ($this->container->has('currentRoute')) {
$routeParams = $this->container->get('currentRouteParams');
-
+
if (null !== $lang && 'de' == $lang) {
unset($routeParams['lang']);
} else {
$routeParams['lang'] = ($lang !== null) ? $lang : \App::$language->getCurrentLanguage();
}
-
+
$routeName = $this->container->get('currentRoute');
$route = array(
@@ -88,12 +88,12 @@ public function currentRoute($lang = null)
return $route;
}
-
+
public function getD115Enabeld()
{
$settingsRepository = \App::$repository->fromSetting();
$active = (bool)($settingsRepository->fetchName('d115.active') ?? true);
-
+
return $active;
}
@@ -143,14 +143,14 @@ public function formatPhoneNumber($phoneNumber)
public function convertOpeningTimes($name)
{
$days = array(
- 'monday'=>'Montag',
- 'tuesday'=>'Dienstag',
- 'wednesday'=>'Mittwoch',
- 'thursday'=>'Donnerstag',
- 'friday'=>'Freitag',
- 'saturday'=>'Samstag',
- 'sunday'=>'Sonntag',
- 'special'=>''
+ 'monday' => 'Montag',
+ 'tuesday' => 'Dienstag',
+ 'wednesday' => 'Mittwoch',
+ 'thursday' => 'Donnerstag',
+ 'friday' => 'Freitag',
+ 'saturday' => 'Samstag',
+ 'sunday' => 'Sonntag',
+ 'special' => ''
);
return $days[$name];
}
@@ -185,7 +185,7 @@ public function formatDateTime($dateString)
$formatDate['ts'] = $dateTime->getTimestamp();
$formatDate['dateId'] = $dateTime->format('Y-m-d');
$formatDate['ym'] = $dateTime->format('Y-m');
-
+
return $formatDate;
}
diff --git a/zmsentities/.gitignore b/zmsentities/.gitignore
index 9b61b1de1..a1a8823e9 100644
--- a/zmsentities/.gitignore
+++ b/zmsentities/.gitignore
@@ -5,3 +5,4 @@ tags
.DS_*
.phpunit.result.cache
clover.xml
+coverage
diff --git a/zmsentities/composer.json b/zmsentities/composer.json
index 0ba6d5e06..524ecdebf 100644
--- a/zmsentities/composer.json
+++ b/zmsentities/composer.json
@@ -45,7 +45,7 @@
"phpunit/phpunit": "^9.6",
"helmich/phpunit-psr7-assert": "^4.3.0",
"phpmd/phpmd": "@stable",
- "squizlabs/php_codesniffer": "^3.5.8",
+ "squizlabs/php_codesniffer": "*",
"league/json-reference": "^1.0",
"yuloh/json-guard-cli": "^0.3.0"
}
diff --git a/zmsentities/composer.lock b/zmsentities/composer.lock
index 9ca74dbd5..51bdee6bc 100644
--- a/zmsentities/composer.lock
+++ b/zmsentities/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "08230cdff5b00898492a8298612e7d7b",
+ "content-hash": "77f0e1ef73f9361b1244f4aef8f7cc53",
"packages": [
{
"name": "eappointment/mellon",
@@ -61,16 +61,16 @@
},
{
"name": "giggsey/libphonenumber-for-php",
- "version": "8.13.52",
+ "version": "8.13.54",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
- "reference": "cc9a82b237d79a85be47c0b06e3943f75ab35c32"
+ "reference": "42d3a03d4f47fcb784666743f4323a7b87a2b2ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/cc9a82b237d79a85be47c0b06e3943f75ab35c32",
- "reference": "cc9a82b237d79a85be47c0b06e3943f75ab35c32",
+ "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/42d3a03d4f47fcb784666743f4323a7b87a2b2ba",
+ "reference": "42d3a03d4f47fcb784666743f4323a7b87a2b2ba",
"shasum": ""
},
"require": {
@@ -134,7 +134,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php"
},
- "time": "2024-12-13T09:08:43+00:00"
+ "time": "2025-01-31T14:50:26+00:00"
},
{
"name": "giggsey/locale",
@@ -1433,16 +1433,16 @@
},
{
"name": "helmich/phpunit-json-assert",
- "version": "v3.5.1",
+ "version": "v3.5.2",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-json-assert.git",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c"
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/f8958119e9e9ea1339d6b4d6fd2df24536261b50",
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50",
"shasum": ""
},
"require": {
@@ -1451,10 +1451,10 @@
"softcreatr/jsonpath": "^0.8"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 11.0"
+ "phpunit/phpunit": "<8.0 || >= 12.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0"
},
"type": "library",
"autoload": {
@@ -1475,7 +1475,7 @@
"description": "PHPUnit assertions for JSON documents",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-json-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.1"
+ "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.2"
},
"funding": [
{
@@ -1487,33 +1487,34 @@
"type": "github"
}
],
- "time": "2023-03-03T14:09:38+00:00"
+ "time": "2024-05-20T11:18:46+00:00"
},
{
"name": "helmich/phpunit-psr7-assert",
- "version": "v4.3.0",
+ "version": "v4.4.1",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-psr7-assert.git",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878"
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/dfe594a09f55ea7f87120363d6720ca1a94c0878",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/f35fa69e07cc16977b52805d3abd873cc16747fd",
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd",
"shasum": ""
},
"require": {
"helmich/phpunit-json-assert": "^3.4",
- "php": "^7.2 || ^8.0",
- "psr/http-message": "^1.0"
+ "php": "^8.0",
+ "psr/http-message": "^1.1 || ^2.0"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 10.0"
+ "phpunit/phpunit": "<8.0 || >= 11.0"
},
"require-dev": {
- "guzzlehttp/psr7": "^1.2",
- "phpunit/phpunit": "^8.0 || ^9.0"
+ "guzzlehttp/psr7": "^2.4",
+ "mockery/mockery": "^1.4.1",
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
},
"type": "library",
"autoload": {
@@ -1534,7 +1535,7 @@
"description": "PHPUnit assertions for testing PSR7-compliant applications",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-psr7-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.3.0"
+ "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.4.1"
},
"funding": [
{
@@ -1546,24 +1547,24 @@
"type": "github"
}
],
- "time": "2020-12-22T06:27:54+00:00"
+ "time": "2023-07-26T19:04:29+00:00"
},
{
"name": "justinrainbow/json-schema",
- "version": "v5.2.13",
+ "version": "5.3.0",
"source": {
"type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+ "url": "https://github.com/jsonrainbow/json-schema.git",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+ "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
@@ -1574,11 +1575,6 @@
"bin/validate-json"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"JsonSchema\\": "src/JsonSchema/"
@@ -1613,10 +1609,10 @@
"schema"
],
"support": {
- "issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+ "issues": "https://github.com/jsonrainbow/json-schema/issues",
+ "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
},
- "time": "2023-09-26T02:20:38+00:00"
+ "time": "2024-07-06T21:00:26+00:00"
},
{
"name": "league/json-reference",
@@ -2604,16 +2600,16 @@
},
{
"name": "psr/http-message",
- "version": "1.1",
+ "version": "2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-message.git",
- "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
- "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+ "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
"shasum": ""
},
"require": {
@@ -2622,7 +2618,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -2637,7 +2633,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP messages",
@@ -2651,9 +2647,9 @@
"response"
],
"support": {
- "source": "https://github.com/php-fig/http-message/tree/1.1"
+ "source": "https://github.com/php-fig/http-message/tree/2.0"
},
- "time": "2023-04-04T09:50:52+00:00"
+ "time": "2023-04-04T09:54:51+00:00"
},
{
"name": "psr/log",
diff --git a/zmsentities/phpunit.xml b/zmsentities/phpunit.xml
index c5ced5456..ced5f557d 100644
--- a/zmsentities/phpunit.xml
+++ b/zmsentities/phpunit.xml
@@ -1,16 +1,16 @@
-
@@ -18,10 +18,18 @@
./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
./tests/Zmsentities/
-
+
\ No newline at end of file
diff --git a/zmsentities/schema/citizenapi/availableAppointmentsByOffice.json b/zmsentities/schema/citizenapi/availableAppointmentsByOffice.json
new file mode 100644
index 000000000..b3d31d492
--- /dev/null
+++ b/zmsentities/schema/citizenapi/availableAppointmentsByOffice.json
@@ -0,0 +1,29 @@
+{
+ "title": "AvailableAppointmentsByOffice",
+ "type": ["array", "object", "null"],
+ "properties": {
+ "offices": {
+ "type": ["array", "object", "null"],
+ "description": "Offices which have free time slots",
+ "items": {
+ "type": ["array", "object", "null"],
+ "properties": {
+ "id": {
+ "type": "integer",
+ "description": "Office ID"
+ },
+ "appointmentTimestamps": {
+ "type": ["array", "null"],
+ "description": "Numeric timestamps (seconds) for each available slot.",
+ "items": {
+ "type": "integer"
+ }
+ }
+ },
+ "required": ["offices"]
+ }
+ }
+ },
+ "required": ["appointmentTimestamps"],
+ "description": "Schema defining the available appointments for a specific date, office, and service"
+}
diff --git a/zmsentities/schema/citizenapi/collections/officeList.json b/zmsentities/schema/citizenapi/collections/officeList.json
index b8a341588..4bd7d1db9 100644
--- a/zmsentities/schema/citizenapi/collections/officeList.json
+++ b/zmsentities/schema/citizenapi/collections/officeList.json
@@ -1,5 +1,9 @@
{
- "type": ["array", "object", "null"],
+ "type": [
+ "array",
+ "object",
+ "null"
+ ],
"properties": {
"offices": {
"type": "array",
@@ -21,6 +25,13 @@
],
"description": "The name of the office"
},
+ "showAlternativeLocations": {
+ "type": [
+ "boolean",
+ "null"
+ ],
+ "description": "Show alternative office locations in the citizen calendar"
+ },
"address": {
"type": [
"array",
@@ -59,19 +70,31 @@
}
},
"displayNameAlternatives": {
- "type": ["array", "null"],
+ "type": [
+ "array",
+ "null"
+ ],
"description": "Alternative names of the office"
},
"organization": {
- "type": ["string", "null"],
+ "type": [
+ "string",
+ "null"
+ ],
"description": "The name of the Organization"
},
"organizationUnit": {
- "type": ["string", "null"],
+ "type": [
+ "string",
+ "null"
+ ],
"description": "The name of the organization"
},
"slotTimeInMinutes": {
- "type": ["integer", "null"],
+ "type": [
+ "integer",
+ "null"
+ ],
"description": "Slot time in minutes"
},
"geo": {
diff --git a/zmsentities/schema/citizenapi/collections/officeServiceAndRelationList.json b/zmsentities/schema/citizenapi/collections/officeServiceAndRelationList.json
index 67b51dff6..341f1efcd 100644
--- a/zmsentities/schema/citizenapi/collections/officeServiceAndRelationList.json
+++ b/zmsentities/schema/citizenapi/collections/officeServiceAndRelationList.json
@@ -26,6 +26,13 @@
],
"description": "The name of the office"
},
+ "showAlternativeLocations": {
+ "type": [
+ "boolean",
+ "null"
+ ],
+ "description": "Show alternative office locations in the citizen calendar"
+ },
"address": {
"type": [
"array",
@@ -64,19 +71,31 @@
}
},
"displayNameAlternatives": {
- "type": ["array", "null"],
+ "type": [
+ "array",
+ "null"
+ ],
"description": "Alternative names of the office"
},
"organization": {
- "type": ["string", "null"],
+ "type": [
+ "string",
+ "null"
+ ],
"description": "The name of the Organization"
},
"organizationUnit": {
- "type": ["string", "null"],
+ "type": [
+ "string",
+ "null"
+ ],
"description": "The name of the organization"
},
"slotTimeInMinutes": {
- "type": ["integer", "null"],
+ "type": [
+ "integer",
+ "null"
+ ],
"description": "Slot time in minutes"
},
"geo": {
diff --git a/zmsentities/schema/citizenapi/office.json b/zmsentities/schema/citizenapi/office.json
index b53b68462..f19ebba7e 100644
--- a/zmsentities/schema/citizenapi/office.json
+++ b/zmsentities/schema/citizenapi/office.json
@@ -1,20 +1,41 @@
{
"title": "Office",
- "type": ["array", "object"],
+ "type": [
+ "array",
+ "object"
+ ],
"properties": {
"id": {
"type": "integer",
"description": "Unique identifier for the office"
},
"name": {
- "type": ["string", "null"],
+ "type": [
+ "string",
+ "null"
+ ],
"description": "The name of the office"
},
+ "showAlternativeLocations": {
+ "type": [
+ "boolean",
+ "null"
+ ],
+ "description": "Show alternative office locations in the citizen calendar"
+ },
"address": {
- "type": ["array", "object", "null"],
+ "type": [
+ "array",
+ "object",
+ "null"
+ ],
"description": "The address of the office",
"items": {
- "type": ["array", "object", "null"],
+ "type": [
+ "array",
+ "object",
+ "null"
+ ],
"properties": {
"house_number": {
"type": "string",
@@ -40,23 +61,39 @@
}
},
"displayNameAlternatives": {
- "type": ["array", "null"],
+ "type": [
+ "array",
+ "null"
+ ],
"description": "Alternative names of the office"
},
"organization": {
- "type": ["string", "null"],
+ "type": [
+ "string",
+ "null"
+ ],
"description": "The name of the Organization"
},
"organizationUnit": {
- "type": ["string", "null"],
+ "type": [
+ "string",
+ "null"
+ ],
"description": "The name of the organization"
},
"slotTimeInMinutes": {
- "type": ["integer", "null"],
+ "type": [
+ "integer",
+ "null"
+ ],
"description": "Slot time in minutes"
},
"geo": {
- "type": ["array", "object", "null"],
+ "type": [
+ "array",
+ "object",
+ "null"
+ ],
"description": "Geographical coordinates of the office",
"properties": {
"lat": {
@@ -73,10 +110,10 @@
}
}
},
- "scope": {
-
- }
+ "scope": {}
},
- "required": ["id"],
+ "required": [
+ "id"
+ ],
"description": "Schema definition for the Office entity"
-}
+}
\ No newline at end of file
diff --git a/zmsentities/src/Zmsentities/Appointment.php b/zmsentities/src/Zmsentities/Appointment.php
index ae91bb818..eff658c64 100644
--- a/zmsentities/src/Zmsentities/Appointment.php
+++ b/zmsentities/src/Zmsentities/Appointment.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities;
-use \BO\Zmsentities\Helper\Property;
+use BO\Zmsentities\Helper\Property;
class Appointment extends Schema\Entity
{
@@ -142,7 +142,7 @@ public function setDateByString($dateString, $format = 'Y-m-d H:i')
$this->date = $appointmentDateTime->format('U');
} else {
throw new Exception\DateStringWrongFormat(
- "String ".htmlspecialchars($dateString)." not format ". htmlspecialchars($format)
+ "String " . htmlspecialchars($dateString) . " not format " . htmlspecialchars($format)
);
}
return $this;
@@ -155,7 +155,8 @@ public function setDateByString($dateString, $format = 'Y-m-d H:i')
public function isMatching(self $appointment)
{
//error_log("Compare $this with $appointment");
- if ($appointment['scope']['id'] == $this['scope']['id']
+ if (
+ $appointment['scope']['id'] == $this['scope']['id']
&& $appointment['date'] == $this['date']
) {
return true;
@@ -167,8 +168,8 @@ public function __toString()
{
return "appointment#"
. $this->toDateTime()->format('c')
- . " ".$this['slotCount']."slots"
- . " scope".$this['scope']['id']
+ . " " . $this['slotCount'] . "slots"
+ . " scope" . $this['scope']['id']
;
}
}
diff --git a/zmsentities/src/Zmsentities/Availability.php b/zmsentities/src/Zmsentities/Availability.php
index f73338259..c414e18e0 100644
--- a/zmsentities/src/Zmsentities/Availability.php
+++ b/zmsentities/src/Zmsentities/Availability.php
@@ -83,7 +83,8 @@ public function getDefaults()
public function hasDate(\DateTimeInterface $dateTime, \DateTimeInterface $now)
{
$dateTime = Helper\DateTime::create($dateTime);
- if (!$this->isOpenedOnDate($dateTime)
+ if (
+ !$this->isOpenedOnDate($dateTime)
|| !$this->isBookable($dateTime, $now)
) {
// Out of date range
@@ -119,7 +120,8 @@ public function hasBookableDates(\DateTimeInterface $now)
public function isOpenedOnDate(\DateTimeInterface $dateTime, $type = false)
{
$dateTime = Helper\DateTime::create($dateTime);
- if (!$this->hasWeekDay($dateTime)
+ if (
+ !$this->hasWeekDay($dateTime)
|| ($type !== false && $this->type != $type)
|| !$this->hasDay($dateTime)
|| !$this->hasWeek($dateTime)
@@ -243,7 +245,8 @@ public function hasWeek(\DateTimeInterface $dateTime)
$dateTime = Helper\DateTime::create($dateTime);
$start = $this->getStartDateTime();
$monday = "monday this week";
- if ($this['repeat']['afterWeeks']
+ if (
+ $this['repeat']['afterWeeks']
&& ($this['repeat']['afterWeeks'] == 1
|| 0 ===
$dateTime->modify($monday)->diff($start->modify($monday))->days
@@ -252,7 +255,8 @@ public function hasWeek(\DateTimeInterface $dateTime)
) {
return true;
}
- if ($this['repeat']['weekOfMonth']
+ if (
+ $this['repeat']['weekOfMonth']
&& (
$dateTime->isWeekOfMonth($this['repeat']['weekOfMonth'])
// On a value of 5, always take the last week
@@ -384,7 +388,8 @@ public function isBookable(\DateTimeInterface $bookableDate, \DateTimeInterface
//error_log("END " . $bookableCurrentTime->format('c').'>'.$endDate->format('c'). " " . $this);
return false;
}
- if ($bookableDate->format('Y-m-d') == $endDate->format('Y-m-d')
+ if (
+ $bookableDate->format('Y-m-d') == $endDate->format('Y-m-d')
&& $now->format('Y-m-d') != $this->getEndDateTime()->format('Y-m-d')
) {
// Avoid releasing all appointments on midnight, allow smaller contingents distributed over the day
@@ -423,7 +428,7 @@ public function getSlotList()
return $slotList;
}
- public function getSlotTimeInMinutes()
+ public function getSlotTimeInMinutes()
{
return $this['slotTimeInMinutes'];
}
@@ -627,7 +632,8 @@ public function hasSharedWeekdayWith(Availability $availability)
public function getTimeOverlaps(Availability $availability, \DateTimeInterface $currentDate)
{
$processList = new Collection\ProcessList();
- if ($availability->id != $this->id
+ if (
+ $availability->id != $this->id
&& $availability->type == $this->type
&& $this->hasSharedWeekdayWith($availability)
) {
@@ -643,7 +649,7 @@ public function getTimeOverlaps(Availability $availability, \DateTimeInterface $
$availabilityEnd = $availability->getEndDateTime()->getSecondsOfDay();
$isEqual = ($availabilityStart == $thisStart && $availabilityEnd == $thisEnd);
-
+
if ($availabilityStart < $thisEnd && $thisStart < $availabilityEnd && ! $isEqual) {
$process = clone $processTemplate;
$process->getFirstAppointment()->date = $this
@@ -706,7 +712,7 @@ public function withScope(\BO\Zmsentities\Scope $scope)
public function __toString()
{
- $info = "Availability.".$this['type']." #" . $this['id'];
+ $info = "Availability." . $this['type'] . " #" . $this['id'];
$info .= " starting " . $this->startDate . $this->getStartDateTime()->format(' Y-m-d');
$info .= "||now+" . $this['bookable']['startInDays'] . " ";
$info .= " until " . $this->getEndDateTime()->format('Y-m-d');
diff --git a/zmsentities/src/Zmsentities/Calldisplay.php b/zmsentities/src/Zmsentities/Calldisplay.php
index 03d53a6dd..13163c72a 100644
--- a/zmsentities/src/Zmsentities/Calldisplay.php
+++ b/zmsentities/src/Zmsentities/Calldisplay.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities;
-use \BO\Zmsentities\Helper\Property;
+use BO\Zmsentities\Helper\Property;
class Calldisplay extends Schema\Entity
{
diff --git a/zmsentities/src/Zmsentities/Collection/AppointmentList.php b/zmsentities/src/Zmsentities/Collection/AppointmentList.php
index 8c781f118..8fdf98939 100644
--- a/zmsentities/src/Zmsentities/Collection/AppointmentList.php
+++ b/zmsentities/src/Zmsentities/Collection/AppointmentList.php
@@ -1,7 +1,8 @@
$item) {
+ foreach ($this as $item) {
$array[] = $item;
}
diff --git a/zmsentities/src/Zmsentities/Collection/ClientList.php b/zmsentities/src/Zmsentities/Collection/ClientList.php
index b25e5ca32..7c56f3ce4 100644
--- a/zmsentities/src/Zmsentities/Collection/ClientList.php
+++ b/zmsentities/src/Zmsentities/Collection/ClientList.php
@@ -1,4 +1,5 @@
format('t');
- for ($dayNumber = 1; $dayNumber <= $lastDay; $dayNumber ++) {
+ for ($dayNumber = 1; $dayNumber <= $lastDay; $dayNumber++) {
$day = str_pad($dayNumber, 2, '0', STR_PAD_LEFT);
$entity = $this->getDay($currentDate->format('Y'), $currentDate->format('m'), $day);
$dayList->addEntity($entity);
@@ -137,7 +138,8 @@ public function withDaysInDateRange(\DateTimeInterface $startDate, \DateTimeInte
{
$list = new self();
foreach ($this as $day) {
- if ($day->toDateTime() >= $startDate->modify('00:00:00') &&
+ if (
+ $day->toDateTime() >= $startDate->modify('00:00:00') &&
$day->toDateTime() <= $endDate->modify('23:59:59')
) {
$list->addEntity($day);
diff --git a/zmsentities/src/Zmsentities/Collection/DayoffList.php b/zmsentities/src/Zmsentities/Collection/DayoffList.php
index 21e7b2488..3c2df9d62 100644
--- a/zmsentities/src/Zmsentities/Collection/DayoffList.php
+++ b/zmsentities/src/Zmsentities/Collection/DayoffList.php
@@ -1,4 +1,5 @@
setTimestamp($entity->date)->format('Y');
+ $entityYear = (new \DateTimeImmutable())->setTimestamp($entity->date)->format('Y');
if ($entityYear != $year) {
throw new \BO\Zmsentities\Exception\DayoffWrongYear();
}
diff --git a/zmsentities/src/Zmsentities/Collection/DepartmentList.php b/zmsentities/src/Zmsentities/Collection/DepartmentList.php
index 146dd1f8b..a80a91d3a 100644
--- a/zmsentities/src/Zmsentities/Collection/DepartmentList.php
+++ b/zmsentities/src/Zmsentities/Collection/DepartmentList.php
@@ -1,7 +1,8 @@
exchangeArray($mergedList);
return $this;
- }
+ }
}
diff --git a/zmsentities/src/Zmsentities/Collection/MimepartList.php b/zmsentities/src/Zmsentities/Collection/MimepartList.php
index 342d9ce3b..2e7bc01b5 100644
--- a/zmsentities/src/Zmsentities/Collection/MimepartList.php
+++ b/zmsentities/src/Zmsentities/Collection/MimepartList.php
@@ -1,4 +1,5 @@
addDate($dateTime->getTimestamp())->addScope($scopeId);
+ $appointment = (new \BO\Zmsentities\Appointment())->addDate($dateTime->getTimestamp())->addScope($scopeId);
foreach ($this as $process) {
if ($process->hasAppointment($dateTime->getTimestamp(), $scopeId) && !$addedAppointment) {
$entity = clone $process;
@@ -263,14 +261,14 @@ public function withDepartmentHasMailFrom()
return $processList;
}
-
-
+
+
public function setConflictAmendment()
{
foreach ($this as $process) {
$process->amendment = 'Die Slots für diesen Zeitraum wurden überbucht';
if (! $process->getFirstAppointment()->availability->hasId()) {
- $process->amendment = 'Der Vorgang ('. $process->getId() .') befindet sich außerhalb der Öffnungszeit!';
+ $process->amendment = 'Der Vorgang (' . $process->getId() . ') befindet sich außerhalb der Öffnungszeit!';
}
}
return $this;
@@ -424,7 +422,8 @@ public function withTimeRangeByAppointment(\BO\Zmsentities\Appointment $appointm
$processList = new self();
if ($this->count()) {
foreach ($this as $process) {
- if ($appointment->getEndTime() > $process->getFirstAppointment()->getStartTime() &&
+ if (
+ $appointment->getEndTime() > $process->getFirstAppointment()->getStartTime() &&
$appointment->getStartTime() < $process->getFirstAppointment()->getEndTime()
) {
$processList->addEntity(clone $process);
diff --git a/zmsentities/src/Zmsentities/Collection/ProviderList.php b/zmsentities/src/Zmsentities/Collection/ProviderList.php
index 1d1279a3a..57bd4f850 100644
--- a/zmsentities/src/Zmsentities/Collection/ProviderList.php
+++ b/zmsentities/src/Zmsentities/Collection/ProviderList.php
@@ -1,4 +1,5 @@
getTimestamp();
while ($next) {
- if (! in_array($next->number, $excludeNumbers) &&
+ if (
+ ! in_array($next->number, $excludeNumbers) &&
(0 == $next->lastCallTime || ($next->lastCallTime + (5 * 60)) <= $currentTime)
) {
return $next->getProcess();
@@ -372,7 +374,7 @@ public function sortByCallTime(string $order)
foreach ($this as $entity) {
$queueListArray[] = $entity;
}
- usort($queueListArray, function($a, $b) use ($order) {
+ usort($queueListArray, function ($a, $b) use ($order) {
if ($order === 'ascending') {
return $a->callTime <=> $b->callTime;
} elseif ($order === 'descending') {
diff --git a/zmsentities/src/Zmsentities/Collection/RequestList.php b/zmsentities/src/Zmsentities/Collection/RequestList.php
index 76935a26f..889eb65ec 100644
--- a/zmsentities/src/Zmsentities/Collection/RequestList.php
+++ b/zmsentities/src/Zmsentities/Collection/RequestList.php
@@ -1,7 +1,8 @@
getId() == $item['request']['id'] &&
+ if (
+ $request->getId() == $item['request']['id'] &&
$providerList->hasProvider($item['provider']['id'])
) {
$list->addEntity($item);
diff --git a/zmsentities/src/Zmsentities/Collection/ScopeList.php b/zmsentities/src/Zmsentities/Collection/ScopeList.php
index c1b7370ba..6be550152 100644
--- a/zmsentities/src/Zmsentities/Collection/ScopeList.php
+++ b/zmsentities/src/Zmsentities/Collection/ScopeList.php
@@ -1,8 +1,9 @@
toDateTime()->format('Y-m-d') .' '. $prevSlot->time
+ $appointment->toDateTime()->format('Y-m-d') . ' ' . $prevSlot->time
)->modify('+' . $appointment->getAvailability()->slotTimeInMinutes . 'minute');
$stopTime = $appointment->getEndTime();
do {
@@ -112,7 +113,7 @@ public function extendList($slotList, $prevSlot, $appointment)
} while ($startTime->getTimestamp() < $stopTime->getTimestamp());
return $slotList;
}
-
+
/**
* Reduce free appointments on slot matching appointment
@@ -187,7 +188,7 @@ public function withTimeGreaterThan(\DateTimeInterface $dateTime)
$referenceTime = $dateTime->getTimestamp() + 1800;
foreach ($this as $index => $slot) {
$slotTime = \BO\Zmsentities\Helper\DateTime::create(
- $dateTime->format('Y-m-d') .' '. $slot->time
+ $dateTime->format('Y-m-d') . ' ' . $slot->time
)->getTimeStamp();
if ($referenceTime > $slotTime) {
$slotList->setEmptySlotValues($index);
@@ -221,7 +222,7 @@ public function getFreeProcesses(
if ($slotsRequired > 1 && $slot->type != Slot::REDUCED) {
throw new \BO\Zmsentities\Exception\SlotRequiredWithoutReducing(
"With $slotsRequired slots required, "
- ."do not use SlotList::getFreeProcesses without reduced slots: $slot"
+ . "do not use SlotList::getFreeProcesses without reduced slots: $slot"
);
}
if ($slot[$slotType] > 0) {
@@ -233,7 +234,7 @@ public function getFreeProcesses(
if (!$slot->hasTime()) {
throw new \BO\Zmsentities\Exception\SlotMissingTime("Time on slot not set: $slot");
}
- $appointment->setDateByString($selectedDate .' '. $slot->getTimeString());
+ $appointment->setDateByString($selectedDate . ' ' . $slot->getTimeString());
$process = new \BO\Zmsentities\Process(array(
'scope' => $scope,
'requests' => $requests
@@ -252,9 +253,9 @@ public function withReducedSlots($slotsRequired)
$slotList = clone $this;
if ($slotsRequired > 1) {
$slotLength = count($slotList);
- for ($slotIndex = 0; $slotIndex < $slotLength; $slotIndex ++) {
+ for ($slotIndex = 0; $slotIndex < $slotLength; $slotIndex++) {
if ($slotIndex + $slotsRequired - 1 < $slotLength) {
- for ($slotRelative = 1; $slotRelative < $slotsRequired; $slotRelative ++) {
+ for ($slotRelative = 1; $slotRelative < $slotsRequired; $slotRelative++) {
if ($slotIndex + $slotRelative < $slotLength) {
$slotList->takeLowerSlotValue($slotIndex, $slotIndex + $slotRelative);
}
diff --git a/zmsentities/src/Zmsentities/Collection/SourceList.php b/zmsentities/src/Zmsentities/Collection/SourceList.php
index 2dbd91c6f..10c04a49f 100644
--- a/zmsentities/src/Zmsentities/Collection/SourceList.php
+++ b/zmsentities/src/Zmsentities/Collection/SourceList.php
@@ -1,4 +1,5 @@
freeAppointments = new Slot($this->freeAppointments);
- return "Day {$this->status}@{$this->year}-{$this->month}-{$this->day} with ". $this->freeAppointments;
+ return "Day {$this->status}@{$this->year}-{$this->month}-{$this->day} with " . $this->freeAppointments;
}
public function setDateTime(\DateTimeInterface $dateTime)
diff --git a/zmsentities/src/Zmsentities/Department.php b/zmsentities/src/Zmsentities/Department.php
index 6749cf087..d9a5d57b7 100644
--- a/zmsentities/src/Zmsentities/Department.php
+++ b/zmsentities/src/Zmsentities/Department.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities;
-use \BO\Zmsentities\Helper\Property;
+use BO\Zmsentities\Helper\Property;
class Department extends Schema\Entity implements Useraccount\AccessInterface
{
diff --git a/zmsentities/src/Zmsentities/EventLog.php b/zmsentities/src/Zmsentities/EventLog.php
index 11d973c8d..7f25e8ab5 100644
--- a/zmsentities/src/Zmsentities/EventLog.php
+++ b/zmsentities/src/Zmsentities/EventLog.php
@@ -1,4 +1,5 @@
data[$pointer]['failed'] = 1;
$this->data[$pointer]['data'] = $error->getData();
}
- $message = '[property '. $error->getDataPath() .'] '. json_encode($this->data[$pointer]['messages'], 1);
+ $message = '[property ' . $error->getDataPath() . '] ' . json_encode($this->data[$pointer]['messages'], 1);
$this->message = (! $this->message) ? $message : $this->message;
return $this;
}
diff --git a/zmsentities/src/Zmsentities/Exchange.php b/zmsentities/src/Zmsentities/Exchange.php
index 538d89648..77a2dabd2 100644
--- a/zmsentities/src/Zmsentities/Exchange.php
+++ b/zmsentities/src/Zmsentities/Exchange.php
@@ -146,42 +146,42 @@ public function withAverage($keyToCalculate)
{
$entity = clone $this;
$average = [];
-
+
foreach ($entity->data as $name => $entry) {
if (!is_array($entry) && !($entry instanceof \Traversable)) {
// Skip or handle non-iterable $entry appropriately.
continue;
}
-
+
$average[$name . '_sum'] = 0;
$average[$name . '_count'] = 0;
-
+
foreach ($entry as $dateItem) {
if (!is_array($dateItem) && !($dateItem instanceof \Traversable)) {
// Skip or handle non-iterable $dateItem appropriately.
continue;
}
-
+
foreach ($dateItem as $key => $value) {
if (!is_numeric($value) || $key !== $keyToCalculate) {
// Skip non-numeric values or when the key doesn't match.
continue;
}
-
+
$average[$name . '_sum'] += $value;
$average[$name . '_count']++;
}
}
-
+
$average[$name] = $average[$name . '_count'] > 0
? round($average[$name . '_sum'] / $average[$name . '_count'], 2)
: null;
}
-
+
$entity->data['average_' . $keyToCalculate] = $average;
return $entity;
}
-
+
public function withMaxAndAverageFromWaitingTime()
{
@@ -258,7 +258,7 @@ public function getGroupedHashSet(array $fields, array $hashfields)
if (count($fields)) {
$field = array_shift($fields);
$fieldposition = $this->getPositionByName($field);
-
+
foreach ($this->data as $element) {
// Check if $fieldposition exists in $element
if (isset($element[$fieldposition])) {
@@ -269,7 +269,7 @@ public function getGroupedHashSet(array $fields, array $hashfields)
$list[$element[$fieldposition]]->data[] = $element;
}
}
-
+
foreach ($list as $key => $row) {
if ($row instanceof Exchange) {
$list[$key] = $row->getGroupedHashSet($fields, $hashfields);
@@ -279,5 +279,5 @@ public function getGroupedHashSet(array $fields, array $hashfields)
return $this->getHashData($hashfields, true);
}
return $list;
- }
+ }
}
diff --git a/zmsentities/src/Zmsentities/Helper/DateTime.php b/zmsentities/src/Zmsentities/Helper/DateTime.php
index 26a5824e2..54c74c04d 100644
--- a/zmsentities/src/Zmsentities/Helper/DateTime.php
+++ b/zmsentities/src/Zmsentities/Helper/DateTime.php
@@ -79,7 +79,7 @@ public static function getFormatedDates(
public static function getSummerTimeStartDateTime($year = null)
{
$year = ($year) ? $year : date('Y');
- $dateTimeMarch = new \DateTime($year. '-03-01', new \DateTimeZone('Europe/Berlin'));
+ $dateTimeMarch = new \DateTime($year . '-03-01', new \DateTimeZone('Europe/Berlin'));
$lastSunday = $dateTimeMarch->modify('Last Sunday of March');
return $lastSunday->setTime('02', '00', '00');
}
@@ -87,7 +87,7 @@ public static function getSummerTimeStartDateTime($year = null)
public static function getSummerTimeEndDateTime($year = null)
{
$year = ($year) ? $year : date('Y');
- $dateTimeOctober = new \DateTime($year. '-10-01', new \DateTimeZone('Europe/Berlin'));
+ $dateTimeOctober = new \DateTime($year . '-10-01', new \DateTimeZone('Europe/Berlin'));
$lastSunday = $dateTimeOctober->modify('Last Sunday of October');
return $lastSunday->setTime('03', '00', '00');
}
diff --git a/zmsentities/src/Zmsentities/Helper/Delegate.php b/zmsentities/src/Zmsentities/Helper/Delegate.php
index 82a049092..e1595b415 100644
--- a/zmsentities/src/Zmsentities/Helper/Delegate.php
+++ b/zmsentities/src/Zmsentities/Helper/Delegate.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities\Helper;
-use \BO\Zmsentities\Schema\Entity;
+use BO\Zmsentities\Schema\Entity;
class Delegate
{
diff --git a/zmsentities/src/Zmsentities/Helper/Messaging.php b/zmsentities/src/Zmsentities/Helper/Messaging.php
index 910deba0d..16823a5d2 100644
--- a/zmsentities/src/Zmsentities/Helper/Messaging.php
+++ b/zmsentities/src/Zmsentities/Helper/Messaging.php
@@ -1,16 +1,18 @@
getFirstClient();
$noAttachmentDomains = $config->toProperty()->notifications->noAttachmentDomains->get();
$noAttachmentDomains = explode(',', (string)$noAttachmentDomains);
@@ -124,16 +125,15 @@ protected static function dbTwigView($templateProvider)
$twig->addExtension(new TranslationExtension());
$twig->addExtension(new IntlExtension());
return $twig;
-
}
public static function getMailContentPreview($templateContent, $process)
{
- $parameters = self::generateMailParameters($process,
+ $parameters = self::generateMailParameters(
+ $process,
new Config(),
null,
- 'appointment',
- null
+ 'appointment'
);
return self::twigView()->createTemplate($templateContent)->render($parameters);
@@ -148,9 +148,8 @@ public static function getMailContent(
) {
$parameters = self::generateMailParameters($processList, $config, $initiator, $status);
- $collection = (new ProcessList)->testProcessListLength($processList, self::isEmptyProcessListAllowed($status));
- $mainProcess = $collection->getFirst();
- $template = self::getTemplate('mail', $status, $mainProcess);
+ (new ProcessList())->testProcessListLength($processList, self::isEmptyProcessListAllowed($status));
+ $template = self::getTemplate('mail', $status);
if ($initiator) {
$template = self::getTemplate('admin', $status);
}
@@ -171,7 +170,7 @@ public static function getMailContent(
public static function generateMailParameters($processList, $config, $initiator, $status)
{
- $collection = (new ProcessList)->testProcessListLength($processList, self::isEmptyProcessListAllowed($status));
+ $collection = (new ProcessList())->testProcessListLength($processList, self::isEmptyProcessListAllowed($status));
$mainProcess = $collection->getFirst();
$date = (new \DateTimeImmutable())->setTimestamp(0);
$client = (new Client());
@@ -246,7 +245,7 @@ public static function getNotificationContent(Process $process, Config $config,
return $message;
}
- protected static function getTemplate($type, $status, ?Process $process = null)
+ protected static function getTemplate($type, $status)
{
$template = null;
if (Property::__keyExists($type, self::$templates)) {
@@ -254,49 +253,9 @@ protected static function getTemplate($type, $status, ?Process $process = null)
$template = self::$templates[$type][$status];
}
}
-
- /*
-
- // temporarily disable until we have all the customized templates in the database
-
- if ($process) {
- $provider = $process->scope->provider;
- //error_log($provider);
- //print_r($provider, true);
- $providerName = $provider->displayName;
- $providerTemplateName = self::getProviderTemplateName($providerName);
- $providerTemplateFolder = 'custom/' . $providerTemplateName . '/';
-
- if (file_exists(TemplateFinder::getTemplatePath() . '/messaging/' . $providerTemplateFolder . $template)) {
- return $providerTemplateFolder . $template;
- }
- }
-
- */
-
return $template;
}
- private static function getProviderTemplateName($providerName)
- {
- if (strpos($providerName, '(')) {
- $providerName = substr($providerName, 0, strpos($providerName, '('));
- }
- $divider = '-';
- $providerTemplate = preg_replace('~[^\pL\d]+~u', $divider, $providerName);
- $providerTemplate = iconv('utf-8', 'us-ascii//TRANSLIT', $providerTemplate);
- $providerTemplate = preg_replace('~[^-\w]+~', '', $providerTemplate);
- $providerTemplate = trim($providerTemplate, $divider);
- $providerTemplate = preg_replace('~-+~', $divider, $providerTemplate);
- $providerTemplate = strtolower($providerTemplate);
-
- if (empty($providerTemplate)) {
- return 'none';
- }
-
- return $providerTemplate;
- }
-
public static function getMailSubject(
Process $process,
Config $config,
@@ -313,15 +272,15 @@ public static function getMailSubject(
'initiator' => $initiator,
'status' => $status
];
-
+
$template = 'subjects.twig';
-
+
if ($templateProvider) {
$subject = self::dbTwigView($templateProvider)->render($template, $parameters);
} else {
$subject = self::twigView()->render('messaging/' . $template, $parameters);
}
-
+
return trim($subject);
}
@@ -334,27 +293,7 @@ public static function getMailIcs(
$templateProvider = false
) {
$ics = new \BO\Zmsentities\Ics();
- $template = self::getTemplate('ics', $status);
$message = self::getMailContent($process, $config, $initiator, $status, $templateProvider);
- $plainContent = self::getPlainText($message, "\\n");
- $appointment = $process->getFirstAppointment();
- $currentYear = $appointment->getStartTime()->format('Y');
- $icsString = self::twigView()->render(
- 'messaging/' . $template,
- array(
- 'date' => $appointment->toDateTime()->format('U'),
- 'startTime' => $appointment->getStartTime()->format('U'),
- 'endTime' => $appointment->getEndTime()->format('U'),
- 'startSummerTime' =>
- \BO\Zmsentities\Helper\DateTime::getSummerTimeStartDateTime($currentYear)->format('U'),
- 'endSummerTime' =>
- \BO\Zmsentities\Helper\DateTime::getSummerTimeEndDateTime($currentYear)->format('U'),
- 'process' => $process,
- 'timestamp' => (!$now) ? time() : $now,
- 'message' => $plainContent
- )
- );
-
$ics->content = self::generateIcsContent($process, $config, $status, $now, $templateProvider, $message);
return $ics;
@@ -372,20 +311,20 @@ protected static function generateIcsContent(
if (empty($message)) {
$message = self::getMailContent($process, $config, null, $status, $templateProvider);
}
-
+
// Convert the email message to plain text for the ICS description
$plainTextDescription = self::getPlainText($message);
-
+
// Get the ICS template for the process status dynamically
- $template = self::getTemplate('ics', $status, $process);
+ $template = self::getTemplate('ics', $status);
if (!$template) {
throw new \Exception("ICS template for status $status not found");
}
-
+
// Extract the first appointment details
$appointment = $process->getFirstAppointment();
$currentYear = $appointment->getStartTime()->format('Y');
-
+
// Prepare parameters for ICS rendering, including the plain text description
$parameters = [
'date' => $appointment->toDateTime()->format('U'),
@@ -397,25 +336,25 @@ protected static function generateIcsContent(
'timestamp' => (!$now) ? time() : $now,
'message' => $plainTextDescription // Pass the plain text email content to the ICS template
];
-
+
// Render the ICS content using Twig and the fetched template
if ($templateProvider) {
$icsString = self::dbTwigView($templateProvider)->render($template, $parameters);
} else {
$icsString = self::twigView()->render('messaging/' . $template, $parameters);
}
-
+
// Decode HTML entities to plain text and ensure lines follow ICS standards
$icsString = html_entity_decode($icsString);
return self::getTextWithFoldedLines($icsString);
}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
public static function getPlainText($content, $lineBreak = "\n")
{
@@ -440,7 +379,7 @@ public static function getTextWithFoldedLines($content)
while (strlen($text) > 75) {
$line = mb_substr($text, 0, 72);
$llength = mb_strlen($line);
- $subline .= $line.chr(13).chr(10).chr(32);
+ $subline .= $line . chr(13) . chr(10) . chr(32);
$text = mb_substr($text, $llength);
}
if (!empty($text) && 0 < strlen($subline)) {
@@ -453,6 +392,6 @@ public static function getTextWithFoldedLines($content)
$newLines[] = $text;
}
}
- return implode(chr(13).chr(10), $newLines);
+ return implode(chr(13) . chr(10), $newLines);
}
}
diff --git a/zmsentities/src/Zmsentities/Helper/ProcessFormValidation.php b/zmsentities/src/Zmsentities/Helper/ProcessFormValidation.php
index 436d483ac..ec06f98f1 100644
--- a/zmsentities/src/Zmsentities/Helper/ProcessFormValidation.php
+++ b/zmsentities/src/Zmsentities/Helper/ProcessFormValidation.php
@@ -1,14 +1,16 @@
isMail("Die E-Mail Adresse muss im Format max@mustermann.de eingeben werden.")
->hasDNS(
- "Zu der angegebenen E-Mail-Adresse können keine Mails verschickt werden. ".
- "Der Host zur Domain nach dem '@' ist nicht erreichbar. ".
+ "Zu der angegebenen E-Mail-Adresse können keine Mails verschickt werden. " .
+ "Der Host zur Domain nach dem '@' ist nicht erreichbar. " .
""
);
}
@@ -210,7 +211,7 @@ protected static function testTelephone($collection, $scopePrefs, $withAppointme
$length = strlen($inputNumber);
$phoneNumberUtil = \libphonenumber\PhoneNumberUtil::getInstance();
$phoneNumberObject = $phoneNumberUtil->parse($inputNumber, 'DE');
- $phoneNumber = '+'.$phoneNumberObject->getCountryCode() . $phoneNumberObject->getNationalNumber();
+ $phoneNumber = '+' . $phoneNumberObject->getCountryCode() . $phoneNumberObject->getNationalNumber();
if (self::isPhoneRequired($scopePrefs) && $withAppointment) {
$collection['telephone'] = Validator::value($phoneNumber, 'telephone')
diff --git a/zmsentities/src/Zmsentities/Helper/Property.php b/zmsentities/src/Zmsentities/Helper/Property.php
index 6ad296e92..5f7e48bb7 100644
--- a/zmsentities/src/Zmsentities/Helper/Property.php
+++ b/zmsentities/src/Zmsentities/Helper/Property.php
@@ -7,7 +7,6 @@
*/
class Property implements \ArrayAccess
{
-
/**
*
* @var Mixed $access
@@ -68,8 +67,10 @@ public function offsetUnset($offset)
public function __get($property)
{
- if ((is_array($this->access) && array_key_exists($property, $this->access)) ||
- ($this->access instanceof \ArrayAccess && $this->access->offsetExists($property))) {
+ if (
+ (is_array($this->access) && array_key_exists($property, $this->access)) ||
+ ($this->access instanceof \ArrayAccess && $this->access->offsetExists($property))
+ ) {
return new self($this->access[$property]);
}
if (is_object($this->access) && isset($this->access->$property)) {
diff --git a/zmsentities/src/Zmsentities/Helper/Sorter.php b/zmsentities/src/Zmsentities/Helper/Sorter.php
index 2b8bb9545..9d3fbcce5 100644
--- a/zmsentities/src/Zmsentities/Helper/Sorter.php
+++ b/zmsentities/src/Zmsentities/Helper/Sorter.php
@@ -7,7 +7,6 @@
*/
class Sorter
{
-
/**
* @todo check against ISO definition
*/
diff --git a/zmsentities/src/Zmsentities/Helper/TemplateFinder.php b/zmsentities/src/Zmsentities/Helper/TemplateFinder.php
index d26717eec..4d5727c4a 100644
--- a/zmsentities/src/Zmsentities/Helper/TemplateFinder.php
+++ b/zmsentities/src/Zmsentities/Helper/TemplateFinder.php
@@ -7,12 +7,11 @@
*/
class TemplateFinder
{
-
/**
* @todo check against ISO definition
*/
public static function getTemplatePath()
{
- return realpath(__DIR__) .'/../../../templates';
+ return realpath(__DIR__) . '/../../../templates';
}
}
diff --git a/zmsentities/src/Zmsentities/Link.php b/zmsentities/src/Zmsentities/Link.php
index f4a2e7b55..c9cda5814 100644
--- a/zmsentities/src/Zmsentities/Link.php
+++ b/zmsentities/src/Zmsentities/Link.php
@@ -21,6 +21,6 @@ public function getDefaults()
public function __toString()
{
- return "Link {$this->name}-{$this->url}- with target ". $this->target;
+ return "Link {$this->name}-{$this->url}- with target " . $this->target;
}
}
diff --git a/zmsentities/src/Zmsentities/Mail.php b/zmsentities/src/Zmsentities/Mail.php
index 01e387ae1..bc7974c72 100644
--- a/zmsentities/src/Zmsentities/Mail.php
+++ b/zmsentities/src/Zmsentities/Mail.php
@@ -2,10 +2,10 @@
namespace BO\Zmsentities;
-use \BO\Zmsentities\Process;
-use \BO\Zmsentities\Collection\ProcessList;
-use \BO\Zmsentities\Helper\Messaging;
-use \BO\Zmsentities\Helper\Property;
+use BO\Zmsentities\Process;
+use BO\Zmsentities\Collection\ProcessList;
+use BO\Zmsentities\Helper\Messaging;
+use BO\Zmsentities\Helper\Property;
/**
* @SuppressWarnings(CouplingBetweenObjects)
@@ -112,18 +112,20 @@ public function toCustomMessageEntity(Process $process, $collection)
{
$entity = clone $this;
$message = '';
- if (Property::__keyExists(
- 'message',
- $collection
- ) &&
+ if (
+ Property::__keyExists(
+ 'message',
+ $collection
+ ) &&
'' != $collection['message']->getValue()
) {
$message = $collection['message']->getValue();
}
- if (Property::__keyExists(
- 'subject',
- $collection
- ) &&
+ if (
+ Property::__keyExists(
+ 'subject',
+ $collection
+ ) &&
'' != $collection['subject']->getValue()
) {
$entity->subject = $collection['subject']->getValue();
@@ -158,7 +160,7 @@ public function toCustomMessageEntity(Process $process, $collection)
*/
public function toResolvedEntity($processList, Config $config, $status, $initiator = null)
{
- $collection = (new ProcessList)->testProcessListLength(
+ $collection = (new ProcessList())->testProcessListLength(
$processList,
Messaging::isEmptyProcessListAllowed($status)
);
@@ -184,7 +186,8 @@ public function toResolvedEntity($processList, Config $config, $status, $initiat
'base64' => false
));
- if ($mainProcess && $mainProcess->getAppointments()->getFirst()->hasTime() &&
+ if (
+ $mainProcess && $mainProcess->getAppointments()->getFirst()->hasTime() &&
Messaging::isIcsRequired($config, $mainProcess, $status)
) {
$entity->multipart[] = new Mimepart(array(
@@ -203,7 +206,7 @@ public function toScopeAdminProcessList(
) {
$entity = clone $this;
$content = Messaging::getScopeAdminProcessListContent($processList, $scope, $dateTime);
- $entity->subject = 'Termine am '. $dateTime->format('Y-m-d');
+ $entity->subject = 'Termine am ' . $dateTime->format('Y-m-d');
$entity->createIP = 0;
$entity->client = new Client([
'email' => $scope->getContactEmail(),
@@ -251,8 +254,8 @@ public function __toString()
{
$string = "mail#";
$string .= ($this->hasId()) ? $this->getId() : 0;
- $string .= " recipient:". $this->getRecipient();
- $string .= " process:". $this->getProcessId();
+ $string .= " recipient:" . $this->getRecipient();
+ $string .= " process:" . $this->getProcessId();
return $string;
}
}
diff --git a/zmsentities/src/Zmsentities/Mailtemplate.php b/zmsentities/src/Zmsentities/Mailtemplate.php
index 2c618b60c..10579cc66 100644
--- a/zmsentities/src/Zmsentities/Mailtemplate.php
+++ b/zmsentities/src/Zmsentities/Mailtemplate.php
@@ -40,5 +40,4 @@ public function setPreference($type, $key, $value)
}
return $this;
}
-
}
diff --git a/zmsentities/src/Zmsentities/Month.php b/zmsentities/src/Zmsentities/Month.php
index d72ce08ef..d5c4a4ff0 100644
--- a/zmsentities/src/Zmsentities/Month.php
+++ b/zmsentities/src/Zmsentities/Month.php
@@ -19,7 +19,7 @@ public function getDefaults()
public function getFirstDay()
{
- $dateTime = Helper\DateTime::create($this['year'] .'-'. $this['month'] .'-1');
+ $dateTime = Helper\DateTime::create($this['year'] . '-' . $this['month'] . '-1');
return $dateTime->modify('00:00:00');
}
diff --git a/zmsentities/src/Zmsentities/Notification.php b/zmsentities/src/Zmsentities/Notification.php
index d491e5d50..9a7e2c7d0 100644
--- a/zmsentities/src/Zmsentities/Notification.php
+++ b/zmsentities/src/Zmsentities/Notification.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities;
-use \BO\Zmsentities\Helper\Property;
+use BO\Zmsentities\Helper\Property;
class Notification extends Schema\Entity
{
@@ -92,14 +92,15 @@ public function getIdentification()
public function getRecipient()
{
- if (! isset($this->client['telephone'])
+ if (
+ ! isset($this->client['telephone'])
|| "" == $this->client['telephone']
|| strlen($this->client['telephone']) < 7
) {
throw new Exception\NotificationMissedNumber();
}
$telephone = $this->getParsedTelephoneNumber();
- $recipient = 'SMS='. $telephone .'@sms.verwalt-berlin.de';
+ $recipient = 'SMS=' . $telephone . '@sms.verwalt-berlin.de';
return $recipient;
}
@@ -108,7 +109,7 @@ public function getParsedTelephoneNumber($number = null)
$number = ($number) ? $number : $this->client['telephone'];
$phoneNumberUtil = \libphonenumber\PhoneNumberUtil::getInstance();
$phoneNumberObject = $phoneNumberUtil->parse($number, 'DE');
- return '+'.$phoneNumberObject->getCountryCode() . $phoneNumberObject->getNationalNumber();
+ return '+' . $phoneNumberObject->getCountryCode() . $phoneNumberObject->getNationalNumber();
}
public function toResolvedEntity(Process $process, Config $config, Department $department, $status)
@@ -127,7 +128,8 @@ public function toResolvedEntity(Process $process, Config $config, Department $d
public function toCustomMessageEntity(Process $process, $collection, Department $department)
{
$entity = new self();
- if (Property::__keyExists('message', $collection) &&
+ if (
+ Property::__keyExists('message', $collection) &&
'' != $collection['message']->getValue()
) {
$entity->message = html_entity_decode($collection['message']->getValue(), ENT_QUOTES);
@@ -156,9 +158,9 @@ public function __toString()
{
$string = "notification#";
$string .= ($this->hasId()) ? $this->getId() : 0;
- $string .= " recipient:". $this->getRecipient();
- $string .= " identification:". $this->getIdentification();
- $string .= " process:". $this->getProcessId();
+ $string .= " recipient:" . $this->getRecipient();
+ $string .= " identification:" . $this->getIdentification();
+ $string .= " process:" . $this->getProcessId();
return $string;
}
}
diff --git a/zmsentities/src/Zmsentities/Process.php b/zmsentities/src/Zmsentities/Process.php
index f9cf0a161..1ed9b1d77 100644
--- a/zmsentities/src/Zmsentities/Process.php
+++ b/zmsentities/src/Zmsentities/Process.php
@@ -1,7 +1,8 @@
requests = new Collection\RequestList();
if ($requestCSV) {
foreach (explode(',', $requestCSV) as $id) {
- $this->requests->addEntity(
- new Request(
- array(
+ $this->requests->addEntity(new Request(array(
'source' => $source,
'id' => $id
- )
- )
- );
+ )));
}
}
return $this;
@@ -191,7 +185,7 @@ public function addAppointmentFromRequest($requestData, \DateTimeInterface $date
$dateTime->setTime($time[0], $time[1]);
}
- $appointment = (new Appointment)
+ $appointment = (new Appointment())
->addDate($dateTime->getTimestamp())
->addScope($this->scope['id']);
if (isset($requestData['slotCount'])) {
@@ -488,7 +482,6 @@ public function withoutPersonalData()
public function withLessData(array $keepArray = [])
{
$entity = clone $this;
-
if (!in_array('availability', $keepArray)) {
foreach ($entity['appointments'] as $appointment) {
if ($appointment->toProperty()->scope->isAvailable()) {
@@ -507,13 +500,12 @@ public function withLessData(array $keepArray = [])
unset($entity['createTimestamp']);
unset($entity['createIP']);
-
if ($entity->toProperty()->scope->status->isAvailable()) {
unset($entity['scope']['status']);
}
if ($entity->status == 'free') {
- // delete keys
+// delete keys
foreach (['authKey', 'queue', 'requests',] as $key) {
if (!in_array($key, $keepArray) && $entity->toProperty()->$key->isAvailable()) {
unset($entity[$key]);
@@ -618,32 +610,26 @@ public function getWayMinutes($defaultTime = 'now')
public function toDerefencedAmendment()
{
- $lastChange = (new \DateTimeImmutable)->setTimestamp($this->createTimestamp)->format('c');
- return var_export(
- array(
+ $lastChange = (new \DateTimeImmutable())->setTimestamp($this->createTimestamp)->format('c');
+ return var_export(array(
'BuergerID' => $this->id,
'StandortID' => $this->scope['id'],
'Anmerkung' => $this->amendment,
'IPTimeStamp' => $this->createTimestamp,
'LastChange' => $lastChange,
- ),
- 1
- );
+ ), 1);
}
public function toDerefencedCustomTextfield()
{
- $lastChange = (new \DateTimeImmutable)->setTimestamp($this->createTimestamp)->format('c');
- return var_export(
- array(
+ $lastChange = (new \DateTimeImmutable())->setTimestamp($this->createTimestamp)->format('c');
+ return var_export(array(
'BuergerID' => $this->id,
'StandortID' => $this->scope['id'],
'CustomTextfield' => $this->customTextfield,
'IPTimeStamp' => $this->createTimestamp,
'LastChange' => $lastChange,
- ),
- 1
- );
+ ), 1);
}
public function __toString()
diff --git a/zmsentities/src/Zmsentities/Processarchived.php b/zmsentities/src/Zmsentities/Processarchived.php
index 77995c87c..64827e57c 100644
--- a/zmsentities/src/Zmsentities/Processarchived.php
+++ b/zmsentities/src/Zmsentities/Processarchived.php
@@ -1,8 +1,9 @@
'No errors',
);
throw new \BO\Zmsentities\Exception\SchemaFailedParseJsonFile(
- "Could not parse JSON File $schemaFilename: ".$json_error_list[$json_error]
+ "Could not parse JSON File $schemaFilename: " . $json_error_list[$json_error]
);
}
$schema = new Schema($array);
diff --git a/zmsentities/src/Zmsentities/Schema/Validator.php b/zmsentities/src/Zmsentities/Schema/Validator.php
index eaff90efa..0ca9afe01 100644
--- a/zmsentities/src/Zmsentities/Schema/Validator.php
+++ b/zmsentities/src/Zmsentities/Schema/Validator.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities\Schema;
-use \League\JsonGuard\ValidationError;
+use League\JsonGuard\ValidationError;
class Validator
{
diff --git a/zmsentities/src/Zmsentities/Scope.php b/zmsentities/src/Zmsentities/Scope.php
index 60d50494b..4f71d87cb 100644
--- a/zmsentities/src/Zmsentities/Scope.php
+++ b/zmsentities/src/Zmsentities/Scope.php
@@ -1,4 +1,5 @@
getExternalLinkData($value, $button);
} else {
- $button['url'] = '/'. $button['type'] .'/'. $value .'/';
+ $button['url'] = '/' . $button['type'] . '/' . $value . '/';
$button[$button['type']]['id'] = $value;
}
diff --git a/zmsentities/src/Zmsentities/Useraccount.php b/zmsentities/src/Zmsentities/Useraccount.php
index 672bc3a5f..9315f508d 100644
--- a/zmsentities/src/Zmsentities/Useraccount.php
+++ b/zmsentities/src/Zmsentities/Useraccount.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities;
-use \BO\Zmsentities\Helper\Property;
+use BO\Zmsentities\Helper\Property;
/**
* @SuppressWarnings(Complexity)
@@ -204,7 +204,8 @@ public function withCleanedUpFormData($keepPassword = false)
if (isset($this['password']) && '' == $this['password'] && false === $keepPassword) {
unset($this['password']);
}
- if (isset($this['changePassword']) &&
+ if (
+ isset($this['changePassword']) &&
0 == count(array_filter($this['changePassword'])) &&
false === $keepPassword
) {
@@ -293,7 +294,7 @@ public function getOidcProviderFromName()
{
$providerName = '';
if (($pos = strpos($this->id, "@")) !== false) {
- $providerName = substr($this->id, $pos+1);
+ $providerName = substr($this->id, $pos + 1);
}
return ('' !== $providerName) ? $providerName : null;
}
diff --git a/zmsentities/src/Zmsentities/Validator/ProcessValidator.php b/zmsentities/src/Zmsentities/Validator/ProcessValidator.php
index 4782f4550..ee649a018 100644
--- a/zmsentities/src/Zmsentities/Validator/ProcessValidator.php
+++ b/zmsentities/src/Zmsentities/Validator/ProcessValidator.php
@@ -2,13 +2,13 @@
namespace BO\Zmsentities\Validator;
-use \BO\Mellon\Valid;
-use \BO\Mellon\Unvalidated;
-use \BO\Mellon\Validator;
-use \BO\Mellon\Parameter;
-use \BO\Mellon\Collection;
-use \BO\Zmsentities\Process;
-use \BO\Zmsentities\Helper\Delegate;
+use BO\Mellon\Valid;
+use BO\Mellon\Unvalidated;
+use BO\Mellon\Validator;
+use BO\Mellon\Parameter;
+use BO\Mellon\Collection;
+use BO\Zmsentities\Process;
+use BO\Zmsentities\Helper\Delegate;
/**
*
@@ -102,7 +102,7 @@ public function validateMail(Unvalidated $unvalid, callable $setter, callable $i
$valid = $unvalid
->isMail("Die E-Mail Adresse muss im Format max@mustermann.de eingeben werden.")
->hasDNS(
- "Zu der angegebenen E-Mail-Adresse können keine Mails verschickt werden. ".
+ "Zu der angegebenen E-Mail-Adresse können keine Mails verschickt werden. " .
"Der Host zur Domain nach dem '@' ist nicht erreichbar. "
);
}
@@ -131,7 +131,7 @@ public function validateCustomField(Unvalidated $unvalid, callable $setter): sel
return $this;
}
- public function validateTelephone(Unvalidated $unvalid, callable $setter, callable $isRequiredCallback = null):self
+ public function validateTelephone(Unvalidated $unvalid, callable $setter, callable $isRequiredCallback = null): self
{
$valid = $unvalid->isString();
$length = strlen($valid->getValue());
@@ -139,16 +139,17 @@ public function validateTelephone(Unvalidated $unvalid, callable $setter, callab
try {
$phoneNumberUtil = \libphonenumber\PhoneNumberUtil::getInstance();
$phoneNumberObject = $phoneNumberUtil->parse($valid->getValue(), 'DE');
- $telephone = '+'.$phoneNumberObject->getCountryCode() . $phoneNumberObject->getNationalNumber();
+ $telephone = '+' . $phoneNumberObject->getCountryCode() . $phoneNumberObject->getNationalNumber();
} catch (\Exception $exception) {
$telephone = $valid->getValue();
}
$valid = (new \BO\Mellon\Unvalidated($telephone, 'telephone'))->isString();
-
- if (!$length
+
+ if (
+ !$length
&& $this->getProcess()->getCurrentScope()->isTelephoneRequired()
&& $this->getProcess()->isWithAppointment()
- ) {
+ ) {
$valid
->isBiggerThan(10, "Für den Standort muss eine gültige Telefonnummer eingetragen werden");
} elseif (!$length && $isRequiredCallback && $isRequiredCallback()) {
@@ -186,7 +187,7 @@ public function validateText(Unvalidated $unvalid, callable $setter): self
}
return $this;
}
-
+
public function validateReminderTimestamp(Unvalidated $unvalid, callable $setter, callable $conditionCallback): self
{
$valid = $unvalid->isNumber();
@@ -198,7 +199,7 @@ public function validateReminderTimestamp(Unvalidated $unvalid, callable $setter
return $this;
}
- public function validateRequests(Unvalidated $unvalid, callable $setter):self
+ public function validateRequests(Unvalidated $unvalid, callable $setter): self
{
if ($this->getProcess()->isWithAppointment()) {
$valid = $unvalid->isArray("Es muss mindestens eine Dienstleistung ausgewählt werden!");
diff --git a/zmsentities/src/Zmsentities/Workstation.php b/zmsentities/src/Zmsentities/Workstation.php
index b0e0b9a54..b45ff9f57 100644
--- a/zmsentities/src/Zmsentities/Workstation.php
+++ b/zmsentities/src/Zmsentities/Workstation.php
@@ -2,7 +2,7 @@
namespace BO\Zmsentities;
-use \BO\Zmsentities\Helper\Property;
+use BO\Zmsentities\Helper\Property;
/**
* @SuppressWarnings(Complexity)
diff --git a/zmsmessaging/.gitignore b/zmsmessaging/.gitignore
index 640eccb3a..75e8f9b66 100644
--- a/zmsmessaging/.gitignore
+++ b/zmsmessaging/.gitignore
@@ -7,4 +7,5 @@ config.php
vendor.old
vendor.update
.phpunit.result.cache
-.DS_*
\ No newline at end of file
+.DS_*
+coverage
\ No newline at end of file
diff --git a/zmsmessaging/composer.json b/zmsmessaging/composer.json
index 10463fb9a..f3580a2a2 100644
--- a/zmsmessaging/composer.json
+++ b/zmsmessaging/composer.json
@@ -42,8 +42,8 @@
"require-dev": {
"phpunit/phpunit": "^9.5.4",
"phpspec/prophecy-phpunit": "^2.0.0",
- "phpmd/phpmd": "^2.3",
- "squizlabs/php_codesniffer": "^3.7"
+ "phpmd/phpmd": "@stable",
+ "squizlabs/php_codesniffer": "*"
},
"repositories": [
{
diff --git a/zmsmessaging/composer.lock b/zmsmessaging/composer.lock
index 5a9a544a7..29dc7c88b 100644
--- a/zmsmessaging/composer.lock
+++ b/zmsmessaging/composer.lock
@@ -393,16 +393,16 @@
},
{
"name": "giggsey/libphonenumber-for-php",
- "version": "8.13.52",
+ "version": "8.13.54",
"source": {
"type": "git",
"url": "https://github.com/giggsey/libphonenumber-for-php.git",
- "reference": "cc9a82b237d79a85be47c0b06e3943f75ab35c32"
+ "reference": "42d3a03d4f47fcb784666743f4323a7b87a2b2ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/cc9a82b237d79a85be47c0b06e3943f75ab35c32",
- "reference": "cc9a82b237d79a85be47c0b06e3943f75ab35c32",
+ "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/42d3a03d4f47fcb784666743f4323a7b87a2b2ba",
+ "reference": "42d3a03d4f47fcb784666743f4323a7b87a2b2ba",
"shasum": ""
},
"require": {
@@ -466,7 +466,7 @@
"issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
"source": "https://github.com/giggsey/libphonenumber-for-php"
},
- "time": "2024-12-13T09:08:43+00:00"
+ "time": "2025-01-31T14:50:26+00:00"
},
{
"name": "giggsey/locale",
diff --git a/zmsmessaging/phpunit.xml b/zmsmessaging/phpunit.xml
index d7bfc3325..bcb19f6a1 100644
--- a/zmsmessaging/phpunit.xml
+++ b/zmsmessaging/phpunit.xml
@@ -1,16 +1,16 @@
-
-
+
@@ -18,10 +18,18 @@
./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
./tests/Zmsmessaging/
-
+
\ No newline at end of file
diff --git a/zmsmessaging/src/Zmsmessaging/Application.php b/zmsmessaging/src/Zmsmessaging/Application.php
index 2a8ba6a25..44fa2cb80 100644
--- a/zmsmessaging/src/Zmsmessaging/Application.php
+++ b/zmsmessaging/src/Zmsmessaging/Application.php
@@ -1,9 +1,11 @@
Send() : $action;
if (false !== $action && null !== $mailer && ! $hasSendSuccess) {
- $this->log("Exception: SendingFailed - ". \App::$now->format('c'));
+ $this->log("Exception: SendingFailed - " . \App::$now->format('c'));
throw new Exception\SendingFailed();
}
// @codeCoverageIgnoreEnd
$log = new Mimepart(['mime' => 'text/plain']);
$log->content = ($entity instanceof Mail) ? $entity->subject : $entity->message;
- \App::$http->readPostResult('/log/process/'. $entity->process['id'] .'/', $log);
+ \App::$http->readPostResult('/log/process/' . $entity->process['id'] . '/', $log);
return $mailer;
}
@@ -63,7 +65,7 @@ protected function removeEntityOlderThanOneHour($entity)
$this->deleteEntityFromQueue($entity);
$log = new Mimepart(['mime' => 'text/plain']);
$log->content = 'Zmsmessaging Failure: Queue entry older than 1 hour has been removed';
- \App::$http->readPostResult('/log/process/'. $entity->process['id'] .'/', $log, ['error' => 1]);
+ \App::$http->readPostResult('/log/process/' . $entity->process['id'] . '/', $log, ['error' => 1]);
\App::$log->warning($log->content);
return false;
}
@@ -73,7 +75,7 @@ public function deleteEntityFromQueue($entity)
{
$type = ($entity instanceof \BO\Zmsentities\Mail) ? 'mails' : 'notification';
try {
- $entity = \App::$http->readDeleteResult('/'. $type .'/'. $entity->id .'/')->getEntity();
+ $entity = \App::$http->readDeleteResult('/' . $type . '/' . $entity->id . '/')->getEntity();
} catch (\BO\Zmsclient\Exception $exception) {
throw $exception;
}
@@ -83,23 +85,23 @@ public function deleteEntityFromQueue($entity)
public function testEntity($entity)
{
if (!isset($entity['department'])) {
- throw new \Exception("Could not resolve department for message ".$entity['id']);
+ throw new \Exception("Could not resolve department for message " . $entity['id']);
}
if (!isset($entity['department']['email'])) {
throw new \Exception(
"No mail address for department "
- .$entity['department']['name']
- ." (departmentID="
- .$entity['department']['id']
- ." Vorgang="
- .$entity['process']['id']
- .") "
- .$entity['id']
+ . $entity['department']['name']
+ . " (departmentID="
+ . $entity['department']['id']
+ . " Vorgang="
+ . $entity['process']['id']
+ . ") "
+ . $entity['id']
);
}
if (! $entity->hasContent()) {
throw new \BO\Zmsmessaging\Exception\MailWithoutContent();
- }
+ }
if ($entity instanceof Mail) {
$isMail = Validator::value($entity->getRecipient())->isMail()->getValue();
if (!$isMail) {
@@ -126,16 +128,16 @@ protected function monitorProcesses($processHandles)
$running = true;
} else {
$output = stream_get_contents($handle['pipes'][1]); // stdout
- $errorOutput = stream_get_contents($handle['pipes'][2]); // stderr
+ $errorOutput = stream_get_contents($handle['pipes'][2]); // stderr
fclose($handle['pipes'][1]);
fclose($handle['pipes'][2]);
- if (trim($output)) {
+ if (trim($output)) {
$this->log("\nProcess stdout: " . trim($output) . "\n");
}
if (trim($errorOutput)) {
$this->log("\nProcess stderr: " . trim($errorOutput) . "\n");
}
-
+
proc_close($handle['process']);
$handle['process'] = null;
}
@@ -144,28 +146,28 @@ protected function monitorProcesses($processHandles)
usleep(500000);
}
}
-
-
-
+
+
+
public function log($message)
{
if (is_array($message)) {
$message = print_r($message, true);
}
-
+
$time = $this->getSpendTime();
$memory = memory_get_usage() / (1024 * 1024);
$text = sprintf("[MailProcessor log %07.3fs %07.1fmb] %s", $time, $memory, $message);
-
+
if ($this->verbose) {
//error_log($text);
}
-
+
// Explicitly flush the output buffer
echo $text . "\n";
flush();
- }
+ }
protected function convertCollectionToArray($collection)
{
@@ -177,5 +179,4 @@ protected function convertCollectionToArray($collection)
$this->log("Conversion complete, array size: " . count($array));
return $array;
}
-
}
diff --git a/zmsmessaging/src/Zmsmessaging/Mail.php b/zmsmessaging/src/Zmsmessaging/Mail.php
index cd41aad30..385fb2bb7 100644
--- a/zmsmessaging/src/Zmsmessaging/Mail.php
+++ b/zmsmessaging/src/Zmsmessaging/Mail.php
@@ -1,26 +1,26 @@
log("Read Mail QueueList start with limit ". \App::$mails_per_minute ." - ". \App::$now->format('c'));
+ $this->log("Read Mail QueueList start with limit " . \App::$mails_per_minute . " - " . \App::$now->format('c'));
$queueList = \App::$http->readGetResult('/mails/', [
'resolveReferences' => 0,
'limit' => \App::$mails_per_minute,
@@ -32,7 +32,7 @@ public function __construct($verbose = false, $maxRunTime = 50)
$this->log("QueueList is null - " . \App::$now->format('c'));
}
}
-
+
public function initQueueTransmission($action = false)
{
$resultList = [];
@@ -44,7 +44,7 @@ public function initQueueTransmission($action = false)
$this->log("Messages queue count - " . count($this->messagesQueue));
if (count($this->messagesQueue) <= 50) {
$this->log("Less than or equal to 50 items, sending immediately.");
-
+
$itemIds = [];
foreach ($this->messagesQueue as $item) {
if ($this->maxRunTime < $this->getSpendTime()) {
@@ -53,7 +53,7 @@ public function initQueueTransmission($action = false)
}
$itemIds[] = $item['id'];
}
-
+
if (!empty($itemIds)) {
try {
$results = $this->sendQueueItems($action, $itemIds);
@@ -63,7 +63,10 @@ public function initQueueTransmission($action = false)
}
}
} catch (\Exception $exception) {
- $this->handleProcessingException($exception);
+ $this->log("Error processing mail items: " . $exception->getMessage());
+ $resultList[] = [
+ 'errorInfo' => $exception->getMessage()
+ ];
}
}
} else {
@@ -71,25 +74,25 @@ public function initQueueTransmission($action = false)
$this->log("More than 50 items, processing in batches of $batchSize.");
$batches = array_chunk(iterator_to_array($this->messagesQueue), $batchSize);
$this->log("Messages divided into " . count($batches) . " batches.");
-
+
$processHandles = [];
- foreach ($batches as $index => $batch) {
+ foreach ($batches as $batch) {
if ($this->maxRunTime < $this->getSpendTime()) {
$this->log("Max Runtime exceeded during batch processing - " . \App::$now->format('c'));
break;
}
-
+
$ids = array_map(function ($message) {
return $message['id'];
}, $batch);
$encodedIds = base64_encode(json_encode($ids));
$actionStr = is_array($action) ? json_encode($action) : ($action === false ? 'false' : ($action === true ? 'true' : (string)$action));
-
+
$idsStr = implode(', ', $ids);
$command = "php " . escapeshellarg(__DIR__ . '/MailProcessor.php') . " " . escapeshellarg($encodedIds) . " " . escapeshellarg($actionStr);
- $processHandles[] = $this->startProcess($command, $index, $idsStr);
+ $processHandles[] = $this->startProcess($command, $idsStr);
}
-
+
if ($this->maxRunTime >= $this->getSpendTime()) {
$this->monitorProcesses($processHandles);
} else {
@@ -101,10 +104,10 @@ public function initQueueTransmission($action = false)
'errorInfo' => 'No mail entry found in Database...'
);
}
-
+
return $resultList;
}
-
+
public function sendQueueItems($action, array $itemIds)
{
$endpoint = '/mails/';
@@ -112,7 +115,7 @@ public function sendQueueItems($action, array $itemIds)
'resolveReferences' => 2,
'ids' => implode(',', $itemIds)
];
-
+
try {
$response = \App::$http->readGetResult($endpoint, $params);
$mailItems = $response->getCollection();
@@ -120,16 +123,16 @@ public function sendQueueItems($action, array $itemIds)
$this->log("Error fetching mail data: " . $e->getMessage() . "\n\n");
return ['errorInfo' => 'Failed to fetch mail data'];
}
-
+
if (empty($mailItems)) {
$this->log("No mail items found for the provided IDs.");
return ['errorInfo' => 'No mail items found'];
}
-
+
$results = [];
$processedItems = [];
$successfullySentIds = [];
-
+
foreach ($mailItems as $item) {
$entity = new \BO\Zmsentities\Mail($item);
$mailer = $this->getValidMailer($entity);
@@ -137,7 +140,7 @@ public function sendQueueItems($action, array $itemIds)
$this->log("No valid mailer for mail ID: " . $entity->id);
continue;
}
-
+
try {
$result = $this->sendMailer($entity, $mailer, $action);
if ($result instanceof PHPMailer) {
@@ -159,10 +162,10 @@ public function sendQueueItems($action, array $itemIds)
$this->log("Exception while sending mail ID " . $entity->id . ": " . $e->getMessage());
$results[] = ['errorInfo' => $e->getMessage()];
}
-
+
$processedItems[] = '[' . $entity->id . ', ' . $entity['process']['id'] . ', ' . $entity->createTimestamp . ']';
}
-
+
if ($action && !empty($successfullySentIds)) {
try {
$this->deleteEntitiesFromQueue($successfullySentIds);
@@ -170,12 +173,12 @@ public function sendQueueItems($action, array $itemIds)
$this->log("Error deleting processed mails: " . $e->getMessage());
}
}
-
+
$this->log("Processing finished for IDs [emailId, processId, createdTimestamp)]: " . implode(', ', $processedItems));
-
+
return $results;
}
-
+
protected function getValidMailer(\BO\Zmsentities\Mail $entity)
{
$message = '';
@@ -184,29 +187,29 @@ protected function getValidMailer(\BO\Zmsentities\Mail $entity)
$mailer = $this->readMailer($entity);
// @codeCoverageIgnoreStart
} catch (PHPMailerException $exception) {
- $message = "Message #$messageId PHPMailer Failure: ". $exception->getMessage();
+ $message = "Message #$messageId PHPMailer Failure: " . $exception->getMessage();
$code = $exception->getCode();
\App::$log->warning($message, []);
} catch (\Exception $exception) {
- $message = "Message #$messageId Exception Failure: ". $exception->getMessage();
+ $message = "Message #$messageId Exception Failure: " . $exception->getMessage();
$code = $exception->getCode();
\App::$log->warning($message, []);
}
if ($message) {
if (428 == $code || 422 == $code) {
- $this->log("Build Mailer Failure ". $code .": deleteEntityFromQueue() - ". \App::$now->format('c'));
+ $this->log("Build Mailer Failure " . $code . ": deleteEntityFromQueue() - " . \App::$now->format('c'));
$this->deleteEntityFromQueue($entity);
} else {
$this->log(
- "Build Mailer Failure ". $code .": removeEntityOlderThanOneHour() - ". \App::$now->format('c')
+ "Build Mailer Failure " . $code . ": removeEntityOlderThanOneHour() - " . \App::$now->format('c')
);
$this->removeEntityOlderThanOneHour($entity);
}
-
+
$log = new Mimepart(['mime' => 'text/plain']);
$log->content = $message;
- $this->log("Build Mailer Exception log message: ". $message);
- \App::$http->readPostResult('/log/process/'. $entity->process['id'] .'/', $log, ['error' => 1]);
+ $this->log("Build Mailer Exception log message: " . $message);
+ \App::$http->readPostResult('/log/process/' . $entity->process['id'] . '/', $log, ['error' => 1]);
return false;
}
@@ -275,15 +278,15 @@ protected function readMailer(\BO\Zmsentities\Mail $entity)
return $mailer;
}
-
- private function startProcess($command, $batchIndex, $ids)
+
+ private function startProcess($command, $ids)
{
$descriptorSpec = [
0 => ["pipe", "r"], // stdin
1 => ["pipe", "w"], // stdout
2 => ["pipe", "w"] // stderr
];
-
+
$process = proc_open($command . ' 2>&1', $descriptorSpec, $pipes); // Redirect stderr to stdout
if (is_resource($process)) {
return [
@@ -295,21 +298,6 @@ private function startProcess($command, $batchIndex, $ids)
return null;
}
}
-
- private function getMailById($itemId)
- {
- $endpoint = '/mails/' . $itemId . '/';
-
- try {
- $response = \App::$http->readGetResult($endpoint);
- return $response->getEntity();
- } catch (\Exception $e) {
- $this->log("Error fetching mail data: " . $e->getMessage() . "\n\n");
- echo "Error fetching mail data: " . $e->getMessage() . "\n\n";
- return null;
- }
- }
-
private function deleteEntitiesFromQueue(array $itemIds)
{
@@ -317,7 +305,7 @@ private function deleteEntitiesFromQueue(array $itemIds)
$params = [
'ids' => implode(',', $itemIds)
];
-
+
try {
$response = \App::$http->readDeleteResult($endpoint, $params);
return $response;
@@ -326,5 +314,4 @@ private function deleteEntitiesFromQueue(array $itemIds)
throw new \Exception("Failed to delete mail data");
}
}
-
}
diff --git a/zmsmessaging/src/Zmsmessaging/MailProcessor.php b/zmsmessaging/src/Zmsmessaging/MailProcessor.php
index a0ba1b43e..0a86ec8aa 100644
--- a/zmsmessaging/src/Zmsmessaging/MailProcessor.php
+++ b/zmsmessaging/src/Zmsmessaging/MailProcessor.php
@@ -1,9 +1,11 @@
log(
- "Read Notification QueueList start with limit ". \App::$mails_per_minute ." - ". \App::$now->format('c')
+ "Read Notification QueueList start with limit " . \App::$mails_per_minute . " - " . \App::$now->format('c')
);
$queueList = \App::$http->readGetResult('/notification/')->getCollection();
if (null !== $queueList) {
$this->messagesQueue = $queueList->sortByCustomKey('createTimestamp');
- $this->log("QueueList sorted by createTimestamp - ". \App::$now->format('c'));
+ $this->log("QueueList sorted by createTimestamp - " . \App::$now->format('c'));
}
}
@@ -34,7 +36,7 @@ public function initQueueTransmission($action = false)
if ($this->messagesQueue && count($this->messagesQueue)) {
foreach ($this->messagesQueue as $item) {
if ($this->maxRunTime < $this->getSpendTime()) {
- $this->log("Max Runtime exceeded - ". \App::$now->format('c'));
+ $this->log("Max Runtime exceeded - " . \App::$now->format('c'));
break;
}
try {
@@ -43,10 +45,10 @@ public function initQueueTransmission($action = false)
$log = new Mimepart(['mime' => 'text/plain']);
$log->content = $exception->getMessage();
if (isset($item['process']) && isset($item['process']['id'])) {
- $this->log("Init Queue Exception message: ". $log->content .' - '. \App::$now->format('c'));
- $this->log("Init Queue Exception log readPostResult start - ". \App::$now->format('c'));
- \App::$http->readPostResult('/log/process/'. $item['process']['id'] .'/', $log, ['error' => 1]);
- $this->log("Init Queue Exception log readPostResult finished - ". \App::$now->format('c'));
+ $this->log("Init Queue Exception message: " . $log->content . ' - ' . \App::$now->format('c'));
+ $this->log("Init Queue Exception log readPostResult start - " . \App::$now->format('c'));
+ \App::$http->readPostResult('/log/process/' . $item['process']['id'] . '/', $log, ['error' => 1]);
+ $this->log("Init Queue Exception log readPostResult finished - " . \App::$now->format('c'));
}
\App::$log->error($log->content);
}
@@ -97,20 +99,20 @@ protected function getValidMailer(\BO\Zmsentities\Notification $entity)
$mailer = $this->readMailer($entity);
// @codeCoverageIgnoreStart
} catch (PHPMailerException $exception) {
- $message = "Message #$messageId PHPMailer Failure: ". $exception->getMessage();
+ $message = "Message #$messageId PHPMailer Failure: " . $exception->getMessage();
\App::$log->warning($message, []);
} catch (\Exception $exception) {
- $message = "Message #$messageId Failure: ". $exception->getMessage();
+ $message = "Message #$messageId Failure: " . $exception->getMessage();
\App::$log->warning($message, []);
}
if ($message) {
$this->removeEntityOlderThanOneHour($entity);
$log = new Mimepart(['mime' => 'text/plain']);
$log->content = $message;
- $this->log("Build Mailer Exception log message: ". $message);
- $this->log("Build Mailer Exception log readPostResult start - ". \App::$now->format('c'));
- \App::$http->readPostResult('/log/process/'. $entity->process['id'] .'/', $log, ['error' => 1]);
- $this->log("Build Mailer Exception log readPostResult finished - ". \App::$now->format('c'));
+ $this->log("Build Mailer Exception log message: " . $message);
+ $this->log("Build Mailer Exception log readPostResult start - " . \App::$now->format('c'));
+ \App::$http->readPostResult('/log/process/' . $entity->process['id'] . '/', $log, ['error' => 1]);
+ $this->log("Build Mailer Exception log readPostResult finished - " . \App::$now->format('c'));
return false;
}
return $mailer;
diff --git a/zmsmessaging/src/Zmsmessaging/PhpUnit/Base.php b/zmsmessaging/src/Zmsmessaging/PhpUnit/Base.php
index 54dd6b2a3..1d0c8fd6a 100644
--- a/zmsmessaging/src/Zmsmessaging/PhpUnit/Base.php
+++ b/zmsmessaging/src/Zmsmessaging/PhpUnit/Base.php
@@ -3,13 +3,12 @@
/**
*
*/
+
namespace BO\Zmsmessaging\PhpUnit;
use PHPUnit\Framework\TestCase;
-
-use \Prophecy\PhpUnit\ProphecyTrait;
-
-use \Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Argument;
/**
* @codeCoverageIgnore
@@ -26,7 +25,6 @@ abstract class Base extends TestCase
* ],
* ]
*/
-
use ProphecyTrait;
protected $apiCalls = array();
diff --git a/zmsslim/.gitignore b/zmsslim/.gitignore
index cc287e9f3..a9206d269 100644
--- a/zmsslim/.gitignore
+++ b/zmsslim/.gitignore
@@ -5,3 +5,4 @@ tags
tests/cache/*
!tests/cache/.gitkeep
public
+coverage
diff --git a/zmsslim/composer.lock b/zmsslim/composer.lock
index 924ffebb5..050a9a994 100644
--- a/zmsslim/composer.lock
+++ b/zmsslim/composer.lock
@@ -2514,16 +2514,16 @@
},
{
"name": "helmich/phpunit-json-assert",
- "version": "v3.5.1",
+ "version": "v3.5.2",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-json-assert.git",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c"
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
- "reference": "5a3a53e46f4d1f1b324c5cc2e33d87ad2d37260c",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-json-assert/zipball/f8958119e9e9ea1339d6b4d6fd2df24536261b50",
+ "reference": "f8958119e9e9ea1339d6b4d6fd2df24536261b50",
"shasum": ""
},
"require": {
@@ -2532,10 +2532,10 @@
"softcreatr/jsonpath": "^0.8"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 11.0"
+ "phpunit/phpunit": "<8.0 || >= 12.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0"
},
"type": "library",
"autoload": {
@@ -2556,7 +2556,7 @@
"description": "PHPUnit assertions for JSON documents",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-json-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.1"
+ "source": "https://github.com/martin-helmich/phpunit-json-assert/tree/v3.5.2"
},
"funding": [
{
@@ -2568,33 +2568,34 @@
"type": "github"
}
],
- "time": "2023-03-03T14:09:38+00:00"
+ "time": "2024-05-20T11:18:46+00:00"
},
{
"name": "helmich/phpunit-psr7-assert",
- "version": "v4.3.0",
+ "version": "v4.4.1",
"source": {
"type": "git",
"url": "https://github.com/martin-helmich/phpunit-psr7-assert.git",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878"
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/dfe594a09f55ea7f87120363d6720ca1a94c0878",
- "reference": "dfe594a09f55ea7f87120363d6720ca1a94c0878",
+ "url": "https://api.github.com/repos/martin-helmich/phpunit-psr7-assert/zipball/f35fa69e07cc16977b52805d3abd873cc16747fd",
+ "reference": "f35fa69e07cc16977b52805d3abd873cc16747fd",
"shasum": ""
},
"require": {
"helmich/phpunit-json-assert": "^3.4",
- "php": "^7.2 || ^8.0",
- "psr/http-message": "^1.0"
+ "php": "^8.0",
+ "psr/http-message": "^1.1 || ^2.0"
},
"conflict": {
- "phpunit/phpunit": "<8.0 || >= 10.0"
+ "phpunit/phpunit": "<8.0 || >= 11.0"
},
"require-dev": {
- "guzzlehttp/psr7": "^1.2",
- "phpunit/phpunit": "^8.0 || ^9.0"
+ "guzzlehttp/psr7": "^2.4",
+ "mockery/mockery": "^1.4.1",
+ "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
},
"type": "library",
"autoload": {
@@ -2615,7 +2616,7 @@
"description": "PHPUnit assertions for testing PSR7-compliant applications",
"support": {
"issues": "https://github.com/martin-helmich/phpunit-psr7-assert/issues",
- "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.3.0"
+ "source": "https://github.com/martin-helmich/phpunit-psr7-assert/tree/v4.4.1"
},
"funding": [
{
@@ -2627,24 +2628,24 @@
"type": "github"
}
],
- "time": "2020-12-22T06:27:54+00:00"
+ "time": "2023-07-26T19:04:29+00:00"
},
{
"name": "justinrainbow/json-schema",
- "version": "v5.2.13",
+ "version": "5.3.0",
"source": {
"type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+ "url": "https://github.com/jsonrainbow/json-schema.git",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+ "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
@@ -2655,11 +2656,6 @@
"bin/validate-json"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"JsonSchema\\": "src/JsonSchema/"
@@ -2694,10 +2690,10 @@
"schema"
],
"support": {
- "issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+ "issues": "https://github.com/jsonrainbow/json-schema/issues",
+ "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
},
- "time": "2023-09-26T02:20:38+00:00"
+ "time": "2024-07-06T21:00:26+00:00"
},
{
"name": "myclabs/deep-copy",
diff --git a/zmsslim/phpunit.xml.dist b/zmsslim/phpunit.xml.dist
index cacae0417..0150bf9d2 100644
--- a/zmsslim/phpunit.xml.dist
+++ b/zmsslim/phpunit.xml.dist
@@ -1,32 +1,40 @@
-
-
-
-
+
+
+
./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
./tests/Slim/
-
+
\ No newline at end of file
diff --git a/zmsslim/src/Slim/Application.php b/zmsslim/src/Slim/Application.php
index de5db074d..dda1c1c07 100644
--- a/zmsslim/src/Slim/Application.php
+++ b/zmsslim/src/Slim/Application.php
@@ -1,53 +1,40 @@
array(
@@ -128,7 +101,6 @@ class Application
'default' => false,
)
);
-
- // default overwritten with Bootstrap::init()
+// default overwritten with Bootstrap::init()
public static $urlSignatureSecret = 'e8dd240a854185c740384d90d771d85c';
}
diff --git a/zmsslim/src/Slim/Bootstrap.php b/zmsslim/src/Slim/Bootstrap.php
index 935937083..1c14fabaa 100644
--- a/zmsslim/src/Slim/Bootstrap.php
+++ b/zmsslim/src/Slim/Bootstrap.php
@@ -1,4 +1,5 @@
parseDebugLevel($level);
$handler = new StreamHandler('php://stderr', $level);
-
+
$formatter = new JsonFormatter();
-
+
// Add processor to format time_local first
App::$log->pushProcessor(function ($record) {
return array(
@@ -94,7 +95,7 @@ protected function configureLogger(string $level, string $identifier): void
'extra' => $record['extra']
);
});
-
+
$handler->setFormatter($formatter);
App::$log->pushHandler($handler);
}
diff --git a/zmsslim/src/Slim/Container.php b/zmsslim/src/Slim/Container.php
index 6e6b5fbad..da758a345 100644
--- a/zmsslim/src/Slim/Container.php
+++ b/zmsslim/src/Slim/Container.php
@@ -1,4 +1,5 @@
format($timestamp);
}
-
+
public static function hashQueryParameters(
string $section,
array $queryVariables,
diff --git a/zmsslim/src/Slim/Language.php b/zmsslim/src/Slim/Language.php
index 1a0f72ed7..1dae6d9c1 100644
--- a/zmsslim/src/Slim/Language.php
+++ b/zmsslim/src/Slim/Language.php
@@ -3,7 +3,6 @@
namespace BO\Slim;
use Psr\Http\Message\RequestInterface;
-
use Symfony\Bridge\Twig\Extension\TranslationExtension;
class Language
@@ -27,7 +26,8 @@ public function __construct(RequestInterface $request, array $supportedLanguages
$this->setCurrentLocale();
$defaultLang = $this->getDefault();
- if (\App::MULTILANGUAGE
+ if (
+ \App::MULTILANGUAGE
|| (strlen($fallbackLocale) > 0 && strlen($this->currentLocale) > 0 && strlen($defaultLang) > 0)
) {
if (null === self::$translatorInstance) {
@@ -58,8 +58,10 @@ public function getCurrentLanguage($lang = '')
public function getLocale($locale = '')
{
$locale = ('' == $locale) ? $this->getDefault() : $locale;
- if (isset(self::$supportedLanguages[$this->getCurrentLanguage($locale)]) &&
- isset(self::$supportedLanguages[$this->getCurrentLanguage($locale)]['locale'])) {
+ if (
+ isset(self::$supportedLanguages[$this->getCurrentLanguage($locale)]) &&
+ isset(self::$supportedLanguages[$this->getCurrentLanguage($locale)]['locale'])
+ ) {
$locale = self::$supportedLanguages[$this->getCurrentLanguage($locale)]['locale'];
}
return $locale;
@@ -84,7 +86,7 @@ protected function getLocaleList($locale)
$localeList[] = $locale;
$suffixList = ['utf8', 'utf-8'];
foreach ($suffixList as $suffix) {
- array_unshift($localeList, $locale .'.'. $suffix);
+ array_unshift($localeList, $locale . '.' . $suffix);
}
return $localeList;
}
diff --git a/zmsslim/src/Slim/LanguageTranslator.php b/zmsslim/src/Slim/LanguageTranslator.php
index b439d1008..c6679619d 100644
--- a/zmsslim/src/Slim/LanguageTranslator.php
+++ b/zmsslim/src/Slim/LanguageTranslator.php
@@ -3,7 +3,6 @@
namespace BO\Slim;
use Psr\Http\Message\RequestInterface;
-
// Symfony Translation Classes
use Symfony\Component\Translation\Loader\JsonFileLoader;
use Symfony\Component\Translation\Loader\PoFileLoader;
@@ -47,7 +46,7 @@ protected function setJsonFileLoader()
foreach (\App::$supportedLanguages as $language) {
$this->translator->addResource(
'json',
- \App::APP_PATH .'/lang/'. $language['locale'] .'.json',
+ \App::APP_PATH . '/lang/' . $language['locale'] . '.json',
$language['locale']
);
}
@@ -60,7 +59,7 @@ protected function setPoFileLoader()
if ($locale != $this->defaultLang) {
$this->translator->addResource(
'pofile',
- \App::APP_PATH .'/lang/'. $language['locale'] .'.po',
+ \App::APP_PATH . '/lang/' . $language['locale'] . '.po',
$language['locale']
);
}
diff --git a/zmsslim/src/Slim/Middleware/HttpBasicAuth.php b/zmsslim/src/Slim/Middleware/HttpBasicAuth.php
index 5371252c3..cd3a6821b 100644
--- a/zmsslim/src/Slim/Middleware/HttpBasicAuth.php
+++ b/zmsslim/src/Slim/Middleware/HttpBasicAuth.php
@@ -1,4 +1,5 @@
isAuthorized = $isAuthorized;
- $this->realm = $realm ?: "Password ".\App::IDENTIFIER;
+ $this->realm = $realm ?: "Password " . \App::IDENTIFIER;
}
public static function useAppConfig(): callable
diff --git a/zmsslim/src/Slim/Middleware/IpAddress.php b/zmsslim/src/Slim/Middleware/IpAddress.php
index e5cc2a6ba..16c44327b 100644
--- a/zmsslim/src/Slim/Middleware/IpAddress.php
+++ b/zmsslim/src/Slim/Middleware/IpAddress.php
@@ -1,4 +1,5 @@
getBaseUrl().'/userinfo';
+ return $this->getBaseUrl() . '/userinfo';
}
/**
@@ -214,7 +214,7 @@ protected function createResourceOwner(array $response, AccessToken $token)
public function getResourceOwnerData(AccessToken $token)
{
$resourceOwner = $this->getResourceOwner($token);
- $ownerData['username'] = $resourceOwner->getName(). '@' . static::PROVIDERNAME;
+ $ownerData['username'] = $resourceOwner->getName() . '@' . static::PROVIDERNAME;
if ($resourceOwner->getVerifiedEmail()) {
$ownerData['email'] = $resourceOwner->getVerifiedEmail();
}
@@ -270,7 +270,7 @@ protected function checkResponse(ResponseInterface $response, $data)
if (!empty($data['error'])) {
$error = $data['error'];
if (isset($data['error_description'])) {
- $error.=': '.$data['error_description'];
+ $error .= ': ' . $data['error_description'];
}
throw new IdentityProviderException($error, 0, $data);
}
diff --git a/zmsslim/src/Slim/Middleware/OAuth/GitlabInstance.php b/zmsslim/src/Slim/Middleware/OAuth/GitlabInstance.php
index 3ca03d454..562407e69 100644
--- a/zmsslim/src/Slim/Middleware/OAuth/GitlabInstance.php
+++ b/zmsslim/src/Slim/Middleware/OAuth/GitlabInstance.php
@@ -2,8 +2,8 @@
namespace BO\Slim\Middleware\OAuth;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
use League\OAuth2\Client\Token\AccessToken;
class GitlabInstance
@@ -85,7 +85,7 @@ private function writeTokenToSession($token)
{
$realmData = $this->provider->getBasicOptionsFromJsonFile();
$sessionHandler = (new \BO\Zmsclient\SessionHandler(\App::$http));
- $sessionHandler->open('/'. $realmData['realm'] . '/', $realmData['clientName']);
+ $sessionHandler->open('/' . $realmData['realm'] . '/', $realmData['clientName']);
$sessionHandler->write(\BO\Zmsclient\Auth::getKey(), serialize($token), ['oidc' => true]);
return $sessionHandler->close();
}
@@ -94,7 +94,7 @@ private function writeDeleteSession()
{
$realmData = $this->provider->getBasicOptionsFromJsonFile();
$sessionHandler = (new \BO\Zmsclient\SessionHandler(\App::$http));
- $sessionHandler->open('/'. $realmData['realm'] . '/', $realmData['clientName']);
+ $sessionHandler->open('/' . $realmData['realm'] . '/', $realmData['clientName']);
$sessionHandler->destroy(\BO\Zmsclient\Auth::getKey());
}
@@ -102,7 +102,7 @@ private function readTokenDataFromSession()
{
$realmData = $this->provider->getBasicOptionsFromJsonFile();
$sessionHandler = (new \BO\Zmsclient\SessionHandler(\App::$http));
- $sessionHandler->open('/'. $realmData['realm'] . '/', $realmData['clientName']);
+ $sessionHandler->open('/' . $realmData['realm'] . '/', $realmData['clientName']);
$tokenData = unserialize($sessionHandler->read(\BO\Zmsclient\Auth::getKey(), ['oidc' => true]));
return $tokenData;
}
diff --git a/zmsslim/src/Slim/Middleware/OAuth/Keycloak/Provider.php b/zmsslim/src/Slim/Middleware/OAuth/Keycloak/Provider.php
index b0920aa23..4e24d5c5a 100644
--- a/zmsslim/src/Slim/Middleware/OAuth/Keycloak/Provider.php
+++ b/zmsslim/src/Slim/Middleware/OAuth/Keycloak/Provider.php
@@ -2,11 +2,11 @@
namespace BO\Slim\Middleware\OAuth\Keycloak;
-use \Stevenmaguire\OAuth2\Client\Provider\Keycloak;
-use \BO\Zmsclient\Psr7\ClientInterface as HttpClientInterface;
-use \BO\Zmsclient\PSR7\Client;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Message\ResponseInterface;
+use Stevenmaguire\OAuth2\Client\Provider\Keycloak;
+use BO\Zmsclient\Psr7\ClientInterface as HttpClientInterface;
+use BO\Zmsclient\PSR7\Client;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
use League\OAuth2\Client\Token\AccessToken;
/**
@@ -16,7 +16,7 @@
class Provider extends Keycloak
{
const PROVIDERNAME = 'keycloak';
-
+
/**
* Sets the config options for keycloak access from json file.
*
@@ -31,7 +31,7 @@ public function __construct($client = null)
$options = $this->getOptionsFromJsonFile();
return parent::__construct($options, ['httpClient' => $client]);
}
-
+
/**
* Sets the HTTP client instance.
*
@@ -66,7 +66,7 @@ public function getResourceOwnerData(AccessToken $token)
{
$resourceOwner = $this->getResourceOwner($token);
$config = \App::$http->readGetResult('/config/', [], \App::CONFIG_SECURE_TOKEN)->getEntity();
- $ownerData['username'] = $resourceOwner->getName(). '@' . static::PROVIDERNAME;
+ $ownerData['username'] = $resourceOwner->getName() . '@' . static::PROVIDERNAME;
if (1 == $config->getPreference('oidc', 'onlyVerifiedMail')) {
if ($resourceOwner->getVerifiedEmail()) {
$ownerData['email'] = $resourceOwner->getVerifiedEmail();
@@ -79,7 +79,7 @@ public function getResourceOwnerData(AccessToken $token)
private function getOptionsFromJsonFile()
{
- $config_data = file_get_contents(\App::APP_PATH . '/'. static::PROVIDERNAME .'.json');
+ $config_data = file_get_contents(\App::APP_PATH . '/' . static::PROVIDERNAME . '.json');
if (gettype($config_data) === 'string') {
$config_data = json_decode($config_data, true);
}
@@ -89,10 +89,10 @@ private function getOptionsFromJsonFile()
$realmData['verify'] = $config_data['ssl-verify'] ?? true;
return $realmData;
}
-
+
public function getBasicOptionsFromJsonFile()
{
- $config_data = file_get_contents(\App::APP_PATH . '/'. static::PROVIDERNAME .'.json');
+ $config_data = file_get_contents(\App::APP_PATH . '/' . static::PROVIDERNAME . '.json');
if (gettype($config_data) === 'string') {
$config_data = json_decode($config_data, true);
}
diff --git a/zmsslim/src/Slim/Middleware/OAuth/KeycloakInstance.php b/zmsslim/src/Slim/Middleware/OAuth/KeycloakInstance.php
index 0b6fcfca0..538c12066 100644
--- a/zmsslim/src/Slim/Middleware/OAuth/KeycloakInstance.php
+++ b/zmsslim/src/Slim/Middleware/OAuth/KeycloakInstance.php
@@ -2,8 +2,8 @@
namespace BO\Slim\Middleware\OAuth;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
use League\OAuth2\Client\Token\AccessToken;
/**
@@ -101,9 +101,9 @@ private function testAccess(AccessToken $token)
'event' => 'oauth_token_validation',
'timestamp' => date('c')
]);
-
+
list($header, $payload, $signature) = explode('.', $token->getToken());
-
+
if (empty($header)) {
$this->logger->error('Token validation failed', [
'event' => 'oauth_token_validation_failed',
@@ -128,16 +128,16 @@ private function testAccess(AccessToken $token)
]);
throw new \BO\Slim\Exception\OAuthFailed();
}
-
+
$realmData = $this->provider->getBasicOptionsFromJsonFile();
-
+
// Fix: Properly handle base64url encoding before JSON decoding
$payload = str_replace(['-', '_'], ['+', '/'], $payload);
$payload = base64_decode($payload . str_repeat('=', 4 - (strlen($payload) % 4)));
$accessTokenPayload = json_decode($payload, true);
-
+
$clientRoles = array();
-
+
if ($accessTokenPayload === null) {
$this->logger->error('Token validation failed', [
'event' => 'oauth_token_validation_failed',
@@ -147,7 +147,7 @@ private function testAccess(AccessToken $token)
]);
throw new \BO\Slim\Exception\OAuthFailed();
}
-
+
if (!isset($accessTokenPayload['resource_access']) || !is_array($accessTokenPayload['resource_access'])) {
$this->logger->error('Token validation failed', [
'event' => 'oauth_token_validation_failed',
@@ -158,7 +158,7 @@ private function testAccess(AccessToken $token)
]);
throw new \BO\Slim\Exception\OAuthFailed();
}
-
+
if (!isset($accessTokenPayload['resource_access'][\App::IDENTIFIER])) {
$this->logger->error('Token validation failed', [
'event' => 'oauth_token_validation_failed',
@@ -169,10 +169,10 @@ private function testAccess(AccessToken $token)
]);
throw new \BO\Slim\Exception\OAuthFailed();
}
-
+
$resourceAccess = $accessTokenPayload['resource_access'];
$appIdentifierRoles = $resourceAccess[\App::IDENTIFIER]['roles'] ?? null;
-
+
if (!$appIdentifierRoles || !is_array($appIdentifierRoles)) {
$this->logger->error('Token validation failed', [
'event' => 'oauth_token_validation_failed',
@@ -183,11 +183,11 @@ private function testAccess(AccessToken $token)
]);
throw new \BO\Slim\Exception\OAuthFailed();
}
-
+
if (is_array($accessTokenPayload['resource_access'])) {
$clientRoles = array_values($accessTokenPayload['resource_access'][\App::IDENTIFIER]['roles']);
}
-
+
if (!in_array($realmData['accessRole'], $clientRoles)) {
$this->logger->error('Token validation failed', [
'event' => 'oauth_token_validation_failed',
@@ -198,7 +198,7 @@ private function testAccess(AccessToken $token)
]);
throw new \BO\Slim\Exception\OAuthFailed();
}
-
+
\App::$log->info('Token validation successful', [
'event' => 'oauth_token_validation_success',
'timestamp' => date('c')
@@ -250,7 +250,7 @@ private function writeTokenToSession($token)
$realmData = $this->provider->getBasicOptionsFromJsonFile();
$sessionHandler = (new \BO\Zmsclient\SessionHandler(\App::$http));
- $sessionHandler->open('/'. $realmData['realm'] . '/', $realmData['clientId']);
+ $sessionHandler->open('/' . $realmData['realm'] . '/', $realmData['clientId']);
$sessionHandler->write(\BO\Zmsclient\Auth::getKey(), serialize($token), ['oidc' => true]);
return $sessionHandler->close();
}
@@ -264,7 +264,7 @@ private function writeDeleteSession()
$realmData = $this->provider->getBasicOptionsFromJsonFile();
$sessionHandler = (new \BO\Zmsclient\SessionHandler(\App::$http));
- $sessionHandler->open('/'. $realmData['realm'] . '/', $realmData['clientId']);
+ $sessionHandler->open('/' . $realmData['realm'] . '/', $realmData['clientId']);
$sessionHandler->destroy(\BO\Zmsclient\Auth::getKey());
}
@@ -277,7 +277,7 @@ private function readTokenDataFromSession()
$realmData = $this->provider->getBasicOptionsFromJsonFile();
$sessionHandler = (new \BO\Zmsclient\SessionHandler(\App::$http));
- $sessionHandler->open('/'. $realmData['realm'] . '/', $realmData['clientId']);
+ $sessionHandler->open('/' . $realmData['realm'] . '/', $realmData['clientId']);
$tokenData = unserialize($sessionHandler->read(\BO\Zmsclient\Auth::getKey(), ['oidc' => true]));
return $tokenData;
}
diff --git a/zmsslim/src/Slim/Middleware/OAuthMiddleware.php b/zmsslim/src/Slim/Middleware/OAuthMiddleware.php
index e799817ec..a19a56756 100644
--- a/zmsslim/src/Slim/Middleware/OAuthMiddleware.php
+++ b/zmsslim/src/Slim/Middleware/OAuthMiddleware.php
@@ -1,8 +1,9 @@
createResponse(200, '');
$request = $request->withAttribute('authentificationHandler', $this->authentificationHandler);
@@ -88,7 +89,8 @@ private function handleLogin(ServerRequestInterface $request, ResponseInterface
private function handleLogout(ServerRequestInterface $request, ResponseInterface $response, $instance)
{
- if ('logout' == $request->getAttribute('authentificationHandler') &&
+ if (
+ 'logout' == $request->getAttribute('authentificationHandler') &&
! $request->getParam('state')
) {
return $instance->doLogout($response);
@@ -98,7 +100,8 @@ private function handleLogout(ServerRequestInterface $request, ResponseInterface
private function handleRefreshToken(ServerRequestInterface $request, ResponseInterface $response, $instance)
{
- if ('refresh' == $request->getAttribute('authentificationHandler') &&
+ if (
+ 'refresh' == $request->getAttribute('authentificationHandler') &&
! $instance->writeNewAccessTokenIfExpired()
) {
return $instance->doLogout($response);
diff --git a/zmsslim/src/Slim/Middleware/Profiler.php b/zmsslim/src/Slim/Middleware/Profiler.php
index fc900960b..79bc7aecc 100644
--- a/zmsslim/src/Slim/Middleware/Profiler.php
+++ b/zmsslim/src/Slim/Middleware/Profiler.php
@@ -2,8 +2,8 @@
namespace BO\Slim\Middleware;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
use Psr\Http\Server\RequestHandlerInterface;
use BO\Slim\Factory\ResponseFactory;
diff --git a/zmsslim/src/Slim/Middleware/Route.php b/zmsslim/src/Slim/Middleware/Route.php
index b81605a4d..594eea0ee 100644
--- a/zmsslim/src/Slim/Middleware/Route.php
+++ b/zmsslim/src/Slim/Middleware/Route.php
@@ -1,4 +1,5 @@
hasStep($stepName)) {
\App::$log->notice(
- "[Human " . session_id() . "] Missing step $stepName on ". $path ." (referer: ". $referer .")"
+ "[Human " . session_id() . "] Missing step $stepName on " . $path . " (referer: " . $referer . ")"
);
$this->writeRedirectCaptcha($path, $stepName);
return true;
}
if ($this->hasStepMaxReload($stepName)) {
\App::$log->notice(
- "[Human " . session_id() . "] Exceeded max reload for step $stepName on ". $path
+ "[Human " . session_id() . "] Exceeded max reload for step $stepName on " . $path
);
$this->writeRedirectCaptcha($path, ($referer) ? $referer : end($requiredSteps));
return true;
@@ -64,7 +64,7 @@ public function redirectOnSuspicion($request, $requiredSteps = array(), $referer
}
if (!$this->isVerified()) {
\App::$log->error(
- "[Human " . session_id() . "] Missing session on ". $path ." (referer: ". $referer .")"
+ "[Human " . session_id() . "] Missing session on " . $path . " (referer: " . $referer . ")"
);
$this->writeRedirectCaptcha($path, $referer);
return true;
@@ -129,7 +129,8 @@ public function hasStep($stepName)
*/
public function hasStepMaxReload($stepName)
{
- if ($this->has('step', 'human') &&
+ if (
+ $this->has('step', 'human') &&
array_key_exists($stepName, $this->get('step', 'human')) &&
$this->get('step', 'human')[$stepName] > self::MAX_RELOAD
) {
diff --git a/zmsslim/src/Slim/Middleware/SessionHeadersHandler.php b/zmsslim/src/Slim/Middleware/SessionHeadersHandler.php
index 18846f710..8cd37a9fa 100644
--- a/zmsslim/src/Slim/Middleware/SessionHeadersHandler.php
+++ b/zmsslim/src/Slim/Middleware/SessionHeadersHandler.php
@@ -1,4 +1,5 @@
withPath($path. '/');
+ $uri = $uri->withPath($path . '/');
if ($request->getHeader('X-Ssl') && 'no' != $request->getHeader('X-Ssl')) {
$uri = $uri->withScheme('https');
$uriString = (string)$uri;
diff --git a/zmsslim/src/Slim/Middleware/Validator.php b/zmsslim/src/Slim/Middleware/Validator.php
index 83d2b950d..78d5d52bf 100644
--- a/zmsslim/src/Slim/Middleware/Validator.php
+++ b/zmsslim/src/Slim/Middleware/Validator.php
@@ -2,8 +2,8 @@
namespace BO\Slim\Middleware;
-use \Psr\Http\Message\ServerRequestInterface;
-use \Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
use Psr\Http\Server\RequestHandlerInterface;
use BO\Slim\Factory\ResponseFactory;
diff --git a/zmsslim/src/Slim/Middleware/ZmsSlimRequest.php b/zmsslim/src/Slim/Middleware/ZmsSlimRequest.php
index 5e5874e8a..c4b53961e 100644
--- a/zmsslim/src/Slim/Middleware/ZmsSlimRequest.php
+++ b/zmsslim/src/Slim/Middleware/ZmsSlimRequest.php
@@ -1,4 +1,5 @@
setEntityClass($this->sessionClass);
return $session;
});
-
+
return $request->withAttribute(SessionMiddleware::SESSION_ATTRIBUTE, $sessionContainer);
}
@@ -135,7 +135,8 @@ public static function createBasicRequest(
$request = new Request($method, $uri, $headers, [], $env, $body, []);
- if ($method === 'POST' &&
+ if (
+ $method === 'POST' &&
in_array($headers->getHeader('Content-Type'), ['application/x-www-form-urlencoded', 'multipart/form-data'])
) {
// parsed body must be $_POST
diff --git a/zmsslim/src/Slim/Profiler.php b/zmsslim/src/Slim/Profiler.php
index 69e7466c2..52b5e7529 100644
--- a/zmsslim/src/Slim/Profiler.php
+++ b/zmsslim/src/Slim/Profiler.php
@@ -60,6 +60,6 @@ public function getMilliSeconds()
public function __toString()
{
- return $this->message . "=" . $this->getMilliSeconds() . "ms/#".$this->includedFiles;
+ return $this->message . "=" . $this->getMilliSeconds() . "ms/#" . $this->includedFiles;
}
}
diff --git a/zmsslim/src/Slim/Render.php b/zmsslim/src/Slim/Render.php
index 5cfad1207..c1ce58ce9 100644
--- a/zmsslim/src/Slim/Render.php
+++ b/zmsslim/src/Slim/Render.php
@@ -1,4 +1,5 @@
withAddedHeader('Cache-Control', 'max-age=' . $maxAge);
diff --git a/zmsslim/src/Slim/Request.php b/zmsslim/src/Slim/Request.php
index fca6dacdd..b750b98b7 100644
--- a/zmsslim/src/Slim/Request.php
+++ b/zmsslim/src/Slim/Request.php
@@ -1,4 +1,5 @@
strlen($basePath)
+ while (
+ min(strlen($serverParams['REQUEST_URI']), strlen($serverParams['SCRIPT_NAME'])) > strlen($basePath)
&& strncmp($serverParams['REQUEST_URI'], $serverParams['SCRIPT_NAME'], strlen($basePath) + 1) === 0
) {
$basePath = substr($serverParams['REQUEST_URI'], 0, strlen($basePath) + 1);
@@ -96,7 +98,7 @@ public function getBasePath(): string
return rtrim($basePath, '/');
}
-
+
/**
* Return the fully qualified base URL.
*
diff --git a/zmsslim/src/Slim/Response.php b/zmsslim/src/Slim/Response.php
index 91916b423..39bec14f5 100644
--- a/zmsslim/src/Slim/Response.php
+++ b/zmsslim/src/Slim/Response.php
@@ -1,4 +1,5 @@
strlen($basePath)
+ while (
+ min(strlen($serverParams['REQUEST_URI']), strlen($serverParams['SCRIPT_NAME'])) > strlen($basePath)
&& strncmp($serverParams['REQUEST_URI'], $serverParams['SCRIPT_NAME'], strlen($basePath) + 1) === 0
) {
$basePath = substr($serverParams['REQUEST_URI'], 0, strlen($basePath) + 1);
diff --git a/zmsslim/src/Slim/TwigExceptionHandler.php b/zmsslim/src/Slim/TwigExceptionHandler.php
index 12464fb68..ac5829a3e 100644
--- a/zmsslim/src/Slim/TwigExceptionHandler.php
+++ b/zmsslim/src/Slim/TwigExceptionHandler.php
@@ -1,4 +1,5 @@
getResponseFactory()->createResponse();
return static::withHtml($decoratedRequest, $response, $exception);
@@ -63,16 +63,16 @@ public static function withHtml(
// Some error-reporting is limited to a defined amount of chars
// Remove unnecessary chars, for ordering see self::getExtendedExceptionInfo()
$logText = json_encode($logInfo);
- $logText = preg_replace('#'.preg_quote('\\/').'#', "/", $logText);
- $logText = preg_replace('#'.preg_quote('\\"').'#', "", $logText);
- $logText = preg_replace('#'.preg_quote('\\n').'#', " ", $logText);
- $logText = preg_replace('#'.preg_quote('\\').'#', ".", $logText);
+ $logText = preg_replace('#' . preg_quote('\\/') . '#', "/", $logText);
+ $logText = preg_replace('#' . preg_quote('\\"') . '#', "", $logText);
+ $logText = preg_replace('#' . preg_quote('\\n') . '#', " ", $logText);
+ $logText = preg_replace('#' . preg_quote('\\') . '#', ".", $logText);
$logText = preg_replace('#"#', "", $logText);
$logText = preg_replace('#\s+#', ' ', $logText);
$logText = preg_replace('#\.\.#', ".", $logText);
$logText = preg_replace('#(/[^/\s]+)+/([^/\s]+/[^/\s]+)\.php#', "$2.php", $logText);
- $logText = preg_replace('#'.preg_quote(\APP::APP_PATH).'/?#', "", $logText);
- \App::$log->critical("PHP-Exception #{$extendedInfo['uniqueid']}: ". $logText);
+ $logText = preg_replace('#' . preg_quote(\APP::APP_PATH) . '/?#', "", $logText);
+ \App::$log->critical("PHP-Exception #{$extendedInfo['uniqueid']}: " . $logText);
/*
\App::$log->critical(
"PHP Fatal Exception #{$extendedInfo['uniqueid']}"
@@ -102,7 +102,7 @@ public static function withHtml(
. $exception->getLine()
. " "
. $exception->getTraceAsString()
- ." ---- because of "
+ . " ---- because of "
. $subexception->getMessage()
. " "
. $subexception->getTraceAsString()
@@ -188,7 +188,7 @@ public static function getExtendedExceptionInfo(\Throwable $exception, RequestIn
if (isset($exception->templatedata)) {
$templatedata = $exception->templatedata;
}
-
+
// Due to shortened error logs in some reportings, important informations first!
return array_merge(array(
"exceptionclass" => $exceptionclass,
diff --git a/zmsslim/src/Slim/TwigExtension.php b/zmsslim/src/Slim/TwigExtension.php
index 2f0997a00..93a574248 100644
--- a/zmsslim/src/Slim/TwigExtension.php
+++ b/zmsslim/src/Slim/TwigExtension.php
@@ -1,4 +1,5 @@
year.'-'.$dateString->month.'-'.$dateString->day,
+ $dateString->year . '-' . $dateString->month . '-' . $dateString->day,
new \DateTimezone('Europe/Berlin')
);
$formatDate['date'] = Helper::getFormatedDates($dateTime, "EE, dd. MMMM yyyy");
@@ -141,7 +142,7 @@ public function currentRoute($lang = null)
} elseif (\App::MULTILANGUAGE) {
$routeParams['lang'] = ($lang !== null) ? $lang : \App::$language->getCurrentLanguage();
}
-
+
$routeName = $this->container->get('currentRoute');
$route = array(
'name' => $routeName,
@@ -270,9 +271,9 @@ public static function remoteInclude($uri)
} else {
$useragent = 'Client-' . (defined("\App::IDENTIFIER") ? constant("\App::IDENTIFIER") : 'ZMS');
$options = array(
- 'http'=>array(
- 'method'=>"GET",
- 'header'=>"Accept-language: de\r\n" .
+ 'http' => array(
+ 'method' => "GET",
+ 'header' => "Accept-language: de\r\n" .
"Cookie: zms=development\r\n" .
"user-agent: $useragent \r\n"
)
@@ -305,7 +306,7 @@ public function baseUrl()
public function getEsiFromPath($path, $locale = false)
{
- $localePath = ($locale && 'de' != $locale) ? '/' .$locale : '';
+ $localePath = ($locale && 'de' != $locale) ? '/' . $locale : '';
return \App::$esiBaseUrl . $localePath . \App::$$path;
}
@@ -355,7 +356,7 @@ protected static function sortFirstChar($string)
public function dumpAppProfiler()
{
$output = 'App Profiles
'
- .' For debugging: This log contains runtime information.
+ . '
For debugging: This log contains runtime information.
DISABLE FOR PRODUCTION!
';
foreach (Profiler::$profileList as $entry) {
if ($entry instanceof Profiler) {
@@ -364,7 +365,7 @@ public function dumpAppProfiler()
$output .= \Tracy\Debugger::dump($entry, true);
}
}
- return $output .'
';
+ return $output . '';
}
public function kindOfPayment($code)
diff --git a/zmsslim/src/Slim/TwigExtensionsAndFilter.php b/zmsslim/src/Slim/TwigExtensionsAndFilter.php
index bc9a749ba..daa855a2c 100644
--- a/zmsslim/src/Slim/TwigExtensionsAndFilter.php
+++ b/zmsslim/src/Slim/TwigExtensionsAndFilter.php
@@ -1,4 +1,5 @@
=6.9.0"
}
},
- "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
- "version": "0.14.1",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
- "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
- "dev": true
- },
"node_modules/@fortawesome/fontawesome-free": {
"version": "5.15.4",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz",
@@ -96,6 +90,7 @@
"arm64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"darwin"
@@ -109,6 +104,7 @@
"x64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"darwin"
@@ -122,6 +118,7 @@
"arm"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"linux"
@@ -135,6 +132,7 @@
"arm64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"linux"
@@ -148,6 +146,7 @@
"x64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"linux"
@@ -161,6 +160,7 @@
"x64"
],
"dev": true,
+ "license": "MIT",
"optional": true,
"os": [
"win32"
@@ -259,21 +259,22 @@
]
},
"node_modules/@parcel/bundler-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.12.0.tgz",
- "integrity": "sha512-3ybN74oYNMKyjD6V20c9Gerdbh7teeNvVMwIoHIQMzuIFT6IGX53PyOLlOKRLbjxMc0TMimQQxIt2eQqxR5LsA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.13.3.tgz",
+ "integrity": "sha512-mOuWeth0bZzRv1b9Lrvydis/hAzJyePy0gwa0tix3/zyYBvw0JY+xkXVR4qKyD/blc1Ra2qOlfI2uD3ucnsdXA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/graph": "3.2.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/graph": "3.3.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -281,37 +282,39 @@
}
},
"node_modules/@parcel/cache": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.12.0.tgz",
- "integrity": "sha512-FX5ZpTEkxvq/yvWklRHDESVRz+c7sLTXgFuzz6uEnBcXV38j6dMSikflNpHA6q/L4GKkCqRywm9R6XQwhwIMyw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/cache/-/cache-2.13.3.tgz",
+ "integrity": "sha512-Vz5+K5uCt9mcuQAMDo0JdbPYDmVdB8Nvu/A2vTEK2rqZPxvoOTczKeMBA4JqzKqGURHPRLaJCvuR8nDG+jhK9A==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/fs": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/fs": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/utils": "2.13.3",
"lmdb": "2.8.5"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/codeframe": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.12.0.tgz",
- "integrity": "sha512-v2VmneILFiHZJTxPiR7GEF1wey1/IXPdZMcUlNXBiPZyWDfcuNgGGVQkx/xW561rULLIvDPharOMdxz5oHOKQg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.13.3.tgz",
+ "integrity": "sha512-L/PQf+PT0xM8k9nc0B+PxxOYO2phQYnbuifu9o4pFRiqVmCtHztP+XMIvRJ2gOEXy3pgAImSPFVJ3xGxMFky4g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "chalk": "^4.1.0"
+ "chalk": "^4.1.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -319,16 +322,17 @@
}
},
"node_modules/@parcel/compressor-raw": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.12.0.tgz",
- "integrity": "sha512-h41Q3X7ZAQ9wbQ2csP8QGrwepasLZdXiuEdpUryDce6rF9ZiHoJ97MRpdLxOhOPyASTw/xDgE1xyaPQr0Q3f5A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.13.3.tgz",
+ "integrity": "sha512-C6vjDlgTLjYc358i7LA/dqcL0XDQZ1IHXFw6hBaHHOfxPKW2T4bzUI6RURyToEK9Q1X7+ggDKqgdLxwp4veCFg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -336,85 +340,87 @@
}
},
"node_modules/@parcel/config-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.12.0.tgz",
- "integrity": "sha512-dPNe2n9eEsKRc1soWIY0yToMUPirPIa2QhxcCB3Z5RjpDGIXm0pds+BaiqY6uGLEEzsjhRO0ujd4v2Rmm0vuFg==",
- "dev": true,
- "dependencies": {
- "@parcel/bundler-default": "2.12.0",
- "@parcel/compressor-raw": "2.12.0",
- "@parcel/namer-default": "2.12.0",
- "@parcel/optimizer-css": "2.12.0",
- "@parcel/optimizer-htmlnano": "2.12.0",
- "@parcel/optimizer-image": "2.12.0",
- "@parcel/optimizer-svgo": "2.12.0",
- "@parcel/optimizer-swc": "2.12.0",
- "@parcel/packager-css": "2.12.0",
- "@parcel/packager-html": "2.12.0",
- "@parcel/packager-js": "2.12.0",
- "@parcel/packager-raw": "2.12.0",
- "@parcel/packager-svg": "2.12.0",
- "@parcel/packager-wasm": "2.12.0",
- "@parcel/reporter-dev-server": "2.12.0",
- "@parcel/resolver-default": "2.12.0",
- "@parcel/runtime-browser-hmr": "2.12.0",
- "@parcel/runtime-js": "2.12.0",
- "@parcel/runtime-react-refresh": "2.12.0",
- "@parcel/runtime-service-worker": "2.12.0",
- "@parcel/transformer-babel": "2.12.0",
- "@parcel/transformer-css": "2.12.0",
- "@parcel/transformer-html": "2.12.0",
- "@parcel/transformer-image": "2.12.0",
- "@parcel/transformer-js": "2.12.0",
- "@parcel/transformer-json": "2.12.0",
- "@parcel/transformer-postcss": "2.12.0",
- "@parcel/transformer-posthtml": "2.12.0",
- "@parcel/transformer-raw": "2.12.0",
- "@parcel/transformer-react-refresh-wrap": "2.12.0",
- "@parcel/transformer-svg": "2.12.0"
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.13.3.tgz",
+ "integrity": "sha512-WUsx83ic8DgLwwnL1Bua4lRgQqYjxiTT+DBxESGk1paNm1juWzyfPXEQDLXwiCTcWMQGiXQFQ8OuSISauVQ8dQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/bundler-default": "2.13.3",
+ "@parcel/compressor-raw": "2.13.3",
+ "@parcel/namer-default": "2.13.3",
+ "@parcel/optimizer-css": "2.13.3",
+ "@parcel/optimizer-htmlnano": "2.13.3",
+ "@parcel/optimizer-image": "2.13.3",
+ "@parcel/optimizer-svgo": "2.13.3",
+ "@parcel/optimizer-swc": "2.13.3",
+ "@parcel/packager-css": "2.13.3",
+ "@parcel/packager-html": "2.13.3",
+ "@parcel/packager-js": "2.13.3",
+ "@parcel/packager-raw": "2.13.3",
+ "@parcel/packager-svg": "2.13.3",
+ "@parcel/packager-wasm": "2.13.3",
+ "@parcel/reporter-dev-server": "2.13.3",
+ "@parcel/resolver-default": "2.13.3",
+ "@parcel/runtime-browser-hmr": "2.13.3",
+ "@parcel/runtime-js": "2.13.3",
+ "@parcel/runtime-react-refresh": "2.13.3",
+ "@parcel/runtime-service-worker": "2.13.3",
+ "@parcel/transformer-babel": "2.13.3",
+ "@parcel/transformer-css": "2.13.3",
+ "@parcel/transformer-html": "2.13.3",
+ "@parcel/transformer-image": "2.13.3",
+ "@parcel/transformer-js": "2.13.3",
+ "@parcel/transformer-json": "2.13.3",
+ "@parcel/transformer-postcss": "2.13.3",
+ "@parcel/transformer-posthtml": "2.13.3",
+ "@parcel/transformer-raw": "2.13.3",
+ "@parcel/transformer-react-refresh-wrap": "2.13.3",
+ "@parcel/transformer-svg": "2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/core": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.12.0.tgz",
- "integrity": "sha512-s+6pwEj+GfKf7vqGUzN9iSEPueUssCCQrCBUlcAfKrJe0a22hTUCjewpB0I7lNrCIULt8dkndD+sMdOrXsRl6Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/core/-/core-2.13.3.tgz",
+ "integrity": "sha512-SRZFtqGiaKHlZ2YAvf+NHvBFWS3GnkBvJMfOJM7kxJRK3M1bhbwJa/GgSdzqro5UVf9Bfj6E+pkdrRQIOZ7jMQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@mischnic/json-sourcemap": "^0.1.0",
- "@parcel/cache": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/graph": "3.2.0",
- "@parcel/logger": "2.12.0",
- "@parcel/package-manager": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/profiler": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/cache": "2.13.3",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3",
+ "@parcel/feature-flags": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/graph": "3.3.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/package-manager": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/profiler": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
- "abortcontroller-polyfill": "^1.1.9",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
"base-x": "^3.0.8",
"browserslist": "^4.6.6",
"clone": "^2.1.1",
- "dotenv": "^7.0.0",
- "dotenv-expand": "^5.1.0",
+ "dotenv": "^16.4.5",
+ "dotenv-expand": "^11.0.6",
"json5": "^2.2.0",
"msgpackr": "^1.9.9",
"nullthrows": "^1.1.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -422,16 +428,17 @@
}
},
"node_modules/@parcel/diagnostic": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.12.0.tgz",
- "integrity": "sha512-8f1NOsSFK+F4AwFCKynyIu9Kr/uWHC+SywAv4oS6Bv3Acig0gtwUjugk0C9UaB8ztBZiW5TQZhw+uPZn9T/lJA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.13.3.tgz",
+ "integrity": "sha512-C70KXLBaXLJvr7XCEVu8m6TqNdw1gQLxqg5BQ8roR62R4vWWDnOq8PEksxDi4Y8Z/FF4i3Sapv6tRx9iBNxDEg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@mischnic/json-sourcemap": "^0.1.0",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -439,12 +446,27 @@
}
},
"node_modules/@parcel/events": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.12.0.tgz",
- "integrity": "sha512-nmAAEIKLjW1kB2cUbCYSmZOGbnGj8wCzhqnK727zCCWaA25ogzAtt657GPOeFyqW77KyosU728Tl63Fc8hphIA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/events/-/events-2.13.3.tgz",
+ "integrity": "sha512-ZkSHTTbD/E+53AjUzhAWTnMLnxLEU5yRw0H614CaruGh+GjgOIKyukGeToF5Gf/lvZ159VrJCGE0Z5EpgHVkuQ==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/feature-flags": {
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/feature-flags/-/feature-flags-2.13.3.tgz",
+ "integrity": "sha512-UZm14QpamDFoUut9YtCZSpG1HxPs07lUwUCpsAYL0PpxASD3oWJQxIJGfDZPa2272DarXDG9adTKrNXvkHZblw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -452,38 +474,42 @@
}
},
"node_modules/@parcel/fs": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.12.0.tgz",
- "integrity": "sha512-NnFkuvou1YBtPOhTdZr44WN7I60cGyly2wpHzqRl62yhObyi1KvW0SjwOMa0QGNcBOIzp4G0CapoZ93hD0RG5Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/fs/-/fs-2.13.3.tgz",
+ "integrity": "sha512-+MPWAt0zr+TCDSlj1LvkORTjfB/BSffsE99A9AvScKytDSYYpY2s0t4vtV9unSh0FHMS2aBCZNJ4t7KL+DcPIg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/rust": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/feature-flags": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/types-internal": "2.13.3",
+ "@parcel/utils": "2.13.3",
"@parcel/watcher": "^2.0.7",
- "@parcel/workers": "2.12.0"
+ "@parcel/workers": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/graph": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-3.2.0.tgz",
- "integrity": "sha512-xlrmCPqy58D4Fg5umV7bpwDx5Vyt7MlnQPxW68vae5+BA4GSWetfZt+Cs5dtotMG2oCHzZxhIPt7YZ7NRyQzLA==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/@parcel/graph/-/graph-3.3.3.tgz",
+ "integrity": "sha512-pxs4GauEdvCN8nRd6wG3st6LvpHske3GfqGwUSR0P0X0pBPI1/NicvXz6xzp3rgb9gPWfbKXeI/2IOTfIxxVfg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
+ "@parcel/feature-flags": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -491,16 +517,17 @@
}
},
"node_modules/@parcel/logger": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.12.0.tgz",
- "integrity": "sha512-cJ7Paqa7/9VJ7C+KwgJlwMqTQBOjjn71FbKk0G07hydUEBISU2aDfmc/52o60ErL9l+vXB26zTrIBanbxS8rVg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/logger/-/logger-2.13.3.tgz",
+ "integrity": "sha512-8YF/ZhsQgd7ohQ2vEqcMD1Ag9JlJULROWRPGgGYLGD+twuxAiSdiFBpN3f+j4gQN4PYaLaIS/SwUFx11J243fQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0"
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -508,15 +535,16 @@
}
},
"node_modules/@parcel/markdown-ansi": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.12.0.tgz",
- "integrity": "sha512-WZz3rzL8k0H3WR4qTHX6Ic8DlEs17keO9gtD4MNGyMNQbqQEvQ61lWJaIH0nAtgEetu0SOITiVqdZrb8zx/M7w==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.13.3.tgz",
+ "integrity": "sha512-B4rUdlNUulJs2xOQuDbN7Hq5a9roq8IZUcJ1vQ8PAv+zMGb7KCfqIIr/BSCDYGhayfAGBVWW8x55Kvrl1zrDYw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "chalk": "^4.1.0"
+ "chalk": "^4.1.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -524,18 +552,19 @@
}
},
"node_modules/@parcel/namer-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.12.0.tgz",
- "integrity": "sha512-9DNKPDHWgMnMtqqZIMiEj/R9PNWW16lpnlHjwK3ciRlMPgjPJ8+UNc255teZODhX0T17GOzPdGbU/O/xbxVPzA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.13.3.tgz",
+ "integrity": "sha512-A2a5A5fuyNcjSGOS0hPcdQmOE2kszZnLIXof7UMGNkNkeC62KAG8WcFZH5RNOY3LT5H773hq51zmc2Y2gE5Rnw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -543,21 +572,22 @@
}
},
"node_modules/@parcel/node-resolver-core": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.3.0.tgz",
- "integrity": "sha512-rhPW9DYPEIqQBSlYzz3S0AjXxjN6Ub2yS6tzzsW/4S3Gpsgk/uEq4ZfxPvoPf/6TgZndVxmKwpmxaKtGMmf3cA==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.4.3.tgz",
+ "integrity": "sha512-IEnMks49egEic1ITBp59VQyHzkSQUXqpU9hOHwqN3KoSTdZ6rEgrXcS3pa6tdXay4NYGlcZ88kFCE8i/xYoVCg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@mischnic/json-sourcemap": "^0.1.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -565,22 +595,23 @@
}
},
"node_modules/@parcel/optimizer-css": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.12.0.tgz",
- "integrity": "sha512-ifbcC97fRzpruTjaa8axIFeX4MjjSIlQfem3EJug3L2AVqQUXnM1XO8L0NaXGNLTW2qnh1ZjIJ7vXT/QhsphsA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.13.3.tgz",
+ "integrity": "sha512-A8o9IVCv919vhv69SkLmyW2WjJR5WZgcMqV6L1uiGF8i8z18myrMhrp2JuSHx29PRT9uNyzNC4Xrd4StYjIhJg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"browserslist": "^4.6.6",
"lightningcss": "^1.22.1",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -588,20 +619,22 @@
}
},
"node_modules/@parcel/optimizer-htmlnano": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.12.0.tgz",
- "integrity": "sha512-MfPMeCrT8FYiOrpFHVR+NcZQlXAptK2r4nGJjfT+ndPBhEEZp4yyL7n1y7HfX9geg5altc4WTb4Gug7rCoW8VQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.13.3.tgz",
+ "integrity": "sha512-K4Uvg0Sy2pECP7pdvvbud++F0pfcbNkq+IxTrgqBX5HJnLEmRZwgdvZEKF43oMEolclMnURMQRGjRplRaPdbXg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"htmlnano": "^2.0.0",
"nullthrows": "^1.1.1",
- "posthtml": "^0.16.5",
- "svgo": "^2.4.0"
+ "posthtml": "^0.16.5"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -609,43 +642,44 @@
}
},
"node_modules/@parcel/optimizer-image": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.12.0.tgz",
- "integrity": "sha512-bo1O7raeAIbRU5nmNVtx8divLW9Xqn0c57GVNGeAK4mygnQoqHqRZ0mR9uboh64pxv6ijXZHPhKvU9HEpjPjBQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.13.3.tgz",
+ "integrity": "sha512-wlDUICA29J4UnqkKrWiyt68g1e85qfYhp4zJFcFJL0LX1qqh1QwsLUz3YJ+KlruoqPxJSFEC8ncBEKiVCsqhEQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0"
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/optimizer-svgo": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.12.0.tgz",
- "integrity": "sha512-Kyli+ZZXnoonnbeRQdoWwee9Bk2jm/49xvnfb+2OO8NN0d41lblBoRhOyFiScRnJrw7eVl1Xrz7NTkXCIO7XFQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.13.3.tgz",
+ "integrity": "sha512-piIKxQKzhZK54dJR6yqIcq+urZmpsfgUpLCZT3cnWlX4ux5+S2iN66qqZBs0zVn+a58LcWcoP4Z9ieiJmpiu2w==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
- "svgo": "^2.4.0"
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -653,21 +687,22 @@
}
},
"node_modules/@parcel/optimizer-swc": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.12.0.tgz",
- "integrity": "sha512-iBi6LZB3lm6WmbXfzi8J3DCVPmn4FN2lw7DGXxUXu7MouDPVWfTsM6U/5TkSHJRNRogZ2gqy5q9g34NPxHbJcw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.13.3.tgz",
+ "integrity": "sha512-zNSq6oWqLlW8ksPIDjM0VgrK6ZAJbPQCDvs1V+p0oX3CzEe85lT5VkRpnfrN1+/vvEJNGL8e60efHKpI+rXGTA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
- "@swc/core": "^1.3.36",
+ "@parcel/utils": "2.13.3",
+ "@swc/core": "^1.7.26",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -675,48 +710,50 @@
}
},
"node_modules/@parcel/package-manager": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.12.0.tgz",
- "integrity": "sha512-0nvAezcjPx9FT+hIL+LS1jb0aohwLZXct7jAh7i0MLMtehOi0z1Sau+QpgMlA9rfEZZ1LIeFdnZZwqSy7Ccspw==",
- "dev": true,
- "dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/node-resolver-core": "3.3.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
- "@swc/core": "^1.3.36",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.13.3.tgz",
+ "integrity": "sha512-FLNI5OrZxymGf/Yln0E/kjnGn5sdkQAxW7pQVdtuM+5VeN75yibJRjsSGv88PvJ+KvpD2ANgiIJo1RufmoPcww==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/node-resolver-core": "3.4.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
+ "@swc/core": "^1.7.26",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/packager-css": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.12.0.tgz",
- "integrity": "sha512-j3a/ODciaNKD19IYdWJT+TP+tnhhn5koBGBWWtrKSu0UxWpnezIGZetit3eE+Y9+NTePalMkvpIlit2eDhvfJA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.13.3.tgz",
+ "integrity": "sha512-ghDqRMtrUwaDERzFm9le0uz2PTeqqsjsW0ihQSZPSAptElRl9o5BR+XtMPv3r7Ui0evo+w35gD55oQCJ28vCig==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"lightningcss": "^1.22.1",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -724,20 +761,21 @@
}
},
"node_modules/@parcel/packager-html": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.12.0.tgz",
- "integrity": "sha512-PpvGB9hFFe+19NXGz2ApvPrkA9GwEqaDAninT+3pJD57OVBaxB8U+HN4a5LICKxjUppPPqmrLb6YPbD65IX4RA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.13.3.tgz",
+ "integrity": "sha512-jDLnKSA/EzVEZ3/aegXO3QJ/Ij732AgBBkIQfeC8tUoxwVz5b3HiPBAjVjcUSfZs7mdBSHO+ELWC3UD+HbsIrQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -745,23 +783,24 @@
}
},
"node_modules/@parcel/packager-js": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.12.0.tgz",
- "integrity": "sha512-viMF+FszITRRr8+2iJyk+4ruGiL27Y6AF7hQ3xbJfzqnmbOhGFtLTQwuwhOLqN/mWR2VKdgbLpZSarWaO3yAMg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.13.3.tgz",
+ "integrity": "sha512-0pMHHf2zOn7EOJe88QJw5h/wcV1bFfj6cXVcE55Wa8GX3V+SdCgolnlvNuBcRQ1Tlx0Xkpo+9hMFVIQbNQY6zw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
"globals": "^13.2.0",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -773,6 +812,7 @@
"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -788,6 +828,7 @@
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true,
+ "license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=10"
},
@@ -796,16 +837,17 @@
}
},
"node_modules/@parcel/packager-raw": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.12.0.tgz",
- "integrity": "sha512-tJZqFbHqP24aq1F+OojFbQIc09P/u8HAW5xfndCrFnXpW4wTgM3p03P0xfw3gnNq+TtxHJ8c3UFE5LnXNNKhYA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.13.3.tgz",
+ "integrity": "sha512-AWu4UB+akBdskzvT3KGVHIdacU9f7cI678DQQ1jKQuc9yZz5D0VFt3ocFBOmvDfEQDF0uH3jjtJR7fnuvX7Biw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -813,19 +855,20 @@
}
},
"node_modules/@parcel/packager-svg": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.12.0.tgz",
- "integrity": "sha512-ldaGiacGb2lLqcXas97k8JiZRbAnNREmcvoY2W2dvW4loVuDT9B9fU777mbV6zODpcgcHWsLL3lYbJ5Lt3y9cg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.13.3.tgz",
+ "integrity": "sha512-tKGRiFq/4jh5u2xpTstNQ7gu+RuZWzlWqpw5NaFmcKe6VQe5CMcS499xTFoREAGnRvevSeIgC38X1a+VOo+/AA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
"posthtml": "^0.16.4"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -833,16 +876,17 @@
}
},
"node_modules/@parcel/packager-wasm": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/packager-wasm/-/packager-wasm-2.12.0.tgz",
- "integrity": "sha512-fYqZzIqO9fGYveeImzF8ll6KRo2LrOXfD+2Y5U3BiX/wp9wv17dz50QLDQm9hmTcKGWxK4yWqKQh+Evp/fae7A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/packager-wasm/-/packager-wasm-2.13.3.tgz",
+ "integrity": "sha512-SZB56/b230vFrSehVXaUAWjJmWYc89gzb8OTLkBm7uvtFtov2J1R8Ig9TTJwinyXE3h84MCFP/YpQElSfoLkJw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">=12.0.0",
- "parcel": "^2.12.0"
+ "node": ">=16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -850,15 +894,16 @@
}
},
"node_modules/@parcel/plugin": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.12.0.tgz",
- "integrity": "sha512-nc/uRA8DiMoe4neBbzV6kDndh/58a4wQuGKw5oEoIwBCHUvE2W8ZFSu7ollSXUGRzfacTt4NdY8TwS73ScWZ+g==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.13.3.tgz",
+ "integrity": "sha512-cterKHHcwg6q11Gpif/aqvHo056TR+yDVJ3fSdiG2xr5KD1VZ2B3hmofWERNNwjMcnR1h9Xq40B7jCKUhOyNFA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/types": "2.12.0"
+ "@parcel/types": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -866,17 +911,19 @@
}
},
"node_modules/@parcel/profiler": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.12.0.tgz",
- "integrity": "sha512-q53fvl5LDcFYzMUtSusUBZSjQrKjMlLEBgKeQHFwkimwR1mgoseaDBDuNz0XvmzDzF1UelJ02TUKCGacU8W2qA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.13.3.tgz",
+ "integrity": "sha512-ok6BwWSLvyHe5TuSXjSacYnDStFgP5Y30tA9mbtWSm0INDsYf+m5DqzpYPx8U54OaywWMK8w3MXUClosJX3aPA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3",
+ "@parcel/types-internal": "2.13.3",
"chrome-trace-event": "^1.0.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -884,20 +931,21 @@
}
},
"node_modules/@parcel/reporter-cli": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.12.0.tgz",
- "integrity": "sha512-TqKsH4GVOLPSCanZ6tcTPj+rdVHERnt5y4bwTM82cajM21bCX1Ruwp8xOKU+03091oV2pv5ieB18pJyRF7IpIw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.13.3.tgz",
+ "integrity": "sha512-EA5tKt/6bXYNMEavSs35qHlFdx6cZmRazlZxPBgxPePQYoouNAPMNLUOEQozaPhz9f5fvNDN7EHOFaAWcdO2LA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
- "chalk": "^4.1.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/types": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "chalk": "^4.1.2",
"term-size": "^2.2.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -905,17 +953,18 @@
}
},
"node_modules/@parcel/reporter-dev-server": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.12.0.tgz",
- "integrity": "sha512-tIcDqRvAPAttRlTV28dHcbWT5K2r/MBFks7nM4nrEDHWtnrCwimkDmZTc1kD8QOCCjGVwRHcQybpHvxfwol6GA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.13.3.tgz",
+ "integrity": "sha512-ZNeFp6AOIQFv7mZIv2P5O188dnZHNg0ymeDVcakfZomwhpSva2dFNS3AnvWo4eyWBlUxkmQO8BtaxeWTs7jAuA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0"
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -923,19 +972,20 @@
}
},
"node_modules/@parcel/reporter-tracer": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.12.0.tgz",
- "integrity": "sha512-g8rlu9GxB8Ut/F8WGx4zidIPQ4pcYFjU9bZO+fyRIPrSUFH2bKijCnbZcr4ntqzDGx74hwD6cCG4DBoleq2UlQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.13.3.tgz",
+ "integrity": "sha512-aBsVPI8jLZTDkFYrI69GxnsdvZKEYerkPsu935LcX9rfUYssOnmmUP+3oI+8fbg+qNjJuk9BgoQ4hCp9FOphMQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"chrome-trace-event": "^1.0.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -943,17 +993,18 @@
}
},
"node_modules/@parcel/resolver-default": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.12.0.tgz",
- "integrity": "sha512-uuhbajTax37TwCxu7V98JtRLiT6hzE4VYSu5B7Qkauy14/WFt2dz6GOUXPgVsED569/hkxebPx3KCMtZW6cHHA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.13.3.tgz",
+ "integrity": "sha512-urBZuRALWT9pFMeWQ8JirchLmsQEyI9lrJptiwLbJWrwvmlwSUGkcstmPwoNRf/aAQjICB7ser/247Vny0pFxA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/node-resolver-core": "3.3.0",
- "@parcel/plugin": "2.12.0"
+ "@parcel/node-resolver-core": "3.4.3",
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -961,17 +1012,18 @@
}
},
"node_modules/@parcel/runtime-browser-hmr": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.12.0.tgz",
- "integrity": "sha512-4ZLp2FWyD32r0GlTulO3+jxgsA3oO1P1b5oO2IWuWilfhcJH5LTiazpL5YdusUjtNn9PGN6QLAWfxmzRIfM+Ow==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.13.3.tgz",
+ "integrity": "sha512-EAcPojQFUNUGUrDk66cu3ySPO0NXRVS5CKPd4QrxPCVVbGzde4koKu8krC/TaGsoyUqhie8HMnS70qBP0GFfcQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0"
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -979,19 +1031,20 @@
}
},
"node_modules/@parcel/runtime-js": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.12.0.tgz",
- "integrity": "sha512-sBerP32Z1crX5PfLNGDSXSdqzlllM++GVnVQVeM7DgMKS8JIFG3VLi28YkX+dYYGtPypm01JoIHCkvwiZEcQJg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.13.3.tgz",
+ "integrity": "sha512-62OucNAnxb2Q0uyTFWW/0Hvv2DJ4b5H6neh/YFu2/wmxaZ37xTpEuEcG2do7KW54xE5DeLP+RliHLwi4NvR3ww==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -999,19 +1052,20 @@
}
},
"node_modules/@parcel/runtime-react-refresh": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.12.0.tgz",
- "integrity": "sha512-SCHkcczJIDFTFdLTzrHTkQ0aTrX3xH6jrA4UsCBL6ji61+w+ohy4jEEe9qCgJVXhnJfGLE43HNXek+0MStX+Mw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.13.3.tgz",
+ "integrity": "sha512-PYZ1klpJVwqE3WuifILjtF1dugtesHEuJcXYZI85T6UoRSD5ctS1nAIpZzT14Ga1lRt/jd+eAmhWL1l3m/Vk1Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"react-error-overlay": "6.0.9",
- "react-refresh": "^0.9.0"
+ "react-refresh": ">=0.9 <=0.14"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1019,18 +1073,19 @@
}
},
"node_modules/@parcel/runtime-service-worker": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.12.0.tgz",
- "integrity": "sha512-BXuMBsfiwpIEnssn+jqfC3jkgbS8oxeo3C7xhSQsuSv+AF2FwY3O3AO1c1RBskEW3XrBLNINOJujroNw80VTKA==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.13.3.tgz",
+ "integrity": "sha512-BjMhPuT7Us1+YIo31exPRwomPiL+jrZZS5UUAwlEW2XGHDceEotzRM94LwxeFliCScT4IOokGoxixm19qRuzWg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1038,12 +1093,13 @@
}
},
"node_modules/@parcel/rust": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/rust/-/rust-2.12.0.tgz",
- "integrity": "sha512-005cldMdFZFDPOjbDVEXcINQ3wT4vrxvSavRWI3Az0e3E18exO/x/mW9f648KtXugOXMAqCEqhFHcXECL9nmMw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/rust/-/rust-2.13.3.tgz",
+ "integrity": "sha512-dLq85xDAtzr3P5200cvxk+8WXSWauYbxuev9LCPdwfhlaWo/JEj6cu9seVdWlkagjGwkoV1kXC+GGntgUXOLAQ==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -1063,23 +1119,24 @@
}
},
"node_modules/@parcel/transformer-babel": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.12.0.tgz",
- "integrity": "sha512-zQaBfOnf/l8rPxYGnsk/ufh/0EuqvmnxafjBIpKZ//j6rGylw5JCqXSb1QvvAqRYruKeccxGv7+HrxpqKU6V4A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.13.3.tgz",
+ "integrity": "sha512-ikzK9f5WTFrdQsPitQgjCPH6HmVU8AQPRemIJ2BndYhtodn5PQut5cnSvTrqax8RjYvheEKCQk/Zb/uR7qgS3g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"browserslist": "^4.6.6",
"json5": "^2.2.0",
"nullthrows": "^1.1.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1087,22 +1144,23 @@
}
},
"node_modules/@parcel/transformer-css": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.12.0.tgz",
- "integrity": "sha512-vXhOqoAlQGATYyQ433Z1DXKmiKmzOAUmKysbYH3FD+LKEKLMEl/pA14goqp00TW+A/EjtSKKyeMyHlMIIUqj4Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.13.3.tgz",
+ "integrity": "sha512-zbrNURGph6JeVADbGydyZ7lcu/izj41kDxQ9xw4RPRW/3rofQiTU0OTREi+uBWiMENQySXVivEdzHA9cA+aLAA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
+ "@parcel/utils": "2.13.3",
"browserslist": "^4.6.6",
"lightningcss": "^1.22.1",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1110,91 +1168,108 @@
}
},
"node_modules/@parcel/transformer-html": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.12.0.tgz",
- "integrity": "sha512-5jW4dFFBlYBvIQk4nrH62rfA/G/KzVzEDa6S+Nne0xXhglLjkm64Ci9b/d4tKZfuGWUbpm2ASAq8skti/nfpXw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.13.3.tgz",
+ "integrity": "sha512-Yf74FkL9RCCB4+hxQRVMNQThH9+fZ5w0NLiQPpWUOcgDEEyxTi4FWPQgEBsKl/XK2ehdydbQB9fBgPQLuQxwPg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5",
- "posthtml-parser": "^0.10.1",
+ "posthtml-parser": "^0.12.1",
"posthtml-render": "^3.0.0",
"semver": "^7.5.2",
"srcset": "4"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
+ "node_modules/@parcel/transformer-html/node_modules/srcset": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
+ "integrity": "sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/@parcel/transformer-image": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.12.0.tgz",
- "integrity": "sha512-8hXrGm2IRII49R7lZ0RpmNk27EhcsH+uNKsvxuMpXPuEnWgC/ha/IrjaI29xCng1uGur74bJF43NUSQhR4aTdw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.13.3.tgz",
+ "integrity": "sha512-wL1CXyeFAqbp2wcEq/JD3a/tbAyVIDMTC6laQxlIwnVV7dsENhK1qRuJZuoBdixESeUpFQSmmQvDIhcfT/cUUg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/transformer-js": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.12.0.tgz",
- "integrity": "sha512-OSZpOu+FGDbC/xivu24v092D9w6EGytB3vidwbdiJ2FaPgfV7rxS0WIUjH4I0OcvHAcitArRXL0a3+HrNTdQQw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.13.3.tgz",
+ "integrity": "sha512-KqfNGn1IHzDoN2aPqt4nDksgb50Xzcny777C7A7hjlQ3cmkjyJrixYjzzsPaPSGJ+kJpknh3KE8unkQ9mhFvRQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/utils": "2.12.0",
- "@parcel/workers": "2.12.0",
+ "@parcel/utils": "2.13.3",
+ "@parcel/workers": "2.13.3",
"@swc/helpers": "^0.5.0",
"browserslist": "^4.6.6",
"nullthrows": "^1.1.1",
- "regenerator-runtime": "^0.13.7",
+ "regenerator-runtime": "^0.14.1",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@parcel/transformer-json": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.12.0.tgz",
- "integrity": "sha512-Utv64GLRCQILK5r0KFs4o7I41ixMPllwOLOhkdjJKvf1hZmN6WqfOmB1YLbWS/y5Zb/iB52DU2pWZm96vLFQZQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.13.3.tgz",
+ "integrity": "sha512-rrq0ab6J0w9ePtsxi0kAvpCmrUYXXAx1Z5PATZakv89rSYbHBKEdXxyCoKFui/UPVCUEGVs5r0iOFepdHpIyeA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
+ "@parcel/plugin": "2.13.3",
"json5": "^2.2.0"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1202,23 +1277,24 @@
}
},
"node_modules/@parcel/transformer-postcss": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.12.0.tgz",
- "integrity": "sha512-FZqn+oUtiLfPOn67EZxPpBkfdFiTnF4iwiXPqvst3XI8H+iC+yNgzmtJkunOOuylpYY6NOU5jT8d7saqWSDv2Q==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.13.3.tgz",
+ "integrity": "sha512-AIiWpU0QSFBrPcYIqAnhqB8RGE6yHFznnxztfg1t2zMSOnK3xoU6xqYKv8H/MduShGGrC3qVOeDfM8MUwzL3cw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
+ "@parcel/utils": "2.13.3",
"clone": "^2.1.1",
"nullthrows": "^1.1.1",
"postcss-value-parser": "^4.2.0",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1226,22 +1302,23 @@
}
},
"node_modules/@parcel/transformer-posthtml": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.12.0.tgz",
- "integrity": "sha512-z6Z7rav/pcaWdeD+2sDUcd0mmNZRUvtHaUGa50Y2mr+poxrKilpsnFMSiWBT+oOqPt7j71jzDvrdnAF4XkCljg==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.13.3.tgz",
+ "integrity": "sha512-5GSLyccpHASwFAu3uJ83gDIBSvfsGdVmhJvy0Vxe+K1Fklk2ibhvvtUHMhB7mg6SPHC+R9jsNc3ZqY04ZLeGjw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5",
- "posthtml-parser": "^0.10.1",
+ "posthtml-parser": "^0.12.1",
"posthtml-render": "^3.0.0",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1249,16 +1326,17 @@
}
},
"node_modules/@parcel/transformer-raw": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.12.0.tgz",
- "integrity": "sha512-Ht1fQvXxix0NncdnmnXZsa6hra20RXYh1VqhBYZLsDfkvGGFnXIgO03Jqn4Z8MkKoa0tiNbDhpKIeTjyclbBxQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.13.3.tgz",
+ "integrity": "sha512-BFsAbdQF0l8/Pdb7dSLJeYcd8jgwvAUbHgMink2MNXJuRUvDl19Gns8jVokU+uraFHulJMBj40+K/RTd33in4g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0"
+ "@parcel/plugin": "2.13.3"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1266,18 +1344,19 @@
}
},
"node_modules/@parcel/transformer-react-refresh-wrap": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.12.0.tgz",
- "integrity": "sha512-GE8gmP2AZtkpBIV5vSCVhewgOFRhqwdM5Q9jNPOY5PKcM3/Ff0qCqDiTzzGLhk0/VMBrdjssrfZkVx6S/lHdJw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.13.3.tgz",
+ "integrity": "sha512-mOof4cRyxsZRdg8kkWaFtaX98mHpxUhcGPU+nF9RQVa9q737ItxrorsPNR9hpZAyE2TtFNflNW7RoYsgvlLw8w==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
- "@parcel/utils": "2.12.0",
- "react-refresh": "^0.9.0"
+ "@parcel/plugin": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "react-refresh": ">=0.9 <=0.14"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1285,18 +1364,19 @@
}
},
"node_modules/@parcel/transformer-sass": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-sass/-/transformer-sass-2.12.0.tgz",
- "integrity": "sha512-xLLoSLPST+2AHJwFRLl4foArDjjy6P1RChP3TxMU2MVS1sbKGJnfFhFpHAacH8ASjuGtu5rbpfpHRZePlvoZxw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-sass/-/transformer-sass-2.13.3.tgz",
+ "integrity": "sha512-M8Ntscr+RGoQJ2ymIvT+f/1THea/6pVLJY2ky2N+fhtM6/iFx/7WnpJKL37IKAGIOn5AhqDqc0tPjK6H9moIbA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/plugin": "2.12.0",
+ "@parcel/plugin": "2.13.3",
"@parcel/source-map": "^2.1.1",
"sass": "^1.38.0"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1304,23 +1384,24 @@
}
},
"node_modules/@parcel/transformer-svg": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.12.0.tgz",
- "integrity": "sha512-cZJqGRJ4JNdYcb+vj94J7PdOuTnwyy45dM9xqbIMH+HSiiIkfrMsdEwYft0GTyFTdsnf+hdHn3tau7Qa5hhX+A==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.13.3.tgz",
+ "integrity": "sha512-9jm7ZF4KHIrGLWlw/SFUz5KKJ20nxHvjFAmzde34R9Wu+F1BOjLZxae7w4ZRwvIc+UVOUcBBQFmhSVwVDZg6Dw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/plugin": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/plugin": "2.13.3",
+ "@parcel/rust": "2.13.3",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.5",
- "posthtml-parser": "^0.10.1",
+ "posthtml-parser": "^0.12.1",
"posthtml-render": "^3.0.0",
"semver": "^7.5.2"
},
"engines": {
- "node": ">= 12.0.0",
- "parcel": "^2.12.0"
+ "node": ">= 16.0.0",
+ "parcel": "^2.13.3"
},
"funding": {
"type": "opencollective",
@@ -1328,37 +1409,47 @@
}
},
"node_modules/@parcel/types": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.12.0.tgz",
- "integrity": "sha512-8zAFiYNCwNTQcglIObyNwKfRYQK5ELlL13GuBOrSMxueUiI5ylgsGbTS1N7J3dAGZixHO8KhHGv5a71FILn9rQ==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/types/-/types-2.13.3.tgz",
+ "integrity": "sha512-+RpFHxx8fy8/dpuehHUw/ja9PRExC3wJoIlIIF42E7SLu2SvlTHtKm6EfICZzxCXNEBzjoDbamCRcN0nmTPlhw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/types-internal": "2.13.3",
+ "@parcel/workers": "2.13.3"
+ }
+ },
+ "node_modules/@parcel/types-internal": {
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/types-internal/-/types-internal-2.13.3.tgz",
+ "integrity": "sha512-Lhx0n+9RCp+Ipktf/I+CLm3zE9Iq9NtDd8b2Vr5lVWyoT8AbzBKIHIpTbhLS4kjZ80L3I6o93OYjqAaIjsqoZw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/cache": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/package-manager": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/feature-flags": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "@parcel/workers": "2.12.0",
"utility-types": "^3.10.0"
}
},
"node_modules/@parcel/utils": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.12.0.tgz",
- "integrity": "sha512-z1JhLuZ8QmDaYoEIuUCVZlhcFrS7LMfHrb2OCRui5SQFntRWBH2fNM6H/fXXUkT9SkxcuFP2DUA6/m4+Gkz72g==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/utils/-/utils-2.13.3.tgz",
+ "integrity": "sha512-yxY9xw2wOUlJaScOXYZmMGoZ4Ck4Kqj+p6Koe5kLkkWM1j98Q0Dj2tf/mNvZi4yrdnlm+dclCwNRnuE8Q9D+pw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/codeframe": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/markdown-ansi": "2.12.0",
- "@parcel/rust": "2.12.0",
+ "@parcel/codeframe": "2.13.3",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/markdown-ansi": "2.13.3",
+ "@parcel/rust": "2.13.3",
"@parcel/source-map": "^2.1.1",
- "chalk": "^4.1.0",
+ "chalk": "^4.1.2",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -1661,27 +1752,28 @@
}
},
"node_modules/@parcel/workers": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.12.0.tgz",
- "integrity": "sha512-zv5We5Jmb+ZWXlU6A+AufyjY4oZckkxsZ8J4dvyWL0W8IQvGO1JB4FGeryyttzQv3RM3OxcN/BpTGPiDG6keBw==",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/@parcel/workers/-/workers-2.13.3.tgz",
+ "integrity": "sha512-oAHmdniWTRwwwsKbcF4t3VjOtKN+/W17Wj5laiYB+HLkfsjGTfIQPj3sdXmrlBAGpI4omIcvR70PHHXnfdTfwA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@parcel/diagnostic": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/profiler": "2.12.0",
- "@parcel/types": "2.12.0",
- "@parcel/utils": "2.12.0",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/profiler": "2.13.3",
+ "@parcel/types-internal": "2.13.3",
+ "@parcel/utils": "2.13.3",
"nullthrows": "^1.1.1"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"peerDependencies": {
- "@parcel/core": "^2.12.0"
+ "@parcel/core": "^2.13.3"
}
},
"node_modules/@popperjs/core": {
@@ -1922,27 +2014,12 @@
"@swc/counter": "^0.1.3"
}
},
- "node_modules/@trysound/sax": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
- "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
- "dev": true,
- "engines": {
- "node": ">=10.13.0"
- }
- },
"node_modules/@types/json5": {
"version": "0.0.29",
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
"dev": true
},
- "node_modules/abortcontroller-polyfill": {
- "version": "1.7.5",
- "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz",
- "integrity": "sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==",
- "dev": true
- },
"node_modules/acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -2216,12 +2293,6 @@
"version": "1.0.0",
"resolved": "git+ssh://git@gitlab.com/eappointment/zmsentities.git#34257f84656f5527d3e66005c9290ac6fd1a606e"
},
- "node_modules/boolbase": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
- "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
- "dev": true
- },
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2410,6 +2481,7 @@
"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6.0"
}
@@ -2469,12 +2541,13 @@
"dev": true
},
"node_modules/commander": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
- "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+ "version": "12.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+ "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">= 10"
+ "node": ">=18"
}
},
"node_modules/concat-map": {
@@ -2488,6 +2561,7 @@
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
"integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"env-paths": "^2.2.1",
"import-fresh": "^3.3.0",
@@ -2513,13 +2587,15 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
- "dev": true
+ "dev": true,
+ "license": "Python-2.0"
},
"node_modules/cosmiconfig/node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"argparse": "^2.0.1"
},
@@ -2552,59 +2628,6 @@
"semver": "bin/semver"
}
},
- "node_modules/css-select": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
- "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
- "dev": true,
- "dependencies": {
- "boolbase": "^1.0.0",
- "css-what": "^6.0.1",
- "domhandler": "^4.3.1",
- "domutils": "^2.8.0",
- "nth-check": "^2.0.1"
- },
- "funding": {
- "url": "https://github.com/sponsors/fb55"
- }
- },
- "node_modules/css-tree": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
- "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
- "dev": true,
- "dependencies": {
- "mdn-data": "2.0.14",
- "source-map": "^0.6.1"
- },
- "engines": {
- "node": ">=8.0.0"
- }
- },
- "node_modules/css-what": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
- "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
- "dev": true,
- "engines": {
- "node": ">= 6"
- },
- "funding": {
- "url": "https://github.com/sponsors/fb55"
- }
- },
- "node_modules/csso": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
- "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
- "dev": true,
- "dependencies": {
- "css-tree": "^1.1.2"
- },
- "engines": {
- "node": ">=8.0.0"
- }
- },
"node_modules/data-view-buffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
@@ -2754,28 +2777,20 @@
}
},
"node_modules/dom-serializer": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
- "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+ "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "domelementtype": "^2.0.1",
- "domhandler": "^4.2.0",
- "entities": "^2.0.0"
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.2",
+ "entities": "^4.2.0"
},
"funding": {
"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
}
},
- "node_modules/dom-serializer/node_modules/entities": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
- "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
- "dev": true,
- "funding": {
- "url": "https://github.com/fb55/entities?sponsor=1"
- }
- },
"node_modules/dom7": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-3.0.0.tgz",
@@ -2794,15 +2809,17 @@
"type": "github",
"url": "https://github.com/sponsors/fb55"
}
- ]
+ ],
+ "license": "BSD-2-Clause"
},
"node_modules/domhandler": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
- "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+ "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
- "domelementtype": "^2.2.0"
+ "domelementtype": "^2.3.0"
},
"engines": {
"node": ">= 4"
@@ -2812,33 +2829,48 @@
}
},
"node_modules/domutils": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
- "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+ "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
- "dom-serializer": "^1.0.1",
- "domelementtype": "^2.2.0",
- "domhandler": "^4.2.0"
+ "dom-serializer": "^2.0.0",
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3"
},
"funding": {
"url": "https://github.com/fb55/domutils?sponsor=1"
}
},
"node_modules/dotenv": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
- "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
+ "version": "16.4.7",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+ "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
"dev": true,
+ "license": "BSD-2-Clause",
"engines": {
- "node": ">=6"
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://dotenvx.com"
}
},
"node_modules/dotenv-expand": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
- "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
- "dev": true
+ "version": "11.0.7",
+ "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
+ "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "dotenv": "^16.4.5"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://dotenvx.com"
+ }
},
"node_modules/electron-to-chromium": {
"version": "1.5.51",
@@ -2853,10 +2885,11 @@
"dev": true
},
"node_modules/entities": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
- "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
"dev": true,
+ "license": "BSD-2-Clause",
"engines": {
"node": ">=0.12"
},
@@ -2869,6 +2902,7 @@
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
"integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6"
}
@@ -2878,6 +2912,7 @@
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"is-arrayish": "^0.2.1"
}
@@ -3757,6 +3792,7 @@
"resolved": "https://registry.npmjs.org/htmlnano/-/htmlnano-2.1.1.tgz",
"integrity": "sha512-kAERyg/LuNZYmdqgCdYvugyLWNFAm8MWXpQMz1pLpetmCbFwoMxvkSoaAMlFrOC4OKTWI4KlZGT/RsNxg4ghOw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"cosmiconfig": "^9.0.0",
"posthtml": "^0.16.5",
@@ -3800,9 +3836,9 @@
}
},
"node_modules/htmlparser2": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
- "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
+ "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
"dev": true,
"funding": [
"https://github.com/fb55/htmlparser2?sponsor=1",
@@ -3811,11 +3847,12 @@
"url": "https://github.com/sponsors/fb55"
}
],
+ "license": "MIT",
"dependencies": {
- "domelementtype": "^2.0.1",
- "domhandler": "^4.2.2",
- "domutils": "^2.8.0",
- "entities": "^3.0.1"
+ "domelementtype": "^2.3.0",
+ "domhandler": "^5.0.3",
+ "domutils": "^3.1.0",
+ "entities": "^4.5.0"
}
},
"node_modules/iconv-lite": {
@@ -3966,7 +4003,8 @@
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/is-bigint": {
"version": "1.0.4",
@@ -4087,7 +4125,8 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz",
"integrity": "sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA==",
- "dev": true
+ "dev": true,
+ "license": "ISC"
},
"node_modules/is-negative-zero": {
"version": "2.0.3",
@@ -4253,7 +4292,8 @@
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/json-schema-traverse": {
"version": "0.4.1",
@@ -4293,10 +4333,11 @@
}
},
"node_modules/lightningcss": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.28.1.tgz",
- "integrity": "sha512-KRDkHlLlNj3DWh79CDt93fPlRJh2W1AuHV0ZSZAMMuN7lqlsZTV5842idfS1urWG8q9tc17velp1gCXhY7sLnQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.1.tgz",
+ "integrity": "sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==",
"dev": true,
+ "license": "MPL-2.0",
"dependencies": {
"detect-libc": "^1.0.3"
},
@@ -4308,26 +4349,27 @@
"url": "https://opencollective.com/parcel"
},
"optionalDependencies": {
- "lightningcss-darwin-arm64": "1.28.1",
- "lightningcss-darwin-x64": "1.28.1",
- "lightningcss-freebsd-x64": "1.28.1",
- "lightningcss-linux-arm-gnueabihf": "1.28.1",
- "lightningcss-linux-arm64-gnu": "1.28.1",
- "lightningcss-linux-arm64-musl": "1.28.1",
- "lightningcss-linux-x64-gnu": "1.28.1",
- "lightningcss-linux-x64-musl": "1.28.1",
- "lightningcss-win32-arm64-msvc": "1.28.1",
- "lightningcss-win32-x64-msvc": "1.28.1"
+ "lightningcss-darwin-arm64": "1.29.1",
+ "lightningcss-darwin-x64": "1.29.1",
+ "lightningcss-freebsd-x64": "1.29.1",
+ "lightningcss-linux-arm-gnueabihf": "1.29.1",
+ "lightningcss-linux-arm64-gnu": "1.29.1",
+ "lightningcss-linux-arm64-musl": "1.29.1",
+ "lightningcss-linux-x64-gnu": "1.29.1",
+ "lightningcss-linux-x64-musl": "1.29.1",
+ "lightningcss-win32-arm64-msvc": "1.29.1",
+ "lightningcss-win32-x64-msvc": "1.29.1"
}
},
"node_modules/lightningcss-darwin-arm64": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.28.1.tgz",
- "integrity": "sha512-VG3vvzM0m/rguCdm76DdobNeNJnHK+jWcdkNLFWHLh9YCotRvbRIt45JxwcHlIF8TDqWStVLTdghq5NaigVCBQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.29.1.tgz",
+ "integrity": "sha512-HtR5XJ5A0lvCqYAoSv2QdZZyoHNttBpa5EP9aNuzBQeKGfbyH5+UipLWvVzpP4Uml5ej4BYs5I9Lco9u1fECqw==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"darwin"
@@ -4341,13 +4383,14 @@
}
},
"node_modules/lightningcss-darwin-x64": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.28.1.tgz",
- "integrity": "sha512-O7ORdislvKfMohFl4Iq7fxKqdJOuuxArcglVI3amuFO5DJ0wfV3Gxgi1JRo49slfr7OVzJQEHLG4muTWYM5cTQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.29.1.tgz",
+ "integrity": "sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"darwin"
@@ -4361,13 +4404,14 @@
}
},
"node_modules/lightningcss-freebsd-x64": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.28.1.tgz",
- "integrity": "sha512-b7sF89B31kYYijxVcFO7l5u6UNA862YstNu+3YbLl/IQKzveL4a5cwR5cdpG+OOhErg/c2u9WCmzZoX2I5GBvw==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.29.1.tgz",
+ "integrity": "sha512-0SUW22fv/8kln2LnIdOCmSuXnxgxVC276W5KLTwoehiO0hxkacBxjHOL5EtHD8BAXg2BvuhsJPmVMasvby3LiQ==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"freebsd"
@@ -4381,13 +4425,14 @@
}
},
"node_modules/lightningcss-linux-arm-gnueabihf": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.28.1.tgz",
- "integrity": "sha512-p61kXwvhUDLLzkWHjzSFfUBW/F0iy3jr3CWi3k8SKULtJEsJXTI9DqRm9EixxMSe2AMBQBt4auTYiQL4B1N51A==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.29.1.tgz",
+ "integrity": "sha512-sD32pFvlR0kDlqsOZmYqH/68SqUMPNj+0pucGxToXZi4XZgZmqeX/NkxNKCPsswAXU3UeYgDSpGhu05eAufjDg==",
"cpu": [
"arm"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4401,13 +4446,14 @@
}
},
"node_modules/lightningcss-linux-arm64-gnu": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.28.1.tgz",
- "integrity": "sha512-iO+fN9hOMmzfwqcG2/BgUtMKD48H2JO/SXU44fyIwpY2veb65QF5xiRrQ9l1FwIxbGK3231KBYCtAqv+xf+NsQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.29.1.tgz",
+ "integrity": "sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4421,13 +4467,14 @@
}
},
"node_modules/lightningcss-linux-arm64-musl": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.28.1.tgz",
- "integrity": "sha512-dnMHeXEmCUzHHZjaDpQBYuBKcN9nPC3nPFKl70bcj5Bkn5EmkcgEqm5p035LKOgvAwk1XwLpQCML6pXmCwz0NQ==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.29.1.tgz",
+ "integrity": "sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4441,13 +4488,14 @@
}
},
"node_modules/lightningcss-linux-x64-gnu": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.28.1.tgz",
- "integrity": "sha512-7vWDISaMUn+oo2TwRdf2hl/BLdPxvywv9JKEqNZB/0K7bXwV4XE9wN/C2sAp1gGuh6QBA8lpjF4JIPt3HNlCHA==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.1.tgz",
+ "integrity": "sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4461,13 +4509,14 @@
}
},
"node_modules/lightningcss-linux-x64-musl": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.28.1.tgz",
- "integrity": "sha512-IHCu9tVGP+x5BCpA2rF3D04DBokcBza/a8AuHQU+1AiMKubuMegPwcL7RatBgK4ztFHeYnnD5NdhwhRfYMAtNA==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.29.1.tgz",
+ "integrity": "sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"linux"
@@ -4481,13 +4530,14 @@
}
},
"node_modules/lightningcss-win32-arm64-msvc": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.28.1.tgz",
- "integrity": "sha512-Erm72kHmMg/3h350PTseskz+eEGBM17Fuu79WW2Qqt0BfWSF1jHHc12lkJCWMYl5jcBHPs5yZdgNHtJ7IJS3Uw==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.29.1.tgz",
+ "integrity": "sha512-QoOVnkIEFfbW4xPi+dpdft/zAKmgLgsRHfJalEPYuJDOWf7cLQzYg0DEh8/sn737FaeMJxHZRc1oBreiwZCjog==",
"cpu": [
"arm64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"win32"
@@ -4501,13 +4551,14 @@
}
},
"node_modules/lightningcss-win32-x64-msvc": {
- "version": "1.28.1",
- "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.28.1.tgz",
- "integrity": "sha512-ZPQtvx+uQBzrSdHH8p4H3M9Alue+x369TPZAA3b4K3d92FPhpZCuBG04+HQzspam9sVeID9mI6f3VRAs2ezaEA==",
+ "version": "1.29.1",
+ "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.29.1.tgz",
+ "integrity": "sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==",
"cpu": [
"x64"
],
"dev": true,
+ "license": "MPL-2.0",
"optional": true,
"os": [
"win32"
@@ -4524,7 +4575,8 @@
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/lmdb": {
"version": "2.8.5",
@@ -4532,6 +4584,7 @@
"integrity": "sha512-9bMdFfc80S+vSldBmG3HOuLVHnxRdNTlpzR6QDnzqCQtCzGUEAGTzBKYMeIM+I/sU4oZfgbcbS7X7F65/z/oxQ==",
"dev": true,
"hasInstallScript": true,
+ "license": "MIT",
"dependencies": {
"msgpackr": "^1.9.5",
"node-addon-api": "^6.1.0",
@@ -4555,7 +4608,8 @@
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
"integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/lodash": {
"version": "4.17.21",
@@ -4583,12 +4637,6 @@
"node": ">= 0.8.0"
}
},
- "node_modules/mdn-data": {
- "version": "2.0.14",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
- "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
- "dev": true
- },
"node_modules/micromatch": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -4744,6 +4792,7 @@
"resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.1.1.tgz",
"integrity": "sha512-+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"detect-libc": "^2.0.1"
},
@@ -4758,6 +4807,7 @@
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
"integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
"dev": true,
+ "license": "Apache-2.0",
"engines": {
"node": ">=8"
}
@@ -4768,18 +4818,6 @@
"integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
"dev": true
},
- "node_modules/nth-check": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
- "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
- "dev": true,
- "dependencies": {
- "boolbase": "^1.0.0"
- },
- "funding": {
- "url": "https://github.com/fb55/nth-check?sponsor=1"
- }
- },
"node_modules/nullthrows": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
@@ -4928,7 +4966,8 @@
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
"integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/os-tmpdir": {
"version": "1.0.2",
@@ -4940,31 +4979,33 @@
}
},
"node_modules/parcel": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/parcel/-/parcel-2.12.0.tgz",
- "integrity": "sha512-W+gxAq7aQ9dJIg/XLKGcRT0cvnStFAQHPaI0pvD0U2l6IVLueUAm3nwN7lkY62zZNmlvNx6jNtE4wlbS+CyqSg==",
- "dev": true,
- "dependencies": {
- "@parcel/config-default": "2.12.0",
- "@parcel/core": "2.12.0",
- "@parcel/diagnostic": "2.12.0",
- "@parcel/events": "2.12.0",
- "@parcel/fs": "2.12.0",
- "@parcel/logger": "2.12.0",
- "@parcel/package-manager": "2.12.0",
- "@parcel/reporter-cli": "2.12.0",
- "@parcel/reporter-dev-server": "2.12.0",
- "@parcel/reporter-tracer": "2.12.0",
- "@parcel/utils": "2.12.0",
- "chalk": "^4.1.0",
- "commander": "^7.0.0",
+ "version": "2.13.3",
+ "resolved": "https://registry.npmjs.org/parcel/-/parcel-2.13.3.tgz",
+ "integrity": "sha512-8GrC8C7J8mwRpAlk7EJ7lwdFTbCN+dcXH2gy5AsEs9pLfzo9wvxOTx6W0fzSlvCOvZOita+8GdfYlGfEt0tRgA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@parcel/config-default": "2.13.3",
+ "@parcel/core": "2.13.3",
+ "@parcel/diagnostic": "2.13.3",
+ "@parcel/events": "2.13.3",
+ "@parcel/feature-flags": "2.13.3",
+ "@parcel/fs": "2.13.3",
+ "@parcel/logger": "2.13.3",
+ "@parcel/package-manager": "2.13.3",
+ "@parcel/reporter-cli": "2.13.3",
+ "@parcel/reporter-dev-server": "2.13.3",
+ "@parcel/reporter-tracer": "2.13.3",
+ "@parcel/utils": "2.13.3",
+ "chalk": "^4.1.2",
+ "commander": "^12.1.0",
"get-port": "^4.2.0"
},
"bin": {
"parcel": "lib/bin.js"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": ">= 16.0.0"
},
"funding": {
"type": "opencollective",
@@ -4988,6 +5029,7 @@
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.0.0",
"error-ex": "^1.3.1",
@@ -5056,13 +5098,15 @@
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/posthtml": {
"version": "0.16.6",
"resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz",
"integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"posthtml-parser": "^0.11.0",
"posthtml-render": "^3.0.0"
@@ -5072,15 +5116,16 @@
}
},
"node_modules/posthtml-parser": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz",
- "integrity": "sha512-PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg==",
+ "version": "0.12.1",
+ "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.12.1.tgz",
+ "integrity": "sha512-rYFmsDLfYm+4Ts2Oh4DCDSZPtdC1BLnRXAobypVzX9alj28KGl65dIFtgDY9zB57D0TC4Qxqrawuq/2et1P0GA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "htmlparser2": "^7.1.1"
+ "htmlparser2": "^9.0.0"
},
"engines": {
- "node": ">=12"
+ "node": ">=16"
}
},
"node_modules/posthtml-render": {
@@ -5088,6 +5133,7 @@
"resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz",
"integrity": "sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"is-json": "^2.0.1"
},
@@ -5095,11 +5141,101 @@
"node": ">=12"
}
},
+ "node_modules/posthtml/node_modules/dom-serializer": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+ "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "domelementtype": "^2.0.1",
+ "domhandler": "^4.2.0",
+ "entities": "^2.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+ }
+ },
+ "node_modules/posthtml/node_modules/dom-serializer/node_modules/entities": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "funding": {
+ "url": "https://github.com/fb55/entities?sponsor=1"
+ }
+ },
+ "node_modules/posthtml/node_modules/domhandler": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+ "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "domelementtype": "^2.2.0"
+ },
+ "engines": {
+ "node": ">= 4"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domhandler?sponsor=1"
+ }
+ },
+ "node_modules/posthtml/node_modules/domutils": {
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+ "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "dom-serializer": "^1.0.1",
+ "domelementtype": "^2.2.0",
+ "domhandler": "^4.2.0"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/domutils?sponsor=1"
+ }
+ },
+ "node_modules/posthtml/node_modules/entities": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+ "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "engines": {
+ "node": ">=0.12"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/entities?sponsor=1"
+ }
+ },
+ "node_modules/posthtml/node_modules/htmlparser2": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+ "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+ "dev": true,
+ "funding": [
+ "https://github.com/fb55/htmlparser2?sponsor=1",
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/fb55"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "domelementtype": "^2.0.1",
+ "domhandler": "^4.2.2",
+ "domutils": "^2.8.0",
+ "entities": "^3.0.1"
+ }
+ },
"node_modules/posthtml/node_modules/posthtml-parser": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz",
"integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"htmlparser2": "^7.1.1"
},
@@ -5145,6 +5281,20 @@
"node": ">=6"
}
},
+ "node_modules/react": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+ "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+ "dev": true,
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/react-datepicker": {
"version": "4.25.0",
"resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.25.0.tgz",
@@ -5163,11 +5313,27 @@
"react-dom": "^16.9.0 || ^17 || ^18"
}
},
+ "node_modules/react-dom": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+ "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+ "dev": true,
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "scheduler": "^0.23.2"
+ },
+ "peerDependencies": {
+ "react": "^18.3.1"
+ }
+ },
"node_modules/react-error-overlay": {
"version": "6.0.9",
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
"integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/react-fast-compare": {
"version": "3.2.2",
@@ -5211,10 +5377,11 @@
}
},
"node_modules/react-refresh": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
- "integrity": "sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ==",
+ "version": "0.14.2",
+ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+ "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=0.10.0"
}
@@ -5233,10 +5400,11 @@
}
},
"node_modules/regenerator-runtime": {
- "version": "0.13.11",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
- "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
- "dev": true
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+ "dev": true,
+ "license": "MIT"
},
"node_modules/regexp.prototype.flags": {
"version": "1.5.3",
@@ -5425,6 +5593,17 @@
"@parcel/watcher": "^2.4.1"
}
},
+ "node_modules/scheduler": {
+ "version": "0.23.2",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+ "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+ "dev": true,
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0"
+ }
+ },
"node_modules/semver": {
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -5573,15 +5752,6 @@
"node": ">=4"
}
},
- "node_modules/source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/source-map-js": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -5598,12 +5768,15 @@
"dev": true
},
"node_modules/srcset": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
- "integrity": "sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/srcset/-/srcset-5.0.1.tgz",
+ "integrity": "sha512-/P1UYbGfJVlxZag7aABNRrulEXAwCSDo7fklafOQrantuPTDmYgijJMks2zusPCVzgW9+4P69mq7w6pYuZpgxw==",
"dev": true,
+ "license": "MIT",
+ "optional": true,
+ "peer": true,
"engines": {
- "node": ">=12"
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
@@ -5614,13 +5787,6 @@
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-3.0.0.tgz",
"integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
},
- "node_modules/stable": {
- "version": "0.1.8",
- "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
- "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
- "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
- "dev": true
- },
"node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -5762,27 +5928,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/svgo": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
- "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
- "dev": true,
- "dependencies": {
- "@trysound/sax": "0.2.0",
- "commander": "^7.2.0",
- "css-select": "^4.1.3",
- "css-tree": "^1.1.3",
- "csso": "^4.2.0",
- "picocolors": "^1.0.0",
- "stable": "^0.1.8"
- },
- "bin": {
- "svgo": "bin/svgo"
- },
- "engines": {
- "node": ">=10.13.0"
- }
- },
"node_modules/swiper": {
"version": "6.8.4",
"resolved": "https://registry.npmjs.org/swiper/-/swiper-6.8.4.tgz",
@@ -5878,7 +6023,8 @@
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
"integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/tmp": {
"version": "0.0.33",
@@ -6087,6 +6233,7 @@
"resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz",
"integrity": "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">= 4"
}
@@ -6110,7 +6257,8 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
"integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/which": {
"version": "1.3.1",
diff --git a/zmsstatistic/phpunit.xml b/zmsstatistic/phpunit.xml
index 2e69fedfa..12463edbd 100644
--- a/zmsstatistic/phpunit.xml
+++ b/zmsstatistic/phpunit.xml
@@ -21,8 +21,15 @@
- ./src
+ ./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
-
diff --git a/zmsstatistic/src/Zmsstatistic/Application.php b/zmsstatistic/src/Zmsstatistic/Application.php
index 4ef96e022..a40acdc9c 100644
--- a/zmsstatistic/src/Zmsstatistic/Application.php
+++ b/zmsstatistic/src/Zmsstatistic/Application.php
@@ -1,4 +1,5 @@
fromArray($infoData, null, 'A'. $sheet->getHighestRow());
+ $sheet->fromArray($infoData, null, 'A' . $sheet->getHighestRow());
if (isset($args['reports'][0]->firstDay)) {
$firstDay = $args['reports'][0]->firstDay->toDateTime()->format('d.m.Y');
$lastDay = $args['reports'][0]->lastDay->toDateTime()->format('d.m.Y');
$range = array('Zeitraum:', $firstDay, 'bis', $lastDay);
- $sheet->fromArray($range, null, 'A'. ($sheet->getHighestRow() + 1));
+ $sheet->fromArray($range, null, 'A' . ($sheet->getHighestRow() + 1));
}
return $spreadsheet;
@@ -89,12 +90,12 @@ protected function setDateTime($dateString)
{
$dateArr = explode('-', $dateString);
if (2 == count($dateArr)) {
- $dateString = $dateString .'-01';
+ $dateString = $dateString . '-01';
}
/* ignore because not in use now */
//@codeCoverageIgnoreStart
if (1 == count($dateArr)) {
- $dateString = $dateString .'-01-01';
+ $dateString = $dateString . '-01-01';
}
//@codeCoverageIgnoreEnd
return new \DateTime($dateString);
diff --git a/zmsstatistic/src/Zmsstatistic/Download/ClientReport.php b/zmsstatistic/src/Zmsstatistic/Download/ClientReport.php
index 66d621224..b6894db04 100644
--- a/zmsstatistic/src/Zmsstatistic/Download/ClientReport.php
+++ b/zmsstatistic/src/Zmsstatistic/Download/ClientReport.php
@@ -1,4 +1,5 @@
setSpreadSheet($title);
$spreadsheet = $download->getSpreadSheet();
$spreadsheet = $this->writeInfoHeader($args, $spreadsheet);
@@ -68,71 +69,71 @@ public function writeReportHeader(ReportEntity $report, $sheet)
if ($columnIndex == 3 || $columnIndex == 4) {
continue;
}
-
+
if (!in_array($headline, static::$ignoreColumns)) {
$reportHeader[] = static::$headlines[$headline];
}
}
-
+
// Placeholders for the new columns
$end = array_splice($reportHeader, -1); // get the last two elements
$reportHeader[] = static::$headlines['noappointment'];
$reportHeader[] = static::$headlines['missednoappointment'];
$reportHeader = array_merge($reportHeader, $end); // append them back after adding new headers
-
-
- $sheet->fromArray($reportHeader, null, 'A'. ($sheet->getHighestRow() + 2));
+
+
+ $sheet->fromArray($reportHeader, null, 'A' . ($sheet->getHighestRow() + 2));
}
-
+
public function writeTotalsRow(ReportEntity $report, $sheet, $datePatternTotals)
{
if ('totals' == end($report->data)['date']) {
$totals = array_pop($report->data);
- $dateString = $report->firstDay->year .'-'. $report->firstDay->month .'-'. $report->firstDay->day;
+ $dateString = $report->firstDay->year . '-' . $report->firstDay->month . '-' . $report->firstDay->day;
$dateCol1 = ('MMMM' == $datePatternTotals) ?
$this->getFormatedDates($this->setDateTime($dateString), $datePatternTotals) :
null;
$dateCol2 = $this->setDateTime($dateString)->format('Y');
$reportTotal = [$dateCol1, $dateCol2];
-
+
$columnIndex = 0;
foreach ($totals as $key => $item) {
$columnIndex++;
if ($columnIndex == 3 || $columnIndex == 4) {
continue;
}
-
+
if (! in_array($key, static::$ignoreColumns) && 'date' != $key) {
$reportTotal[] = (string)($item);
}
}
-
+
// Calculations for the new columns
$end = array_splice($reportTotal, -1);
-
+
$reportTotal[] = $this->calculateNoAppointment($totals);
$reportTotal[] = $this->calculateMissedNoAppointment($totals);
-
+
$reportTotal = array_merge($reportTotal, $end);
-
- $sheet->fromArray($reportTotal, null, 'A'. ($sheet->getHighestRow() + 1));
+
+ $sheet->fromArray($reportTotal, null, 'A' . ($sheet->getHighestRow() + 1));
}
}
-
+
public function writeReportData(ReportEntity $report, $sheet, $datePatternCol1, $datePatternCol2)
{
$reportData = [];
-
+
foreach ($report->data as $row => $entry) {
$processedRow = [];
$columnIndex = 0;
-
+
foreach ($entry as $key => $item) {
$columnIndex++;
if ($columnIndex == 3 || $columnIndex == 4) {
continue;
}
-
+
if (!in_array($key, static::$ignoreColumns)) {
if ('date' == $key) {
$dateCol1 = $this->getFormatedDates($this->setDateTime($item), $datePatternCol1);
@@ -142,29 +143,29 @@ public function writeReportData(ReportEntity $report, $sheet, $datePatternCol1,
$processedRow[] = (is_numeric($item)) ? (string)($item) : $item;
}
}
-
+
// Calculations for the new columns
$end = array_splice($processedRow, -1);
-
+
$processedRow[] = $this->calculateNoAppointmentForRow($entry);
$processedRow[] = $this->calculateMissedNoAppointmentForRow($entry);
-
+
$processedRow = array_merge($processedRow, $end);
-
+
$reportData[$row] = $processedRow;
}
-
- $sheet->fromArray($reportData, null, 'A'. ($sheet->getHighestRow() + 1));
+
+ $sheet->fromArray($reportData, null, 'A' . ($sheet->getHighestRow() + 1));
}
-
-
+
+
protected function writeLegend(Spreadsheet $spreadsheet)
{
$sheet = $spreadsheet->getActiveSheet();
$legendData[] = '** in dieser Spalte sind nicht abschließend bearbeitete Kunden angegeben';
$legendData = array_chunk($legendData, 1);
- $sheet->fromArray($legendData, null, 'A'. ($sheet->getHighestRow() + 1));
+ $sheet->fromArray($legendData, null, 'A' . ($sheet->getHighestRow() + 1));
return $spreadsheet;
}
@@ -176,7 +177,7 @@ private function calculateNoAppointment($totals)
}
return 'N/A';
}
-
+
private function calculateMissedNoAppointment($totals)
{
if (isset($totals['missed']) && isset($totals['missedwithappointment'])) {
@@ -192,7 +193,7 @@ private function calculateNoAppointmentForRow($entry)
}
return 'N/A';
}
-
+
private function calculateMissedNoAppointmentForRow($entry)
{
if (isset($entry['missed']) && isset($entry['missedwithappointment'])) {
diff --git a/zmsstatistic/src/Zmsstatistic/Download/RequestReport.php b/zmsstatistic/src/Zmsstatistic/Download/RequestReport.php
index 5f4d03d60..f473731f1 100644
--- a/zmsstatistic/src/Zmsstatistic/Download/RequestReport.php
+++ b/zmsstatistic/src/Zmsstatistic/Download/RequestReport.php
@@ -1,4 +1,5 @@
setSpreadSheet($title);
$this->writeInfoHeader($args, $download->getSpreadSheet());
@@ -55,8 +56,8 @@ public function writeReport(
) {
$sheet = $spreadsheet->getActiveSheet();
- $firstDay = $report->firstDay->year .'-'. $report->firstDay->month .'-'. $report->firstDay->day;
- $lastDay = $report->lastDay->year .'-'. $report->lastDay->month .'-'. $report->lastDay->day;
+ $firstDay = $report->firstDay->year . '-' . $report->firstDay->month . '-' . $report->firstDay->day;
+ $lastDay = $report->lastDay->year . '-' . $report->lastDay->month . '-' . $report->lastDay->day;
$this->firstDayDate = $this->setDateTime($firstDay);
$this->lastDayDate = $this->setDateTime($lastDay);
@@ -75,9 +76,9 @@ public function writeHeader(ReportEntity $report, $sheet, $datePatternCol1, $dat
$dateTime = clone $this->firstDayDate;
do {
$reportHeader[] = $this->getFormatedDates($dateTime, $datePatternCol2);
- $dateTime->modify('+1 '. $report->period);
+ $dateTime->modify('+1 ' . $report->period);
} while ($dateTime <= $this->lastDayDate);
- $sheet->fromArray($reportHeader, null, 'A'. ($sheet->getHighestRow() + 2));
+ $sheet->fromArray($reportHeader, null, 'A' . ($sheet->getHighestRow() + 2));
}
/**
@@ -87,18 +88,18 @@ public function writeReportData(ReportEntity $report, $sheet, $datePatternCol1,
{
$reportData = [];
foreach ($report->data as $name => $entry) {
- if ('sum' != $name && 'average_processingtime' != $name ) {
+ if ('sum' != $name && 'average_processingtime' != $name) {
$reportData[$name][] = $name;
$reportData[$name][] = isset($report->data['average_processingtime'][$name]) || is_numeric($report->data['average_processingtime'][$name]) ? (string)$report->data['average_processingtime'][$name] : "0";
- $reportData[$name][] = $report->data['sum'][$name];
+ $reportData[$name][] = $report->data['sum'][$name];
$dateTime = clone $this->firstDayDate;
do {
$dateString = $dateTime->format($this->dateFormatter[$report->period]);
$reportData[$name][] = (isset($entry[$dateString])) ? $entry[$dateString]['requestscount'] : '0';
- $dateTime->modify('+1 '. $report->period);
+ $dateTime->modify('+1 ' . $report->period);
} while ($dateTime <= $this->lastDayDate);
}
}
- $sheet->fromArray($reportData, null, 'A'. ($sheet->getHighestRow() + 1));
+ $sheet->fromArray($reportData, null, 'A' . ($sheet->getHighestRow() + 1));
}
}
diff --git a/zmsstatistic/src/Zmsstatistic/Download/WaitingReport.php b/zmsstatistic/src/Zmsstatistic/Download/WaitingReport.php
index 1f3a83286..d951e6650 100644
--- a/zmsstatistic/src/Zmsstatistic/Download/WaitingReport.php
+++ b/zmsstatistic/src/Zmsstatistic/Download/WaitingReport.php
@@ -1,4 +1,5 @@
'gemessene Wegezeit Spontankunden',
'waytime_termin' => 'gemessene Wegezeit Terminkunden',
];
-
+
/**
* @SuppressWarnings(Param)
* @return ResponseInterface
@@ -34,7 +35,7 @@ public function readResponse(
ResponseInterface $response,
array $args
) {
- $title = 'waitingstatistic_'. $args['period'];
+ $title = 'waitingstatistic_' . $args['period'];
$download = (new Download($request))->setSpreadSheet($title);
$this->writeInfoHeader($args, $download->getSpreadSheet());
@@ -67,7 +68,7 @@ public function writeWaitingReport(
public function writeHeader(ReportEntity $report, $sheet, $datePatternCol1, $datePatternCol2)
{
- $dateString = $report->firstDay->year .'-'. $report->firstDay->month .'-'. $report->firstDay->day;
+ $dateString = $report->firstDay->year . '-' . $report->firstDay->month . '-' . $report->firstDay->day;
$reportHeader = [];
$reportHeader[] = null;
$reportHeader[] = $this->getFormatedDates($this->setDateTime($dateString), $datePatternCol1);
@@ -77,7 +78,7 @@ public function writeHeader(ReportEntity $report, $sheet, $datePatternCol1, $dat
$reportHeader[] = $date;
}
}
- $sheet->fromArray($reportHeader, null, 'A'. ($sheet->getHighestRow() + 2));
+ $sheet->fromArray($reportHeader, null, 'A' . ($sheet->getHighestRow() + 2));
}
public function writeTotals(ReportEntity $report, $sheet)
@@ -95,7 +96,7 @@ public function writeTotals(ReportEntity $report, $sheet)
$reportTotal['average'][] = $entry['average_waitingtime'];
$reportTotal['average_waytime'][] = $entry['average_waytime'];
}
- $sheet->fromArray($reportTotal, null, 'A'. ($sheet->getHighestRow() + 1));
+ $sheet->fromArray($reportTotal, null, 'A' . ($sheet->getHighestRow() + 1));
$reportTotal2['max'][] = 'Tagesmaximum Terminkunden der gemessenen Zeit';
$reportTotal2['average'][] = 'Tagesdurchschnitt Terminkunden der gemessenen Zeit';
@@ -108,7 +109,7 @@ public function writeTotals(ReportEntity $report, $sheet)
$reportTotal2['average'][] = $entry['average_waitingtime_termin'];
$reportTotal2['average_waytime'][] = $entry['average_waytime_termin'];
}
- $sheet->fromArray($reportTotal2, null, 'A'. ($sheet->getHighestRow() + 1));
+ $sheet->fromArray($reportTotal2, null, 'A' . ($sheet->getHighestRow() + 1));
}
public function writeReportPart(ReportEntity $report, $sheet, $rangeName, $headline)
@@ -123,7 +124,7 @@ public function writeReportPart(ReportEntity $report, $sheet, $rangeName, $headl
if (! isset($reportData[$hour])) {
$reportData[$hour] = [];
}
- $range = $hour .'-'. ($hour + 1) .' Uhr';
+ $range = $hour . '-' . ($hour + 1) . ' Uhr';
if (! in_array($range, $reportData[$hour])) {
$reportData[$hour][] = $range;
$reportData[$hour][] = $totals[$hour][$rangeName];
@@ -132,6 +133,6 @@ public function writeReportPart(ReportEntity $report, $sheet, $rangeName, $headl
}
}
}
- $sheet->fromArray($reportData, null, 'A'. ($sheet->getHighestRow() + 2));
+ $sheet->fromArray($reportData, null, 'A' . ($sheet->getHighestRow() + 2));
}
}
diff --git a/zmsstatistic/src/Zmsstatistic/Download/WarehouseReport.php b/zmsstatistic/src/Zmsstatistic/Download/WarehouseReport.php
index 86c3ebeef..fb0906229 100644
--- a/zmsstatistic/src/Zmsstatistic/Download/WarehouseReport.php
+++ b/zmsstatistic/src/Zmsstatistic/Download/WarehouseReport.php
@@ -1,4 +1,5 @@
setSpreadSheet($title);
$this->writeRawReport($args['report'], $download->getSpreadSheet());
@@ -43,7 +44,7 @@ protected function writeRawReport(ReportEntity $report, Spreadsheet $spreadsheet
$reportData[$row][] = (is_numeric($item)) ? (string)($item) : $item;
}
}
- $sheet->fromArray($reportData, null, 'A'. ($sheet->getHighestRow()));
+ $sheet->fromArray($reportData, null, 'A' . ($sheet->getHighestRow()));
return $spreadsheet;
}
}
diff --git a/zmsstatistic/src/Zmsstatistic/Download/WarehouseSubject.php b/zmsstatistic/src/Zmsstatistic/Download/WarehouseSubject.php
index b4f0cf014..d7e363cda 100644
--- a/zmsstatistic/src/Zmsstatistic/Download/WarehouseSubject.php
+++ b/zmsstatistic/src/Zmsstatistic/Download/WarehouseSubject.php
@@ -1,4 +1,5 @@
setSpreadSheet($title);
$this->writeRawReport($args['reports'][0], $download->getSpreadSheet());
@@ -41,7 +42,7 @@ protected function writeRawReport(ReportEntity $report, Spreadsheet $spreadsheet
$reportData[$row][] = (is_numeric($item)) ? (string)($item) : $item;
}
}
- $sheet->fromArray($reportData, null, 'A'. ($sheet->getHighestRow()));
+ $sheet->fromArray($reportData, null, 'A' . ($sheet->getHighestRow()));
return $spreadsheet;
}
}
diff --git a/zmsstatistic/src/Zmsstatistic/Healthcheck.php b/zmsstatistic/src/Zmsstatistic/Healthcheck.php
index dd2cc59e5..06892acde 100644
--- a/zmsstatistic/src/Zmsstatistic/Healthcheck.php
+++ b/zmsstatistic/src/Zmsstatistic/Healthcheck.php
@@ -1,4 +1,5 @@
owner) ||
+ if (
+ (false !== strpos($path, 'owner') && ! $this->owner) ||
(false !== strpos($path, 'organisation') && ! $this->organisation) ||
(false !== strpos($path, 'department') && ! $this->department)
) {
@@ -91,7 +94,8 @@ protected function testAccess($path)
protected function testScope($path)
{
- if ($this->isPathWithoutScope($path)
+ if (
+ $this->isPathWithoutScope($path)
&& (! isset($this->workstation['scope']) || ! isset($this->workstation['scope']['id']))
) {
throw new WorkstationMissingScope();
@@ -130,7 +134,8 @@ protected function testLogin($input)
} elseif ('BO\Zmsapi\Exception\Useraccount\UserAlreadyLoggedIn' == $exception->template) {
Auth::setKey($exception->data['authkey'], time() + \App::SESSION_DURATION);
throw $exception;
- } elseif ('' != $exception->template
+ } elseif (
+ '' != $exception->template
&& \App::$slim->getContainer()->get('view')->getLoader()->exists($template)
) {
$exceptionData = [
diff --git a/zmsstatistic/src/Zmsstatistic/Helper/DialogHandler.php b/zmsstatistic/src/Zmsstatistic/Helper/DialogHandler.php
index 319f91e12..cc980aa64 100644
--- a/zmsstatistic/src/Zmsstatistic/Helper/DialogHandler.php
+++ b/zmsstatistic/src/Zmsstatistic/Helper/DialogHandler.php
@@ -1,9 +1,11 @@
template) {
\BO\Zmsclient\Auth::setKey($exception->data['authkey'], time() + \App::SESSION_DURATION);
throw $exception;
- } elseif ('' != $exception->template
+ } elseif (
+ '' != $exception->template
&& \App::$slim->getContainer()->get('view')->getLoader()->exists($template)
) {
$exceptionData = [
@@ -107,7 +109,8 @@ protected function getProviderList($config)
$allowedProviderList = explode(',', $config->getPreference('oidc', 'provider'));
$oidcproviderlist = [];
foreach (\BO\Slim\Middleware\OAuthMiddleware::$authInstances as $provider => $authInstance) {
- if (0 < count($allowedProviderList) &&
+ if (
+ 0 < count($allowedProviderList) &&
class_exists($authInstance) &&
in_array($provider, $allowedProviderList)
) {
diff --git a/zmsstatistic/src/Zmsstatistic/Logout.php b/zmsstatistic/src/Zmsstatistic/Logout.php
index 1e5b0ddda..9081494a7 100644
--- a/zmsstatistic/src/Zmsstatistic/Logout.php
+++ b/zmsstatistic/src/Zmsstatistic/Logout.php
@@ -1,4 +1,5 @@
readDeleteResult('/workstation/login/'. $this->workstation->useraccount['id'] .'/');
+ \App::$http->readDeleteResult('/workstation/login/' . $this->workstation->useraccount['id'] . '/');
return Render::redirect(
'index',
array(
diff --git a/zmsstatistic/src/Zmsstatistic/Oidc.php b/zmsstatistic/src/Zmsstatistic/Oidc.php
index c8e1e1b18..33f4782c7 100644
--- a/zmsstatistic/src/Zmsstatistic/Oidc.php
+++ b/zmsstatistic/src/Zmsstatistic/Oidc.php
@@ -1,4 +1,5 @@
getParam("state");
$authKey = \BO\Zmsclient\Auth::getKey();
-
+
\App::$log->info('OIDC state validation', [
'event' => 'oauth_state_validation',
'timestamp' => date('c'),
@@ -30,12 +31,12 @@ public function readResponse(
'application' => 'zmsstatistic',
'state_match' => ($state == $authKey)
]);
-
+
if ($state == $authKey) {
try {
$workstation = \App::$http->readGetResult('/workstation/', ['resolveReferences' => 2])->getEntity();
$username = $workstation->getUseraccount()->id . '@' . \BO\Zmsclient\Auth::getOidcProvider();
-
+
\App::$log->info('OIDC workstation access', [
'event' => 'oauth_workstation_access',
'timestamp' => date('c'),
@@ -44,9 +45,9 @@ public function readResponse(
'username' => $username,
'workstation_id' => $workstation->id ?? 'unknown'
]);
-
+
$departmentCount = $workstation->getUseraccount()->getDepartmentList()->count();
-
+
// Log department check with username
\App::$log->info('OIDC department check', [
'event' => 'oauth_department_check',
@@ -57,7 +58,7 @@ public function readResponse(
'department_count' => $departmentCount,
'has_departments' => ($departmentCount > 0)
]);
-
+
if (0 == $departmentCount) {
return \BO\Slim\Render::redirect(
'index',
@@ -73,7 +74,7 @@ public function readResponse(
[]
);
} catch (\Exception $e) {
- \App::$log->error('OIDC workstation error', [
+ \App::$log->error('OIDC workstation error', [
'event' => 'oauth_workstation_error',
'timestamp' => date('c'),
'provider' => \BO\Zmsclient\Auth::getOidcProvider(),
@@ -84,24 +85,23 @@ public function readResponse(
throw $e;
}
}
-
+
\App::$log->error('OIDC invalid state', [
'event' => 'oauth_invalid_state',
'timestamp' => date('c'),
'provider' => \BO\Zmsclient\Auth::getOidcProvider(),
'application' => 'zmsstatistic'
]);
-
+
throw new \BO\Slim\Exception\OAuthInvalid();
-
} catch (\Exception $e) {
\App::$log->error('OIDC error', [
- 'event' => 'oauth_error',
- 'timestamp' => date('c'),
- 'provider' => \BO\Zmsclient\Auth::getOidcProvider(),
- 'application' => 'zmsstatistic',
- 'error' => $e->getMessage(),
- 'code' => $e->getCode()
+ 'event' => 'oauth_error',
+ 'timestamp' => date('c'),
+ 'provider' => \BO\Zmsclient\Auth::getOidcProvider(),
+ 'application' => 'zmsstatistic',
+ 'error' => $e->getMessage(),
+ 'code' => $e->getCode()
]);
throw $e;
}
diff --git a/zmsstatistic/src/Zmsstatistic/Overview.php b/zmsstatistic/src/Zmsstatistic/Overview.php
index 3b383f85f..2a07a857a 100644
--- a/zmsstatistic/src/Zmsstatistic/Overview.php
+++ b/zmsstatistic/src/Zmsstatistic/Overview.php
@@ -1,4 +1,5 @@
readPostResult('/workstation/', $workstation)->getEntity();
$basePath = $request->getBasePath();
- return $response->withRedirect($basePath .'/'. trim($loginData['redirectUrl']['value'], "/"));
+ return $response->withRedirect($basePath . '/' . trim($loginData['redirectUrl']['value'], "/"));
}
}
diff --git a/zmsstatistic/src/Zmsstatistic/ReportClientDepartment.php b/zmsstatistic/src/Zmsstatistic/ReportClientDepartment.php
index 8ed79830a..1652ed128 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportClientDepartment.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportClientDepartment.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/clientdepartment/' . $this->department->id . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/clientdepartment/' . $this->department->id . '/' . $args['period'] . '/')
->getEntity()
->withCalculatedTotals($this->totals, 'date')
->toHashed();
$exchangeNotification = \App::$http
->readGetResult(
- '/warehouse/notificationdepartment/' . $this->department->id . '/'. $args['period']. '/',
+ '/warehouse/notificationdepartment/' . $this->department->id . '/' . $args['period'] . '/',
['groupby' => 'month']
)
->getEntity()
diff --git a/zmsstatistic/src/Zmsstatistic/ReportClientIndex.php b/zmsstatistic/src/Zmsstatistic/ReportClientIndex.php
index f0fc0ff0f..767497db7 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportClientIndex.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportClientIndex.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/clientscope/' . $scopeId . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/clientscope/' . $scopeId . '/' . $args['period'] . '/')
->getEntity()
->withCalculatedTotals($this->totals, 'date')
->toHashed();
diff --git a/zmsstatistic/src/Zmsstatistic/ReportClientOrganisation.php b/zmsstatistic/src/Zmsstatistic/ReportClientOrganisation.php
index b3775a49a..1fa28bbe3 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportClientOrganisation.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportClientOrganisation.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/clientorganisation/' . $organisationId . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/clientorganisation/' . $organisationId . '/' . $args['period'] . '/')
->getEntity()
->withCalculatedTotals($this->totals, 'date')
->toHashed();
$exchangeNotification = \App::$http
->readGetResult(
- '/warehouse/notificationorganisation/' . $organisationId . '/'. $args['period']. '/',
+ '/warehouse/notificationorganisation/' . $organisationId . '/' . $args['period'] . '/',
['groupby' => 'month']
)
->getEntity()
diff --git a/zmsstatistic/src/Zmsstatistic/ReportRequestDepartment.php b/zmsstatistic/src/Zmsstatistic/ReportRequestDepartment.php
index a6729044e..31dd645be 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportRequestDepartment.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportRequestDepartment.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/requestdepartment/' . $this->department->id . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/requestdepartment/' . $this->department->id . '/' . $args['period'] . '/')
->getEntity()
->toGrouped($this->groupfields, $this->hashset)
->withRequestsSum()
diff --git a/zmsstatistic/src/Zmsstatistic/ReportRequestIndex.php b/zmsstatistic/src/Zmsstatistic/ReportRequestIndex.php
index 2729b088b..471ddf1cd 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportRequestIndex.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportRequestIndex.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/requestscope/' . $this->workstation->scope['id'] . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/requestscope/' . $this->workstation->scope['id'] . '/' . $args['period'] . '/')
->getEntity()
->toGrouped($this->groupfields, $this->hashset)
->withRequestsSum()
diff --git a/zmsstatistic/src/Zmsstatistic/ReportRequestOrganisation.php b/zmsstatistic/src/Zmsstatistic/ReportRequestOrganisation.php
index ae23793a0..0a57dfbaf 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportRequestOrganisation.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportRequestOrganisation.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/requestorganisation/' . $this->organisation->id . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/requestorganisation/' . $this->organisation->id . '/' . $args['period'] . '/')
->getEntity()
->toGrouped($this->groupfields, $this->hashset)
->withRequestsSum()
diff --git a/zmsstatistic/src/Zmsstatistic/ReportWaitingDepartment.php b/zmsstatistic/src/Zmsstatistic/ReportWaitingDepartment.php
index 66857f724..e9a71d29f 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportWaitingDepartment.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportWaitingDepartment.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/waitingdepartment/' . $this->department->id . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/waitingdepartment/' . $this->department->id . '/' . $args['period'] . '/')
->getEntity()
->toGrouped($this->groupfields, $this->hashset)
->withMaxByHour($this->hashset)
@@ -55,7 +55,7 @@ public function readResponse(
$exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waitingtime');
$exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waitingtime_termin');
$exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waytime');
- $exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waytime_termin');
+ $exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waytime_termin');
}
$type = $validator->getParameter('type')->isString()->getValue();
@@ -85,5 +85,4 @@ public function readResponse(
)
);
}
-
}
diff --git a/zmsstatistic/src/Zmsstatistic/ReportWaitingIndex.php b/zmsstatistic/src/Zmsstatistic/ReportWaitingIndex.php
index 8addfa368..f5a75796b 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportWaitingIndex.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportWaitingIndex.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/waitingscope/' . $this->workstation->scope['id'] . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/waitingscope/' . $this->workstation->scope['id'] . '/' . $args['period'] . '/')
->getEntity()
->toGrouped($this->groupfields, $this->hashset)
->withMaxByHour($this->hashset)
@@ -86,5 +86,4 @@ public function readResponse(
)
);
}
-
}
diff --git a/zmsstatistic/src/Zmsstatistic/ReportWaitingOrganisation.php b/zmsstatistic/src/Zmsstatistic/ReportWaitingOrganisation.php
index 7480564b5..d504d68ed 100644
--- a/zmsstatistic/src/Zmsstatistic/ReportWaitingOrganisation.php
+++ b/zmsstatistic/src/Zmsstatistic/ReportWaitingOrganisation.php
@@ -1,4 +1,5 @@
readGetResult('/warehouse/waitingorganisation/' . $this->organisation->id . '/'. $args['period']. '/')
+ ->readGetResult('/warehouse/waitingorganisation/' . $this->organisation->id . '/' . $args['period'] . '/')
->getEntity()
->toGrouped($this->groupfields, $this->hashset)
->withMaxByHour($this->hashset)
@@ -55,7 +55,7 @@ public function readResponse(
$exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waitingtime');
$exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waitingtime_termin');
$exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waytime');
- $exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waytime_termin');
+ $exchangeWaiting = ReportHelper::withMaxAndAverage($exchangeWaiting, 'waytime_termin');
}
$type = $validator->getParameter('type')->isString()->getValue();
@@ -84,5 +84,4 @@ public function readResponse(
)
);
}
-
}
diff --git a/zmsstatistic/src/Zmsstatistic/Status.php b/zmsstatistic/src/Zmsstatistic/Status.php
index 5f352ba47..f96abe37c 100644
--- a/zmsstatistic/src/Zmsstatistic/Status.php
+++ b/zmsstatistic/src/Zmsstatistic/Status.php
@@ -1,9 +1,11 @@
readGetResult('/warehouse/'. $args['subject'] .'/'. $args['subjectid'] .'/')
+ ->readGetResult('/warehouse/' . $args['subject'] . '/' . $args['subjectid'] . '/')
->getEntity();
if (count($periodList['data']) == 1) {
return Render::redirect("WarehouseReport", [
diff --git a/zmsstatistic/src/Zmsstatistic/WarehouseReport.php b/zmsstatistic/src/Zmsstatistic/WarehouseReport.php
index abee32a14..b5189d54f 100644
--- a/zmsstatistic/src/Zmsstatistic/WarehouseReport.php
+++ b/zmsstatistic/src/Zmsstatistic/WarehouseReport.php
@@ -1,4 +1,5 @@
getAttribute('validator');
$report = \App::$http
- ->readGetResult('/warehouse/'. $args['subject'] .'/'. $args['subjectid'] .'/'. $args['period'] .'/')
+ ->readGetResult('/warehouse/' . $args['subject'] . '/' . $args['subjectid'] . '/' . $args['period'] . '/')
->getEntity();
$type = $validator->getParameter('type')->isString()->getValue();
if ($type) {
- $args['category'] = 'raw-'. $args['subject'];
+ $args['category'] = 'raw-' . $args['subject'];
$args['report'] = $report;
return (new Download(\App::$slim->getContainer()))->readResponse($request, $response, $args);
}
diff --git a/zmsstatistic/src/Zmsstatistic/WarehouseSubject.php b/zmsstatistic/src/Zmsstatistic/WarehouseSubject.php
index 11e17c094..546b351a1 100644
--- a/zmsstatistic/src/Zmsstatistic/WarehouseSubject.php
+++ b/zmsstatistic/src/Zmsstatistic/WarehouseSubject.php
@@ -1,4 +1,5 @@
getAttribute('validator');
- $subjectList = \App::$http->readGetResult('/warehouse/'. $args['subject'] .'/')->getEntity();
+ $subjectList = \App::$http->readGetResult('/warehouse/' . $args['subject'] . '/')->getEntity();
$type = $validator->getParameter('type')->isString()->getValue();
if ($type) {
- $args['category'] = 'raw-'.$args['subject'];
+ $args['category'] = 'raw-' . $args['subject'];
$args['reports'][] = $subjectList;
$args['department'] = $this->department;
$args['organisation'] = $this->organisation;
diff --git a/zmsstatistic/src/Zmsstatistic/WorkstationSelect.php b/zmsstatistic/src/Zmsstatistic/WorkstationSelect.php
index ade000a6b..9b6a11287 100644
--- a/zmsstatistic/src/Zmsstatistic/WorkstationSelect.php
+++ b/zmsstatistic/src/Zmsstatistic/WorkstationSelect.php
@@ -1,4 +1,5 @@
- ./src
+ ./src
+
+ ./vendor
+ ./tests
+
+
+
+
+
-
diff --git a/zmsticketprinter/src/Zmsticketprinter/Application.php b/zmsticketprinter/src/Zmsticketprinter/Application.php
index 4c675942d..ae3a1ac22 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Application.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Application.php
@@ -1,15 +1,16 @@
array(
- 'name' => 'Deutsch',
- 'locale' => 'de_DE.utf-8',
+ 'name' => 'Deutsch',
+ 'locale' => 'de_DE.utf-8',
'default' => true,
),
'en' => array(
- 'name' => 'English',
- 'locale' => 'en_GB.utf-8',
+ 'name' => 'English',
+ 'locale' => 'en_GB.utf-8',
'default' => false,
)
);
diff --git a/zmsticketprinter/src/Zmsticketprinter/BaseController.php b/zmsticketprinter/src/Zmsticketprinter/BaseController.php
index e72629f7f..d471d3a92 100644
--- a/zmsticketprinter/src/Zmsticketprinter/BaseController.php
+++ b/zmsticketprinter/src/Zmsticketprinter/BaseController.php
@@ -1,13 +1,15 @@
isNumber();
if (! $scope->hasFailed()) {
- $scopes[] = 's'. $scope->getValue();
+ $scopes[] = 's' . $scope->getValue();
}
}
}
@@ -41,7 +42,7 @@ protected static function getClusters($request)
foreach ($clusterData as $cluster) {
$cluster = Validator::value($cluster)->isNumber();
if (! $cluster->hasFailed()) {
- $clusters[] = 'c'. $cluster->getValue();
+ $clusters[] = 'c' . $cluster->getValue();
}
}
}
diff --git a/zmsticketprinter/src/Zmsticketprinter/Helper/HomeUrl.php b/zmsticketprinter/src/Zmsticketprinter/Helper/HomeUrl.php
index 301c13555..6aa20c41a 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Helper/HomeUrl.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Helper/HomeUrl.php
@@ -6,6 +6,7 @@
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
*
*/
+
namespace BO\Zmsticketprinter\Helper;
use BO\Mellon\Validator;
diff --git a/zmsticketprinter/src/Zmsticketprinter/Helper/QueueListHelper.php b/zmsticketprinter/src/Zmsticketprinter/Helper/QueueListHelper.php
index 11ec9b847..37ce19fc1 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Helper/QueueListHelper.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Helper/QueueListHelper.php
@@ -1,15 +1,16 @@
readGetResult('/scope/'. $scope->getId() . '/queue/')
+ ->readGetResult('/scope/' . $scope->getId() . '/queue/')
->getCollection();
return ($fullList) ? $fullList : new QueueList();
}
diff --git a/zmsticketprinter/src/Zmsticketprinter/Helper/TemplateFinder.php b/zmsticketprinter/src/Zmsticketprinter/Helper/TemplateFinder.php
index 4710a24f8..bc39c2bd0 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Helper/TemplateFinder.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Helper/TemplateFinder.php
@@ -6,6 +6,7 @@
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
*
*/
+
namespace BO\Zmsticketprinter\Helper;
class TemplateFinder
@@ -94,7 +95,7 @@ protected function getTemplateBySettings($ticketprinter, $organisation)
protected function getExistingTemplate(\BO\Zmsentities\Schema\Entity $entity)
{
- $path = $this->subPath .'/buttonDisplay_'. $entity->getEntityName() .'_'. $entity->id .'.twig';
+ $path = $this->subPath . '/buttonDisplay_' . $entity->getEntityName() . '_' . $entity->id . '.twig';
if ($entity->hasId() && $this->isTemplateReadable($path)) {
return $path;
}
@@ -111,6 +112,6 @@ protected function isTemplateReadable($path)
*/
protected function getTemplatePath()
{
- return realpath(__DIR__) .'/../../../templates';
+ return realpath(__DIR__) . '/../../../templates';
}
}
diff --git a/zmsticketprinter/src/Zmsticketprinter/Helper/Ticketprinter.php b/zmsticketprinter/src/Zmsticketprinter/Helper/Ticketprinter.php
index 16776f3fb..2d5b7bccc 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Helper/Ticketprinter.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Helper/Ticketprinter.php
@@ -1,10 +1,12 @@
readGetResult('/ticketprinter/'. $hash . '/')->getEntity();
+ $entityWithHash = \App::$http->readGetResult('/ticketprinter/' . $hash . '/')->getEntity();
$entity->hash = $entityWithHash->hash;
$entity->enabled = $entityWithHash->enabled;
return $entity;
@@ -92,7 +94,7 @@ protected function writeNewWithHash(RequestInterface $request, Entity $entity):
throw new OrganisationNotFoundException();
}
$entityWithHash = \App::$http->readGetResult(
- '/organisation/'. $this->organisation->getId() . '/hash/',
+ '/organisation/' . $this->organisation->getId() . '/hash/',
['name' => (isset($this->requestParams['name'])) ? $this->requestParams['name'] : '']
)->getEntity();
TicketprinterClient::setHash($entityWithHash->hash, $request);
@@ -112,7 +114,7 @@ protected function getAssembledEntity(): Entity
$entity = new Entity($this->requestParams);
if ($this->scopeId) {
$entity = new Entity();
- $entity->buttonlist = 's'. $this->scopeId;
+ $entity->buttonlist = 's' . $this->scopeId;
}
$entity = $entity->toStructuredButtonList();
return $entity;
@@ -124,7 +126,7 @@ protected function readOrganisation(): Organisation
$ticketprinter = $this->getAssembledEntity();
if ($this->scopeId) {
$organisation = \App::$http->readGetResult(
- '/scope/'. $this->scopeId . '/organisation/',
+ '/scope/' . $this->scopeId . '/organisation/',
['resolveReferences' => 2]
)->getEntity();
}
@@ -132,7 +134,7 @@ protected function readOrganisation(): Organisation
while (! $organisation && $nextButton) {
if (in_array($nextButton['type'], ['scope', 'request'])) {
$organisation = \App::$http->readGetResult(
- '/scope/'. $nextButton['scope']['id'] . '/organisation/',
+ '/scope/' . $nextButton['scope']['id'] . '/organisation/',
['resolveReferences' => 2]
)->getEntity();
}
diff --git a/zmsticketprinter/src/Zmsticketprinter/Helper/TwigExceptionHandler.php b/zmsticketprinter/src/Zmsticketprinter/Helper/TwigExceptionHandler.php
index d4539fdeb..f17c7c66d 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Helper/TwigExceptionHandler.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Helper/TwigExceptionHandler.php
@@ -2,8 +2,8 @@
namespace BO\Zmsticketprinter\Helper;
-use \Psr\Http\Message\RequestInterface;
-use \Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
class TwigExceptionHandler extends \BO\Slim\TwigExceptionHandler
{
diff --git a/zmsticketprinter/src/Zmsticketprinter/Home.php b/zmsticketprinter/src/Zmsticketprinter/Home.php
index 5b6e04898..b4ef09276 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Home.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Home.php
@@ -1,10 +1,12 @@
readGetResult('/config/', [], \App::SECURE_TOKEN)->getEntity();
+ $config = $this->getConfig();
+
$validator = $request->getAttribute('validator');
- $defaultTemplate = $validator->getParameter("template")
- ->isPath()
- ->setDefault('default');
- $languageConfig = str_replace(' ', '+', $validator->getParameter("config")->isString()->getValue());
- $languageConfig = json_decode(base64_decode($languageConfig), true);
- $currentLang = $validator->getParameter("lang")->isString()->getValue();
- $queryString = isset($_SERVER['QUERY_STRING']) ? str_replace('/&', '', $_SERVER['QUERY_STRING']) : '';
+ $defaultTemplate = $this->getDefaultTemplate($validator);
+ $languageConfig = $this->getLanguageConfig($validator);
- if (! strpos($queryString, 'lang=')) {
- $queryString .= '&lang=de';
- $currentLang = 'de';
- }
+ $currentLang = $this->getCurrentLanguage($validator);
+ $queryString = $this->getQueryStringWithLang();
- $translations = [
- 'printText' => ''
- ];
- $languages = [];
- $defaultLanguage = 'de';
+ $translations = $this->getTranslations($languageConfig, $currentLang);
+ $defaultLanguage = $languageConfig['defaultLanguage'] ?? 'de';
+ $languages = $this->getAvailableLanguages($languageConfig);
- if ($languageConfig) {
- $defaultLanguage = $languageConfig['defaultLanguage'] ?? '';
- foreach ($languageConfig['languages'] as $language) {
- $languages[] = $language['language'];
-
- if ($language['language'] !== $currentLang) {
- continue;
- }
-
- foreach ($language['translations'] as $requestId => $translation) {
- $translations[$requestId] = $translation;
- }
- }
- }
-
- if (empty($currentLang) || $currentLang === 'de') {
- $translations['printText'] = $languageConfig['defaultPrintText'] ?? '';
- }
-
- $ticketprinterHelper = (new Helper\Ticketprinter($args, $request));
+ $ticketprinterHelper = new Helper\Ticketprinter($args, $request);
$ticketprinter = $ticketprinterHelper->getEntity();
+
$ticketprinter->testValid();
$scope = $ticketprinter->getScopeList()->getFirst();
- $department = \App::$http->readGetResult('/scope/'. $scope->id . '/department/')->getEntity();
+ $department = $this->getDepartment($scope);
$organisation = $ticketprinterHelper->getOrganisation();
-
- /*
- *Check whether at least one button is not active (no opening hours stored or location deactivated)
- *the value will be transferd to the template.
- */
- $hasDisabledButton = false;
- foreach ($ticketprinter->buttons as $button) {
- if (!isset($button['enabled']) || $button['enabled'] != 1) {
- $hasDisabledButton = true;
- break;
- }
- }
-
- if (1 == count($ticketprinter->buttons) && 'scope' == $ticketprinter->buttons[0]['type']) {
+ if ($this->shouldRedirectToScope($ticketprinter)) {
return Render::redirect(
'TicketprinterByScope',
- array(
- 'scopeId' => $ticketprinter->buttons[0]['scope']['id']
- ),
+ ['scopeId' => $ticketprinter->buttons[0]['scope']['id']],
$this->getQueryString($validator, $ticketprinter, $defaultTemplate)
);
}
+
$template = (new Helper\TemplateFinder($defaultTemplate->getValue()))
->setCustomizedTemplate($ticketprinter, $organisation);
return Render::withHtml(
$response,
$template->getTemplate(),
- array(
+ [
'debug' => \App::DEBUG,
'refreshInSeconds' => 30,
'urlQueryString' => $queryString,
@@ -119,11 +77,86 @@ public function readResponse(
'defaultLanguage' => $defaultLanguage,
'languages' => $languages,
'translations' => $translations,
- 'hasDisabledButton' => $hasDisabledButton
- )
+ 'hasDisabledButton' => $this->hasDisabledButton($ticketprinter)
+ ]
);
}
+ private function getConfig()
+ {
+ return \App::$http->readGetResult('/config/', [], \App::SECURE_TOKEN)->getEntity();
+ }
+
+ private function getDefaultTemplate($validator)
+ {
+ return $validator->getParameter("template")
+ ->isPath()
+ ->setDefault('default');
+ }
+
+ private function getLanguageConfig($validator)
+ {
+ return json_decode(base64_decode(str_replace(' ', '+', $validator->getParameter("config")->isString()->getValue())), true);
+ }
+
+ private function getCurrentLanguage($validator)
+ {
+ return $validator->getParameter("lang")->isString()->getValue();
+ }
+
+ private function getQueryStringWithLang()
+ {
+ $queryString = $_SERVER['QUERY_STRING'] ?? '';
+ if (!strpos($queryString, 'lang=')) {
+ $queryString .= '&lang=de';
+ }
+ return str_replace('/&', '', $queryString);
+ }
+
+ private function getTranslations($languageConfig, $currentLang)
+ {
+ $translations = ['printText' => ''];
+ if ($languageConfig) {
+ foreach ($languageConfig['languages'] as $language) {
+ if ($language['language'] !== $currentLang) {
+ continue;
+ }
+ foreach ($language['translations'] as $requestId => $translation) {
+ $translations[$requestId] = $translation;
+ }
+ }
+ if (empty($currentLang) || $currentLang === 'de') {
+ $translations['printText'] = $languageConfig['defaultPrintText'] ?? '';
+ }
+ }
+ return $translations;
+ }
+
+ private function getAvailableLanguages($languageConfig)
+ {
+ return array_column($languageConfig['languages'] ?? [], 'language');
+ }
+
+ private function getDepartment($scope)
+ {
+ return \App::$http->readGetResult('/scope/' . $scope->id . '/department/')->getEntity();
+ }
+
+ private function shouldRedirectToScope($ticketprinter)
+ {
+ return count($ticketprinter->buttons) === 1 && $ticketprinter->buttons[0]['type'] === 'scope';
+ }
+
+ private function hasDisabledButton($ticketprinter)
+ {
+ foreach ($ticketprinter->buttons as $button) {
+ if (!isset($button['enabled']) || $button['enabled'] != 1) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* @param Validator $validator
* @param Ticketprinter $ticketprinter
@@ -132,14 +165,13 @@ public function readResponse(
*/
protected function getQueryString($validator, $ticketprinter, $defaultTemplate)
{
- $query = ($defaultTemplate->getValue() == 'default') ? [] : ['template' => $defaultTemplate->getValue()];
+ $query = ($defaultTemplate->getValue() === 'default') ? [] : ['template' => $defaultTemplate->getValue()];
if (isset($ticketprinter['home'])) {
$homeUrl = $validator::value($ticketprinter['home'])->isUrl()->getValue();
if ($homeUrl) {
$query['ticketprinter[home]'] = $homeUrl;
}
}
-
return $query;
}
}
diff --git a/zmsticketprinter/src/Zmsticketprinter/Message.php b/zmsticketprinter/src/Zmsticketprinter/Message.php
index 830b2b7b9..a313e7040 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Message.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Message.php
@@ -1,19 +1,20 @@
readGetResult('/scope/'. $scopeId .'/queue/'. $waitingNumber .'/')
+ ->readGetResult('/scope/' . $scopeId . '/queue/' . $waitingNumber . '/')
->getEntity();
if ($process->getFirstClient()->hasTelephone()) {
diff --git a/zmsticketprinter/src/Zmsticketprinter/NotificationAmendment.php b/zmsticketprinter/src/Zmsticketprinter/NotificationAmendment.php
index 8bd249961..103653bb9 100644
--- a/zmsticketprinter/src/Zmsticketprinter/NotificationAmendment.php
+++ b/zmsticketprinter/src/Zmsticketprinter/NotificationAmendment.php
@@ -1,10 +1,12 @@
getParameter('clusterId')->isNumber()->getValue();
$ticketprinter = (new Helper\Ticketprinter($args, $request))->getEntity();
- $scope = ($scopeId) ? \App::$http->readGetResult('/scope/'. $scopeId .'/')->getEntity() : null;
- $cluster = ($clusterId) ? \App::$http->readGetResult('/cluster/'. $clusterId .'/')->getEntity() : null;
+ $scope = ($scopeId) ? \App::$http->readGetResult('/scope/' . $scopeId . '/')->getEntity() : null;
+ $cluster = ($clusterId) ? \App::$http->readGetResult('/cluster/' . $clusterId . '/')->getEntity() : null;
return Render::withHtml(
$response,
@@ -41,7 +42,7 @@ public function readResponse(
'scope' => $scope,
'cluster' => $cluster,
'organisation' => \App::$http->readGetResult(
- '/scope/'. $scopeId . '/organisation/',
+ '/scope/' . $scopeId . '/organisation/',
['resolveReferences' => 2]
)->getEntity(),
)
diff --git a/zmsticketprinter/src/Zmsticketprinter/NotificationAssign.php b/zmsticketprinter/src/Zmsticketprinter/NotificationAssign.php
index 1dd77a5a0..b7a66d6aa 100644
--- a/zmsticketprinter/src/Zmsticketprinter/NotificationAssign.php
+++ b/zmsticketprinter/src/Zmsticketprinter/NotificationAssign.php
@@ -1,10 +1,12 @@
getParameter('processId')->isNumber()->getValue();
$authKey = $validator->getParameter('authKey')->isString()->getValue();
- $process = \App::$http->readGetResult('/process/'. $processId .'/'. $authKey .'/')->getEntity();
+ $process = \App::$http->readGetResult('/process/' . $processId . '/' . $authKey . '/')->getEntity();
if ($telephone->hasFailed()) {
return Render::redirect(
@@ -75,11 +76,11 @@ protected function writeUpdateProcessWithNotification(\BO\Zmsentities\Process $p
//add notification to queue
$process->status = 'queued';
$process = \App::$http
- ->readPostResult('/process/'. $process->id .'/'. $process->authKey .'/', $process)
+ ->readPostResult('/process/' . $process->id . '/' . $process->authKey . '/', $process)
->getEntity();
\App::$http->readPostResult(
- '/process/'. $process->id .'/'. $process->authKey .'/confirmation/notification/',
+ '/process/' . $process->id . '/' . $process->authKey . '/confirmation/notification/',
$process
);
diff --git a/zmsticketprinter/src/Zmsticketprinter/Process.php b/zmsticketprinter/src/Zmsticketprinter/Process.php
index 3dd0a4c1c..763b5cbd3 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Process.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Process.php
@@ -1,10 +1,12 @@
readGetResult(
- '/scope/'. $scopeId .'/waitingnumber/'. $ticketprinterHelper->getEntity()->hash .'/',
+ '/scope/' . $scopeId . '/waitingnumber/' . $ticketprinterHelper->getEntity()->hash . '/',
$requestId ? ['requestId' => $requestId] : null
)->getEntity();
$scope = new Scope($process->scope);
- $department = \App::$http->readGetResult('/scope/'. $scope->getId() . '/department/')->getEntity();
+ $department = \App::$http->readGetResult('/scope/' . $scope->getId() . '/department/')->getEntity();
$queueListHelper = (new QueueListHelper($scope, $process));
diff --git a/zmsticketprinter/src/Zmsticketprinter/RedirectOld.php b/zmsticketprinter/src/Zmsticketprinter/RedirectOld.php
index a160773fb..f5c019edb 100644
--- a/zmsticketprinter/src/Zmsticketprinter/RedirectOld.php
+++ b/zmsticketprinter/src/Zmsticketprinter/RedirectOld.php
@@ -6,6 +6,7 @@
* @copyright BerlinOnline Stadtportal GmbH & Co. KG
*
*/
+
namespace BO\Zmsticketprinter;
use BO\Slim\Render;
@@ -14,7 +15,6 @@
class RedirectOld extends BaseController
{
-
/**
* @SuppressWarnings(UnusedFormalParameter)
* add params to session if valid and redirect to calendar
diff --git a/zmsticketprinter/src/Zmsticketprinter/Reset.php b/zmsticketprinter/src/Zmsticketprinter/Reset.php
index ce7c1c8a0..0580911d1 100644
--- a/zmsticketprinter/src/Zmsticketprinter/Reset.php
+++ b/zmsticketprinter/src/Zmsticketprinter/Reset.php
@@ -1,10 +1,12 @@
readGetResult('/ticketprinter/'. $status['hash'] . '/')
+ ->readGetResult('/ticketprinter/' . $status['hash'] . '/')
->getEntity();
}
diff --git a/zmsticketprinter/src/Zmsticketprinter/TicketprinterByScope.php b/zmsticketprinter/src/Zmsticketprinter/TicketprinterByScope.php
index 30be78dc2..a934dbf15 100644
--- a/zmsticketprinter/src/Zmsticketprinter/TicketprinterByScope.php
+++ b/zmsticketprinter/src/Zmsticketprinter/TicketprinterByScope.php
@@ -1,10 +1,12 @@
getEntity();
$scope = $ticketprinter->getScopeList()->getFirst();
- $department = \App::$http->readGetResult('/scope/'. $scope->id . '/department/')->getEntity();
+ $department = \App::$http->readGetResult('/scope/' . $scope->id . '/department/')->getEntity();
$organisation = $ticketprinterHelper->getOrganisation();
-
+
$queueListHelper = new QueueListHelper($scope);
-
+
$template = (new TemplateFinder($defaultTemplate))->setCustomizedTemplate($ticketprinter, $organisation);
$hasDisabledButton = false;
@@ -49,7 +51,7 @@ public function readResponse(
break;
}
}
-
+
return Render::withHtml(
$response,
$template->getTemplate(),