From 8992368cb6de2572b6b3547790f089286c4e0006 Mon Sep 17 00:00:00 2001 From: Wilco Louwerse Date: Thu, 28 Mar 2024 16:47:08 +0100 Subject: [PATCH] Update some dependencies --- api/composer.json | 4 +- api/composer.lock | 264 ++++++++++++++++-- api/config/bundles.php | 1 + .../packages/stof_doctrine_extensions.yaml | 4 + api/config/packages/translation.yaml | 7 + api/src/Entity/Entity.php | 2 +- api/symfony.lock | 31 +- api/translations/.gitignore | 0 8 files changed, 288 insertions(+), 25 deletions(-) create mode 100644 api/config/packages/stof_doctrine_extensions.yaml create mode 100644 api/config/packages/translation.yaml create mode 100644 api/translations/.gitignore diff --git a/api/composer.json b/api/composer.json index 2ed21942b..5cffc478b 100644 --- a/api/composer.json +++ b/api/composer.json @@ -42,8 +42,8 @@ "phpoffice/phpspreadsheet": "^1.29", "phpoffice/phpword": "^0.18.2", "phpstan/phpdoc-parser": "^1.25", - "ramsey/uuid": "*", - "ramsey/uuid-doctrine": "^2.0", + "ramsey/uuid": "^3.8 | ^4.7", + "ramsey/uuid-doctrine": "^1.5 | ^2.0", "respect/validation": "^2.2", "setono/cron-expression-bundle": "^1.5", "symfony/asset": "5.3.* | ^5.4", diff --git a/api/composer.lock b/api/composer.lock index 03e597431..bfea379c4 100644 --- a/api/composer.lock +++ b/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": "dc2a9f17a748ed5fbf959d425f91a347", + "content-hash": "f879d20d5b2f2ac0280ffbdfa8a64de5", "packages": [ { "name": "adbario/php-dot-notation", @@ -562,16 +562,16 @@ }, { "name": "commongateway/corebundle", - "version": "1.3.0", + "version": "1.3.9", "source": { "type": "git", "url": "https://github.com/CommonGateway/CoreBundle.git", - "reference": "cc4716640b05f988e1b171bf30776489d42e1841" + "reference": "ed331a9f7bb16ee270b4765d3c5d2422121f8b0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CommonGateway/CoreBundle/zipball/cc4716640b05f988e1b171bf30776489d42e1841", - "reference": "cc4716640b05f988e1b171bf30776489d42e1841", + "url": "https://api.github.com/repos/CommonGateway/CoreBundle/zipball/ed331a9f7bb16ee270b4765d3c5d2422121f8b0d", + "reference": "ed331a9f7bb16ee270b4765d3c5d2422121f8b0d", "shasum": "" }, "require": { @@ -581,6 +581,7 @@ "composer/package-versions-deprecated": "1.11.99.3", "doctrine/annotations": "^1.14 | ^2.0", "doctrine/doctrine-bundle": "^2.7", + "doctrine/doctrine-fixtures-bundle": "^3.2", "doctrine/doctrine-migrations-bundle": "^3.1", "doctrine/orm": "^2.14", "dompdf/dompdf": "^2", @@ -603,8 +604,11 @@ "phpdocumentor/reflection-docblock": "^5.2", "phpoffice/phpspreadsheet": "^1.29", "phpoffice/phpword": "^0.18.2", + "ramsey/uuid": "^3.8 | ^4.7", + "ramsey/uuid-doctrine": "^1.5 | ^2.0", "respect/validation": "^2.2", "setono/cron-expression-bundle": "^1.5", + "stof/doctrine-extensions-bundle": "^1.3", "symfony/asset": "5.3.* | ^5.4", "symfony/console": "5.3.* | ^5.4", "symfony/contracts": "^2.4.0", @@ -617,16 +621,20 @@ "symfony/mailgun-mailer": "5.3.* | ^5.4", "symfony/messenger": "5.3.* | ^5.4", "symfony/monolog-bundle": "^3.8", + "symfony/orm-pack": "^2.3", + "symfony/process": "^5.4", "symfony/property-access": "5.3.* | ^5.4", "symfony/property-info": "5.3.* | ^5.4", "symfony/proxy-manager-bridge": "5.3.* | ^5.4", "symfony/runtime": "5.3.* | ^5.4", "symfony/security-bundle": "5.3.* | ^5.4", "symfony/serializer": "5.3.* | ^5.4", + "symfony/translation": "^5.4", "symfony/twig-bundle": "5.3.* | ^5.4", "symfony/validator": "5.3.* | ^5.4", "symfony/web-profiler-bundle": "5.3.* | ^5.4", - "symfony/yaml": "5.3.* | ^5.4" + "symfony/yaml": "5.3.* | ^5.4", + "web-token/jwt-framework": "^3.0" }, "conflict": { "doctrine/dbal": "<2.5", @@ -681,7 +689,7 @@ "issues": "https://github.com/CommonGateway/CoreBundle/issues", "source": "https://github.com/CommonGateway/CoreBundle" }, - "time": "2024-03-14T11:15:54+00:00" + "time": "2024-03-28T15:41:12+00:00" }, { "name": "composer/package-versions-deprecated", @@ -7371,6 +7379,86 @@ ], "time": "2024-02-05T20:37:46+00:00" }, + { + "name": "stof/doctrine-extensions-bundle", + "version": "v1.11.0", + "source": { + "type": "git", + "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git", + "reference": "9f7023e4c8a1c00a5627d41c1027a3f89e477630" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/9f7023e4c8a1c00a5627d41c1027a3f89e477630", + "reference": "9f7023e4c8a1c00a5627d41c1027a3f89e477630", + "shasum": "" + }, + "require": { + "gedmo/doctrine-extensions": "^3.15.0", + "php": "^7.4 || ^8.0", + "symfony/cache": "^5.4 || ^6.0 || ^7.0", + "symfony/config": "^5.4 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-deprecation-rules": "^1.1", + "phpstan/phpstan-phpunit": "^1.3", + "phpstan/phpstan-strict-rules": "^1.5", + "phpstan/phpstan-symfony": "^1.3", + "symfony/mime": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1", + "symfony/security-core": "^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "doctrine/doctrine-bundle": "to use the ORM extensions", + "doctrine/mongodb-odm-bundle": "to use the MongoDB ODM extensions", + "symfony/mime": "To use the Mime component integration for Uploadable" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Stof\\DoctrineExtensionsBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + } + ], + "description": "Integration of the gedmo/doctrine-extensions with Symfony", + "homepage": "https://github.com/stof/StofDoctrineExtensionsBundle", + "keywords": [ + "behaviors", + "doctrine2", + "extensions", + "gedmo", + "loggable", + "nestedset", + "sluggable", + "sortable", + "timestampable", + "translatable", + "tree" + ], + "support": { + "issues": "https://github.com/stof/StofDoctrineExtensionsBundle/issues", + "source": "https://github.com/stof/StofDoctrineExtensionsBundle/tree/v1.11.0" + }, + "time": "2024-02-13T14:43:20+00:00" + }, { "name": "symfony/amqp-messenger", "version": "v5.4.36", @@ -9731,6 +9819,55 @@ ], "time": "2023-02-14T08:03:56+00:00" }, + { + "name": "symfony/orm-pack", + "version": "v2.4.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/orm-pack.git", + "reference": "9d8729016b3a8b0db854c028d15c2dcf4d19b1b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/orm-pack/zipball/9d8729016b3a8b0db854c028d15c2dcf4d19b1b4", + "reference": "9d8729016b3a8b0db854c028d15c2dcf4d19b1b4", + "shasum": "" + }, + "require": { + "doctrine/dbal": "^3", + "doctrine/doctrine-bundle": "*", + "doctrine/doctrine-migrations-bundle": "*", + "doctrine/orm": "*" + }, + "conflict": { + "php": "<8.1" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for the Doctrine ORM", + "support": { + "issues": "https://github.com/symfony/orm-pack/issues", + "source": "https://github.com/symfony/orm-pack/tree/v2.4.1" + }, + "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-02-13T17:58:44+00:00" + }, { "name": "symfony/password-hasher", "version": "v5.4.36", @@ -11723,6 +11860,103 @@ ], "time": "2024-02-01T08:49:30+00:00" }, + { + "name": "symfony/translation", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "77d7d1e46f52827585e65e6cd6f52a2542e59c72" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/77d7d1e46f52827585e65e6cd6f52a2542e59c72", + "reference": "77d7d1e46f52827585e65e6cd6f52a2542e59c72", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.16", + "symfony/translation-contracts": "^2.3" + }, + "conflict": { + "symfony/config": "<4.4", + "symfony/console": "<5.3", + "symfony/dependency-injection": "<5.0", + "symfony/http-kernel": "<5.0", + "symfony/twig-bundle": "<5.0", + "symfony/yaml": "<4.4" + }, + "provide": { + "symfony/translation-implementation": "2.3" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/console": "^5.4|^6.0", + "symfony/dependency-injection": "^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/http-client-contracts": "^1.1|^2.0|^3.0", + "symfony/http-kernel": "^5.0|^6.0", + "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/polyfill-intl-icu": "^1.21", + "symfony/service-contracts": "^1.1.2|^2|^3", + "symfony/yaml": "^4.4|^5.0|^6.0" + }, + "suggest": { + "psr/log-implementation": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "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 tools to internationalize your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/translation/tree/v5.4.35" + }, + "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-01-23T13:51:25+00:00" + }, { "name": "symfony/twig-bridge", "version": "v5.4.36", @@ -14163,16 +14397,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -14184,7 +14418,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -14205,8 +14439,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -14214,8 +14447,7 @@ "type": "github" } ], - "abandoned": true, - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", diff --git a/api/config/bundles.php b/api/config/bundles.php index d029c6f9a..b804ad652 100644 --- a/api/config/bundles.php +++ b/api/config/bundles.php @@ -18,4 +18,5 @@ Endroid\QrCodeBundle\EndroidQrCodeBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], League\FlysystemBundle\FlysystemBundle::class => ['all' => true], + Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true], ]; diff --git a/api/config/packages/stof_doctrine_extensions.yaml b/api/config/packages/stof_doctrine_extensions.yaml new file mode 100644 index 000000000..b258add36 --- /dev/null +++ b/api/config/packages/stof_doctrine_extensions.yaml @@ -0,0 +1,4 @@ +# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html +# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc +stof_doctrine_extensions: + default_locale: en_US diff --git a/api/config/packages/translation.yaml b/api/config/packages/translation.yaml new file mode 100644 index 000000000..b3f8f9cfe --- /dev/null +++ b/api/config/packages/translation.yaml @@ -0,0 +1,7 @@ +framework: + default_locale: en + translator: + default_path: '%kernel.project_dir%/translations' + fallbacks: + - en + providers: diff --git a/api/src/Entity/Entity.php b/api/src/Entity/Entity.php index 2185064a3..437286337 100644 --- a/api/src/Entity/Entity.php +++ b/api/src/Entity/Entity.php @@ -1176,7 +1176,7 @@ public function toSchema(?ObjectEntity $objectEntity = null): array $attribute->getFormat() && $property['format'] = $attribute->getFormat(); } - $stringReplace = str_replace('“', "'", $attribute->getDescription()); + $stringReplace = str_replace('“', "'", $attribute->getDescription() ?? ''); $decodedDescription = str_replace('”', "'", $stringReplace); $attribute->getDescription() && $property['description'] = $decodedDescription; diff --git a/api/symfony.lock b/api/symfony.lock index d57394f1d..790d1a783 100644 --- a/api/symfony.lock +++ b/api/symfony.lock @@ -31,9 +31,6 @@ "brick/reflection": { "version": "0.4.1" }, - "common-gateway/woo-bundle": { - "version": "dev-feature/GW-1596/test-symfony54" - }, "commongateway/corebundle": { "version": "dev-master" }, @@ -366,9 +363,6 @@ "ralouphie/getallheaders": { "version": "3.0.3" }, - "ramsey/collection": { - "version": "2.0.0" - }, "ramsey/uuid": { "version": "4.7.5" }, @@ -447,6 +441,18 @@ "spomky-labs/aes-key-wrap": { "version": "v6.0.0" }, + "stof/doctrine-extensions-bundle": { + "version": "1.11", + "recipe": { + "repo": "github.com/symfony/recipes-contrib", + "branch": "main", + "version": "1.2", + "ref": "e805aba9eff5372e2d149a9ff56566769e22819d" + }, + "files": [ + "config/packages/stof_doctrine_extensions.yaml" + ] + }, "symfony/amqp-messenger": { "version": "v5.3.14" }, @@ -722,6 +728,19 @@ "symfony/string": { "version": "v5.3.3" }, + "symfony/translation": { + "version": "5.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "5.3", + "ref": "e28e27f53663cc34f0be2837aba18e3a1bef8e7b" + }, + "files": [ + "config/packages/translation.yaml", + "translations/.gitignore" + ] + }, "symfony/twig-bridge": { "version": "v5.3.4" }, diff --git a/api/translations/.gitignore b/api/translations/.gitignore new file mode 100644 index 000000000..e69de29bb