Merge pull request #3716 from wallabag/csfixer

php-cs-fixer: native_function_invocation
author: Jérémy Benoist <j0k3r@users.noreply.github.com> 2018-09-05 16:38:20 +0000
committer: GitHub <noreply@github.com> 2018-09-05 16:38:20 +0000
commit: ada5d5b2694ec95c6ca84aa91f22add1973343e0 (patch)
tree: df0b695eb99e96dc55b63b27a404080c23421639 /src/Wallabag/ImportBundle/Controller
parent: 685a5d745e2b723a09111d7d31157cced67ea9b4 (diff)
parent: 2a1ceb67b4400f46f4d3067e887ff54aa906f0a2 (diff)
download: wallabag-ada5d5b2694ec95c6ca84aa91f22add1973343e0.tar.gz
wallabag-ada5d5b2694ec95c6ca84aa91f22add1973343e0.tar.zst
wallabag-ada5d5b2694ec95c6ca84aa91f22add1973343e0.zip
5 files changed, 5 insertions, 5 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/BrowserController.php b/src/Wallabag/ImportBundle/Controller/BrowserController.php
index 77a7a904..6418925c 100644
--- a/src/Wallabag/ImportBundle/Controller/BrowserController.php
+++ b/src/Wallabag/ImportBundle/Controller/BrowserController.php
@@ -30,7 +30,7 @@ abstract class BrowserController extends Controller
            $markAsRead = $form->get('mark_as_read')->getData();
            $name = $this->getUser()->getId() . '.json';
-            if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
                $res = $wallabag
                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
                    ->setMarkAsRead($markAsRead)
diff --git a/src/Wallabag/ImportBundle/Controller/InstapaperController.php b/src/Wallabag/ImportBundle/Controller/InstapaperController.php
index 550679c3..f184baf9 100644
--- a/src/Wallabag/ImportBundle/Controller/InstapaperController.php
+++ b/src/Wallabag/ImportBundle/Controller/InstapaperController.php
@@ -31,7 +31,7 @@ class InstapaperController extends Controller
            $markAsRead = $form->get('mark_as_read')->getData();
            $name = 'instapaper_' . $this->getUser()->getId() . '.csv';
-            if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
                $res = $instapaper
                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
                    ->setMarkAsRead($markAsRead)
diff --git a/src/Wallabag/ImportBundle/Controller/PinboardController.php b/src/Wallabag/ImportBundle/Controller/PinboardController.php
index 0e57fd41..6f54c69a 100644
--- a/src/Wallabag/ImportBundle/Controller/PinboardController.php
+++ b/src/Wallabag/ImportBundle/Controller/PinboardController.php
@@ -31,7 +31,7 @@ class PinboardController extends Controller
            $markAsRead = $form->get('mark_as_read')->getData();
            $name = 'pinboard_' . $this->getUser()->getId() . '.json';
-            if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
                $res = $pinboard
                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
                    ->setMarkAsRead($markAsRead)
diff --git a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php
index 59de24cb..729a97a3 100644
--- a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php
+++ b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php
@@ -31,7 +31,7 @@ class ReadabilityController extends Controller
            $markAsRead = $form->get('mark_as_read')->getData();
            $name = 'readability_' . $this->getUser()->getId() . '.json';
-            if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
                $res = $readability
                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
                    ->setMarkAsRead($markAsRead)
diff --git a/src/Wallabag/ImportBundle/Controller/WallabagController.php b/src/Wallabag/ImportBundle/Controller/WallabagController.php
index 6e6524b4..d182dd2c 100644
--- a/src/Wallabag/ImportBundle/Controller/WallabagController.php
+++ b/src/Wallabag/ImportBundle/Controller/WallabagController.php
@@ -33,7 +33,7 @@ abstract class WallabagController extends Controller
            $markAsRead = $form->get('mark_as_read')->getData();
            $name = $this->getUser()->getId() . '.json';
-            if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
+            if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
                $res = $wallabag
                    ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
                    ->setMarkAsRead($markAsRead)
author	Jérémy Benoist <j0k3r@users.noreply.github.com>	2018-09-05 16:38:20 +0000
committer	GitHub <noreply@github.com>	2018-09-05 16:38:20 +0000
commit	ada5d5b2694ec95c6ca84aa91f22add1973343e0 (patch)
tree	df0b695eb99e96dc55b63b27a404080c23421639 /src/Wallabag/ImportBundle/Controller
parent	685a5d745e2b723a09111d7d31157cced67ea9b4 (diff)
parent	2a1ceb67b4400f46f4d3067e887ff54aa906f0a2 (diff)
download	wallabag-ada5d5b2694ec95c6ca84aa91f22add1973343e0.tar.gz wallabag-ada5d5b2694ec95c6ca84aa91f22add1973343e0.tar.zst wallabag-ada5d5b2694ec95c6ca84aa91f22add1973343e0.zip

diff --git a/src/Wallabag/ImportBundle/Controller/BrowserController.php b/src/Wallabag/ImportBundle/Controller/BrowserController.php index 77a7a904..6418925c 100644 --- a/src/Wallabag/ImportBundle/Controller/BrowserController.php +++ b/src/Wallabag/ImportBundle/Controller/BrowserController.php
@@ -30,7 +30,7 @@ abstract class BrowserController extends Controller
30	$markAsRead = $form->get('mark_as_read')->getData();	30	$markAsRead = $form->get('mark_as_read')->getData();
31	$name = $this->getUser()->getId() . '.json';	31	$name = $this->getUser()->getId() . '.json';
32		32
33	if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {	33	if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
34	$res = $wallabag	34	$res = $wallabag
35	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)	35	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
36	->setMarkAsRead($markAsRead)	36	->setMarkAsRead($markAsRead)


diff --git a/src/Wallabag/ImportBundle/Controller/InstapaperController.php b/src/Wallabag/ImportBundle/Controller/InstapaperController.php index 550679c3..f184baf9 100644 --- a/src/Wallabag/ImportBundle/Controller/InstapaperController.php +++ b/src/Wallabag/ImportBundle/Controller/InstapaperController.php
@@ -31,7 +31,7 @@ class InstapaperController extends Controller
31	$markAsRead = $form->get('mark_as_read')->getData();	31	$markAsRead = $form->get('mark_as_read')->getData();
32	$name = 'instapaper_' . $this->getUser()->getId() . '.csv';	32	$name = 'instapaper_' . $this->getUser()->getId() . '.csv';
33		33
34	if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {	34	if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
35	$res = $instapaper	35	$res = $instapaper
36	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)	36	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
37	->setMarkAsRead($markAsRead)	37	->setMarkAsRead($markAsRead)


diff --git a/src/Wallabag/ImportBundle/Controller/PinboardController.php b/src/Wallabag/ImportBundle/Controller/PinboardController.php index 0e57fd41..6f54c69a 100644 --- a/src/Wallabag/ImportBundle/Controller/PinboardController.php +++ b/src/Wallabag/ImportBundle/Controller/PinboardController.php
@@ -31,7 +31,7 @@ class PinboardController extends Controller
31	$markAsRead = $form->get('mark_as_read')->getData();	31	$markAsRead = $form->get('mark_as_read')->getData();
32	$name = 'pinboard_' . $this->getUser()->getId() . '.json';	32	$name = 'pinboard_' . $this->getUser()->getId() . '.json';
33		33
34	if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {	34	if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
35	$res = $pinboard	35	$res = $pinboard
36	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)	36	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
37	->setMarkAsRead($markAsRead)	37	->setMarkAsRead($markAsRead)


diff --git a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php index 59de24cb..729a97a3 100644 --- a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php +++ b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php
@@ -31,7 +31,7 @@ class ReadabilityController extends Controller
31	$markAsRead = $form->get('mark_as_read')->getData();	31	$markAsRead = $form->get('mark_as_read')->getData();
32	$name = 'readability_' . $this->getUser()->getId() . '.json';	32	$name = 'readability_' . $this->getUser()->getId() . '.json';
33		33
34	if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {	34	if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
35	$res = $readability	35	$res = $readability
36	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)	36	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
37	->setMarkAsRead($markAsRead)	37	->setMarkAsRead($markAsRead)


diff --git a/src/Wallabag/ImportBundle/Controller/WallabagController.php b/src/Wallabag/ImportBundle/Controller/WallabagController.php index 6e6524b4..d182dd2c 100644 --- a/src/Wallabag/ImportBundle/Controller/WallabagController.php +++ b/src/Wallabag/ImportBundle/Controller/WallabagController.php
@@ -33,7 +33,7 @@ abstract class WallabagController extends Controller
33	$markAsRead = $form->get('mark_as_read')->getData();	33	$markAsRead = $form->get('mark_as_read')->getData();
34	$name = $this->getUser()->getId() . '.json';	34	$name = $this->getUser()->getId() . '.json';
35		35
36	if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {	36	if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
37	$res = $wallabag	37	$res = $wallabag
38	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)	38	->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name)
39	->setMarkAsRead($markAsRead)	39	->setMarkAsRead($markAsRead)