From 5d6f6f56a2a0f72a67c2d3f96eb61986cf821a1e Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 27 Mar 2016 19:20:43 +0200 Subject: [PATCH 1/1] Some cleanup - travis tabulation - extra namespace definition in entities --- .travis.yml | 6 +++--- src/Wallabag/AnnotationBundle/Entity/Annotation.php | 6 +++--- src/Wallabag/CoreBundle/Entity/Entry.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2bf90ca..fc9a38c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,9 +23,9 @@ php: - hhvm env: - - DB=mysql - - DB=pgsql - - DB=sqlite + - DB=mysql + - DB=pgsql + - DB=sqlite matrix: fast_finish: true diff --git a/src/Wallabag/AnnotationBundle/Entity/Annotation.php b/src/Wallabag/AnnotationBundle/Entity/Annotation.php index db9590b0..90ee7c2d 100644 --- a/src/Wallabag/AnnotationBundle/Entity/Annotation.php +++ b/src/Wallabag/AnnotationBundle/Entity/Annotation.php @@ -82,7 +82,7 @@ class Annotation /* * @param User $user */ - public function __construct(\Wallabag\UserBundle\Entity\User $user) + public function __construct(User $user) { $this->user = $user; } @@ -204,7 +204,7 @@ class Annotation /** * Set user. * - * @param string $user + * @param User $user * * @return Annotation */ @@ -218,7 +218,7 @@ class Annotation /** * Get user. * - * @return string + * @return User */ public function getUser() { diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 8f4ddf61..1271f1f5 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -187,7 +187,7 @@ class Entry /* * @param User $user */ - public function __construct(\Wallabag\UserBundle\Entity\User $user) + public function __construct(User $user) { $this->user = $user; $this->tags = new ArrayCollection(); -- 2.41.0