diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-11-19 14:22:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-19 14:22:42 +0100 |
commit | 31579b75fccceb7bf81907db38072963fa425c36 (patch) | |
tree | 61cd2e49530ef7c8293195e89df0a75c2959e607 | |
parent | 069229e19cbb02d83b94b8356dfa2e28901aa1b6 (diff) | |
parent | bff82c32020bff5a45b68d48ab68a6b73215a7e6 (diff) | |
download | wallabag-31579b75fccceb7bf81907db38072963fa425c36.tar.gz wallabag-31579b75fccceb7bf81907db38072963fa425c36.tar.zst wallabag-31579b75fccceb7bf81907db38072963fa425c36.zip |
Merge pull request #4195 from wallabag/dependabot/composer/doctrine/orm-2.6.6
Bump doctrine/orm from 2.6.4 to 2.6.6
-rw-r--r-- | composer.lock | 20 | ||||
-rw-r--r-- | tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php | 2 | ||||
-rw-r--r-- | tests/Wallabag/ImportBundle/fixtures/elcurator.json | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/composer.lock b/composer.lock index 01b78585..1e546e8d 100644 --- a/composer.lock +++ b/composer.lock | |||
@@ -412,16 +412,16 @@ | |||
412 | }, | 412 | }, |
413 | { | 413 | { |
414 | "name": "doctrine/cache", | 414 | "name": "doctrine/cache", |
415 | "version": "1.9.0", | 415 | "version": "1.9.1", |
416 | "source": { | 416 | "source": { |
417 | "type": "git", | 417 | "type": "git", |
418 | "url": "https://github.com/doctrine/cache.git", | 418 | "url": "https://github.com/doctrine/cache.git", |
419 | "reference": "c15dcd24b756f9e52ea7c3ae8227354f3628f11a" | 419 | "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55" |
420 | }, | 420 | }, |
421 | "dist": { | 421 | "dist": { |
422 | "type": "zip", | 422 | "type": "zip", |
423 | "url": "https://api.github.com/repos/doctrine/cache/zipball/c15dcd24b756f9e52ea7c3ae8227354f3628f11a", | 423 | "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55", |
424 | "reference": "c15dcd24b756f9e52ea7c3ae8227354f3628f11a", | 424 | "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55", |
425 | "shasum": "" | 425 | "shasum": "" |
426 | }, | 426 | }, |
427 | "require": { | 427 | "require": { |
@@ -491,7 +491,7 @@ | |||
491 | "riak", | 491 | "riak", |
492 | "xcache" | 492 | "xcache" |
493 | ], | 493 | ], |
494 | "time": "2019-11-11T10:31:52+00:00" | 494 | "time": "2019-11-15T14:31:57+00:00" |
495 | }, | 495 | }, |
496 | { | 496 | { |
497 | "name": "doctrine/collections", | 497 | "name": "doctrine/collections", |
@@ -1304,16 +1304,16 @@ | |||
1304 | }, | 1304 | }, |
1305 | { | 1305 | { |
1306 | "name": "doctrine/orm", | 1306 | "name": "doctrine/orm", |
1307 | "version": "v2.6.4", | 1307 | "version": "v2.6.6", |
1308 | "source": { | 1308 | "source": { |
1309 | "type": "git", | 1309 | "type": "git", |
1310 | "url": "https://github.com/doctrine/orm.git", | 1310 | "url": "https://github.com/doctrine/orm.git", |
1311 | "reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43" | 1311 | "reference": "2d9b9351831d1230881c52f006011cbf72fe944e" |
1312 | }, | 1312 | }, |
1313 | "dist": { | 1313 | "dist": { |
1314 | "type": "zip", | 1314 | "type": "zip", |
1315 | "url": "https://api.github.com/repos/doctrine/orm/zipball/b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43", | 1315 | "url": "https://api.github.com/repos/doctrine/orm/zipball/2d9b9351831d1230881c52f006011cbf72fe944e", |
1316 | "reference": "b52ef5a1002f99ab506a5a2d6dba5a2c236c5f43", | 1316 | "reference": "2d9b9351831d1230881c52f006011cbf72fe944e", |
1317 | "shasum": "" | 1317 | "shasum": "" |
1318 | }, | 1318 | }, |
1319 | "require": { | 1319 | "require": { |
@@ -1381,7 +1381,7 @@ | |||
1381 | "database", | 1381 | "database", |
1382 | "orm" | 1382 | "orm" |
1383 | ], | 1383 | ], |
1384 | "time": "2019-09-20T14:30:26+00:00" | 1384 | "time": "2019-11-18T22:01:21+00:00" |
1385 | }, | 1385 | }, |
1386 | { | 1386 | { |
1387 | "name": "doctrine/persistence", | 1387 | "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 | |||
115 | ->get('doctrine.orm.entity_manager') | 115 | ->get('doctrine.orm.entity_manager') |
116 | ->getRepository('WallabagCoreBundle:Entry') | 116 | ->getRepository('WallabagCoreBundle:Entry') |
117 | ->findByUrlAndUserId( | 117 | ->findByUrlAndUserId( |
118 | 'https://devblog.lexik.fr/qualite-de-code-integration-de-php-git-hooks-dans-symfony2/', | 118 | 'https://devblog.lexik.fr/git/qualite-de-code-integration-de-php-git-hooks-dans-symfony2-2842', |
119 | $this->getLoggedInUserId() | 119 | $this->getLoggedInUserId() |
120 | ); | 120 | ); |
121 | 121 | ||
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 @@ | |||
2 | { | 2 | { |
3 | "created_at": "2015-09-09 11:10:32 UTC", | 3 | "created_at": "2015-09-09 11:10:32 UTC", |
4 | "title": "Qualité de code - Intégration de php-git-hooks dans Symfony2 - Experts Symfony et Drupal - Lexik", | 4 | "title": "Qualité de code - Intégration de php-git-hooks dans Symfony2 - Experts Symfony et Drupal - Lexik", |
5 | "url": "https://devblog.lexik.fr/qualite-de-code-integration-de-php-git-hooks-dans-symfony2/", | 5 | "url": "https://devblog.lexik.fr/git/qualite-de-code-integration-de-php-git-hooks-dans-symfony2-2842", |
6 | "description": null, | 6 | "description": null, |
7 | "tags": [ | 7 | "tags": [ |
8 | "tag1", | 8 | "tag1", |