diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
commit | 79efca1e6ff28362d4bd2713f68205294cdd07de (patch) | |
tree | c20482071f97b5ba0f075d59a9a097b08b26b910 /src/Wallabag/CoreBundle/Helper | |
parent | 9c545fe028013b30417c1a932cd6b9027bff752d (diff) | |
parent | 80bb0b73445092c4aa3e94f90cc5f8667fa123ba (diff) | |
download | wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.gz wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.zst wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.zip |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php index 14ef4a64..239d09ae 100644 --- a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php +++ b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php | |||
@@ -25,7 +25,7 @@ class RuleBasedTagger | |||
25 | /** | 25 | /** |
26 | * Add tags from rules defined by the user. | 26 | * Add tags from rules defined by the user. |
27 | * | 27 | * |
28 | * @param Entry $entry Entry to tag. | 28 | * @param Entry $entry Entry to tag |
29 | */ | 29 | */ |
30 | public function tag(Entry $entry) | 30 | public function tag(Entry $entry) |
31 | { | 31 | { |
@@ -49,7 +49,7 @@ class RuleBasedTagger | |||
49 | * | 49 | * |
50 | * @param User $user | 50 | * @param User $user |
51 | * | 51 | * |
52 | * @return array<Entry> A list of modified entries. | 52 | * @return array<Entry> A list of modified entries |
53 | */ | 53 | */ |
54 | public function tagAllForUser(User $user) | 54 | public function tagAllForUser(User $user) |
55 | { | 55 | { |
@@ -75,7 +75,7 @@ class RuleBasedTagger | |||
75 | /** | 75 | /** |
76 | * Fetch a tag. | 76 | * Fetch a tag. |
77 | * | 77 | * |
78 | * @param string $label The tag's label. | 78 | * @param string $label The tag's label |
79 | * | 79 | * |
80 | * @return Tag | 80 | * @return Tag |
81 | */ | 81 | */ |