Merge branch 'STA-966' into 'main' (ddafca3f) · Commits · Адлан Шамавов / iqdevTranningProgram

.env

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ APP_SECRET=ea3ebbf899855d483050e0d1aad6a759
		# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
		# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
		# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
		DATABASE_URL="postgresql://postgres:12345@127.0.0.1:5433/postgres?serverVersion=16&charset=utf8"
		DATABASE_URL="postgresql://postgres:12345@postgres/postgres?serverVersion=16&charset=utf8"
		###< doctrine/doctrine-bundle ###

		###> symfony/messenger ###

composer.json

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,8 +11,10 @@
		"doctrine/doctrine-bundle": "^2.12",
		"doctrine/doctrine-migrations-bundle": "^3.3",
		"doctrine/orm": "^3.1",
		"nelmio/api-doc-bundle": "^4.26",
		"phpdocumentor/reflection-docblock": "^5.3",
		"phpstan/phpdoc-parser": "^1.28",
		"ramsey/collection": "^2.0",
		"symfony/asset": "7.0.*",
		"symfony/asset-mapper": "7.0.*",
		"symfony/console": "7.0.*",
		@@ -41,6 +43,7 @@
		"symfony/uid": "7.0.*",
		"symfony/ux-turbo": "^2.16",
		"symfony/validator": "6.4.*",
		"symfony/var-exporter": "6.4.5",
		"symfony/web-link": "7.0.*",
		"symfony/yaml": "7.0.*",
		"twig/extra-bundle": "^2.12\|^3.0",
		@@ -97,6 +100,7 @@
		}
		},
		"require-dev": {
		"doctrine/doctrine-fixtures-bundle": "*",
		"phpunit/phpunit": "^9.5",
		"symfony/browser-kit": "7.0.*",
		"symfony/css-selector": "7.0.*",

composer.lock

+457 −1

Original line number	Diff line number	Diff line
		@@ -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": "b1f7459f48c910e2a39af6ee5a9b80eb",
		"content-hash": "814cfe23efd2a11a49bcfec687d342ba",
		"packages": [
		{
		"name": "composer/semver",
		@@ -1474,6 +1474,121 @@
		],
		"time": "2024-04-12T21:02:21+00:00"
		},
		{
		"name": "nelmio/api-doc-bundle",
		"version": "v4.26.1",
		"source": {
		"type": "git",
		"url": "https://github.com/nelmio/NelmioApiDocBundle.git",
		"reference": "2af8c5d55d48c488ef1a650b9ef7133e3c583623"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/2af8c5d55d48c488ef1a650b9ef7133e3c583623",
		"reference": "2af8c5d55d48c488ef1a650b9ef7133e3c583623",
		"shasum": ""
		},
		"require": {
		"ext-json": "*",
		"php": ">=7.4",
		"phpdocumentor/reflection-docblock": "^4.3.4 \|\| ^5.0",
		"phpdocumentor/type-resolver": "^1.8.2",
		"psr/cache": "^1.0 \|\| ^2.0 \|\| ^3.0",
		"psr/container": "^1.0 \|\| ^2.0",
		"psr/log": "^1.0 \|\| ^2.0 \|\| ^3.0",
		"symfony/config": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/console": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/dependency-injection": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/deprecation-contracts": "^2.1 \|\| ^3",
		"symfony/framework-bundle": "^5.4.24 \|\| ^6.0 \|\| ^7.0",
		"symfony/http-foundation": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/http-kernel": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/options-resolver": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/property-info": "^5.4.10 \|\| ^6.0 \|\| ^7.0",
		"symfony/routing": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"zircote/swagger-php": "^4.6.1"
		},
		"conflict": {
		"zircote/swagger-php": "4.8.7"
		},
		"require-dev": {
		"api-platform/core": "^2.7.0 \|\| ^3",
		"composer/package-versions-deprecated": "1.11.99.1",
		"doctrine/annotations": "^2.0",
		"friendsofphp/php-cs-fixer": "^3.52",
		"friendsofsymfony/rest-bundle": "^2.8 \|\| ^3.0",
		"jms/serializer": "^1.14 \|\| ^3.0",
		"jms/serializer-bundle": "^2.3 \|\| ^3.0 \|\| ^4.0 \|\| ^5.0",
		"phpstan/phpstan": "^1.10",
		"phpstan/phpstan-phpunit": "^1.3",
		"phpstan/phpstan-strict-rules": "^1.5",
		"phpstan/phpstan-symfony": "^1.3",
		"phpunit/phpunit": "^9.6 \|\| ^10.5",
		"symfony/asset": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/browser-kit": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/cache": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/dom-crawler": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/expression-language": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/form": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/phpunit-bridge": "^6.4",
		"symfony/property-access": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/security-csrf": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/serializer": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/stopwatch": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/templating": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/twig-bundle": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"symfony/validator": "^5.4 \|\| ^6.0 \|\| ^7.0",
		"willdurand/hateoas-bundle": "^1.0 \|\| ^2.0"
		},
		"suggest": {
		"api-platform/core": "For using an API oriented framework.",
		"doctrine/annotations": "For using doctrine annotations",
		"friendsofsymfony/rest-bundle": "For using the parameters annotations.",
		"jms/serializer-bundle": "For describing your models.",
		"symfony/asset": "For using the Swagger UI.",
		"symfony/cache": "For using a PSR-6 compatible cache implementation with the API doc generator.",
		"symfony/form": "For describing your form type models.",
		"symfony/monolog-bundle": "For using a PSR-3 compatible logger implementation with the API PHP describer.",
		"symfony/security-csrf": "For using csrf protection tokens in forms.",
		"symfony/serializer": "For describing your models.",
		"symfony/twig-bundle": "For using the Swagger UI.",
		"symfony/validator": "For describing the validation constraints in your models.",
		"willdurand/hateoas-bundle": "For extracting HATEOAS metadata."
		},
		"type": "symfony-bundle",
		"extra": {
		"branch-alias": {
		"dev-master": "4.x-dev"
		}
		},
		"autoload": {
		"psr-4": {
		"Nelmio\\ApiDocBundle\\": "src/"
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "Symfony Community",
		"homepage": "https://github.com/nelmio/NelmioApiDocBundle/contributors"
		}
		],
		"description": "Generates documentation for your REST API from annotations and attributes",
		"keywords": [
		"api",
		"doc",
		"documentation",
		"rest"
		],
		"support": {
		"issues": "https://github.com/nelmio/NelmioApiDocBundle/issues",
		"source": "https://github.com/nelmio/NelmioApiDocBundle/tree/v4.26.1"
		},
		"time": "2024-04-20T11:19:38+00:00"
		},
		{
		"name": "phpdocumentor/reflection-common",
		"version": "2.2.0",
		@@ -2002,6 +2117,95 @@
		},
		"time": "2021-07-14T16:46:02+00:00"
		},
		{
		"name": "ramsey/collection",
		"version": "2.0.0",
		"source": {
		"type": "git",
		"url": "https://github.com/ramsey/collection.git",
		"reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
		"reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5",
		"shasum": ""
		},
		"require": {
		"php": "^8.1"
		},
		"require-dev": {
		"captainhook/plugin-composer": "^5.3",
		"ergebnis/composer-normalize": "^2.28.3",
		"fakerphp/faker": "^1.21",
		"hamcrest/hamcrest-php": "^2.0",
		"jangregor/phpstan-prophecy": "^1.0",
		"mockery/mockery": "^1.5",
		"php-parallel-lint/php-console-highlighter": "^1.0",
		"php-parallel-lint/php-parallel-lint": "^1.3",
		"phpcsstandards/phpcsutils": "^1.0.0-rc1",
		"phpspec/prophecy-phpunit": "^2.0",
		"phpstan/extension-installer": "^1.2",
		"phpstan/phpstan": "^1.9",
		"phpstan/phpstan-mockery": "^1.1",
		"phpstan/phpstan-phpunit": "^1.3",
		"phpunit/phpunit": "^9.5",
		"psalm/plugin-mockery": "^1.1",
		"psalm/plugin-phpunit": "^0.18.4",
		"ramsey/coding-standard": "^2.0.3",
		"ramsey/conventional-commits": "^1.3",
		"vimeo/psalm": "^5.4"
		},
		"type": "library",
		"extra": {
		"captainhook": {
		"force-install": true
		},
		"ramsey/conventional-commits": {
		"configFile": "conventional-commits.json"
		}
		},
		"autoload": {
		"psr-4": {
		"Ramsey\\Collection\\": "src/"
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "Ben Ramsey",
		"email": "ben@benramsey.com",
		"homepage": "https://benramsey.com"
		}
		],
		"description": "A PHP library for representing and manipulating collections.",
		"keywords": [
		"array",
		"collection",
		"hash",
		"map",
		"queue",
		"set"
		],
		"support": {
		"issues": "https://github.com/ramsey/collection/issues",
		"source": "https://github.com/ramsey/collection/tree/2.0.0"
		},
		"funding": [
		{
		"url": "https://github.com/ramsey",
		"type": "github"
		},
		{
		"url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
		"type": "tidelift"
		}
		],
		"time": "2022-12-31T21:50:55+00:00"
		},
		{
		"name": "symfony/asset",
		"version": "v7.0.3",
		@@ -7590,9 +7794,261 @@
		"source": "https://github.com/webmozarts/assert/tree/1.11.0"
		},
		"time": "2022-06-03T18:03:27+00:00"
		},
		{
		"name": "zircote/swagger-php",
		"version": "4.9.0",
		"source": {
		"type": "git",
		"url": "https://github.com/zircote/swagger-php.git",
		"reference": "b46a36d006f4db4d761995a5add1e7ab0386ed1d"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/zircote/swagger-php/zipball/b46a36d006f4db4d761995a5add1e7ab0386ed1d",
		"reference": "b46a36d006f4db4d761995a5add1e7ab0386ed1d",
		"shasum": ""
		},
		"require": {
		"ext-json": "*",
		"php": ">=7.2",
		"psr/log": "^1.1 \|\| ^2.0 \|\| ^3.0",
		"symfony/deprecation-contracts": "^2 \|\| ^3",
		"symfony/finder": ">=2.2",
		"symfony/yaml": ">=3.3"
		},
		"require-dev": {
		"composer/package-versions-deprecated": "^1.11",
		"doctrine/annotations": "^1.7 \|\| ^2.0",
		"friendsofphp/php-cs-fixer": "^2.17 \|\| ^3.47.1",
		"phpstan/phpstan": "^1.6",
		"phpunit/phpunit": ">=8",
		"vimeo/psalm": "^4.23"
		},
		"suggest": {
		"doctrine/annotations": "^1.7 \|\| ^2.0"
		},
		"bin": [
		"bin/openapi"
		],
		"type": "library",
		"extra": {
		"branch-alias": {
		"dev-master": "4.x-dev"
		}
		},
		"autoload": {
		"psr-4": {
		"OpenApi\\": "src"
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"Apache-2.0"
		],
		"authors": [
		{
		"name": "Robert Allen",
		"email": "zircote@gmail.com"
		},
		{
		"name": "Bob Fanger",
		"email": "bfanger@gmail.com",
		"homepage": "https://bfanger.nl"
		},
		{
		"name": "Martin Rademacher",
		"email": "mano@radebatz.net",
		"homepage": "https://radebatz.net"
		}
		],
		"description": "swagger-php - Generate interactive documentation for your RESTful API using phpdoc annotations",
		"homepage": "https://github.com/zircote/swagger-php/",
		"keywords": [
		"api",
		"json",
		"rest",
		"service discovery"
		],
		"support": {
		"issues": "https://github.com/zircote/swagger-php/issues",
		"source": "https://github.com/zircote/swagger-php/tree/4.9.0"
		},
		"time": "2024-04-18T22:32:11+00:00"
		}
		],
		"packages-dev": [
		{
		"name": "doctrine/data-fixtures",
		"version": "1.7.0",
		"source": {
		"type": "git",
		"url": "https://github.com/doctrine/data-fixtures.git",
		"reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/bbcb74f2ac6dbe81a14b3c3687d7623490a0448f",
		"reference": "bbcb74f2ac6dbe81a14b3c3687d7623490a0448f",
		"shasum": ""
		},
		"require": {
		"doctrine/deprecations": "^0.5.3 \|\| ^1.0",
		"doctrine/persistence": "^2.0\|^3.0",
		"php": "^7.4 \|\| ^8.0"
		},
		"conflict": {
		"doctrine/dbal": "<3.5 \|\| >=5",
		"doctrine/orm": "<2.14 \|\| >=4",
		"doctrine/phpcr-odm": "<1.3.0"
		},
		"require-dev": {
		"doctrine/annotations": "^1.12 \|\| ^2",
		"doctrine/coding-standard": "^12",
		"doctrine/dbal": "^3.5 \|\| ^4",
		"doctrine/mongodb-odm": "^1.3.0 \|\| ^2.0.0",
		"doctrine/orm": "^2.14 \|\| ^3",
		"ext-sqlite3": "*",
		"phpstan/phpstan": "^1.10",
		"phpunit/phpunit": "^9.6.13 \|\| ^10.4.2",
		"symfony/cache": "^5.4 \|\| ^6.3 \|\| ^7",
		"symfony/var-exporter": "^5.4 \|\| ^6.3 \|\| ^7",
		"vimeo/psalm": "^5.9"
		},
		"suggest": {
		"alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)",
		"doctrine/mongodb-odm": "For loading MongoDB ODM fixtures",
		"doctrine/orm": "For loading ORM fixtures",
		"doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
		},
		"type": "library",
		"autoload": {
		"psr-4": {
		"Doctrine\\Common\\DataFixtures\\": "src"
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "Jonathan Wage",
		"email": "jonwage@gmail.com"
		}
		],
		"description": "Data Fixtures for all Doctrine Object Managers",
		"homepage": "https://www.doctrine-project.org",
		"keywords": [
		"database"
		],
		"support": {
		"issues": "https://github.com/doctrine/data-fixtures/issues",
		"source": "https://github.com/doctrine/data-fixtures/tree/1.7.0"
		},
		"funding": [
		{
		"url": "https://www.doctrine-project.org/sponsorship.html",
		"type": "custom"
		},
		{
		"url": "https://www.patreon.com/phpdoctrine",
		"type": "patreon"
		},
		{
		"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures",
		"type": "tidelift"
		}
		],
		"time": "2023-11-24T11:18:31+00:00"
		},
		{
		"name": "doctrine/doctrine-fixtures-bundle",
		"version": "3.5.1",
		"source": {
		"type": "git",
		"url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
		"reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c808a0c85c38c8ee265cc8405b456c1d2b38567d",
		"reference": "c808a0c85c38c8ee265cc8405b456c1d2b38567d",
		"shasum": ""
		},
		"require": {
		"doctrine/data-fixtures": "^1.3",
		"doctrine/doctrine-bundle": "^2.2",
		"doctrine/orm": "^2.14.0 \|\| ^3.0",
		"doctrine/persistence": "^2.4\|^3.0",
		"php": "^7.4 \|\| ^8.0",
		"symfony/config": "^5.4\|^6.0\|^7.0",
		"symfony/console": "^5.4\|^6.0\|^7.0",
		"symfony/dependency-injection": "^5.4\|^6.0\|^7.0",
		"symfony/deprecation-contracts": "^2.1\|^3",
		"symfony/doctrine-bridge": "^5.4\|^6.0\|^7.0",
		"symfony/http-kernel": "^5.4\|^6.0\|^7.0"
		},
		"conflict": {
		"doctrine/dbal": "< 3"
		},
		"require-dev": {
		"doctrine/coding-standard": "^12",
		"phpstan/phpstan": "^1.10.39",
		"phpunit/phpunit": "^9.6.13",
		"symfony/phpunit-bridge": "^6.3.6",
		"vimeo/psalm": "^5.15"
		},
		"type": "symfony-bundle",
		"autoload": {
		"psr-4": {
		"Doctrine\\Bundle\\FixturesBundle\\": ""
		}
		},
		"notification-url": "https://packagist.org/downloads/",
		"license": [
		"MIT"
		],
		"authors": [
		{
		"name": "Fabien Potencier",
		"email": "fabien@symfony.com"
		},
		{
		"name": "Doctrine Project",
		"homepage": "https://www.doctrine-project.org"
		},
		{
		"name": "Symfony Community",
		"homepage": "https://symfony.com/contributors"
		}
		],
		"description": "Symfony DoctrineFixturesBundle",
		"homepage": "https://www.doctrine-project.org",
		"keywords": [
		"Fixture",
		"persistence"
		],
		"support": {
		"issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues",
		"source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.5.1"
		},
		"funding": [
		{
		"url": "https://www.doctrine-project.org/sponsorship.html",
		"type": "custom"
		},
		{
		"url": "https://www.patreon.com/phpdoctrine",
		"type": "patreon"
		},
		{
		"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle",
		"type": "tidelift"
		}
		],
		"time": "2023-11-19T12:48:54+00:00"
		},
		{
		"name": "masterminds/html5",
		"version": "2.9.0",

config/bundles.php

+2 −0

Original line number	Diff line number	Diff line
		@@ -13,4 +13,6 @@ return [
		Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
		Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
		Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
		Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
		Nelmio\ApiDocBundle\NelmioApiDocBundle::class => ['all' => true],
		];

config/packages/nelmio_api_doc.yaml

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		nelmio_api_doc:
		documentation:
		info:
		title: Yamal
		description:
		version: 1.0.0
		areas: # to filter documented areas
		path_patterns:
		- ^/api/v1 # Accepts routes under /api except /api/doc