diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-09-10 22:00:53 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-09-10 22:00:53 +0200 |
commit | f1e29e69cb0ba5a0f05190c62e7a4afd43d03436 (patch) | |
tree | 7f718281168c7390ef741930a83f40250333c10e | |
parent | 558d9aabab7e01c2e2b506aa362c70a568b953aa (diff) | |
download | wallabag-f1e29e69cb0ba5a0f05190c62e7a4afd43d03436.tar.gz wallabag-f1e29e69cb0ba5a0f05190c62e7a4afd43d03436.tar.zst wallabag-f1e29e69cb0ba5a0f05190c62e7a4afd43d03436.zip |
CS
-rw-r--r-- | src/Wallabag/ApiBundle/Resources/config/services.yml | 3 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/ContentProxy.php | 8 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/Wallabag/ApiBundle/Resources/config/services.yml b/src/Wallabag/ApiBundle/Resources/config/services.yml index 9ab4f3d1..6854a444 100644 --- a/src/Wallabag/ApiBundle/Resources/config/services.yml +++ b/src/Wallabag/ApiBundle/Resources/config/services.yml | |||
@@ -10,6 +10,3 @@ services: | |||
10 | tags: | 10 | tags: |
11 | - { name: monolog.logger, channel: wsse } | 11 | - { name: monolog.logger, channel: wsse } |
12 | arguments: ['@security.context', '@security.authentication.manager', '@logger'] | 12 | arguments: ['@security.context', '@security.authentication.manager', '@logger'] |
13 | |||
14 | wallabag_core.graby: | ||
15 | class: Graby\Graby | ||
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index 2dd70e51..4565d8e7 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php | |||
@@ -7,7 +7,7 @@ use Wallabag\CoreBundle\Entity\Entry; | |||
7 | 7 | ||
8 | /** | 8 | /** |
9 | * This kind of proxy class take care of getting the content from an url | 9 | * This kind of proxy class take care of getting the content from an url |
10 | * and update the entry with what it found | 10 | * and update the entry with what it found. |
11 | */ | 11 | */ |
12 | class ContentProxy | 12 | class ContentProxy |
13 | { | 13 | { |
@@ -20,10 +20,10 @@ class ContentProxy | |||
20 | 20 | ||
21 | /** | 21 | /** |
22 | * Fetch content using graby and hydrate given entry with results information. | 22 | * Fetch content using graby and hydrate given entry with results information. |
23 | * In case we couldn't find content, we'll try to use Open Graph data | 23 | * In case we couldn't find content, we'll try to use Open Graph data. |
24 | * | 24 | * |
25 | * @param Entry $entry Entry to update | 25 | * @param Entry $entry Entry to update |
26 | * @param string $url Url to grab content for | 26 | * @param string $url Url to grab content for |
27 | * | 27 | * |
28 | * @return Entry | 28 | * @return Entry |
29 | */ | 29 | */ |
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php b/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php index 7c93f460..71a004ff 100644 --- a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php +++ b/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php | |||
@@ -68,8 +68,8 @@ class ContentProxyTest extends KernelTestCase | |||
68 | 'open_graph' => array( | 68 | 'open_graph' => array( |
69 | 'og_title' => 'my OG title', | 69 | 'og_title' => 'my OG title', |
70 | 'og_description' => 'OG desc', | 70 | 'og_description' => 'OG desc', |
71 | 'og_image' => 'http://3.3.3.3/cover.jpg' | 71 | 'og_image' => 'http://3.3.3.3/cover.jpg', |
72 | ) | 72 | ), |
73 | )); | 73 | )); |
74 | 74 | ||
75 | $proxy = new ContentProxy($graby); | 75 | $proxy = new ContentProxy($graby); |