diff options
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 3 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Entity/Entry.php | 8 | ||||
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 1 |
4 files changed, 12 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 8c8093bf..7468b116 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -5,13 +5,14 @@ services: | |||
5 | - redis | 5 | - redis |
6 | 6 | ||
7 | # faster builds on docker-container setup | 7 | # faster builds on docker-container setup |
8 | sudo: false | 8 | sudo: required |
9 | 9 | ||
10 | # used for HHVM | 10 | # used for HHVM |
11 | addons: | 11 | addons: |
12 | apt: | 12 | apt: |
13 | packages: | 13 | packages: |
14 | - tidy | 14 | - tidy |
15 | postgresql: 9.5 | ||
15 | 16 | ||
16 | # cache vendor dirs | 17 | # cache vendor dirs |
17 | cache: | 18 | cache: |
@@ -59,6 +60,7 @@ before_script: | |||
59 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi | 60 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi |
60 | - composer self-update --no-progress | 61 | - composer self-update --no-progress |
61 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; | 62 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; |
63 | - if [[ $DB = pgsql ]]; then psql -U postgres wallabag_test -c 'create extension "uuid-ossp";'; fi; | ||
62 | 64 | ||
63 | install: | 65 | install: |
64 | - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; | 66 | - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index b03f49ed..83148671 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -355,6 +355,9 @@ class EntryController extends Controller | |||
355 | { | 355 | { |
356 | $this->checkUserAction($entry); | 356 | $this->checkUserAction($entry); |
357 | 357 | ||
358 | $version = $this->getDoctrine()->getManager()->getConnection()->query('SELECT version();')->fetchColumn(); | ||
359 | var_dump($version); | ||
360 | |||
358 | return $this->render( | 361 | return $this->render( |
359 | 'WallabagCoreBundle:Entry:entry.html.twig', | 362 | 'WallabagCoreBundle:Entry:entry.html.twig', |
360 | ['entry' => $entry] | 363 | ['entry' => $entry] |
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 8dcc7190..4c22cf9c 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php | |||
@@ -22,8 +22,10 @@ use Wallabag\AnnotationBundle\Entity\Annotation; | |||
22 | * @ORM\Table( | 22 | * @ORM\Table( |
23 | * name="`entry`", | 23 | * name="`entry`", |
24 | * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, | 24 | * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, |
25 | * indexes={@ORM\Index(name="created_at", columns={"created_at"})}, | 25 | * indexes={ |
26 | * indexes={@ORM\Index(name="uuid", columns={"uuid"})} | 26 | * @ORM\Index(name="created_at", columns={"created_at"}), |
27 | * @ORM\Index(name="uuid", columns={"uuid"}) | ||
28 | * } | ||
27 | * ) | 29 | * ) |
28 | * @ORM\HasLifecycleCallbacks() | 30 | * @ORM\HasLifecycleCallbacks() |
29 | * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") | 31 | * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") |
@@ -45,7 +47,7 @@ class Entry | |||
45 | /** | 47 | /** |
46 | * @var string | 48 | * @var string |
47 | * | 49 | * |
48 | * @ORM\Column(name="uuid", type="text", nullable=true) | 50 | * @ORM\Column(name="uuid", type="guid", nullable=true) |
49 | * | 51 | * |
50 | * @Groups({"entries_for_user", "export_all"}) | 52 | * @Groups({"entries_for_user", "export_all"}) |
51 | */ | 53 | */ |
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index c347cca5..10cda475 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | |||
@@ -816,6 +816,7 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
816 | 816 | ||
817 | // generating the uuid | 817 | // generating the uuid |
818 | $client->request('GET', '/share/'.$content->getId()); | 818 | $client->request('GET', '/share/'.$content->getId()); |
819 | var_dump($client->getResponse()->getContent()); | ||
819 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); | 820 | $this->assertEquals(302, $client->getResponse()->getStatusCode()); |
820 | 821 | ||
821 | // follow link with uuid | 822 | // follow link with uuid |