diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-02-11 11:50:24 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-02-11 11:57:52 +0100 |
commit | 0182cdaec430a72379ef96ade05300e7b4d0efd7 (patch) | |
tree | c2711cc037ab21822831affd0cb0dec8e9047672 | |
parent | a9f61d3dbba07d25d4290572f157787c0b99dcfd (diff) | |
download | wallabag-0182cdaec430a72379ef96ade05300e7b4d0efd7.tar.gz wallabag-0182cdaec430a72379ef96ade05300e7b4d0efd7.tar.zst wallabag-0182cdaec430a72379ef96ade05300e7b4d0efd7.zip |
CS
9 files changed, 13 insertions, 13 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index 702c7f7a..37d0640a 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -108,7 +108,7 @@ class EntryFilterType extends AbstractType | |||
108 | ->add('httpStatus', TextFilterType::class, [ | 108 | ->add('httpStatus', TextFilterType::class, [ |
109 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { | 109 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { |
110 | $value = $values['value']; | 110 | $value = $values['value']; |
111 | if (false === array_key_exists($value, Response::$statusTexts)) { | 111 | if (false === \array_key_exists($value, Response::$statusTexts)) { |
112 | return; | 112 | return; |
113 | } | 113 | } |
114 | 114 | ||
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index 1c2c5093..183d394a 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |||
@@ -23,7 +23,7 @@ class PreparePagerForEntries | |||
23 | * @param AdapterInterface $adapter | 23 | * @param AdapterInterface $adapter |
24 | * @param User $user If user isn't logged in, we can force it (like for rss) | 24 | * @param User $user If user isn't logged in, we can force it (like for rss) |
25 | * | 25 | * |
26 | * @return null|Pagerfanta | 26 | * @return Pagerfanta|null |
27 | */ | 27 | */ |
28 | public function prepare(AdapterInterface $adapter, User $user = null) | 28 | public function prepare(AdapterInterface $adapter, User $user = null) |
29 | { | 29 | { |
diff --git a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php b/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php index 36906761..b2e212a4 100644 --- a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php +++ b/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php | |||
@@ -22,7 +22,7 @@ class SiteCredentialRepository extends \Doctrine\ORM\EntityRepository | |||
22 | * @param string $host | 22 | * @param string $host |
23 | * @param int $userId | 23 | * @param int $userId |
24 | * | 24 | * |
25 | * @return null|array | 25 | * @return array|null |
26 | */ | 26 | */ |
27 | public function findOneByHostAndUser($host, $userId) | 27 | public function findOneByHostAndUser($host, $userId) |
28 | { | 28 | { |
diff --git a/src/Wallabag/ImportBundle/Import/BrowserImport.php b/src/Wallabag/ImportBundle/Import/BrowserImport.php index 4678ae0c..811e3fb8 100644 --- a/src/Wallabag/ImportBundle/Import/BrowserImport.php +++ b/src/Wallabag/ImportBundle/Import/BrowserImport.php | |||
@@ -77,7 +77,7 @@ abstract class BrowserImport extends AbstractImport | |||
77 | */ | 77 | */ |
78 | public function parseEntry(array $importedEntry) | 78 | public function parseEntry(array $importedEntry) |
79 | { | 79 | { |
80 | if ((!array_key_exists('guid', $importedEntry) || (!array_key_exists('id', $importedEntry))) && \is_array(reset($importedEntry))) { | 80 | if ((!\array_key_exists('guid', $importedEntry) || (!\array_key_exists('id', $importedEntry))) && \is_array(reset($importedEntry))) { |
81 | if ($this->producer) { | 81 | if ($this->producer) { |
82 | $this->parseEntriesForProducer($importedEntry); | 82 | $this->parseEntriesForProducer($importedEntry); |
83 | 83 | ||
@@ -89,7 +89,7 @@ abstract class BrowserImport extends AbstractImport | |||
89 | return; | 89 | return; |
90 | } | 90 | } |
91 | 91 | ||
92 | if (array_key_exists('children', $importedEntry)) { | 92 | if (\array_key_exists('children', $importedEntry)) { |
93 | if ($this->producer) { | 93 | if ($this->producer) { |
94 | $this->parseEntriesForProducer($importedEntry['children']); | 94 | $this->parseEntriesForProducer($importedEntry['children']); |
95 | 95 | ||
@@ -101,11 +101,11 @@ abstract class BrowserImport extends AbstractImport | |||
101 | return; | 101 | return; |
102 | } | 102 | } |
103 | 103 | ||
104 | if (!array_key_exists('uri', $importedEntry) && !array_key_exists('url', $importedEntry)) { | 104 | if (!\array_key_exists('uri', $importedEntry) && !\array_key_exists('url', $importedEntry)) { |
105 | return; | 105 | return; |
106 | } | 106 | } |
107 | 107 | ||
108 | $url = array_key_exists('uri', $importedEntry) ? $importedEntry['uri'] : $importedEntry['url']; | 108 | $url = \array_key_exists('uri', $importedEntry) ? $importedEntry['uri'] : $importedEntry['url']; |
109 | 109 | ||
110 | $existingEntry = $this->em | 110 | $existingEntry = $this->em |
111 | ->getRepository('WallabagCoreBundle:Entry') | 111 | ->getRepository('WallabagCoreBundle:Entry') |
@@ -126,7 +126,7 @@ abstract class BrowserImport extends AbstractImport | |||
126 | // update entry with content (in case fetching failed, the given entry will be return) | 126 | // update entry with content (in case fetching failed, the given entry will be return) |
127 | $this->fetchContent($entry, $data['url'], $data); | 127 | $this->fetchContent($entry, $data['url'], $data); |
128 | 128 | ||
129 | if (array_key_exists('tags', $data)) { | 129 | if (\array_key_exists('tags', $data)) { |
130 | $this->tagsAssigner->assignTagsToEntry( | 130 | $this->tagsAssigner->assignTagsToEntry( |
131 | $entry, | 131 | $entry, |
132 | $data['tags'] | 132 | $data['tags'] |
diff --git a/src/Wallabag/ImportBundle/Import/ChromeImport.php b/src/Wallabag/ImportBundle/Import/ChromeImport.php index eccee698..4ae82ade 100644 --- a/src/Wallabag/ImportBundle/Import/ChromeImport.php +++ b/src/Wallabag/ImportBundle/Import/ChromeImport.php | |||
@@ -57,7 +57,7 @@ class ChromeImport extends BrowserImport | |||
57 | 'created_at' => substr($entry['date_added'], 0, 10), | 57 | 'created_at' => substr($entry['date_added'], 0, 10), |
58 | ]; | 58 | ]; |
59 | 59 | ||
60 | if (array_key_exists('tags', $entry) && '' !== $entry['tags']) { | 60 | if (\array_key_exists('tags', $entry) && '' !== $entry['tags']) { |
61 | $data['tags'] = $entry['tags']; | 61 | $data['tags'] = $entry['tags']; |
62 | } | 62 | } |
63 | 63 | ||
diff --git a/src/Wallabag/ImportBundle/Import/FirefoxImport.php b/src/Wallabag/ImportBundle/Import/FirefoxImport.php index 8999e3f3..b3558f21 100644 --- a/src/Wallabag/ImportBundle/Import/FirefoxImport.php +++ b/src/Wallabag/ImportBundle/Import/FirefoxImport.php | |||
@@ -57,7 +57,7 @@ class FirefoxImport extends BrowserImport | |||
57 | 'created_at' => substr($entry['dateAdded'], 0, 10), | 57 | 'created_at' => substr($entry['dateAdded'], 0, 10), |
58 | ]; | 58 | ]; |
59 | 59 | ||
60 | if (array_key_exists('tags', $entry) && '' !== $entry['tags']) { | 60 | if (\array_key_exists('tags', $entry) && '' !== $entry['tags']) { |
61 | $data['tags'] = $entry['tags']; | 61 | $data['tags'] = $entry['tags']; |
62 | } | 62 | } |
63 | 63 | ||
diff --git a/src/Wallabag/ImportBundle/Import/InstapaperImport.php b/src/Wallabag/ImportBundle/Import/InstapaperImport.php index 5a18c7c0..3a9f08b4 100644 --- a/src/Wallabag/ImportBundle/Import/InstapaperImport.php +++ b/src/Wallabag/ImportBundle/Import/InstapaperImport.php | |||
@@ -62,7 +62,7 @@ class InstapaperImport extends AbstractImport | |||
62 | } | 62 | } |
63 | 63 | ||
64 | $entries = []; | 64 | $entries = []; |
65 | $handle = fopen($this->filepath, 'rb'); | 65 | $handle = fopen($this->filepath, 'r'); |
66 | while (false !== ($data = fgetcsv($handle, 10240))) { | 66 | while (false !== ($data = fgetcsv($handle, 10240))) { |
67 | if ('URL' === $data[0]) { | 67 | if ('URL' === $data[0]) { |
68 | continue; | 68 | continue; |
diff --git a/src/Wallabag/ImportBundle/Import/WallabagImport.php b/src/Wallabag/ImportBundle/Import/WallabagImport.php index 350d0600..58b6a970 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagImport.php +++ b/src/Wallabag/ImportBundle/Import/WallabagImport.php | |||
@@ -122,7 +122,7 @@ abstract class WallabagImport extends AbstractImport | |||
122 | // update entry with content (in case fetching failed, the given entry will be return) | 122 | // update entry with content (in case fetching failed, the given entry will be return) |
123 | $this->fetchContent($entry, $data['url'], $data); | 123 | $this->fetchContent($entry, $data['url'], $data); |
124 | 124 | ||
125 | if (array_key_exists('tags', $data)) { | 125 | if (\array_key_exists('tags', $data)) { |
126 | $this->tagsAssigner->assignTagsToEntry( | 126 | $this->tagsAssigner->assignTagsToEntry( |
127 | $entry, | 127 | $entry, |
128 | $data['tags'], | 128 | $data['tags'], |
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php index b9bb525a..e0562611 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php +++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php | |||
@@ -61,7 +61,7 @@ class WallabagV1Import extends WallabagImport | |||
61 | $data['html'] = $this->fetchingErrorMessage; | 61 | $data['html'] = $this->fetchingErrorMessage; |
62 | } | 62 | } |
63 | 63 | ||
64 | if (array_key_exists('tags', $entry) && '' !== $entry['tags']) { | 64 | if (\array_key_exists('tags', $entry) && '' !== $entry['tags']) { |
65 | $data['tags'] = $entry['tags']; | 65 | $data['tags'] = $entry['tags']; |
66 | } | 66 | } |
67 | 67 | ||