From: Jérémy Benoist Date: Tue, 19 Nov 2019 13:22:42 +0000 (+0100) Subject: Merge pull request #4195 from wallabag/dependabot/composer/doctrine/orm-2.6.6 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=31579b75fccceb7bf81907db38072963fa425c36;hp=069229e19cbb02d83b94b8356dfa2e28901aa1b6;p=github%2Fwallabag%2Fwallabag.git Merge pull request #4195 from wallabag/dependabot/composer/doctrine/orm-2.6.6 Bump doctrine/orm from 2.6.4 to 2.6.6 --- diff --git a/composer.lock b/composer.lock index 01b78585..1e546e8d 100644 --- a/composer.lock +++ b/composer.lock @@ -412,16 +412,16 @@ }, { "name": "doctrine/cache", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "c15dcd24b756f9e52ea7c3ae8227354f3628f11a" + "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/c15dcd24b756f9e52ea7c3ae8227354f3628f11a", - "reference": "c15dcd24b756f9e52ea7c3ae8227354f3628f11a", + "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55", + "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55", "shasum": "" }, "require": { @@ -491,7 +491,7 @@ "riak", "xcache" ], - "time": "2019-11-11T10:31:52+00:00" + "time": "2019-11-15T14:31:57+00:00" }, { "name": "doctrine/collections", @@ -1304,16 +1304,16 @@ }, { "name": "doctrine/orm", - "version": "v2.6.4", + "version": "v2.6.6", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43" + "reference": "2d9b9351831d1230881c52f006011cbf72fe944e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43", - "reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43", + "url": "https://api.github.com/repos/doctrine/orm/zipball/2d9b9351831d1230881c52f006011cbf72fe944e", + "reference": "2d9b9351831d1230881c52f006011cbf72fe944e", "shasum": "" }, "require": { @@ -1381,7 +1381,7 @@ "database", "orm" ], - "time": "2019-09-20T14:30:26+00:00" + "time": "2019-11-18T22:01:21+00:00" }, { "name": "doctrine/persistence", diff --git a/tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php index 18507054..b9919f8f 100644 --- a/tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php +++ b/tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php @@ -115,7 +115,7 @@ class ElcuratorControllerTest extends WallabagCoreTestCase ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findByUrlAndUserId( - 'https://devblog.lexik.fr/qualite-de-code-integration-de-php-git-hooks-dans-symfony2/', + 'https://devblog.lexik.fr/git/qualite-de-code-integration-de-php-git-hooks-dans-symfony2-2842', $this->getLoggedInUserId() ); diff --git a/tests/Wallabag/ImportBundle/fixtures/elcurator.json b/tests/Wallabag/ImportBundle/fixtures/elcurator.json index 58972d93..f6fb2dfb 100644 --- a/tests/Wallabag/ImportBundle/fixtures/elcurator.json +++ b/tests/Wallabag/ImportBundle/fixtures/elcurator.json @@ -2,7 +2,7 @@ { "created_at": "2015-09-09 11:10:32 UTC", "title": "Qualité de code - Intégration de php-git-hooks dans Symfony2 - Experts Symfony et Drupal - Lexik", - "url": "https://devblog.lexik.fr/qualite-de-code-integration-de-php-git-hooks-dans-symfony2/", + "url": "https://devblog.lexik.fr/git/qualite-de-code-integration-de-php-git-hooks-dans-symfony2-2842", "description": null, "tags": [ "tag1",