diff --git a/composer.json b/composer.json index 1f853375..18fdd210 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "gedmo/doctrine-extensions": "^3.6", "handcraftedinthealps/rest-routing-bundle": "^1.0", "jms/metadata": "^2.0", - "jms/serializer-bundle": "^3.9", + "jms/serializer-bundle": "^4.0", "kevinpapst/adminlte-bundle": "^3.5", "league/csv": "^9.4", "league/html-to-markdown": "^5.0", diff --git a/composer.lock b/composer.lock index ff7adc8f..46305cf6 100644 --- a/composer.lock +++ b/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": "dab2c3e6b313d71e0b67b7b8915ac111", + "content-hash": "6e9c77287bc1717bd97278ef2410c6de", "packages": [ { "name": "beberlei/doctrineextensions", @@ -2308,36 +2308,38 @@ }, { "name": "jms/serializer-bundle", - "version": "3.10.0", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "1a030ecaf913b7a895eeaab04191cd7ff1810b46" + "reference": "d402554c66442ba494af7a37e3e43fc0f24e2689" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/1a030ecaf913b7a895eeaab04191cd7ff1810b46", - "reference": "1a030ecaf913b7a895eeaab04191cd7ff1810b46", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/d402554c66442ba494af7a37e3e43fc0f24e2689", + "reference": "d402554c66442ba494af7a37e3e43fc0f24e2689", "shasum": "" }, "require": { "jms/metadata": "^2.5", - "jms/serializer": "^3.0", + "jms/serializer": "^3.18", "php": "^7.2 || ^8.0", - "symfony/dependency-injection": "^3.3 || ^4.0 || ^5.0", - "symfony/framework-bundle": "^3.0 || ^4.0 || ^5.0" + "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0 || ^6.0", + "symfony/framework-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { "doctrine/coding-standard": "^8.1", "doctrine/orm": "^2.4", "phpunit/phpunit": "^8.0 || ^9.0", - "symfony/expression-language": "^3.0 || ^4.0 || ^5.0", - "symfony/finder": "^3.0 || ^4.0 || ^5.0", - "symfony/form": "^3.0 || ^4.0 || ^5.0", - "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0", - "symfony/twig-bundle": "*", - "symfony/validator": "^3.0 || ^4.0 || ^5.0", - "symfony/yaml": "^3.0 || ^4.0 || ^5.0" + "symfony/expression-language": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/finder": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/form": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/templating": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/twig-bundle": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/uid": "^5.1 || ^6.0", + "symfony/validator": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/yaml": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "suggest": { "jms/di-extra-bundle": "Required to get lazy loading (de)serialization visitors, ^1.3", @@ -2347,7 +2349,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "3.9-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -2382,7 +2384,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/JMSSerializerBundle/issues", - "source": "https://github.com/schmittjoh/JMSSerializerBundle/tree/3.10.0" + "source": "https://github.com/schmittjoh/JMSSerializerBundle/tree/4.2.0" }, "funding": [ { @@ -2390,7 +2392,7 @@ "type": "github" } ], - "time": "2021-08-06T12:12:38+00:00" + "time": "2022-09-13T19:27:18+00:00" }, { "name": "kevinpapst/adminlte-bundle", @@ -4941,16 +4943,16 @@ }, { "name": "symfony/cache", - "version": "v4.4.46", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "f59de59d747fbb55c9bd148c092de4e52b2054c8" + "reference": "3b98ed664887ad197b8ede3da2432787212eb915" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/f59de59d747fbb55c9bd148c092de4e52b2054c8", - "reference": "f59de59d747fbb55c9bd148c092de4e52b2054c8", + "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915", + "reference": "3b98ed664887ad197b8ede3da2432787212eb915", "shasum": "" }, "require": { @@ -5016,7 +5018,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v4.4.46" + "source": "https://github.com/symfony/cache/tree/v4.4.48" }, "funding": [ { @@ -5032,7 +5034,7 @@ "type": "tidelift" } ], - "time": "2022-09-06T07:28:32+00:00" + "time": "2022-10-17T20:21:54+00:00" }, { "name": "symfony/cache-contracts", @@ -5193,16 +5195,16 @@ }, { "name": "symfony/console", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7" + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7", + "url": "https://api.github.com/repos/symfony/console/zipball/8e70c1cab07ac641b885ce80385b9824a293c623", + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623", "shasum": "" }, "require": { @@ -5263,7 +5265,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.47" + "source": "https://github.com/symfony/console/tree/v4.4.48" }, "funding": [ { @@ -5279,7 +5281,7 @@ "type": "tidelift" } ], - "time": "2022-10-04T05:58:30+00:00" + "time": "2022-10-26T16:02:45+00:00" }, { "name": "symfony/css-selector", @@ -5571,16 +5573,16 @@ }, { "name": "symfony/doctrine-bridge", - "version": "v4.4.46", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "49a19ea3ce2508077fb9a2bf9adfbed3485aada6" + "reference": "8dbbec53714eb512321380d582b45ff7e074a5d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/49a19ea3ce2508077fb9a2bf9adfbed3485aada6", - "reference": "49a19ea3ce2508077fb9a2bf9adfbed3485aada6", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/8dbbec53714eb512321380d582b45ff7e074a5d6", + "reference": "8dbbec53714eb512321380d582b45ff7e074a5d6", "shasum": "" }, "require": { @@ -5661,7 +5663,7 @@ "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-bridge/tree/v4.4.46" + "source": "https://github.com/symfony/doctrine-bridge/tree/v4.4.48" }, "funding": [ { @@ -5677,7 +5679,7 @@ "type": "tidelift" } ], - "time": "2022-09-06T11:08:20+00:00" + "time": "2022-10-14T11:24:01+00:00" }, { "name": "symfony/dotenv", @@ -6234,16 +6236,16 @@ }, { "name": "symfony/form", - "version": "v4.4.46", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "e3f321b14e46f1f92aa6571dba375f4ac3f63656" + "reference": "e1d137b13e0ec2cb5c5e38debca7a510c6f858c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/e3f321b14e46f1f92aa6571dba375f4ac3f63656", - "reference": "e3f321b14e46f1f92aa6571dba375f4ac3f63656", + "url": "https://api.github.com/repos/symfony/form/zipball/e1d137b13e0ec2cb5c5e38debca7a510c6f858c6", + "reference": "e1d137b13e0ec2cb5c5e38debca7a510c6f858c6", "shasum": "" }, "require": { @@ -6312,7 +6314,7 @@ "description": "Allows to easily create, process and reuse HTML forms", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/form/tree/v4.4.46" + "source": "https://github.com/symfony/form/tree/v4.4.48" }, "funding": [ { @@ -6328,7 +6330,7 @@ "type": "tidelift" } ], - "time": "2022-08-30T11:56:56+00:00" + "time": "2022-10-22T05:50:33+00:00" }, { "name": "symfony/framework-bundle", @@ -6699,16 +6701,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811" + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd4f478e67f7c8776a13b17e7d44241fd66261ad", + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad", "shasum": "" }, "require": { @@ -6747,7 +6749,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.47" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.48" }, "funding": [ { @@ -6763,20 +6765,20 @@ "type": "tidelift" } ], - "time": "2022-10-01T21:39:02+00:00" + "time": "2022-10-12T09:40:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d" + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a6d5229dd9466e046674baad8449ad92ee24eddd", + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd", "shasum": "" }, "require": { @@ -6851,7 +6853,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.47" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.48" }, "funding": [ { @@ -6867,7 +6869,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T07:05:45+00:00" + "time": "2022-10-28T16:49:22+00:00" }, { "name": "symfony/inflector", @@ -7096,16 +7098,16 @@ }, { "name": "symfony/mailer", - "version": "v4.4.46", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "877cfb31a1589dcfee525ce82475f76ef20fbb30" + "reference": "3fe0ba37c541cc0d32456781a1c9563fada2174f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/877cfb31a1589dcfee525ce82475f76ef20fbb30", - "reference": "877cfb31a1589dcfee525ce82475f76ef20fbb30", + "url": "https://api.github.com/repos/symfony/mailer/zipball/3fe0ba37c541cc0d32456781a1c9563fada2174f", + "reference": "3fe0ba37c541cc0d32456781a1c9563fada2174f", "shasum": "" }, "require": { @@ -7157,7 +7159,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v4.4.46" + "source": "https://github.com/symfony/mailer/tree/v4.4.48" }, "funding": [ { @@ -7173,7 +7175,7 @@ "type": "tidelift" } ], - "time": "2022-08-27T06:29:57+00:00" + "time": "2022-10-10T16:46:39+00:00" }, { "name": "symfony/mailgun-mailer", @@ -8709,16 +8711,16 @@ }, { "name": "symfony/security-core", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "4e33dc288158230edb78f35e929221c946cf2c5b" + "reference": "423ccb332784b236dfe6c5f396d0ac49db57c914" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/4e33dc288158230edb78f35e929221c946cf2c5b", - "reference": "4e33dc288158230edb78f35e929221c946cf2c5b", + "url": "https://api.github.com/repos/symfony/security-core/zipball/423ccb332784b236dfe6c5f396d0ac49db57c914", + "reference": "423ccb332784b236dfe6c5f396d0ac49db57c914", "shasum": "" }, "require": { @@ -8776,7 +8778,7 @@ "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-core/tree/v4.4.47" + "source": "https://github.com/symfony/security-core/tree/v4.4.48" }, "funding": [ { @@ -8792,7 +8794,7 @@ "type": "tidelift" } ], - "time": "2022-10-01T17:13:09+00:00" + "time": "2022-10-22T05:50:33+00:00" }, { "name": "symfony/security-csrf", @@ -8934,16 +8936,16 @@ }, { "name": "symfony/security-http", - "version": "v4.4.44", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/security-http.git", - "reference": "edb73e18f50f91bfe325e0524b68d9cf99a58f22" + "reference": "41e7666313f140ac8560f8db64ab54cc7348615a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/edb73e18f50f91bfe325e0524b68d9cf99a58f22", - "reference": "edb73e18f50f91bfe325e0524b68d9cf99a58f22", + "url": "https://api.github.com/repos/symfony/security-http/zipball/41e7666313f140ac8560f8db64ab54cc7348615a", + "reference": "41e7666313f140ac8560f8db64ab54cc7348615a", "shasum": "" }, "require": { @@ -8993,7 +8995,7 @@ "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-http/tree/v4.4.44" + "source": "https://github.com/symfony/security-http/tree/v4.4.48" }, "funding": [ { @@ -9009,7 +9011,7 @@ "type": "tidelift" } ], - "time": "2022-07-26T16:38:53+00:00" + "time": "2022-10-20T10:00:58+00:00" }, { "name": "symfony/sendgrid-mailer", @@ -9320,16 +9322,16 @@ }, { "name": "symfony/string", - "version": "v5.4.14", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4" + "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/089e7237497fae7a9c404d0c3aeb8db3254733e4", - "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4", + "url": "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed", + "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed", "shasum": "" }, "require": { @@ -9386,7 +9388,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.14" + "source": "https://github.com/symfony/string/tree/v5.4.15" }, "funding": [ { @@ -9852,16 +9854,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8" + "reference": "54781a4c41efbd283b779110bf8ae7f263737775" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8", + "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775", + "reference": "54781a4c41efbd283b779110bf8ae7f263737775", "shasum": "" }, "require": { @@ -9938,7 +9940,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.47" + "source": "https://github.com/symfony/validator/tree/v4.4.48" }, "funding": [ { @@ -9954,7 +9956,7 @@ "type": "tidelift" } ], - "time": "2022-10-01T17:13:09+00:00" + "time": "2022-10-25T13:54:11+00:00" }, { "name": "symfony/var-dumper", @@ -11863,16 +11865,16 @@ }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.19", + "version": "1.3.21", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "45b6fe98ec8b624ef7869683f27ec780d5cb7cf0" + "reference": "3243a3876ad465ed905332f4e6878bfe1ecbea69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/45b6fe98ec8b624ef7869683f27ec780d5cb7cf0", - "reference": "45b6fe98ec8b624ef7869683f27ec780d5cb7cf0", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/3243a3876ad465ed905332f4e6878bfe1ecbea69", + "reference": "3243a3876ad465ed905332f4e6878bfe1ecbea69", "shasum": "" }, "require": { @@ -11926,27 +11928,27 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.19" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.21" }, - "time": "2022-10-25T11:34:22+00:00" + "time": "2022-10-26T08:50:00+00:00" }, { "name": "phpstan/phpstan-phpunit", - "version": "1.1.3", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "6b93db7fae6d6f3e81a5b4297f93af6fe4146785" + "reference": "dea1f87344c6964c607d9076dee42d891f3923f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/6b93db7fae6d6f3e81a5b4297f93af6fe4146785", - "reference": "6b93db7fae6d6f3e81a5b4297f93af6fe4146785", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/dea1f87344c6964c607d9076dee42d891f3923f0", + "reference": "dea1f87344c6964c607d9076dee42d891f3923f0", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.8.0" + "phpstan/phpstan": "^1.8.11" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -11978,9 +11980,9 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.3" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.2.2" }, - "time": "2022-10-24T11:38:17+00:00" + "time": "2022-10-28T10:23:07+00:00" }, { "name": "phpstan/phpstan-symfony", @@ -12055,16 +12057,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.17", + "version": "9.2.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", "shasum": "" }, "require": { @@ -12120,7 +12122,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" }, "funding": [ { @@ -12128,7 +12130,7 @@ "type": "github" } ], - "time": "2022-08-30T12:24:04+00:00" + "time": "2022-10-27T13:35:33+00:00" }, { "name": "phpunit/php-file-iterator", @@ -12373,16 +12375,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.25", + "version": "9.5.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", "shasum": "" }, "require": { @@ -12455,7 +12457,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" }, "funding": [ { @@ -12471,7 +12473,7 @@ "type": "tidelift" } ], - "time": "2022-09-25T03:44:45+00:00" + "time": "2022-10-28T06:00:21+00:00" }, { "name": "sebastian/cli-parser", diff --git a/src/Command/ExportCreateCommand.php b/src/Command/ExportCreateCommand.php index 73ffa833..bb1d8e3e 100644 --- a/src/Command/ExportCreateCommand.php +++ b/src/Command/ExportCreateCommand.php @@ -18,7 +18,6 @@ use App\Repository\Query\TimesheetQuery; use App\Repository\TeamRepository; use App\Repository\UserRepository; use App\Timesheet\DateTimeFactory; -use App\Utils\Translator; use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; @@ -28,6 +27,8 @@ use Symfony\Component\Console\Style\SymfonyStyle; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\Response; +use Symfony\Contracts\Translation\LocaleAwareInterface; +use Symfony\Contracts\Translation\TranslatorInterface; class ExportCreateCommand extends Command { @@ -45,7 +46,7 @@ class ExportCreateCommand extends Command ProjectRepository $projectRepository, TeamRepository $teamRepository, UserRepository $userRepository, - Translator $translator, + TranslatorInterface $translator, KimaiMailer $mailer ) { $this->serviceExport = $serviceExport; @@ -110,7 +111,9 @@ class ExportCreateCommand extends Command $locale = $input->getOption('locale'); \Locale::setDefault($locale); - $this->translator->setLocale($locale); + if ($this->translator instanceof LocaleAwareInterface) { + $this->translator->setLocale($locale); + } $timezone = $input->getOption('timezone'); if ($timezone === null) { diff --git a/src/Constants.php b/src/Constants.php index 264de03e..dd0e4079 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -17,11 +17,11 @@ class Constants /** * The current release version */ - public const VERSION = '1.28.0'; + public const VERSION = '1.28.1'; /** * The current release: major * 10000 + minor * 100 + patch */ - public const VERSION_ID = 12800; + public const VERSION_ID = 12801; /** * The current release status, either "stable" or "dev" */ diff --git a/tests/Command/ExportCreateCommandTest.php b/tests/Command/ExportCreateCommandTest.php index 08e9c95e..89c62b78 100644 --- a/tests/Command/ExportCreateCommandTest.php +++ b/tests/Command/ExportCreateCommandTest.php @@ -23,10 +23,10 @@ use App\Tests\DataFixtures\CustomerFixtures; use App\Tests\DataFixtures\ProjectFixtures; use App\Tests\DataFixtures\TimesheetFixtures; use App\Tests\KernelTestTrait; -use App\Utils\Translator; use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Console\Tester\CommandTester; +use Symfony\Contracts\Translation\TranslatorInterface; /** * @covers \App\Command\ExportCreateCommand @@ -78,7 +78,7 @@ class ExportCreateCommandTest extends KernelTestCase $container->get(ProjectRepository::class), $container->get(TeamRepository::class), $container->get(UserRepository::class), - $container->get(Translator::class), + $container->get(TranslatorInterface::class), $mailer ?? $container->get(KimaiMailer::class), ));