From 89cd670abfc77ca268a538c9323a4026fec06fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Dec 2016 09:49:22 +0100 Subject: [PATCH] Changed uuid type in database --- .travis.yml | 4 +--- Makefile | 3 +-- app/DoctrineMigrations/Version20160410190541.php | 3 ++- src/Wallabag/CoreBundle/Controller/EntryController.php | 3 --- src/Wallabag/CoreBundle/Entity/Entry.php | 2 +- tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 1 - 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7468b1162..8c8093bf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,13 @@ services: - redis # faster builds on docker-container setup -sudo: required +sudo: false # used for HHVM addons: apt: packages: - tidy - postgresql: 9.5 # cache vendor dirs cache: @@ -60,7 +59,6 @@ before_script: - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi - composer self-update --no-progress - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; - - if [[ $DB = pgsql ]]; then psql -U postgres wallabag_test -c 'create extension "uuid-ossp";'; fi; install: - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; diff --git a/Makefile b/Makefile index 83c5f37ad..b33352616 100755 --- a/Makefile +++ b/Makefile @@ -27,8 +27,7 @@ build: ## Run grunt @grunt test: ## Launch wallabag testsuite - @if [ ! -d "vendor/phpunit" ]; then composer install; fi - @ant prepare && vendor/phpunit/phpunit/phpunit -v + @ant prepare && bin/simple-phpunit -v release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). ifndef VERSION diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php index 0cdec0085..8761a9bb7 100644 --- a/app/DoctrineMigrations/Version20160410190541.php +++ b/app/DoctrineMigrations/Version20160410190541.php @@ -33,8 +33,9 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI $this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.'); - $entryTable->addColumn('uuid', 'guid', [ + $entryTable->addColumn('uuid', 'string', [ 'notnull' => false, + 'length' => 23, ]); $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_public', '1', 'entry')"); } diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 831486714..b03f49eda 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -355,9 +355,6 @@ class EntryController extends Controller { $this->checkUserAction($entry); - $version = $this->getDoctrine()->getManager()->getConnection()->query('SELECT version();')->fetchColumn(); - var_dump($version); - return $this->render( 'WallabagCoreBundle:Entry:entry.html.twig', ['entry' => $entry] diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 4c22cf9c2..4c9d518f8 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -47,7 +47,7 @@ class Entry /** * @var string * - * @ORM\Column(name="uuid", type="guid", nullable=true) + * @ORM\Column(name="uuid", type="string", length=23, nullable=true) * * @Groups({"entries_for_user", "export_all"}) */ diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 10cda475c..c347cca5a 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -816,7 +816,6 @@ class EntryControllerTest extends WallabagCoreTestCase // generating the uuid $client->request('GET', '/share/'.$content->getId()); - var_dump($client->getResponse()->getContent()); $this->assertEquals(302, $client->getResponse()->getStatusCode()); // follow link with uuid