diff --git a/composer.json b/composer.json index c5646f239..0395e5838 100644 --- a/composer.json +++ b/composer.json @@ -2,8 +2,9 @@ "name": "stfc-egi/gocdb", "description": "A web portal and REST style API for e-Infrastructure topology managment", "require": { - "doctrine/orm": "2.9.*", - "symfony/cache": "*" + "doctrine/orm": "2.10.*", + "symfony/cache": "*", + "doctrine/annotations": "*" }, "require-dev": { "phpunit/phpunit": "4.8.*", diff --git a/composer.lock b/composer.lock index 107e500c5..be5786933 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d8e1d0a6d530ca19aa5e9d4e23f41213", + "content-hash": "fa7bac5f55b22454bc3b6cdccdda01c2", "packages": [ { "name": "composer/package-versions-deprecated", @@ -411,35 +411,40 @@ }, { "name": "doctrine/dbal", - "version": "2.13.9", + "version": "3.9.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8" + "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8", - "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/d7dc08f98cba352b2bab5d32c5e58f7e745c11a7", + "reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7", "shasum": "" }, "require": { - "doctrine/cache": "^1.0|^2.0", + "composer-runtime-api": "^2", + "doctrine/cache": "^1.11|^2.0", "doctrine/deprecations": "^0.5.3|^1", - "doctrine/event-manager": "^1.0", - "ext-pdo": "*", - "php": "^7.1 || ^8" + "doctrine/event-manager": "^1|^2", + "php": "^7.4 || ^8.0", + "psr/cache": "^1|^2|^3", + "psr/log": "^1|^2|^3" }, "require-dev": { - "doctrine/coding-standard": "9.0.0", - "jetbrains/phpstorm-stubs": "2021.1", - "phpstan/phpstan": "1.4.6", - "phpunit/phpunit": "^7.5.20|^8.5|9.5.16", - "psalm/plugin-phpunit": "0.16.1", - "squizlabs/php_codesniffer": "3.6.2", - "symfony/cache": "^4.4", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "4.22.0" + "doctrine/coding-standard": "12.0.0", + "fig/log-test": "^1", + "jetbrains/phpstorm-stubs": "2023.1", + "phpstan/phpstan": "1.12.0", + "phpstan/phpstan-strict-rules": "^1.6", + "phpunit/phpunit": "9.6.20", + "psalm/plugin-phpunit": "0.18.4", + "slevomat/coding-standard": "8.13.1", + "squizlabs/php_codesniffer": "3.10.2", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/console": "^4.4|^5.4|^6.0|^7.0", + "vimeo/psalm": "4.30.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -450,7 +455,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" + "Doctrine\\DBAL\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -493,14 +498,13 @@ "queryobject", "sasql", "sql", - "sqlanywhere", "sqlite", "sqlserver", "sqlsrv" ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.13.9" + "source": "https://github.com/doctrine/dbal/tree/3.9.1" }, "funding": [ { @@ -516,7 +520,7 @@ "type": "tidelift" } ], - "time": "2022-05-02T20:28:55+00:00" + "time": "2024-09-01T13:49:23+00:00" }, { "name": "doctrine/deprecations", @@ -892,25 +896,24 @@ }, { "name": "doctrine/orm", - "version": "2.9.6", + "version": "2.10.5", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "5f768742a0461327bebe0fd11012bbd69e29a311" + "reference": "1e972b6e0e3468355901a301735d859165490af2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/5f768742a0461327bebe0fd11012bbd69e29a311", - "reference": "5f768742a0461327bebe0fd11012bbd69e29a311", + "url": "https://api.github.com/repos/doctrine/orm/zipball/1e972b6e0e3468355901a301735d859165490af2", + "reference": "1e972b6e0e3468355901a301735d859165490af2", "shasum": "" }, "require": { "composer/package-versions-deprecated": "^1.8", - "doctrine/annotations": "^1.13", "doctrine/cache": "^1.12.1 || ^2.1.1", "doctrine/collections": "^1.5", "doctrine/common": "^3.0.3", - "doctrine/dbal": "^2.13.0", + "doctrine/dbal": "^2.13.1 || ^3.1.1", "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.1", "doctrine/inflector": "^1.4 || ^2.0", @@ -921,17 +924,23 @@ "ext-pdo": "*", "php": "^7.1 ||^8.0", "psr/cache": "^1 || ^2 || ^3", - "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/polyfill-php72": "^1.23", + "symfony/polyfill-php80": "^1.15" + }, + "conflict": { + "doctrine/annotations": "<1.13 || >= 2.0" }, "require-dev": { + "doctrine/annotations": "^1.13", "doctrine/coding-standard": "^9.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "0.12.99", + "phpstan/phpstan": "1.3.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", - "squizlabs/php_codesniffer": "3.6.0", - "symfony/cache": "^4.4 || ^5.2", + "squizlabs/php_codesniffer": "3.6.2", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.10.0" + "vimeo/psalm": "4.18.1" }, "suggest": { "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", @@ -980,9 +989,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.9.6" + "source": "https://github.com/doctrine/orm/tree/2.10.5" }, - "time": "2021-10-02T17:37:08+00:00" + "time": "2022-01-12T09:06:40+00:00" }, { "name": "doctrine/persistence", @@ -1893,6 +1902,71 @@ ], "time": "2024-09-09T11:45:10+00:00" }, + { + "name": "symfony/polyfill-php72", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "metapackage", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, { "name": "symfony/polyfill-php73", "version": "v1.31.0", diff --git a/tests/doctrine/DoctrineCleanInsert1Test.php b/tests/doctrine/DoctrineCleanInsert1Test.php index f88a254ba..c714d905e 100644 --- a/tests/doctrine/DoctrineCleanInsert1Test.php +++ b/tests/doctrine/DoctrineCleanInsert1Test.php @@ -502,7 +502,7 @@ public function testRollback() * first have to delete the services that holds the FK to the site (one site * to many services). * - * @expectedException \Doctrine\DBAL\DBALException + * @expectedException \Doctrine\DBAL\Exception */ public function testExpectedFK_ViolationOnSiteDeleteWithoutCascade() { @@ -536,7 +536,9 @@ public function testExpectedFK_ViolationOnSiteDeleteWithoutCascade() // services first as we have no cascade-delete option set. $this->em->remove($refetchedSite); $this->em->flush(); - $this->fail('Should not get to this point - DBALException expected'); + $this->fail( + 'Should not get to this point - \Doctrine\DBAL\Exception expected' + ); } @@ -702,7 +704,7 @@ public function testServiceToEndpointCascadeDelete_WithNoDTs() * association to a downtime (this relationship would need to be deleted first * to allow the endpoint to be deleted cleanly by the cascade). * - * @expectedException \Doctrine\DBAL\DBALException + * @expectedException \Doctrine\DBAL\Exception */ public function testExpectedFK_ViolationOnServiceToEndpointCascadeDelete_WithDTs() { @@ -751,8 +753,10 @@ public function testExpectedFK_ViolationOnServiceToEndpointCascadeDelete_WithDTs // services first as we have no cascade-delete option set. $this->em->remove($se); $this->em->flush(); - $this->fail('Should not get to this point - DBALException expected'); - } + $this->fail( + 'Should not get to this point - \Doctrine\DBAL\Exception expected' + ); + } /** * Show how Bidirectional relationships must be correctly managed in diff --git a/tests/doctrine/RolesTest.php b/tests/doctrine/RolesTest.php index aac664770..93d5d72dc 100644 --- a/tests/doctrine/RolesTest.php +++ b/tests/doctrine/RolesTest.php @@ -215,7 +215,7 @@ public function testRoleDiscriminatorNGI() * Add a role type, user, NGI and a role linking * them all together. Assert that $newRole->getOwnedEntity() * returns an instance of NGI. - * @expectedException \Doctrine\DBAL\DBALException + * @expectedException \Doctrine\DBAL\Exception */ public function testRoleTypeIntegrityConstraint() { @@ -248,7 +248,7 @@ public function testRoleTypeIntegrityConstraint() /** * Ensure no duplicate role types are inserted - * @expectedException \Doctrine\DBAL\DBALException + * @expectedException \Doctrine\DBAL\Exception */ public function testDuplicateRoleTypes() {