aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rwxr-xr-xMakefile3
-rw-r--r--app/DoctrineMigrations/Version20160410190541.php3
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php3
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php2
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php1
6 files changed, 5 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 7468b116..8c8093bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,13 @@ services:
5 - redis 5 - redis
6 6
7# faster builds on docker-container setup 7# faster builds on docker-container setup
8sudo: required 8sudo: false
9 9
10# used for HHVM 10# used for HHVM
11addons: 11addons:
12 apt: 12 apt:
13 packages: 13 packages:
14 - tidy 14 - tidy
15 postgresql: 9.5
16 15
17# cache vendor dirs 16# cache vendor dirs
18cache: 17cache:
@@ -60,7 +59,6 @@ before_script:
60 - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi 59 - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
61 - composer self-update --no-progress 60 - composer self-update --no-progress
62 - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; 61 - 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;
64 62
65install: 63install:
66 - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; 64 - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi;
diff --git a/Makefile b/Makefile
index 83c5f37a..b3335261 100755
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,7 @@ build: ## Run grunt
27 @grunt 27 @grunt
28 28
29test: ## Launch wallabag testsuite 29test: ## Launch wallabag testsuite
30 @if [ ! -d "vendor/phpunit" ]; then composer install; fi 30 @ant prepare && bin/simple-phpunit -v
31 @ant prepare && vendor/phpunit/phpunit/phpunit -v
32 31
33release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). 32release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
34ifndef VERSION 33ifndef VERSION
diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php
index 0cdec008..8761a9bb 100644
--- a/app/DoctrineMigrations/Version20160410190541.php
+++ b/app/DoctrineMigrations/Version20160410190541.php
@@ -33,8 +33,9 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI
33 33
34 $this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.'); 34 $this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
35 35
36 $entryTable->addColumn('uuid', 'guid', [ 36 $entryTable->addColumn('uuid', 'string', [
37 'notnull' => false, 37 'notnull' => false,
38 'length' => 23,
38 ]); 39 ]);
39 $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_public', '1', 'entry')"); 40 $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_public', '1', 'entry')");
40 } 41 }
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 83148671..b03f49ed 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -355,9 +355,6 @@ 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
361 return $this->render( 358 return $this->render(
362 'WallabagCoreBundle:Entry:entry.html.twig', 359 'WallabagCoreBundle:Entry:entry.html.twig',
363 ['entry' => $entry] 360 ['entry' => $entry]
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 4c22cf9c..4c9d518f 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -47,7 +47,7 @@ class Entry
47 /** 47 /**
48 * @var string 48 * @var string
49 * 49 *
50 * @ORM\Column(name="uuid", type="guid", nullable=true) 50 * @ORM\Column(name="uuid", type="string", length=23, nullable=true)
51 * 51 *
52 * @Groups({"entries_for_user", "export_all"}) 52 * @Groups({"entries_for_user", "export_all"})
53 */ 53 */
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index 10cda475..c347cca5 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -816,7 +816,6 @@ 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());
820 $this->assertEquals(302, $client->getResponse()->getStatusCode()); 819 $this->assertEquals(302, $client->getResponse()->getStatusCode());
821 820
822 // follow link with uuid 821 // follow link with uuid