diff --git a/app/api/composer.json b/app/api/composer.json index 0715f4a322..58248e0771 100644 --- a/app/api/composer.json +++ b/app/api/composer.json @@ -1,133 +1,133 @@ { - "name": "olcs/backend", - "description": "Back End Application for OLCS Project", - "require": { - "php": "~8.2.0", - "ext-intl": "*", - "ext-json": "*", - "ext-curl": "*", - "ext-redis": "*", - "ext-pdo": "*", - "aws/aws-sdk-php": "^3.183", - "beberlei/doctrineextensions": "^1.0", - "caseyamcl/guzzle_retry_middleware": "^2.7.1", - "doctrine/doctrine-orm-module": "^5", - "doctrine/orm": "^2.19.5", - "doctrine/persistence": "^2.1", - "dvsa/authentication-cognito": "^2.0", - "dvsa/laminas-config-cloud-parameters": "^0.1.0", - "dvsa/php-govuk-account": "^2.0.1", - "gedmo/doctrine-extensions": "^3", - "guzzlehttp/guzzle": "^7.5", - "league/flysystem": "^1.0", - "league/flysystem-webdav": "1.0.10", - "monolog/monolog": "^2.9", - "olcs/olcs-logging": "^7.0", - "olcs/olcs-transfer": "^7.4.0", - "olcs/olcs-utils": "^6.0.0", - "olcs/olcs-xmltools": "~7.0.0", - "oro/doctrine-extensions": "^2", - "phprtflite/phprtflite": "~1.3.3", - "phpseclib/phpseclib": "^2.0.6", - "qandidate/toggle": "^1.1", - "ramsey/uuid": "^3.6", - "ruflin/elastica": "^7.0", - "saeven/zf3-purifier": "^1.1", - "simplesamlphp/saml2": "~3.4.2", - "symfony/filesystem": "^5", - "symfony/finder": "^5", - "symfony/lock": "^5", - "twig/twig": "^2.0", - "lm-commons/lmc-rbac-mvc": "^3.3", - "laminas/laminas-mail": "^2.16", - "laminas/laminas-mvc": "^3.3", - "laminas/laminas-mvc-i18n": "^1.4", - "laminas/laminas-servicemanager": "^3.17", - "laminas/laminas-http": "^2.16", - "laminas/laminas-view": "^2.23", - "laminas/laminas-i18n": "^2.17", - "laminas/laminas-serializer": "^2.13", - "laminas/laminas-eventmanager": "^3.5", - "psr/container": "^1.1|^2", - "laminas/laminas-cli": "^1.5" - }, - "autoload": { - "psr-4": { - "Dvsa\\Olcs\\Db\\": "module/Db/src", - "Dvsa\\Olcs\\AcquiredRights\\": "module/AcquiredRights/src", - "Dvsa\\Olcs\\Api\\": "module/Api/src", - "Dvsa\\Olcs\\DocumentShare\\": "module/DocumentShare/src", - "Dvsa\\Olcs\\Cli\\": "module/Cli/src", - "Dvsa\\Olcs\\Scanning\\": "module/Scanning/src", - "Dvsa\\Olcs\\Email\\": "module/Email/src", - "Dvsa\\Olcs\\Address\\": "module/Address/src", - "Dvsa\\Olcs\\DvsaAddressService\\": "module/DvsaAddressService/src", - "Dvsa\\Olcs\\Snapshot\\": "module/Snapshot/src", - "Dvsa\\Olcs\\GdsVerify\\": "module/GdsVerify/src", - "Dvsa\\Olcs\\Queue\\": "module/Queue/src", - "Dvsa\\Olcs\\AwsSdk\\": "module/AwsSdk/src", - "Dvsa\\Olcs\\Auth\\": "module/Auth/src", - "Dvsa\\Olcs\\CompaniesHouse\\": "module/CompaniesHouse/src", - "Dvsa\\Olcs\\Cpms\\": "module/Cpms/src" - } - }, - "autoload-dev": { - "psr-4": { - "Dvsa\\OlcsTest\\Auth\\": "test/module/Auth/src", - "Dvsa\\OlcsTest\\CompaniesHouse\\": "test/module/CompaniesHouse/src", - "Dvsa\\OlcsTest\\Cpms\\": "test/module/Cpms/src", - "Dvsa\\OlcsTest\\Db\\": "test/module/Olcs/Db/src", - "Dvsa\\OlcsTest\\": "test/src", - "Dvsa\\OlcsTest\\Address\\": "test/module/Address/src", - "Dvsa\\OlcsTest\\Api\\": "test/module/Api/src", - "Dvsa\\OlcsTest\\Cli\\": "test/module/Cli/src", - "Dvsa\\OlcsTest\\DocumentShare\\": "test/module/DocumentShare/src", - "Dvsa\\OlcsTest\\Email\\": "test/module/Email/src", - "Dvsa\\OlcsTest\\Scanning\\": "test/module/Scanning/src", - "Dvsa\\OlcsTest\\Snapshot\\": "test/module/Snapshot/src", - "Dvsa\\OlcsTest\\AwsSdk\\": "test/module/AwsSdk/src", - "Dvsa\\OlcsTest\\Queue\\": "test/module/Queue/src" - } - }, - "minimum-stability": "dev", - "prefer-stable": true, - "config": { - "platform": { - "ext-redis": "4.3" - }, - "allow-plugins": { - "bamarni/composer-bin-plugin": true - } - }, - "scripts": { - "bin": "echo 'bin not installed'", - "post-install-cmd": [ - "@composer bin all install" - ], - "test": "phpunit", - "phpcs": "phpcs", - "psalm": "psalm", - "phpstan": "phpstan", - "all": [ - "@test", - "@phpcs", - "@psalm", - "@phpstan" - ] - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.8", - "phpunit/phpunit": "^9.6", - "mockery/mockery": "^1.6", - "johnkary/phpunit-speedtrap": "^4.0", - "mikey179/vfsstream": "^1.6", - "dms/phpunit-arraysubset-asserts": "^0.5.0", - "dvsa/authentication-ldap": "^3" + "name": "olcs/backend", + "description": "Back End Application for OLCS Project", + "require": { + "php": "~8.2.0", + "ext-intl": "*", + "ext-json": "*", + "ext-curl": "*", + "ext-redis": "*", + "ext-pdo": "*", + "aws/aws-sdk-php": "^3.183", + "beberlei/doctrineextensions": "^1.0", + "caseyamcl/guzzle_retry_middleware": "^2.7.1", + "doctrine/doctrine-orm-module": "^5", + "doctrine/orm": "^2.19.5", + "doctrine/persistence": "^2.1", + "dvsa/authentication-cognito": "^2.0", + "dvsa/laminas-config-cloud-parameters": "^1.0", + "dvsa/php-govuk-account": "^2.0.1", + "gedmo/doctrine-extensions": "^3", + "guzzlehttp/guzzle": "^7.5", + "league/flysystem": "^1.0", + "league/flysystem-webdav": "1.0.10", + "monolog/monolog": "^2.9", + "olcs/olcs-logging": "^7.0", + "olcs/olcs-transfer": "^7.4.0", + "olcs/olcs-utils": "^6.0.0", + "olcs/olcs-xmltools": "~7.0.0", + "oro/doctrine-extensions": "^2", + "phprtflite/phprtflite": "~1.3.3", + "phpseclib/phpseclib": "^2.0.6", + "qandidate/toggle": "^1.1", + "ramsey/uuid": "^3.6", + "ruflin/elastica": "^7.0", + "saeven/zf3-purifier": "^1.1", + "simplesamlphp/saml2": "~3.4.2", + "symfony/filesystem": "^5", + "symfony/finder": "^5", + "symfony/lock": "^5", + "twig/twig": "^2.0", + "lm-commons/lmc-rbac-mvc": "^3.3", + "laminas/laminas-mail": "^2.16", + "laminas/laminas-mvc": "^3.3", + "laminas/laminas-mvc-i18n": "^1.4", + "laminas/laminas-servicemanager": "^3.17", + "laminas/laminas-http": "^2.16", + "laminas/laminas-view": "^2.23", + "laminas/laminas-i18n": "^2.17", + "laminas/laminas-serializer": "^2.13", + "laminas/laminas-eventmanager": "^3.5", + "psr/container": "^1.1|^2", + "laminas/laminas-cli": "^1.5" + }, + "autoload": { + "psr-4": { + "Dvsa\\Olcs\\Db\\": "module/Db/src", + "Dvsa\\Olcs\\AcquiredRights\\": "module/AcquiredRights/src", + "Dvsa\\Olcs\\Api\\": "module/Api/src", + "Dvsa\\Olcs\\DocumentShare\\": "module/DocumentShare/src", + "Dvsa\\Olcs\\Cli\\": "module/Cli/src", + "Dvsa\\Olcs\\Scanning\\": "module/Scanning/src", + "Dvsa\\Olcs\\Email\\": "module/Email/src", + "Dvsa\\Olcs\\Address\\": "module/Address/src", + "Dvsa\\Olcs\\DvsaAddressService\\": "module/DvsaAddressService/src", + "Dvsa\\Olcs\\Snapshot\\": "module/Snapshot/src", + "Dvsa\\Olcs\\GdsVerify\\": "module/GdsVerify/src", + "Dvsa\\Olcs\\Queue\\": "module/Queue/src", + "Dvsa\\Olcs\\AwsSdk\\": "module/AwsSdk/src", + "Dvsa\\Olcs\\Auth\\": "module/Auth/src", + "Dvsa\\Olcs\\CompaniesHouse\\": "module/CompaniesHouse/src", + "Dvsa\\Olcs\\Cpms\\": "module/Cpms/src" + } + }, + "autoload-dev": { + "psr-4": { + "Dvsa\\OlcsTest\\Auth\\": "test/module/Auth/src", + "Dvsa\\OlcsTest\\CompaniesHouse\\": "test/module/CompaniesHouse/src", + "Dvsa\\OlcsTest\\Cpms\\": "test/module/Cpms/src", + "Dvsa\\OlcsTest\\Db\\": "test/module/Olcs/Db/src", + "Dvsa\\OlcsTest\\": "test/src", + "Dvsa\\OlcsTest\\Address\\": "test/module/Address/src", + "Dvsa\\OlcsTest\\Api\\": "test/module/Api/src", + "Dvsa\\OlcsTest\\Cli\\": "test/module/Cli/src", + "Dvsa\\OlcsTest\\DocumentShare\\": "test/module/DocumentShare/src", + "Dvsa\\OlcsTest\\Email\\": "test/module/Email/src", + "Dvsa\\OlcsTest\\Scanning\\": "test/module/Scanning/src", + "Dvsa\\OlcsTest\\Snapshot\\": "test/module/Snapshot/src", + "Dvsa\\OlcsTest\\AwsSdk\\": "test/module/AwsSdk/src", + "Dvsa\\OlcsTest\\Queue\\": "test/module/Queue/src" + } + }, + "minimum-stability": "dev", + "prefer-stable": true, + "config": { + "platform": { + "ext-redis": "4.3" }, - "extra" : { - "bamarni-bin": { - "bin-links": true, - "forward-command": true - } + "allow-plugins": { + "bamarni/composer-bin-plugin": true + } + }, + "scripts": { + "bin": "echo 'bin not installed'", + "post-install-cmd": [ + "@composer bin all install" + ], + "test": "phpunit", + "phpcs": "phpcs", + "psalm": "psalm", + "phpstan": "phpstan", + "all": [ + "@test", + "@phpcs", + "@psalm", + "@phpstan" + ] + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8", + "phpunit/phpunit": "^9.6", + "mockery/mockery": "^1.6", + "johnkary/phpunit-speedtrap": "^4.0", + "mikey179/vfsstream": "^1.6", + "dms/phpunit-arraysubset-asserts": "^0.5.0", + "dvsa/authentication-ldap": "^3" + }, + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true } + } } diff --git a/app/api/composer.lock b/app/api/composer.lock index f404433199..07757c87ab 100644 --- a/app/api/composer.lock +++ b/app/api/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": "09dafd059e7f1129bd2316ef96f48bfe", + "content-hash": "7c29a180f505918478039c3f59d22742", "packages": [ { "name": "aws/aws-crt-php", @@ -1736,16 +1736,16 @@ }, { "name": "dvsa/laminas-config-cloud-parameters", - "version": "v0.1.1", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters.git", - "reference": "1cec4e8cdf16bf61c848be45f758697977659c1e" + "reference": "7d3fe94fabc215d4721d550393018944055a6168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/dvsa-laminas-config-cloud-parameters/zipball/1cec4e8cdf16bf61c848be45f758697977659c1e", - "reference": "1cec4e8cdf16bf61c848be45f758697977659c1e", + "url": "https://api.github.com/repos/dvsa/dvsa-laminas-config-cloud-parameters/zipball/7d3fe94fabc215d4721d550393018944055a6168", + "reference": "7d3fe94fabc215d4721d550393018944055a6168", "shasum": "" }, "require": { @@ -1753,8 +1753,9 @@ "laminas/laminas-config": "^2.0|^3.0", "laminas/laminas-config-aggregator": "^1.7", "laminas/laminas-modulemanager": "^2.4|^3.0", - "php": "^7.4 || ^8.0", - "symfony/dependency-injection": "^5.4" + "php": "^8.0", + "symfony/dependency-injection": "^5.4", + "symfony/property-access": "^5.4|^6.3" }, "require-dev": { "aws/aws-sdk-php": "^3.281", @@ -1782,9 +1783,9 @@ "license": ["MIT"], "support": { "issues": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/issues", - "source": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/tree/v0.1.1" + "source": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/tree/v1.0.0" }, - "time": "2023-11-06T10:01:58+00:00" + "time": "2024-03-19T14:06:05+00:00" }, { "name": "dvsa/php-govuk-account", @@ -8797,6 +8798,158 @@ ], "time": "2024-04-18T09:22:46+00:00" }, + { + "name": "symfony/property-access", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/property-access.git", + "reference": "e4d9b00983612f9c0013ca37c61affdba2dd975a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/property-access/zipball/e4d9b00983612f9c0013ca37c61affdba2dd975a", + "reference": "e4d9b00983612f9c0013ca37c61affdba2dd975a", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/property-info": "^5.4|^6.0|^7.0" + }, + "require-dev": { + "symfony/cache": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\PropertyAccess\\": "" + }, + "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 functions to read and write from/to an object or array using a simple string notation", + "homepage": "https://symfony.com", + "keywords": [ + "access", + "array", + "extraction", + "index", + "injection", + "object", + "property", + "property-path", + "reflection" + ], + "support": { + "source": "https://github.com/symfony/property-access/tree/v6.4.8" + }, + "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-05-31T14:49:08+00:00" + }, + { + "name": "symfony/property-info", + "version": "v6.4.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/property-info.git", + "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/property-info/zipball/edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", + "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/string": "^5.4|^6.0|^7.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "<5.2", + "phpdocumentor/type-resolver": "<1.5.1", + "symfony/dependency-injection": "<5.4", + "symfony/serializer": "<6.4" + }, + "require-dev": { + "phpdocumentor/reflection-docblock": "^5.2", + "phpstan/phpdoc-parser": "^1.0", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\PropertyInfo\\": "" + }, + "exclude-from-classmap": ["/Tests/"] + }, + "notification-url": "https://packagist.org/downloads/", + "license": ["MIT"], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Extracts information about PHP class' properties using metadata of popular sources", + "homepage": "https://symfony.com", + "keywords": [ + "doctrine", + "phpdoc", + "property", + "symfony", + "type", + "validator" + ], + "support": { + "source": "https://github.com/symfony/property-info/tree/v6.4.10" + }, + "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-07-26T07:32:07+00:00" + }, { "name": "symfony/service-contracts", "version": "v2.5.3", diff --git a/app/api/config/autoload/config-parameters.global.php b/app/api/config/autoload/config-parameters.global.php index 69e1c4dc1d..caa6da6869 100644 --- a/app/api/config/autoload/config-parameters.global.php +++ b/app/api/config/autoload/config-parameters.global.php @@ -37,9 +37,9 @@ ], 'config_parameters' => [ 'providers' => $providers, - ], - 'casts' => [ - '[log][Logger][writers][full][options][filters][priority][options][priority]' => Integer::class, - '[log][ExceptionLogger][writers][full][options][filters][priority][options][priority]' => Integer::class, + 'casts' => [ + '[log][Logger][writers][full][options][filters][priority][options][priority]' => Integer::class, + '[log][ExceptionLogger][writers][full][options][filters][priority][options][priority]' => Integer::class, + ], ], ]; diff --git a/app/internal/composer.json b/app/internal/composer.json index 26c4126f6d..1da4c99574 100644 --- a/app/internal/composer.json +++ b/app/internal/composer.json @@ -1,98 +1,98 @@ { - "name": "olcs/olcs-internal", - "description": "OLCS Internal Web Site", - "require": { - "php": "~8.2.0", - "ext-redis": "*", - "dvsa/laminas-config-cloud-parameters": "^0.2.0", - "laminas/laminas-authentication": "^2.5", - "laminas/laminas-cache": "^3.0", - "laminas/laminas-cache-storage-adapter-redis": "^2.0", - "laminas/laminas-code": "^4.0", - "laminas/laminas-escaper": "^2.5", - "laminas/laminas-eventmanager": "^3.0", - "laminas/laminas-filter": "^2.5", - "laminas/laminas-form": "^3.0", - "laminas/laminas-http": "^2.5", - "laminas/laminas-i18n": "^2.5", - "laminas/laminas-inputfilter": "^2.5", - "laminas/laminas-json": "^3.0", - "laminas/laminas-mvc": "^3.0", - "laminas/laminas-mvc-i18n": "^1", - "laminas/laminas-mvc-plugin-flashmessenger": "^1", - "laminas/laminas-mvc-plugin-prg": "^1", - "laminas/laminas-navigation": "^2.10", - "laminas/laminas-servicemanager": "^3.3", - "laminas/laminas-session": "^2.5", - "laminas/laminas-stdlib": "^3.0", - "laminas/laminas-validator": "^2.5", - "laminas/laminas-view": "^2.5", - "lm-commons/lmc-rbac-mvc": "^3.0", - "firebase/php-jwt": "^6.0", - "olcs/olcs-auth": "^8.0", - "olcs/olcs-common": "^7.8.0", - "olcs/olcs-logging": "^7.2", - "olcs/olcs-transfer": "^7.4.0", - "olcs/olcs-utils": "^6.0.0", - "saeven/zf3-purifier": "^1.1", - "doctrine/doctrine-module": "^5", - "laminas/laminas-serializer": "^2.5", - "psr/container": "^1.1|^2", - "aws/aws-sdk-php": "^3.300" - }, - "require-dev": { - "johnkary/phpunit-speedtrap": "^4.0", - "laminas/laminas-developer-tools": "*", - "mockery/mockery": "^1.6", - "phpunit/phpunit": "^9.6", - "san/san-session-toolbar": "*", - "bamarni/composer-bin-plugin": "^1.8" - }, - "autoload": { - "psr-4": { - "Olcs\\": "module/Olcs/src", - "Admin\\": "module/Admin/src" - } - }, - "autoload-dev": { - "psr-4": { - "Dvsa\\OlcsTest\\": "./test", - "OlcsTest\\": "./test/Olcs/src", - "AdminTest\\": "./test/Admin/src", - "CommonTest\\": "vendor/olcs/olcs-common/test/Common/src/" - } - }, - "minimum-stability": "dev", - "prefer-stable": true, - "scripts": { - "bin": "echo 'bin not installed'", - "post-install-cmd": [ - "@composer bin all install" - ], - "test": "phpunit", - "phpcs": "phpcs", - "psalm": "psalm", - "phpstan": "phpstan", - "all": [ - "@test", - "@phpcs", - "@psalm", - "@phpstan" - ] - }, - "extra" : { - "bamarni-bin": { - "bin-links": true, - "forward-command": true - } + "name": "olcs/olcs-internal", + "description": "OLCS Internal Web Site", + "require": { + "php": "~8.2.0", + "ext-redis": "*", + "dvsa/laminas-config-cloud-parameters": "^1.0", + "laminas/laminas-authentication": "^2.5", + "laminas/laminas-cache": "^3.0", + "laminas/laminas-cache-storage-adapter-redis": "^2.0", + "laminas/laminas-code": "^4.0", + "laminas/laminas-escaper": "^2.5", + "laminas/laminas-eventmanager": "^3.0", + "laminas/laminas-filter": "^2.5", + "laminas/laminas-form": "^3.0", + "laminas/laminas-http": "^2.5", + "laminas/laminas-i18n": "^2.5", + "laminas/laminas-inputfilter": "^2.5", + "laminas/laminas-json": "^3.0", + "laminas/laminas-mvc": "^3.0", + "laminas/laminas-mvc-i18n": "^1", + "laminas/laminas-mvc-plugin-flashmessenger": "^1", + "laminas/laminas-mvc-plugin-prg": "^1", + "laminas/laminas-navigation": "^2.10", + "laminas/laminas-servicemanager": "^3.3", + "laminas/laminas-session": "^2.5", + "laminas/laminas-stdlib": "^3.0", + "laminas/laminas-validator": "^2.5", + "laminas/laminas-view": "^2.5", + "lm-commons/lmc-rbac-mvc": "^3.0", + "firebase/php-jwt": "^6.0", + "olcs/olcs-auth": "^8.0", + "olcs/olcs-common": "^7.8.0", + "olcs/olcs-logging": "^7.2", + "olcs/olcs-transfer": "^7.4.0", + "olcs/olcs-utils": "^6.0.0", + "saeven/zf3-purifier": "^1.1", + "doctrine/doctrine-module": "^5", + "laminas/laminas-serializer": "^2.5", + "psr/container": "^1.1|^2", + "aws/aws-sdk-php": "^3.300" + }, + "require-dev": { + "johnkary/phpunit-speedtrap": "^4.0", + "laminas/laminas-developer-tools": "*", + "mockery/mockery": "^1.6", + "phpunit/phpunit": "^9.6", + "san/san-session-toolbar": "*", + "bamarni/composer-bin-plugin": "^1.8" + }, + "autoload": { + "psr-4": { + "Olcs\\": "module/Olcs/src", + "Admin\\": "module/Admin/src" + } + }, + "autoload-dev": { + "psr-4": { + "Dvsa\\OlcsTest\\": "./test", + "OlcsTest\\": "./test/Olcs/src", + "AdminTest\\": "./test/Admin/src", + "CommonTest\\": "vendor/olcs/olcs-common/test/Common/src/" + } + }, + "minimum-stability": "dev", + "prefer-stable": true, + "scripts": { + "bin": "echo 'bin not installed'", + "post-install-cmd": [ + "@composer bin all install" + ], + "test": "phpunit", + "phpcs": "phpcs", + "psalm": "psalm", + "phpstan": "phpstan", + "all": [ + "@test", + "@phpcs", + "@psalm", + "@phpstan" + ] + }, + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + } + }, + "config": { + "allow-plugins": { + "laminas/laminas-dependency-plugin": true, + "bamarni/composer-bin-plugin": true }, - "config": { - "allow-plugins": { - "laminas/laminas-dependency-plugin": true, - "bamarni/composer-bin-plugin": true - }, - "platform": { - "ext-redis": "4.3" - } + "platform": { + "ext-redis": "4.3" } + } } diff --git a/app/internal/composer.lock b/app/internal/composer.lock index a52c5185f7..6bb4894cc8 100644 --- a/app/internal/composer.lock +++ b/app/internal/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": "9938cbb0342d6fce3f0f60f1fc9e321a", + "content-hash": "19726ec9153ea944e02b7642bc74bf16", "packages": [ { "name": "aws/aws-crt-php", @@ -993,16 +993,16 @@ }, { "name": "dvsa/laminas-config-cloud-parameters", - "version": "v0.2.0", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters.git", - "reference": "073c97dd6fb426e31bec5a592e3119c3ffcb668d" + "reference": "7d3fe94fabc215d4721d550393018944055a6168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/dvsa-laminas-config-cloud-parameters/zipball/073c97dd6fb426e31bec5a592e3119c3ffcb668d", - "reference": "073c97dd6fb426e31bec5a592e3119c3ffcb668d", + "url": "https://api.github.com/repos/dvsa/dvsa-laminas-config-cloud-parameters/zipball/7d3fe94fabc215d4721d550393018944055a6168", + "reference": "7d3fe94fabc215d4721d550393018944055a6168", "shasum": "" }, "require": { @@ -1010,7 +1010,7 @@ "laminas/laminas-config": "^2.0|^3.0", "laminas/laminas-config-aggregator": "^1.7", "laminas/laminas-modulemanager": "^2.4|^3.0", - "php": "^7.4 || ^8.0", + "php": "^8.0", "symfony/dependency-injection": "^5.4", "symfony/property-access": "^5.4|^6.3" }, @@ -1040,9 +1040,9 @@ "license": ["MIT"], "support": { "issues": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/issues", - "source": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/tree/v0.2.0" + "source": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/tree/v1.0.0" }, - "time": "2023-11-17T11:31:22+00:00" + "time": "2024-03-19T14:06:05+00:00" }, { "name": "ezyang/htmlpurifier", diff --git a/app/internal/config/autoload/config-paramater.global.php b/app/internal/config/autoload/config-paramater.global.php index b2ad852db1..21675dd35a 100644 --- a/app/internal/config/autoload/config-paramater.global.php +++ b/app/internal/config/autoload/config-paramater.global.php @@ -40,12 +40,12 @@ ], 'config_parameters' => [ 'providers' => $providers, - ], - 'casts' => [ - '[query_cache][enabled]' => Boolean::class, - '[query_cache][ttl][' . CacheableMediumTermQueryInterface::class . ']' => Integer::class, - '[query_cache][ttl][' . CacheableLongTermQueryInterface::class . ']' => Integer::class, - '[log][Logger][writers][full][options][filters][priority][options][priority]' => Integer::class, - '[log][ExceptionLogger][writers][full][options][filters][priority][options][priority]' => Integer::class, + 'casts' => [ + '[query_cache][enabled]' => Boolean::class, + '[query_cache][ttl][' . CacheableMediumTermQueryInterface::class . ']' => Integer::class, + '[query_cache][ttl][' . CacheableLongTermQueryInterface::class . ']' => Integer::class, + '[log][Logger][writers][full][options][filters][priority][options][priority]' => Integer::class, + '[log][ExceptionLogger][writers][full][options][filters][priority][options][priority]' => Integer::class, + ], ], ]; diff --git a/app/selfserve/composer.json b/app/selfserve/composer.json index 825bb5c4be..c5b7fd234c 100644 --- a/app/selfserve/composer.json +++ b/app/selfserve/composer.json @@ -1,59 +1,59 @@ { - "name": "olcs/olcs-selfserve", - "description": "OLCS Self Service Web Site", - "require": { - "php": "~8.2.0", - "ext-redis": "*", - "doctrine/annotations": "^1.14.2", - "doctrine/doctrine-module": "^5", - "dvsa/laminas-config-cloud-parameters": "^0.2.0", - "laminas/laminas-authentication": "^2.6", - "laminas/laminas-cache": "^3.6", - "laminas/laminas-cache-storage-adapter-redis": "^2.4", - "laminas/laminas-eventmanager": "^3.0", - "laminas/laminas-filter": "^2.22", - "laminas/laminas-form": "^3.0", - "laminas/laminas-http": "^2.8", - "laminas/laminas-i18n": "^2.14", - "laminas/laminas-inputfilter": "^2.21", - "laminas/laminas-mvc": "^3.0", - "laminas/laminas-mvc-plugin-flashmessenger": "^1.8", - "laminas/laminas-mvc-plugin-prg": "^1.7", - "laminas/laminas-navigation": "^2.15", - "laminas/laminas-serializer": "^2.10", - "laminas/laminas-servicemanager": "^3.3", - "laminas/laminas-session": "^2.8", - "laminas/laminas-stdlib": "^3.0", - "laminas/laminas-validator": "^2.25", - "laminas/laminas-view": "^2.11", - "lm-commons/lmc-rbac-mvc": "^3.3", - "olcs/olcs-auth": "^8.0", - "olcs/olcs-common": "^7.8.0", - "olcs/olcs-logging": "^7.2", - "olcs/olcs-transfer": "^7.0", - "olcs/olcs-utils": "^6.0.0", - "psr/container": "^1.1|^2", - "aws/aws-sdk-php": "^3.300" - }, - "require-dev": { - "bamarni/composer-bin-plugin": "^1.8", - "johnkary/phpunit-speedtrap": "^4.0", - "laminas/laminas-developer-tools": "*", - "mockery/mockery": "^1.6", - "phpunit/phpunit": "^9.6", - "san/san-session-toolbar": "*" - }, - "autoload": { - "classmap": [ - "module/Olcs/src", - "module/Permits/src", - "module/Application/src", - "vendor/olcs/olcs-common/Common/src/Common" - ], - "psr-4": { - "Common\\": "vendor/olcs/olcs-common/Common/src/Common" - } - }, + "name": "olcs/olcs-selfserve", + "description": "OLCS Self Service Web Site", + "require": { + "php": "~8.2.0", + "ext-redis": "*", + "doctrine/annotations": "^1.14.2", + "doctrine/doctrine-module": "^5", + "dvsa/laminas-config-cloud-parameters": "^1.0", + "laminas/laminas-authentication": "^2.6", + "laminas/laminas-cache": "^3.6", + "laminas/laminas-cache-storage-adapter-redis": "^2.4", + "laminas/laminas-eventmanager": "^3.0", + "laminas/laminas-filter": "^2.22", + "laminas/laminas-form": "^3.0", + "laminas/laminas-http": "^2.8", + "laminas/laminas-i18n": "^2.14", + "laminas/laminas-inputfilter": "^2.21", + "laminas/laminas-mvc": "^3.0", + "laminas/laminas-mvc-plugin-flashmessenger": "^1.8", + "laminas/laminas-mvc-plugin-prg": "^1.7", + "laminas/laminas-navigation": "^2.15", + "laminas/laminas-serializer": "^2.10", + "laminas/laminas-servicemanager": "^3.3", + "laminas/laminas-session": "^2.8", + "laminas/laminas-stdlib": "^3.0", + "laminas/laminas-validator": "^2.25", + "laminas/laminas-view": "^2.11", + "lm-commons/lmc-rbac-mvc": "^3.3", + "olcs/olcs-auth": "^8.0", + "olcs/olcs-common": "^7.8.0", + "olcs/olcs-logging": "^7.2", + "olcs/olcs-transfer": "^7.0", + "olcs/olcs-utils": "^6.0.0", + "psr/container": "^1.1|^2", + "aws/aws-sdk-php": "^3.300" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8", + "johnkary/phpunit-speedtrap": "^4.0", + "laminas/laminas-developer-tools": "*", + "mockery/mockery": "^1.6", + "phpunit/phpunit": "^9.6", + "san/san-session-toolbar": "*" + }, + "autoload": { + "classmap": [ + "module/Olcs/src", + "module/Permits/src", + "module/Application/src", + "vendor/olcs/olcs-common/Common/src/Common" + ], + "psr-4": { + "Common\\": "vendor/olcs/olcs-common/Common/src/Common" + } + }, "autoload-dev": { "psr-4": { "OlcsTest\\": "test/Olcs/src", @@ -87,10 +87,10 @@ "@phpstan" ] }, - "extra": { - "bamarni-bin": { - "bin-links": true, - "forward-command": true - } + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true } + } } diff --git a/app/selfserve/composer.lock b/app/selfserve/composer.lock index 95f23dd822..5d30e7c4e1 100644 --- a/app/selfserve/composer.lock +++ b/app/selfserve/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": "75a2c30145f06bfaaf8515d2fc3a4d73", + "content-hash": "24e3c05e129acee0f6334b3520160946", "packages": [ { "name": "aws/aws-crt-php", @@ -993,16 +993,16 @@ }, { "name": "dvsa/laminas-config-cloud-parameters", - "version": "v0.2.0", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters.git", - "reference": "073c97dd6fb426e31bec5a592e3119c3ffcb668d" + "reference": "7d3fe94fabc215d4721d550393018944055a6168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/dvsa-laminas-config-cloud-parameters/zipball/073c97dd6fb426e31bec5a592e3119c3ffcb668d", - "reference": "073c97dd6fb426e31bec5a592e3119c3ffcb668d", + "url": "https://api.github.com/repos/dvsa/dvsa-laminas-config-cloud-parameters/zipball/7d3fe94fabc215d4721d550393018944055a6168", + "reference": "7d3fe94fabc215d4721d550393018944055a6168", "shasum": "" }, "require": { @@ -1010,7 +1010,7 @@ "laminas/laminas-config": "^2.0|^3.0", "laminas/laminas-config-aggregator": "^1.7", "laminas/laminas-modulemanager": "^2.4|^3.0", - "php": "^7.4 || ^8.0", + "php": "^8.0", "symfony/dependency-injection": "^5.4", "symfony/property-access": "^5.4|^6.3" }, @@ -1040,9 +1040,9 @@ "license": ["MIT"], "support": { "issues": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/issues", - "source": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/tree/v0.2.0" + "source": "https://github.com/dvsa/dvsa-laminas-config-cloud-parameters/tree/v1.0.0" }, - "time": "2023-11-17T11:31:22+00:00" + "time": "2024-03-19T14:06:05+00:00" }, { "name": "ezyang/htmlpurifier", diff --git a/app/selfserve/config/autoload/config-parameter.global.php b/app/selfserve/config/autoload/config-parameter.global.php index d964a4896a..e269c511c5 100644 --- a/app/selfserve/config/autoload/config-parameter.global.php +++ b/app/selfserve/config/autoload/config-parameter.global.php @@ -38,10 +38,10 @@ ], 'config_parameters' => [ 'providers' => $providers, - ], - 'casts' => [ - '[query_cache][enabled]' => Boolean::class, - '[log][Logger][writers][full][options][filters][priority][options][priority]' => Integer::class, - '[log][ExceptionLogger][writers][full][options][filters][priority][options][priority]' => Integer::class, + 'casts' => [ + '[query_cache][enabled]' => Boolean::class, + '[log][Logger][writers][full][options][filters][priority][options][priority]' => Integer::class, + '[log][ExceptionLogger][writers][full][options][filters][priority][options][priority]' => Integer::class, + ], ], ];