aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-03-27 19:20:43 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-03-27 20:36:35 +0200
commit5d6f6f56a2a0f72a67c2d3f96eb61986cf821a1e (patch)
tree975f8319a53ed9372454d10a75e6f16673813fcb
parent18b812b1b905a53c185b3572541b3e90c08b669f (diff)
downloadwallabag-5d6f6f56a2a0f72a67c2d3f96eb61986cf821a1e.tar.gz
wallabag-5d6f6f56a2a0f72a67c2d3f96eb61986cf821a1e.tar.zst
wallabag-5d6f6f56a2a0f72a67c2d3f96eb61986cf821a1e.zip
Some cleanup
- travis tabulation - extra namespace definition in entities
-rw-r--r--.travis.yml6
-rw-r--r--src/Wallabag/AnnotationBundle/Entity/Annotation.php6
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php2
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:
23 - hhvm 23 - hhvm
24 24
25env: 25env:
26 - DB=mysql 26 - DB=mysql
27 - DB=pgsql 27 - DB=pgsql
28 - DB=sqlite 28 - DB=sqlite
29 29
30matrix: 30matrix:
31 fast_finish: true 31 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
82 /* 82 /*
83 * @param User $user 83 * @param User $user
84 */ 84 */
85 public function __construct(\Wallabag\UserBundle\Entity\User $user) 85 public function __construct(User $user)
86 { 86 {
87 $this->user = $user; 87 $this->user = $user;
88 } 88 }
@@ -204,7 +204,7 @@ class Annotation
204 /** 204 /**
205 * Set user. 205 * Set user.
206 * 206 *
207 * @param string $user 207 * @param User $user
208 * 208 *
209 * @return Annotation 209 * @return Annotation
210 */ 210 */
@@ -218,7 +218,7 @@ class Annotation
218 /** 218 /**
219 * Get user. 219 * Get user.
220 * 220 *
221 * @return string 221 * @return User
222 */ 222 */
223 public function getUser() 223 public function getUser()
224 { 224 {
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
187 /* 187 /*
188 * @param User $user 188 * @param User $user
189 */ 189 */
190 public function __construct(\Wallabag\UserBundle\Entity\User $user) 190 public function __construct(User $user)
191 { 191 {
192 $this->user = $user; 192 $this->user = $user;
193 $this->tags = new ArrayCollection(); 193 $this->tags = new ArrayCollection();