From 82e15f7cbad4d313402fe2ebccbcb46187e15e57 Mon Sep 17 00:00:00 2001 From: jmleroux Date: Mon, 30 Aug 2021 18:08:59 +0200 Subject: [PATCH 1/7] BH-681: Update doctrine-bundle --- composer.json | 31 +++++++++---------- config/packages/doctrine.yml | 2 ++ phpstan.neon | 1 + .../AttributeOption/LocalizableSubscriber.php | 2 -- ...ferenceDataRepositoryResolverInterface.php | 4 ++- .../Persistence/Sql/GetJobExecutionIds.php | 19 +++++++----- .../ORM/MappingsOverrideConfiguratorSpec.php | 2 +- .../Acl/Persistence/AbstractAclManager.php | 2 +- symfony.lock | 6 ++++ .../ORM/Repository/ProductRepositorySpec.php | 3 +- .../Updater/TwoWayAssociationUpdaterSpec.php | 2 +- .../LocalizableSubscriberSpec.php | 2 +- .../LoadEntitySubscriberSpec.php | 2 +- .../LoadEntityWithValuesSubscriberSpec.php | 2 +- .../TimestampableSubscriberSpec.php | 2 +- .../RoleWithPermissionsRepositorySpec.php | 2 +- .../Normalizer/RoleNormalizerSpec.php | 2 +- .../Saver/RoleWithPermissionsSaverSpec.php | 5 ++- .../RoleWithPermissionsUpdaterSpec.php | 6 ++-- .../features/Behat/Context/HookContext.php | 2 +- ..._20200113145800_fix_versioning_indexes.php | 4 +-- 21 files changed, 58 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index dbb3b498e8b9..67b8216a21b0 100644 --- a/composer.json +++ b/composer.json @@ -55,24 +55,23 @@ "ass/xmlsecurity": "1.1.1", "box/spout": "2.7.3", "doctrine/annotations": "1.13.2", - "doctrine/cache": "1.9.1", - "doctrine/collections": "1.6.4", - "doctrine/common": "2.13.3", - "doctrine/data-fixtures": "1.4.0", - "doctrine/dbal": "2.10.0", - "doctrine/doctrine-bundle": "1.12.0", - "doctrine/doctrine-fixtures-bundle": "3.3.0", - "doctrine/doctrine-migrations-bundle": "1.3.2", - "doctrine/event-manager": "1.1.0", - "doctrine/instantiator": "1.3.1", - "doctrine/migrations": "1.8.1", - "doctrine/orm": "2.7.0", - "doctrine/persistence": "1.3.3", - "doctrine/reflection": "1.0.0", + "doctrine/cache": "^1.12.1", + "doctrine/collections": "^1.6.8", + "doctrine/common": "^3.1.2", + "doctrine/data-fixtures": "^1.5.0", + "doctrine/dbal": "^2.13.2", + "doctrine/doctrine-bundle": "2.4.2", + "doctrine/doctrine-fixtures-bundle": "^3.4.0", + "doctrine/doctrine-migrations-bundle": "^2.2", + "doctrine/event-manager": "^1.1.1", + "doctrine/instantiator": "^1.4.0", + "doctrine/migrations": "^2.3.4", + "doctrine/orm": "^2.9.5", + "doctrine/persistence": "^2.2.2", "dompdf/dompdf" : "1.0.2", "elasticsearch/elasticsearch": "7.11.0", "friendsofsymfony/jsrouting-bundle": "2.7.0", - "friendsofsymfony/oauth-server-bundle": "1.6.2", + "friendsofsymfony/oauth-server-bundle": "dev-master", "friendsofsymfony/rest-bundle": "^3.0.5", "gedmo/doctrine-extensions":"v3.0.3", "google/cloud-pubsub": "1.29.1", @@ -112,7 +111,7 @@ "symfony/proxy-manager-bridge": "4.4.25", "symfony/requirements-checker": "^1.1", "symfony/routing": "4.4.25", - "symfony/security-acl": "3.0.2", + "symfony/security-acl": "^3.2.0", "symfony/security-bundle": "4.4.25", "symfony/security-core": "4.4.25", "symfony/security-csrf": "4.4.25", diff --git a/config/packages/doctrine.yml b/config/packages/doctrine.yml index 2db41506a87b..641ea88171e0 100644 --- a/config/packages/doctrine.yml +++ b/config/packages/doctrine.yml @@ -59,3 +59,5 @@ doctrine_migrations: dir_name: '%doctrine_migrations_dir%' namespace: Pim\Upgrade\Schema name: PIM Migrations + column_name: 'version' + column_length: 191 diff --git a/phpstan.neon b/phpstan.neon index c0e54e723922..63a9e582a72e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3,6 +3,7 @@ includes: - vendor/phpstan/phpstan-webmozart-assert/extension.neon parameters: reportUnmatchedIgnoredErrors: false + checkGenericClassInNonGenericObjectType: false symfony: container_xml_path: %rootDir%/../../../var/cache/dev/srcKernelDevDebugContainer.xml ignoreErrors: diff --git a/src/Akeneo/Pim/Enrichment/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriber.php b/src/Akeneo/Pim/Enrichment/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriber.php index ba4428181df6..379ab7594625 100644 --- a/src/Akeneo/Pim/Enrichment/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriber.php +++ b/src/Akeneo/Pim/Enrichment/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriber.php @@ -41,8 +41,6 @@ public function getSubscribedEvents() /** * After load - * - * @param LifecycleEventArgs $args */ public function postLoad(LifecycleEventArgs $args) { diff --git a/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php b/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php index b78a93c8848a..3280ae498205 100644 --- a/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php +++ b/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php @@ -2,6 +2,8 @@ namespace Akeneo\Pim\Enrichment\Component\Product\Repository; +use Doctrine\Persistence\ObjectRepository; + /** * Resolves the repository given a reference data type * @@ -14,7 +16,7 @@ interface ReferenceDataRepositoryResolverInterface /** * @param string $referenceDataType * - * @return \Doctrine\Common\Persistence\ObjectRepository + * @return ObjectRepository */ public function resolve($referenceDataType); } diff --git a/src/Akeneo/Tool/Bundle/BatchBundle/Persistence/Sql/GetJobExecutionIds.php b/src/Akeneo/Tool/Bundle/BatchBundle/Persistence/Sql/GetJobExecutionIds.php index e8c82449af0f..1fac59decc82 100644 --- a/src/Akeneo/Tool/Bundle/BatchBundle/Persistence/Sql/GetJobExecutionIds.php +++ b/src/Akeneo/Tool/Bundle/BatchBundle/Persistence/Sql/GetJobExecutionIds.php @@ -5,9 +5,11 @@ namespace Akeneo\Tool\Bundle\BatchBundle\Persistence\Sql; use Akeneo\Tool\Component\Batch\Job\BatchStatus; +use DateTime; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver\PDOStatement; +use Doctrine\DBAL\Driver\ResultStatement; use Doctrine\DBAL\Types\Types; +use InvalidArgumentException; /** * @copyright 2020 Akeneo SAS (http://www.akeneo.com) @@ -15,21 +17,22 @@ */ final class GetJobExecutionIds { - /** @var Connection */ - private $connection; + private Connection $connection; public function __construct(Connection $connection) { $this->connection = $connection; } - public function olderThanDays(int $days): PDOStatement + public function olderThanDays(int $days): ResultStatement { if ($days < 1) { - throw new \InvalidArgumentException(sprintf('Number of days should be strictly superior to 0, "%s% given', $days)); + throw new InvalidArgumentException( + sprintf('Number of days should be strictly superior to 0, "%s given', $days) + ); } - $endTime = new \DateTime(); + $endTime = new DateTime(); $endTime->modify(sprintf('- %d days', $days)); $query = <<connection->executeQuery( $query, @@ -50,7 +53,7 @@ public function olderThanDays(int $days): PDOStatement ); } - public function all(): PDOStatement + public function all(): ResultStatement { $query = <<getRole()); + return new RoleSecurityIdentity($identity->getRole() ?? ''); } elseif ($identity instanceof UserInterface) { return UserSecurityIdentity::fromAccount($identity); } elseif ($identity instanceof TokenInterface) { diff --git a/symfony.lock b/symfony.lock index 97fe5de3031a..3708eea5ed30 100644 --- a/symfony.lock +++ b/symfony.lock @@ -81,6 +81,9 @@ "doctrine/dbal": { "version": "v2.7.2" }, + "doctrine/deprecations": { + "version": "v0.5.3" + }, "doctrine/doctrine-bundle": { "version": "1.6", "recipe": { @@ -148,6 +151,9 @@ "doctrine/reflection": { "version": "v1.0.0" }, + "doctrine/sql-formatter": { + "version": "1.1.1" + }, "dompdf/dompdf": { "version": "v0.6.2" }, diff --git a/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Repository/ProductRepositorySpec.php b/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Repository/ProductRepositorySpec.php index 0cafd3af3215..b6caf2a531f9 100644 --- a/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Repository/ProductRepositorySpec.php +++ b/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Repository/ProductRepositorySpec.php @@ -8,6 +8,7 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\QueryBuilder; +use Doctrine\Persistence\ObjectRepository; use PhpSpec\ObjectBehavior; use Akeneo\Pim\Structure\Component\ReferenceData\ConfigurationRegistryInterface; use Prophecy\Argument; @@ -30,7 +31,7 @@ function it_is_a_product_repository() function it_is_an_object_repository() { - $this->shouldImplement('Doctrine\Common\Persistence\ObjectRepository'); + $this->shouldImplement(ObjectRepository::class); } function it_checks_if_the_product_has_an_attribute_in_its_family( diff --git a/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Updater/TwoWayAssociationUpdaterSpec.php b/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Updater/TwoWayAssociationUpdaterSpec.php index c20e5fa72872..88f0bfe671da 100644 --- a/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Updater/TwoWayAssociationUpdaterSpec.php +++ b/tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Updater/TwoWayAssociationUpdaterSpec.php @@ -15,8 +15,8 @@ use Akeneo\Pim\Enrichment\Component\Product\Model\ProductModelInterface; use Akeneo\Pim\Enrichment\Component\Product\Updater\TwoWayAssociationUpdaterInterface; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; +use Doctrine\Persistence\ManagerRegistry; use PhpSpec\ObjectBehavior; use Prophecy\Argument; diff --git a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriberSpec.php b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriberSpec.php index 9bbdef82d864..eb8130fc19b6 100644 --- a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriberSpec.php +++ b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriberSpec.php @@ -2,7 +2,7 @@ namespace Specification\Akeneo\Pim\Enrichment\Bundle\EventSubscriber\AttributeOption; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\Persistence\Event\LifecycleEventArgs; use PhpSpec\ObjectBehavior; use Akeneo\Pim\Enrichment\Bundle\Context\CatalogContext; use Akeneo\Pim\Structure\Component\Model\AttributeOptionInterface; diff --git a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithQuantifiedAssociations/LoadEntitySubscriberSpec.php b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithQuantifiedAssociations/LoadEntitySubscriberSpec.php index 35bf5e3590fc..be02bf8fd63a 100644 --- a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithQuantifiedAssociations/LoadEntitySubscriberSpec.php +++ b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithQuantifiedAssociations/LoadEntitySubscriberSpec.php @@ -8,7 +8,7 @@ use Akeneo\Pim\Enrichment\Component\Product\Query\FindQuantifiedAssociationTypeCodesInterface; use Akeneo\Pim\Enrichment\Component\Product\Query\QuantifiedAssociation\GetIdMappingFromProductIdsQueryInterface; use Akeneo\Pim\Enrichment\Component\Product\Query\QuantifiedAssociation\GetIdMappingFromProductModelIdsQueryInterface; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\Persistence\Event\LifecycleEventArgs; use PhpSpec\ObjectBehavior; use Prophecy\Argument; diff --git a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithValues/LoadEntityWithValuesSubscriberSpec.php b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithValues/LoadEntityWithValuesSubscriberSpec.php index 2661d5ea3767..ff8871d9ac86 100644 --- a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithValues/LoadEntityWithValuesSubscriberSpec.php +++ b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/EntityWithValues/LoadEntityWithValuesSubscriberSpec.php @@ -2,7 +2,7 @@ namespace Specification\Akeneo\Pim\Enrichment\Bundle\EventSubscriber\EntityWithValues; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\Persistence\Event\LifecycleEventArgs; use PhpSpec\ObjectBehavior; use Akeneo\Pim\Enrichment\Bundle\EventSubscriber\EntityWithValues\LoadEntityWithValuesSubscriber; use Akeneo\Pim\Enrichment\Component\Product\Factory\WriteValueCollectionFactory; diff --git a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/TimestampableSubscriberSpec.php b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/TimestampableSubscriberSpec.php index ffcca656b300..1df17fb53460 100644 --- a/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/TimestampableSubscriberSpec.php +++ b/tests/back/Pim/Enrichment/Specification/Bundle/EventSubscriber/TimestampableSubscriberSpec.php @@ -3,7 +3,7 @@ namespace Specification\Akeneo\Pim\Enrichment\Bundle\EventSubscriber; use Akeneo\Tool\Component\Versioning\Model\VersionableInterface; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\Persistence\Event\LifecycleEventArgs; use PhpSpec\ObjectBehavior; use Akeneo\Tool\Component\Versioning\Model\TimestampableInterface; use Prophecy\Argument; diff --git a/tests/back/UserManagement/Specification/Bundle/Doctrine/ORM/Repository/RoleWithPermissionsRepositorySpec.php b/tests/back/UserManagement/Specification/Bundle/Doctrine/ORM/Repository/RoleWithPermissionsRepositorySpec.php index 0c66c840f4aa..4ec8fcdfd586 100644 --- a/tests/back/UserManagement/Specification/Bundle/Doctrine/ORM/Repository/RoleWithPermissionsRepositorySpec.php +++ b/tests/back/UserManagement/Specification/Bundle/Doctrine/ORM/Repository/RoleWithPermissionsRepositorySpec.php @@ -26,7 +26,7 @@ function let( AclPrivilegeRepository $privilegeRepository ) { $aclManager->getSid(Argument::type(RoleInterface::class))->will( - fn (...$role): RoleSecurityIdentity => new RoleSecurityIdentity($role) + fn ($role): RoleSecurityIdentity => new RoleSecurityIdentity($role[0]) ); $aclManager->getPrivilegeRepository()->willReturn($privilegeRepository); $this->beConstructedWith($roleRepository, $aclManager); diff --git a/tests/back/UserManagement/Specification/Component/Normalizer/RoleNormalizerSpec.php b/tests/back/UserManagement/Specification/Component/Normalizer/RoleNormalizerSpec.php index 8c15f6d81881..4493e73c27dd 100644 --- a/tests/back/UserManagement/Specification/Component/Normalizer/RoleNormalizerSpec.php +++ b/tests/back/UserManagement/Specification/Component/Normalizer/RoleNormalizerSpec.php @@ -48,7 +48,7 @@ function it_normalizes_a_role( $format = 'standard'; - $sid = new RoleSecurityIdentity($role); + $sid = new RoleSecurityIdentity($role->getRole()); $aclManager->getSid($role)->willReturn($sid); $aclManager->getPrivilegeRepository()->willReturn($aclPrivilegeRepository); $aclPrivileges = $this->buildAclPrivileges(); diff --git a/tests/back/UserManagement/Specification/Component/Storage/Saver/RoleWithPermissionsSaverSpec.php b/tests/back/UserManagement/Specification/Component/Storage/Saver/RoleWithPermissionsSaverSpec.php index 359e21a55c6c..651903a7955a 100644 --- a/tests/back/UserManagement/Specification/Component/Storage/Saver/RoleWithPermissionsSaverSpec.php +++ b/tests/back/UserManagement/Specification/Component/Storage/Saver/RoleWithPermissionsSaverSpec.php @@ -70,9 +70,8 @@ function it_saves_roles_with_permissions( ['action:privilege1' => true, 'action:privilege2' => false] ); - $aclManager->getSid(Argument::type(RoleInterface::class))->shouldBeCalledTimes(2)->will( - fn (...$role) => new RoleSecurityIdentity($role) - ); + $aclManager->getSid($role1)->shouldBeCalledTimes(1)->willReturn(new RoleSecurityIdentity('ROLE_ADMIN')); + $aclManager->getSid($role2)->shouldBeCalledTimes(1)->willReturn(new RoleSecurityIdentity('ROLE_USER')); $aclManager->getPrivilegeRepository()->willReturn($privilegeRepository); $privilege1->getIdentity()->willReturn(new AclPrivilegeIdentity('action:privilege1')); diff --git a/tests/back/UserManagement/Specification/Component/Updater/RoleWithPermissionsUpdaterSpec.php b/tests/back/UserManagement/Specification/Component/Updater/RoleWithPermissionsUpdaterSpec.php index 4d5f896edf69..cf5070066283 100644 --- a/tests/back/UserManagement/Specification/Component/Updater/RoleWithPermissionsUpdaterSpec.php +++ b/tests/back/UserManagement/Specification/Component/Updater/RoleWithPermissionsUpdaterSpec.php @@ -56,7 +56,8 @@ function it_updates_the_permissions( ) { $roleWithPermissions = RoleWithPermissions::createFromRoleAndPermissions($role->getWrappedObject(), []); - $sid = new RoleSecurityIdentity($role); + $role->getRole()->willReturn('my_role'); + $sid = new RoleSecurityIdentity('my_role'); $aclManager->getSid($role)->willReturn($sid); $aclManager->getPrivilegeRepository()->willReturn($privilegeRepository); $privilegeRepository->getPrivileges($sid)->willReturn( @@ -93,7 +94,8 @@ function it_adds_non_existent_permissions( ) { $roleWithPermissions = RoleWithPermissions::createFromRoleAndPermissions($role->getWrappedObject(), []); - $sid = new RoleSecurityIdentity($role); + $role->getRole()->willReturn('my_role'); + $sid = new RoleSecurityIdentity('my_role'); $aclManager->getSid($role)->willReturn($sid); $aclManager->getPrivilegeRepository()->willReturn($privilegeRepository); $privilegeRepository->getPrivileges($sid)->willReturn( diff --git a/tests/legacy/features/Behat/Context/HookContext.php b/tests/legacy/features/Behat/Context/HookContext.php index 277ada73aa32..f32e6012b8e1 100644 --- a/tests/legacy/features/Behat/Context/HookContext.php +++ b/tests/legacy/features/Behat/Context/HookContext.php @@ -219,7 +219,7 @@ public function removeTmpDir() */ public function clearUOW() { - foreach ($this->getDoctrine()->getEntityManagers() as $manager) { + foreach ($this->getDoctrine()->getManagers() as $manager) { $manager->clear(); } } diff --git a/upgrades/schema/Version_4_0_20200113145800_fix_versioning_indexes.php b/upgrades/schema/Version_4_0_20200113145800_fix_versioning_indexes.php index 12c36c3a9510..f6baa37c3184 100644 --- a/upgrades/schema/Version_4_0_20200113145800_fix_versioning_indexes.php +++ b/upgrades/schema/Version_4_0_20200113145800_fix_versioning_indexes.php @@ -8,7 +8,7 @@ class Version_4_0_20200113145800_fix_versioning_indexes extends AbstractMigration { - public function up(Schema $schema) + public function up(Schema $schema): void { $this->updateVersioningIndexes(); } @@ -56,7 +56,7 @@ private function updateVersioningIndexes() } } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->throwIrreversibleMigrationException(); } From 15c5619acd80a2d564e44f42dbefabb1f8484bd3 Mon Sep 17 00:00:00 2001 From: jmleroux Date: Tue, 31 Aug 2021 18:00:53 +0200 Subject: [PATCH 2/7] BH-681: Update doctrine-bundle - fix oauth server bundle --- composer.json | 2 +- config/bundles.php | 2 +- symfony.lock | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 67b8216a21b0..82ebf94bcae7 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,7 @@ "dompdf/dompdf" : "1.0.2", "elasticsearch/elasticsearch": "7.11.0", "friendsofsymfony/jsrouting-bundle": "2.7.0", - "friendsofsymfony/oauth-server-bundle": "dev-master", + "cutwise/oauth-server-bundle": "2.0.4", "friendsofsymfony/rest-bundle": "^3.0.5", "gedmo/doctrine-extensions":"v3.0.3", "google/cloud-pubsub": "1.29.1", diff --git a/config/bundles.php b/config/bundles.php index 7df49283fd32..314802e101ee 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -52,6 +52,6 @@ Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'behat' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'behat' => true], Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true, 'test' => true, 'behat' => true], - Akeneo\FreeTrial\Infrastructure\Symfony\AkeneoCommunityFreeTrialBundle::class => ['all' => true], + Akeneo\FreeTrial\Infrastructure\Symfony\AkeneoCommunityFreeTrialBundle::class => ['all' => true], Akeneo\Platform\Bundle\FrameworkBundle\PimFrameworkBundle::class => ['all' => true], ]; diff --git a/symfony.lock b/symfony.lock index 3708eea5ed30..238b54c68b37 100644 --- a/symfony.lock +++ b/symfony.lock @@ -54,6 +54,9 @@ "composer/xdebug-handler": { "version": "1.3.3" }, + "cutwise/oauth-server-bundle": { + "version": "v2.0.4" + }, "doctrine/annotations": { "version": "1.0", "recipe": { From 4155a3c56a9fd741e40406b213ec5be2dd1151fd Mon Sep 17 00:00:00 2001 From: jmleroux Date: Wed, 1 Sep 2021 11:10:02 +0200 Subject: [PATCH 3/7] BH-681: Fix migrations tests --- phpstan.neon | 1 - .../Application/Webhook/WebhookUserAuthenticator.php | 6 +++--- .../Doctrine/ReferenceDataRepositoryResolver.php | 3 ++- .../ReferenceDataRepositoryResolverInterface.php | 7 +------ symfony.lock | 12 ------------ ...thorized_view_all_jobs_permission_Integration.php | 5 +++-- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 63a9e582a72e..c0e54e723922 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3,7 +3,6 @@ includes: - vendor/phpstan/phpstan-webmozart-assert/extension.neon parameters: reportUnmatchedIgnoredErrors: false - checkGenericClassInNonGenericObjectType: false symfony: container_xml_path: %rootDir%/../../../var/cache/dev/srcKernelDevDebugContainer.xml ignoreErrors: diff --git a/src/Akeneo/Connectivity/Connection/back/Application/Webhook/WebhookUserAuthenticator.php b/src/Akeneo/Connectivity/Connection/back/Application/Webhook/WebhookUserAuthenticator.php index fb4813640f24..f883e28438af 100644 --- a/src/Akeneo/Connectivity/Connection/back/Application/Webhook/WebhookUserAuthenticator.php +++ b/src/Akeneo/Connectivity/Connection/back/Application/Webhook/WebhookUserAuthenticator.php @@ -4,7 +4,7 @@ namespace Akeneo\Connectivity\Connection\Application\Webhook; -use Doctrine\Persistence\ObjectRepository; +use Akeneo\UserManagement\Component\Repository\UserRepositoryInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Symfony\Component\Security\Core\User\UserInterface; @@ -15,11 +15,11 @@ */ class WebhookUserAuthenticator { - private ObjectRepository $userRepository; + private UserRepositoryInterface $userRepository; private TokenStorageInterface $tokenStorage; - public function __construct(ObjectRepository $userRepository, TokenStorageInterface $tokenStorage) + public function __construct(UserRepositoryInterface $userRepository, TokenStorageInterface $tokenStorage) { $this->userRepository = $userRepository; $this->tokenStorage = $tokenStorage; diff --git a/src/Akeneo/Pim/Enrichment/Bundle/Doctrine/ReferenceDataRepositoryResolver.php b/src/Akeneo/Pim/Enrichment/Bundle/Doctrine/ReferenceDataRepositoryResolver.php index 9ae6dcb67087..d0c931a4ad97 100644 --- a/src/Akeneo/Pim/Enrichment/Bundle/Doctrine/ReferenceDataRepositoryResolver.php +++ b/src/Akeneo/Pim/Enrichment/Bundle/Doctrine/ReferenceDataRepositoryResolver.php @@ -5,6 +5,7 @@ use Akeneo\Pim\Enrichment\Component\Product\Repository\ReferenceDataRepositoryResolverInterface; use Akeneo\Pim\Structure\Component\ReferenceData\ConfigurationRegistryInterface; use Doctrine\Persistence\ManagerRegistry; +use Doctrine\Persistence\ObjectRepository; /** * Resolves the repository given a reference data type @@ -29,7 +30,7 @@ public function __construct( /** * {@inheritdoc} */ - public function resolve($referenceDataType) + public function resolve(string $referenceDataType): ObjectRepository { $referenceDataConf = $this->configurationRegistry->get($referenceDataType); $referenceDataClass = $referenceDataConf->getClass(); diff --git a/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php b/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php index 3280ae498205..db773247115a 100644 --- a/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php +++ b/src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php @@ -13,10 +13,5 @@ */ interface ReferenceDataRepositoryResolverInterface { - /** - * @param string $referenceDataType - * - * @return ObjectRepository - */ - public function resolve($referenceDataType); + public function resolve(string $referenceDataType): ObjectRepository; } diff --git a/symfony.lock b/symfony.lock index 238b54c68b37..71bb18dfaa93 100644 --- a/symfony.lock +++ b/symfony.lock @@ -102,9 +102,6 @@ "src/Repository/.gitignore" ] }, - "doctrine/doctrine-cache-bundle": { - "version": "1.4.0" - }, "doctrine/doctrine-fixtures-bundle": { "version": "3.0", "recipe": { @@ -151,9 +148,6 @@ "doctrine/persistence": { "version": "v1.1.0" }, - "doctrine/reflection": { - "version": "v1.0.0" - }, "doctrine/sql-formatter": { "version": "1.1.1" }, @@ -217,9 +211,6 @@ "ref": "370bcf99b04c0dfd0b545745aad622d757af5e1b" } }, - "friendsofsymfony/oauth-server-bundle": { - "version": "1.6.2" - }, "friendsofsymfony/oauth2-php": { "version": "1.2.3" }, @@ -280,9 +271,6 @@ "instaclick/php-webdriver": { "version": "1.4.6" }, - "jdorn/sql-formatter": { - "version": "v1.2.17" - }, "justinrainbow/json-schema": { "version": "5.2.9" }, diff --git a/upgrades/test_schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission_Integration.php b/upgrades/test_schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission_Integration.php index f645e5cf07be..1d0984f05865 100644 --- a/upgrades/test_schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission_Integration.php +++ b/upgrades/test_schema/Version_4_1_20200127171059_unauthorized_view_all_jobs_permission_Integration.php @@ -105,7 +105,8 @@ public function testItForbidToViewAllJobsForAllRoles() private function findAccessLevelForRole(Role $role): ?int { - $aclPrivileges = $this->aclManager->getPrivilegeRepository()->getPrivileges(new RoleSecurityIdentity($role)); + $aclPrivileges = $this->aclManager->getPrivilegeRepository() + ->getPrivileges(new RoleSecurityIdentity($role->getRole())); foreach ($aclPrivileges as $aclPrivilege) { if ($aclPrivilege->getIdentity()->getId() === static::PRIVILEGE_ID) { return $aclPrivilege->getPermissions()->get('EXECUTE')->getAccessLevel(); @@ -126,7 +127,7 @@ private function authorizedPermission(Role $role): void $this ->aclManager ->getPrivilegeRepository() - ->savePrivileges(new RoleSecurityIdentity($role), new ArrayCollection([$privilege])); + ->savePrivileges(new RoleSecurityIdentity($role->getRole()), new ArrayCollection([$privilege])); } private function getMigrationLabel(): string From 59131d898e58882735c7eeecb08928fc12bc5043 Mon Sep 17 00:00:00 2001 From: jmleroux Date: Fri, 3 Sep 2021 09:16:57 +0200 Subject: [PATCH 4/7] BH-681: Update doctrine-bundle - fix coupling detector --- src/Akeneo/Connectivity/Connection/back/tests/.php_cd.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Akeneo/Connectivity/Connection/back/tests/.php_cd.php b/src/Akeneo/Connectivity/Connection/back/tests/.php_cd.php index c870b978c319..276d2405b310 100644 --- a/src/Akeneo/Connectivity/Connection/back/tests/.php_cd.php +++ b/src/Akeneo/Connectivity/Connection/back/tests/.php_cd.php @@ -77,7 +77,7 @@ // Not ok 'Akeneo\UserManagement\Component\Model\UserInterface', - 'Doctrine\Common\Persistence\ObjectRepository', + 'Akeneo\UserManagement\Component\Repository\UserRepositoryInterface', 'Doctrine\Persistence', 'Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface', 'Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', From 962dfa4d4f93720ace57419f80015310ce785e33 Mon Sep 17 00:00:00 2001 From: jmleroux Date: Mon, 6 Sep 2021 09:19:29 +0200 Subject: [PATCH 5/7] BH-681: Doctrine Migration configuration --- config/packages/doctrine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/packages/doctrine.yml b/config/packages/doctrine.yml index 641ea88171e0..04a642a24b9d 100644 --- a/config/packages/doctrine.yml +++ b/config/packages/doctrine.yml @@ -60,4 +60,4 @@ doctrine_migrations: namespace: Pim\Upgrade\Schema name: PIM Migrations column_name: 'version' - column_length: 191 + column_length: 190 From da1a5adfb2371df42bfaae35fe320918e88b7ec1 Mon Sep 17 00:00:00 2001 From: jmleroux Date: Mon, 6 Sep 2021 16:22:43 +0200 Subject: [PATCH 6/7] BH-681: Use akeneo/oauth-server-bundle --- composer.json | 2 +- symfony.lock | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 82ebf94bcae7..fe6230648fd3 100644 --- a/composer.json +++ b/composer.json @@ -71,7 +71,7 @@ "dompdf/dompdf" : "1.0.2", "elasticsearch/elasticsearch": "7.11.0", "friendsofsymfony/jsrouting-bundle": "2.7.0", - "cutwise/oauth-server-bundle": "2.0.4", + "akeneo/oauth-server-bundle": "^2.0.0", "friendsofsymfony/rest-bundle": "^3.0.5", "gedmo/doctrine-extensions":"v3.0.3", "google/cloud-pubsub": "1.29.1", diff --git a/symfony.lock b/symfony.lock index 71bb18dfaa93..c0b796e33c00 100644 --- a/symfony.lock +++ b/symfony.lock @@ -1,4 +1,7 @@ { + "akeneo/oauth-server-bundle": { + "version": "1.7.x-dev" + }, "akeneo/php-coupling-detector": { "version": "0.3.1" }, From d9349dee1a8df3a123c55c0fae3b98d5732ddbd6 Mon Sep 17 00:00:00 2001 From: jmleroux Date: Mon, 6 Sep 2021 16:26:08 +0200 Subject: [PATCH 7/7] BH-681: Composer update --- composer.lock | 1247 ++++++++++++++++++++++++------------------------- 1 file changed, 615 insertions(+), 632 deletions(-) diff --git a/composer.lock b/composer.lock index 5ed2021d4c27..e03636bedcc9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,97 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f669c831367e35e3191d614858bfcc2f", + "content-hash": "cd9519133a6bf9dbf9bfeaeb49636a4e", "packages": [ + { + "name": "akeneo/oauth-server-bundle", + "version": "v2.0.0", + "source": { + "type": "git", + "url": "https://github.com/akeneo/FOSOAuthServerBundle.git", + "reference": "79b0dd80d3c3a94b09ae55727aa8b99f00decc29" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/akeneo/FOSOAuthServerBundle/zipball/79b0dd80d3c3a94b09ae55727aa8b99f00decc29", + "reference": "79b0dd80d3c3a94b09ae55727aa8b99f00decc29", + "shasum": "" + }, + "require": { + "friendsofsymfony/oauth2-php": "~1.1", + "php": "^7.2 || ^8.0", + "symfony/dependency-injection": "^4.4 || ^5.1", + "symfony/framework-bundle": "^4.4 || ^5.1", + "symfony/security-bundle": "^4.4 || ^5.1", + "symfony/twig-bundle": "^4.4 || ^5.1" + }, + "conflict": { + "twig/twig": "<1.40 || >=2.0,<2.9" + }, + "require-dev": { + "doctrine/doctrine-bundle": "^2.0", + "doctrine/mongodb-odm": "^2.2", + "doctrine/orm": "~2.2", + "phing/phing": "~2.4", + "php-mock/php-mock-phpunit": "~1.0 || ~2.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "~0.9", + "phpunit/phpunit": "^9.0", + "propel/propel1": "~1.6", + "symfony/console": "^4.4 || ^5.1", + "symfony/form": "^4.4 || ^5.1", + "symfony/phpunit-bridge": "^4.4 || ^5.1", + "symfony/yaml": "^4.4 || ^5.1", + "willdurand/propel-typehintable-behavior": "~1.0" + }, + "suggest": { + "doctrine/doctrine-bundle": "*", + "doctrine/mongodb-odm-bundle": "*", + "propel/propel-bundle": "If you want to use Propel with Symfony2, then you will have to install the PropelBundle", + "symfony/console": "Needed to be able to use commands", + "symfony/form": "Needed to be able to use the AuthorizeFormType", + "willdurand/propel-typehintable-behavior": "The Typehintable behavior is useful to add type hints on generated methods, to be compliant with interfaces" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "FOS\\OAuthServerBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arnaud Le Blanc", + "email": "arnaud.lb@gmail.com" + }, + { + "name": "FriendsOfSymfony Community", + "homepage": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/contributors" + } + ], + "description": "Fork of Symfony2 OAuth Server Bundle", + "homepage": "http://friendsofsymfony.github.com", + "keywords": [ + "oauth", + "oauth2", + "server" + ], + "support": { + "source": "https://github.com/akeneo/FOSOAuthServerBundle/tree/v2.0.0" + }, + "time": "2021-09-06T14:20:35+00:00" + }, { "name": "ass/xmlsecurity", "version": "v1.1.1", @@ -427,40 +516,39 @@ }, { "name": "doctrine/cache", - "version": "1.9.1", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55" + "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55", - "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55", + "url": "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8", + "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8", "shasum": "" }, "require": { - "php": "~7.1" + "php": "~7.1 || ^8.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^6.0", + "cache/integration-tests": "dev-master", + "doctrine/coding-standard": "^8.0", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0", - "predis/predis": "~1.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "predis/predis": "~1.0", + "psr/cache": "^1.0 || ^2.0 || ^3.0", + "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev", + "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" @@ -503,44 +591,52 @@ "memcached", "php", "redis", - "riak", "xcache" ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.9.1" + "source": "https://github.com/doctrine/cache/tree/1.12.1" }, - "time": "2019-11-15T14:31:57+00:00" + "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%2Fcache", + "type": "tidelift" + } + ], + "time": "2021-07-17T14:39:21+00:00" }, { "name": "doctrine/collections", - "version": "1.6.4", + "version": "1.6.8", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7" + "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", + "url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af", + "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan-shim": "^0.9.2", - "phpunit/phpunit": "^7.0", - "vimeo/psalm": "^3.2.2" + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", + "vimeo/psalm": "^4.2.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" @@ -582,49 +678,38 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.6.4" + "source": "https://github.com/doctrine/collections/tree/1.6.8" }, - "time": "2019-11-13T13:07:11+00:00" + "time": "2021-08-10T18:51:53+00:00" }, { "name": "doctrine/common", - "version": "2.13.3", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f" + "reference": "a036d90c303f3163b5be8b8fde9b6755b2be4a3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f", - "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f", + "url": "https://api.github.com/repos/doctrine/common/zipball/a036d90c303f3163b5be8b8fde9b6755b2be4a3a", + "reference": "a036d90c303f3163b5be8b8fde9b6755b2be4a3a", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", - "doctrine/cache": "^1.0", - "doctrine/collections": "^1.0", - "doctrine/event-manager": "^1.0", - "doctrine/inflector": "^1.0", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^1.3.3", - "doctrine/reflection": "^1.0", + "doctrine/persistence": "^2.0", "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^1.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpunit/phpunit": "^7.0", + "doctrine/coding-standard": "^6.0 || ^8.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.0", - "symfony/phpunit-bridge": "^4.0.5" + "symfony/phpunit-bridge": "^4.0.5", + "vimeo/psalm": "^4.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.11.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\": "lib/Doctrine/Common" @@ -660,7 +745,7 @@ "email": "ocramius@gmail.com" } ], - "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.", + "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, proxies and much more.", "homepage": "https://www.doctrine-project.org/projects/common.html", "keywords": [ "common", @@ -669,7 +754,7 @@ ], "support": { "issues": "https://github.com/doctrine/common/issues", - "source": "https://github.com/doctrine/common/tree/2.13.x" + "source": "https://github.com/doctrine/common/tree/3.1.2" }, "funding": [ { @@ -685,49 +770,45 @@ "type": "tidelift" } ], - "time": "2020-06-05T16:46:05+00:00" + "time": "2021-02-10T20:18:51+00:00" }, { "name": "doctrine/data-fixtures", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "608a35a3b5bcc4214d116603095f8b0c51091592" + "reference": "51d3d4880d28951fff42a635a2389f8c63baddc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/608a35a3b5bcc4214d116603095f8b0c51091592", - "reference": "608a35a3b5bcc4214d116603095f8b0c51091592", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/51d3d4880d28951fff42a635a2389f8c63baddc5", + "reference": "51d3d4880d28951fff42a635a2389f8c63baddc5", "shasum": "" }, "require": { - "doctrine/common": "^2.11", - "php": "^7.2" + "doctrine/common": "^2.13|^3.0", + "doctrine/persistence": "^1.3.3|^2.0", + "php": "^7.2 || ^8.0" }, "conflict": { "doctrine/phpcr-odm": "<1.3.0" }, "require-dev": { - "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.2", "doctrine/dbal": "^2.5.4", - "doctrine/mongodb-odm": "^1.3.0", - "doctrine/orm": "^2.5.4", - "phpunit/phpunit": "^7.0" + "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", + "doctrine/orm": "^2.7.0", + "ext-sqlite3": "*", + "phpunit/phpunit": "^8.0" }, "suggest": { - "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7", + "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", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" @@ -750,36 +831,54 @@ ], "support": { "issues": "https://github.com/doctrine/data-fixtures/issues", - "source": "https://github.com/doctrine/data-fixtures/tree/1.4.0" + "source": "https://github.com/doctrine/data-fixtures/tree/1.5.0" }, - "time": "2019-10-30T20:03:18+00:00" + "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": "2021-01-23T10:20:43+00:00" }, { "name": "doctrine/dbal", - "version": "v2.10.0", + "version": "2.13.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934" + "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934", - "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4", + "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4", "shasum": "" }, "require": { - "doctrine/cache": "^1.0", + "doctrine/cache": "^1.0|^2.0", + "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.0", "ext-pdo": "*", - "php": "^7.2" + "php": "^7.1 || ^8" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "jetbrains/phpstorm-stubs": "^2019.1", - "phpstan/phpstan": "^0.11.3", - "phpunit/phpunit": "^8.4.1", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0" + "doctrine/coding-standard": "9.0.0", + "jetbrains/phpstorm-stubs": "2020.2", + "phpstan/phpstan": "0.12.81", + "phpunit/phpunit": "^7.5.20|^8.5|9.5.5", + "squizlabs/php_codesniffer": "3.6.0", + "symfony/cache": "^4.4", + "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", + "vimeo/psalm": "4.6.4" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -788,12 +887,6 @@ "bin/doctrine-dbal" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "3.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" @@ -846,156 +939,128 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/v2.10.0" + "source": "https://github.com/doctrine/dbal/tree/2.13.2" }, - "time": "2019-11-03T16:50:43+00:00" + "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%2Fdbal", + "type": "tidelift" + } + ], + "time": "2021-06-18T21:48:39+00:00" }, { - "name": "doctrine/doctrine-bundle", - "version": "1.12.0", + "name": "doctrine/deprecations", + "version": "v0.5.3", "source": { "type": "git", - "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115" + "url": "https://github.com/doctrine/deprecations.git", + "reference": "9504165960a1f83cc1480e2be1dd0a0478561314" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115", - "reference": "a374f3bc54fe7c23ddb722ef6b9ddd2d9dcb9115", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314", + "reference": "9504165960a1f83cc1480e2be1dd0a0478561314", "shasum": "" }, "require": { - "doctrine/dbal": "^2.5.12", - "doctrine/doctrine-cache-bundle": "~1.2", - "jdorn/sql-formatter": "^1.2.16", - "php": "^7.1", - "symfony/config": "^3.4.30|^4.3.3", - "symfony/console": "^3.4.30|^4.3.3", - "symfony/dependency-injection": "^3.4.30|^4.3.3", - "symfony/doctrine-bridge": "^3.4.30|^4.3.3", - "symfony/framework-bundle": "^3.4.30|^4.3.3" - }, - "conflict": { - "doctrine/orm": "<2.6", - "twig/twig": "<1.34|>=2.0,<2.4" + "php": "^7.1|^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "doctrine/orm": "^2.6", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^7.5", - "symfony/cache": "^3.4.30|^4.3.3", - "symfony/phpunit-bridge": "^4.2", - "symfony/property-info": "^3.4.30|^4.3.3", - "symfony/twig-bridge": "^3.4|^4.1", - "symfony/validator": "^3.4.30|^4.3.3", - "symfony/web-profiler-bundle": "^3.4.30|^4.3.3", - "symfony/yaml": "^3.4.30|^4.3.3", - "twig/twig": "^1.34|^2.12" + "doctrine/coding-standard": "^6.0|^7.0|^8.0", + "phpunit/phpunit": "^7.0|^8.0|^9.0", + "psr/log": "^1.0" }, "suggest": { - "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", - "symfony/web-profiler-bundle": "To use the data collector." - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.12.x-dev" - } + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" }, + "type": "library", "autoload": { "psr-4": { - "Doctrine\\Bundle\\DoctrineBundle\\": "" + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org/" - } - ], - "description": "Symfony DoctrineBundle", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "database", - "dbal", - "orm", - "persistence" - ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", "support": { - "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/1.12.x" + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v0.5.3" }, - "time": "2019-11-19T11:42:20+00:00" + "time": "2021-03-21T12:59:47+00:00" }, { - "name": "doctrine/doctrine-cache-bundle", - "version": "1.4.0", + "name": "doctrine/doctrine-bundle", + "version": "2.4.2", "source": { "type": "git", - "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "6bee2f9b339847e8a984427353670bad4e7bdccb" + "url": "https://github.com/doctrine/DoctrineBundle.git", + "reference": "4202ce675d29e70a8b9ee763bec021b6f44caccb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/6bee2f9b339847e8a984427353670bad4e7bdccb", - "reference": "6bee2f9b339847e8a984427353670bad4e7bdccb", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/4202ce675d29e70a8b9ee763bec021b6f44caccb", + "reference": "4202ce675d29e70a8b9ee763bec021b6f44caccb", "shasum": "" }, "require": { - "doctrine/cache": "^1.4.2", - "doctrine/inflector": "^1.0", - "php": "^7.1", - "symfony/doctrine-bridge": "^3.4|^4.0" + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/dbal": "^2.9.0|^3.0", + "doctrine/persistence": "^1.3.3|^2.0", + "doctrine/sql-formatter": "^1.0.1", + "php": "^7.1 || ^8.0", + "symfony/cache": "^4.3.3|^5.0|^6.0", + "symfony/config": "^4.4.3|^5.0|^6.0", + "symfony/console": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/dependency-injection": "^4.3.3|^5.0|^6.0", + "symfony/deprecation-contracts": "^2.1", + "symfony/doctrine-bridge": "^4.4.22|^5.2.7|^6.0", + "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/service-contracts": "^1.1.1|^2.0" + }, + "conflict": { + "doctrine/orm": "<2.9", + "twig/twig": "<1.34|>=2.0,<2.4" }, "require-dev": { - "instaclick/coding-standard": "~1.1", - "instaclick/object-calisthenics-sniffs": "dev-master", - "instaclick/symfony2-coding-standard": "dev-remaster", - "phpunit/phpunit": "^7.0", - "predis/predis": "~0.8", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "~1.5", - "symfony/console": "^3.4|^4.0", - "symfony/finder": "^3.4|^4.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/phpunit-bridge": "^3.4|^4.0", - "symfony/security-acl": "^2.8", - "symfony/validator": "^3.4|^4.0", - "symfony/yaml": "^3.4|^4.0" + "doctrine/coding-standard": "^9.0", + "doctrine/orm": "^2.9", + "friendsofphp/proxy-manager-lts": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3", + "psalm/plugin-phpunit": "^0.15.1", + "psalm/plugin-symfony": "^2.3.0", + "symfony/phpunit-bridge": "^5.2|^6.0", + "symfony/property-info": "^4.3.3|^5.0|^6.0", + "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0|^6.0", + "symfony/security-bundle": "^4.4|^5.0|^6.0", + "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/validator": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/yaml": "^3.4.30|^4.3.3|^5.0|^6.0", + "twig/twig": "^1.34|^2.12|^3.0", + "vimeo/psalm": "^4.7" }, "suggest": { - "symfony/security-acl": "For using this bundle to cache ACLs" + "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", + "ext-pdo": "*", + "symfony/web-profiler-bundle": "To use the data collector." }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Bundle\\DoctrineCacheBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Doctrine\\Bundle\\DoctrineBundle\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1010,14 +1075,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Fabio B. Silva", - "email": "fabio.bat.silva@gmail.com" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@hotmail.com" - }, { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" @@ -1027,38 +1084,54 @@ "homepage": "http://www.doctrine-project.org/" } ], - "description": "Symfony Bundle for Doctrine Cache", - "homepage": "https://www.doctrine-project.org", + "description": "Symfony DoctrineBundle", + "homepage": "http://www.doctrine-project.org", "keywords": [ - "cache", - "caching" + "database", + "dbal", + "orm", + "persistence" ], "support": { - "issues": "https://github.com/doctrine/DoctrineCacheBundle/issues", - "source": "https://github.com/doctrine/DoctrineCacheBundle/tree/1.4.0" + "issues": "https://github.com/doctrine/DoctrineBundle/issues", + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.4.2" }, - "abandoned": true, - "time": "2019-11-29T11:22:01+00:00" + "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-bundle", + "type": "tidelift" + } + ], + "time": "2021-06-05T13:40:39+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "8f07fcfdac7f3591f3c4bf13a50cbae05f65ed70" + "reference": "870189619a7770f468ffb0b80925302e065a3b34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/8f07fcfdac7f3591f3c4bf13a50cbae05f65ed70", - "reference": "8f07fcfdac7f3591f3c4bf13a50cbae05f65ed70", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/870189619a7770f468ffb0b80925302e065a3b34", + "reference": "870189619a7770f468ffb0b80925302e065a3b34", "shasum": "" }, "require": { "doctrine/data-fixtures": "^1.3", "doctrine/doctrine-bundle": "^1.11|^2.0", "doctrine/orm": "^2.6.0", - "php": "^7.1", + "doctrine/persistence": "^1.3.7|^2.0", + "php": "^7.1 || ^8.0", "symfony/config": "^3.4|^4.3|^5.0", "symfony/console": "^3.4|^4.3|^5.0", "symfony/dependency-injection": "^3.4|^4.3|^5.0", @@ -1067,15 +1140,10 @@ }, "require-dev": { "doctrine/coding-standard": "^6.0", - "phpunit/phpunit": "^7.4", + "phpunit/phpunit": "^7.4 || ^8.0 || ^9.2", "symfony/phpunit-bridge": "^4.1|^5.0" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.3.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Bundle\\FixturesBundle\\": "" @@ -1107,43 +1175,64 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", - "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/master" + "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.4.0" }, - "time": "2019-11-13T15:46:58+00:00" + "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": "2020-11-14T09:36:49+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "v1.3.2", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "49fa399181db4bf4f9f725126bd1cb65c4398dce" + "reference": "85f0b847174daf243362c7da80efe1539be64f47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/49fa399181db4bf4f9f725126bd1cb65c4398dce", - "reference": "49fa399181db4bf4f9f725126bd1cb65c4398dce", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/85f0b847174daf243362c7da80efe1539be64f47", + "reference": "85f0b847174daf243362c7da80efe1539be64f47", "shasum": "" }, "require": { - "doctrine/doctrine-bundle": "~1.0", - "doctrine/migrations": "^1.1", - "php": ">=5.4.0", - "symfony/framework-bundle": "~2.7|~3.3|~4.0" + "doctrine/doctrine-bundle": "~1.0|~2.0", + "doctrine/migrations": "^2.2", + "php": "^7.1|^8.0", + "symfony/framework-bundle": "~3.4|~4.0|~5.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^7.4" + "doctrine/coding-standard": "^8.0", + "mikey179/vfsstream": "^1.6", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.0|^8.0|^9.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { "psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1151,20 +1240,20 @@ ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Doctrine Project", "homepage": "http://www.doctrine-project.org" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony DoctrineMigrationsBundle", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "dbal", "migrations", @@ -1172,26 +1261,40 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", - "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/1.3" + "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/2.2.2" }, - "time": "2018-12-03T11:55:33+00:00" + "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-migrations-bundle", + "type": "tidelift" + } + ], + "time": "2020-12-23T15:06:17+00:00" }, { "name": "doctrine/event-manager", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "629572819973f13486371cb611386eb17851e85c" + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c", - "reference": "629572819973f13486371cb611386eb17851e85c", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.9@dev" @@ -1252,32 +1355,46 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.1.0" + "source": "https://github.com/doctrine/event-manager/tree/1.1.x" }, - "time": "2019-11-10T09:48:07+00:00" + "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%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2020-05-29T18:28:51+00:00" }, { "name": "doctrine/inflector", - "version": "1.4.4", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" + "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210", + "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", + "doctrine/coding-standard": "^7.0", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-strict-rules": "^0.11", "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", @@ -1288,7 +1405,6 @@ }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, @@ -1334,7 +1450,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/1.4.4" + "source": "https://github.com/doctrine/inflector/tree/2.0.x" }, "funding": [ { @@ -1350,40 +1466,35 @@ "type": "tidelift" } ], - "time": "2021-04-16T17:34:40+00:00" + "time": "2020-05-29T15:13:26+00:00" }, { "name": "doctrine/instantiator", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.0", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.0" + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -1397,7 +1508,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", @@ -1408,7 +1519,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.3.x" + "source": "https://github.com/doctrine/instantiator/tree/1.4.0" }, "funding": [ { @@ -1424,7 +1535,7 @@ "type": "tidelift" } ], - "time": "2020-05-29T17:27:14+00:00" + "time": "2020-11-10T18:47:58+00:00" }, { "name": "doctrine/lexer", @@ -1508,32 +1619,39 @@ }, { "name": "doctrine/migrations", - "version": "v1.8.1", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "215438c0eef3e5f9b7da7d09c6b90756071b43e6" + "reference": "6d87c9a0baa6a4725b4c4e1a45b2a39f53bf1859" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/215438c0eef3e5f9b7da7d09c6b90756071b43e6", - "reference": "215438c0eef3e5f9b7da7d09c6b90756071b43e6", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/6d87c9a0baa6a4725b4c4e1a45b2a39f53bf1859", + "reference": "6d87c9a0baa6a4725b4c4e1a45b2a39f53bf1859", "shasum": "" }, "require": { - "doctrine/dbal": "~2.6", - "ocramius/proxy-manager": "^1.0|^2.0", - "php": "^7.1", - "symfony/console": "~3.3|^4.0" + "composer/package-versions-deprecated": "^1.8", + "doctrine/dbal": "^2.9", + "friendsofphp/proxy-manager-lts": "^1.0", + "php": "^7.1 || ^8.0", + "symfony/console": "^3.4||^4.4.16||^5.0", + "symfony/stopwatch": "^3.4||^4.0||^5.0" }, "require-dev": { - "doctrine/coding-standard": "^1.0", - "doctrine/orm": "~2.5", - "jdorn/sql-formatter": "~1.1", + "doctrine/coding-standard": "^8.2", + "doctrine/orm": "^2.6", + "ext-pdo_sqlite": "*", + "jdorn/sql-formatter": "^1.1", "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "~7.0", - "squizlabs/php_codesniffer": "^3.0", - "symfony/yaml": "~3.3|^4.0" + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "symfony/process": "^3.4||^4.0||^5.0", + "symfony/yaml": "^3.4||^4.0||^5.0" }, "suggest": { "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command.", @@ -1543,14 +1661,8 @@ "bin/doctrine-migrations" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "v1.8.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations", "Doctrine\\Migrations\\": "lib/Doctrine/Migrations" } }, @@ -1572,62 +1684,85 @@ "email": "contact@mikesimonson.com" } ], - "description": "Database Schema migrations using Doctrine DBAL", + "description": "PHP Doctrine Migrations project offer additional functionality on top of the database abstraction layer (DBAL) for versioning your database schema and easily deploying changes to it. It is a very easy to use and a powerful tool.", "homepage": "https://www.doctrine-project.org/projects/migrations.html", "keywords": [ "database", - "migrations" + "dbal", + "migrations", + "php" ], "support": { "issues": "https://github.com/doctrine/migrations/issues", - "source": "https://github.com/doctrine/migrations/tree/1.8" + "source": "https://github.com/doctrine/migrations/tree/2.3.4" }, - "time": "2018-06-06T21:00:30+00:00" + "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%2Fmigrations", + "type": "tidelift" + } + ], + "time": "2021-04-10T07:56:08+00:00" }, { "name": "doctrine/orm", - "version": "v2.7.0", + "version": "2.9.5", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62" + "reference": "77cc86ed880e3f1f6c9c5819e131a8aaeeeee0da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/4d763ca4c925f647b248b9fa01b5f47aa3685d62", - "reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62", + "url": "https://api.github.com/repos/doctrine/orm/zipball/77cc86ed880e3f1f6c9c5819e131a8aaeeeee0da", + "reference": "77cc86ed880e3f1f6c9c5819e131a8aaeeeee0da", "shasum": "" }, "require": { - "doctrine/annotations": "^1.8", - "doctrine/cache": "^1.9.1", + "composer/package-versions-deprecated": "^1.8", + "doctrine/annotations": "^1.13", + "doctrine/cache": "^1.12.1 || ^2.1.1", "doctrine/collections": "^1.5", - "doctrine/common": "^2.11", - "doctrine/dbal": "^2.9.3", + "doctrine/common": "^3.0.3", + "doctrine/dbal": "^2.13.0", + "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.1", + "doctrine/inflector": "^1.4 || ^2.0", "doctrine/instantiator": "^1.3", - "doctrine/persistence": "^1.2", + "doctrine/lexer": "^1.0", + "doctrine/persistence": "^2.2", + "ext-ctype": "*", "ext-pdo": "*", - "php": "^7.1", - "symfony/console": "^3.0|^4.0|^5.0" + "php": "^7.1 ||^8.0", + "psr/cache": "^1 || ^2 || ^3", + "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { - "doctrine/coding-standard": "^5.0", - "phpunit/phpunit": "^7.5", - "symfony/yaml": "^3.4|^4.0|^5.0" + "doctrine/coding-standard": "^9.0", + "phpbench/phpbench": "^0.16.10 || ^1.0", + "phpstan/phpstan": "0.12.94", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "squizlabs/php_codesniffer": "3.6.0", + "symfony/cache": "^4.4 || ^5.2", + "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", + "vimeo/psalm": "4.7.0" }, "suggest": { + "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, "bin": [ "bin/doctrine" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\ORM\\": "lib/Doctrine/ORM" @@ -1667,46 +1802,46 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/v2.7.0" + "source": "https://github.com/doctrine/orm/tree/2.9.5" }, - "time": "2019-11-19T08:38:05+00:00" + "time": "2021-08-23T10:20:22+00:00" }, { "name": "doctrine/persistence", - "version": "1.3.3", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "99b196bbd4715a94fa100fac664a351ffa46d6a5" + "reference": "4ce4712e6dc84a156176a0fbbb11954a25c93103" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/99b196bbd4715a94fa100fac664a351ffa46d6a5", - "reference": "99b196bbd4715a94fa100fac664a351ffa46d6a5", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/4ce4712e6dc84a156176a0fbbb11954a25c93103", + "reference": "4ce4712e6dc84a156176a0fbbb11954a25c93103", "shasum": "" }, "require": { "doctrine/annotations": "^1.0", - "doctrine/cache": "^1.0", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/collections": "^1.0", + "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.0", - "doctrine/reflection": "^1.0", - "php": "^7.1" + "php": "^7.1 || ^8.0", + "psr/cache": "^1.0|^2.0|^3.0" }, "conflict": { "doctrine/common": "<2.10@dev" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11", - "phpunit/phpunit": "^7.0" + "composer/package-versions-deprecated": "^1.11", + "doctrine/coding-standard": "^6.0 || ^9.0", + "doctrine/common": "^3.0", + "phpstan/phpstan": "0.12.84", + "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0", + "symfony/cache": "^4.4|^5.0", + "vimeo/psalm": "4.7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\": "lib/Doctrine/Common", @@ -1754,46 +1889,42 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/1.3.3" + "source": "https://github.com/doctrine/persistence/tree/2.2.2" }, - "time": "2019-12-13T10:43:02+00:00" + "time": "2021-08-10T19:01:29+00:00" }, { - "name": "doctrine/reflection", - "version": "v1.0.0", + "name": "doctrine/sql-formatter", + "version": "1.1.1", "source": { "type": "git", - "url": "https://github.com/doctrine/reflection.git", - "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6" + "url": "https://github.com/doctrine/sql-formatter.git", + "reference": "56070bebac6e77230ed7d306ad13528e60732871" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6", - "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6", + "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/56070bebac6e77230ed7d306ad13528e60732871", + "reference": "56070bebac6e77230ed7d306ad13528e60732871", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", - "ext-tokenizer": "*", - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^4.0", - "doctrine/common": "^2.8", - "phpstan/phpstan": "^0.9.2", - "phpstan/phpstan-phpunit": "^0.9.4", - "phpunit/phpunit": "^7.0", - "squizlabs/php_codesniffer": "^3.0" + "bamarni/composer-bin-plugin": "^1.4" }, + "bin": [ + "bin/sql-formatter" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\SqlFormatter\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1802,41 +1933,22 @@ ], "authors": [ { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - }, - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" + "name": "Jeremy Dorn", + "email": "jeremy@jeremydorn.com", + "homepage": "http://jeremydorn.com/" } ], - "description": "Doctrine Reflection component", - "homepage": "https://www.doctrine-project.org/projects/reflection.html", + "description": "a PHP SQL highlighting library", + "homepage": "https://github.com/doctrine/sql-formatter/", "keywords": [ - "reflection" + "highlight", + "sql" ], "support": { - "issues": "https://github.com/doctrine/reflection/issues", - "source": "https://github.com/doctrine/reflection/tree/master" + "issues": "https://github.com/doctrine/sql-formatter/issues", + "source": "https://github.com/doctrine/sql-formatter/tree/1.1.x" }, - "abandoned": "roave/better-reflection", - "time": "2018-06-14T14:45:07+00:00" + "time": "2020-07-30T16:57:33+00:00" }, { "name": "dompdf/dompdf", @@ -2359,94 +2471,6 @@ }, "time": "2020-11-20T10:38:12+00:00" }, - { - "name": "friendsofsymfony/oauth-server-bundle", - "version": "1.6.2", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle.git", - "reference": "fcaa25cc49474bdb0db7894f880976fe76ffed23" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSOAuthServerBundle/zipball/fcaa25cc49474bdb0db7894f880976fe76ffed23", - "reference": "fcaa25cc49474bdb0db7894f880976fe76ffed23", - "shasum": "" - }, - "require": { - "friendsofsymfony/oauth2-php": "~1.1", - "paragonie/random_compat": "^1|^2", - "php": "^5.5|^7.0", - "symfony/dependency-injection": "^2.8|~3.0|^4.0", - "symfony/framework-bundle": "~2.8|~3.0|^4.0", - "symfony/security-bundle": "~2.8|~3.0|^4.0" - }, - "require-dev": { - "doctrine/doctrine-bundle": "~1.0", - "doctrine/mongodb-odm": "~1.0", - "doctrine/orm": "~2.2", - "phing/phing": "~2.4", - "php-mock/php-mock-phpunit": "^1.1", - "phpunit/phpunit": "~4.8|~5.0", - "propel/propel1": "^1.6.5", - "symfony/class-loader": "~2.8|~3.0|^4.0", - "symfony/console": "~2.8|~3.0|^4.0", - "symfony/form": "~2.8|~3.0|^4.0", - "symfony/phpunit-bridge": "~2.8|~3.0|^4.0", - "symfony/templating": "~2.8|~3.0|^4.0", - "symfony/twig-bundle": "~2.8|~3.0|^4.0", - "symfony/yaml": "~2.8|~3.0|^4.0", - "willdurand/propel-typehintable-behavior": "^1.0.4" - }, - "suggest": { - "doctrine/doctrine-bundle": "*", - "doctrine/mongodb-odm-bundle": "*", - "propel/propel-bundle": "If you want to use Propel with Symfony2, then you will have to install the PropelBundle", - "symfony/console": "Needed to be able to use commands", - "symfony/form": "Needed to be able to use the AuthorizeFormType", - "willdurand/propel-typehintable-behavior": "The Typehintable behavior is useful to add type hints on generated methods, to be compliant with interfaces" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, - "autoload": { - "psr-4": { - "FOS\\OAuthServerBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Arnaud Le Blanc", - "email": "arnaud.lb@gmail.com" - }, - { - "name": "FriendsOfSymfony Community", - "homepage": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/contributors" - } - ], - "description": "Symfony2 OAuth Server Bundle", - "homepage": "http://friendsofsymfony.github.com", - "keywords": [ - "oauth", - "oauth2", - "server" - ], - "support": { - "issues": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/issues", - "source": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/tree/1.6" - }, - "time": "2019-01-23T15:23:04+00:00" - }, { "name": "friendsofsymfony/oauth2-php", "version": "1.3.1", @@ -3476,60 +3500,6 @@ }, "time": "2020-11-03T22:35:03+00:00" }, - { - "name": "jdorn/sql-formatter", - "version": "v1.2.17", - "source": { - "type": "git", - "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "lib" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeremy Dorn", - "email": "jeremy@jeremydorn.com", - "homepage": "http://jeremydorn.com/" - } - ], - "description": "a PHP SQL highlighting library", - "homepage": "https://github.com/jdorn/sql-formatter/", - "keywords": [ - "highlight", - "sql" - ], - "support": { - "issues": "https://github.com/jdorn/sql-formatter/issues", - "source": "https://github.com/jdorn/sql-formatter/tree/master" - }, - "time": "2014-01-12T16:20:24+00:00" - }, { "name": "justinrainbow/json-schema", "version": "5.2.11", @@ -4358,33 +4328,29 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.20", + "version": "v9.99.100", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a" + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0f1f60250fccffeaf5dda91eea1c018aed1adc2a", - "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": ">= 7" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" }, "suggest": { "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -4408,7 +4374,7 @@ "issues": "https://github.com/paragonie/random_compat/issues", "source": "https://github.com/paragonie/random_compat" }, - "time": "2021-04-17T09:33:01+00:00" + "time": "2020-10-15T08:29:30+00:00" }, { "name": "phenx/php-font-lib", @@ -6471,16 +6437,16 @@ }, { "name": "symfony/flex", - "version": "v1.15.1", + "version": "v1.15.3", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "c2605222ee4984899bdc93b3e56f502fc79bafc6" + "reference": "f16f10772422ace36dc76d5d5c7a682c8b925c0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/c2605222ee4984899bdc93b3e56f502fc79bafc6", - "reference": "c2605222ee4984899bdc93b3e56f502fc79bafc6", + "url": "https://api.github.com/repos/symfony/flex/zipball/f16f10772422ace36dc76d5d5c7a682c8b925c0c", + "reference": "f16f10772422ace36dc76d5d5c7a682c8b925c0c", "shasum": "" }, "require": { @@ -6519,7 +6485,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.15.1" + "source": "https://github.com/symfony/flex/tree/v1.15.3" }, "funding": [ { @@ -6535,7 +6501,7 @@ "type": "tidelift" } ], - "time": "2021-08-30T14:55:05+00:00" + "time": "2021-09-06T12:45:00+00:00" }, { "name": "symfony/form", @@ -8984,37 +8950,40 @@ }, { "name": "symfony/security-acl", - "version": "v3.0.2", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/security-acl.git", - "reference": "22928f6be80a37f301500c67e50f57f5b25ffaa8" + "reference": "b8f4a879f32ae48059e0071070deaca75bf4901c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-acl/zipball/22928f6be80a37f301500c67e50f57f5b25ffaa8", - "reference": "22928f6be80a37f301500c67e50f57f5b25ffaa8", + "url": "https://api.github.com/repos/symfony/security-acl/zipball/b8f4a879f32ae48059e0071070deaca75bf4901c", + "reference": "b8f4a879f32ae48059e0071070deaca75bf4901c", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/security-core": "~2.8|~3.0|~4.0" + "php": ">=7.2.5", + "symfony/security-core": "^4.4|^5.0" }, - "require-dev": { - "doctrine/common": "~2.2", - "doctrine/dbal": "~2.2", - "psr/log": "~1.0", - "symfony/phpunit-bridge": "~2.8|~3.0|~4.0" + "conflict": { + "doctrine/cache": "<1.11", + "doctrine/dbal": "<2.13.1|~3.0.0" }, - "suggest": { - "doctrine/dbal": "For using the built-in ACL implementation", - "symfony/class-loader": "For using the ACL generateSql script", - "symfony/finder": "For using the ACL generateSql script" + "require-dev": { + "doctrine/cache": "^1.11|^2.0", + "doctrine/common": "^2.2|^3", + "doctrine/dbal": "^2.13.1|^3.1", + "doctrine/persistence": "^1.3.3|^2", + "psr/log": "^1|^2|^3", + "symfony/cache": "^4.4|^5.0", + "symfony/finder": "^4.4|^5.0", + "symfony/phpunit-bridge": "^5.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -9043,9 +9012,23 @@ "homepage": "https://symfony.com", "support": { "issues": "https://github.com/symfony/security-acl/issues", - "source": "https://github.com/symfony/security-acl/tree/v3.0.2" + "source": "https://github.com/symfony/security-acl/tree/v3.2.0" }, - "time": "2018-12-13T16:51:15+00:00" + "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": "2021-07-21T09:22:34+00:00" }, { "name": "symfony/security-bundle", @@ -9624,6 +9607,68 @@ ], "time": "2021-04-01T10:43:52+00:00" }, + { + "name": "symfony/stopwatch", + "version": "v5.3.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "b24c6a92c6db316fee69e38c80591e080e41536c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b24c6a92c6db316fee69e38c80591e080e41536c", + "reference": "b24c6a92c6db316fee69e38c80591e080e41536c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/service-contracts": "^1.0|^2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "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 a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v5.3.4" + }, + "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": "2021-07-10T08:58:57+00:00" + }, { "name": "symfony/string", "version": "v5.3.7", @@ -15942,68 +15987,6 @@ ], "time": "2021-08-28T15:40:01+00:00" }, - { - "name": "symfony/stopwatch", - "version": "v5.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "b24c6a92c6db316fee69e38c80591e080e41536c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b24c6a92c6db316fee69e38c80591e080e41536c", - "reference": "b24c6a92c6db316fee69e38c80591e080e41536c", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/service-contracts": "^1.0|^2" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "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 a way to profile code", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.3.4" - }, - "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": "2021-07-10T08:58:57+00:00" - }, { "name": "symfony/web-profiler-bundle", "version": "v4.4.18", @@ -16226,5 +16209,5 @@ "ext-openssl": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.0.0" }