first try to set indention limit at 80 characters in php

7 files changed, 39 insertions, 16 deletions

diff --git a/controller/admincontroller.php b/controller/admincontroller.php
index cd3ae9df4..71bcf0d29 100644
--- a/controller/admincontroller.php
+++ b/controller/admincontroller.php
@@ -35,7 +35,8 @@ class AdminController extends Controller {
     // in admin/admin.php
     public function index() {
         $data = [
-            'autoPurgeMinimumInterval' => $this->config->getAutoPurgeMinimumInterval(),
+            'autoPurgeMinimumInterval' =>
+                $this->config->getAutoPurgeMinimumInterval(),
             'autoPurgeCount' => $this->config->getAutoPurgeCount(),
             'cacheDuration' => $this->config->getSimplePieCacheDuration(),
             'feedFetcherTimeout' => $this->config->getFeedFetcherTimeout(),
@@ -64,7 +65,8 @@ class AdminController extends Controller {
         $this->config->write($this->configPath);
 
         return [
-            'autoPurgeMinimumInterval' => $this->config->getAutoPurgeMinimumInterval(),
+            'autoPurgeMinimumInterval' =>
+                $this->config->getAutoPurgeMinimumInterval(),
             'autoPurgeCount' => $this->config->getAutoPurgeCount(),
             'cacheDuration' => $this->config->getSimplePieCacheDuration(),
             'feedFetcherTimeout' => $this->config->getFeedFetcherTimeout(),
diff --git a/controller/exportcontroller.php b/controller/exportcontroller.php
index 1d0f7086c..b1d62f015 100644
--- a/controller/exportcontroller.php
+++ b/controller/exportcontroller.php
@@ -56,7 +56,9 @@ class ExportController extends Controller {
         $feeds = $this->feedService->findAll($this->userId);
         $folders = $this->folderService->findAll($this->userId);
         $opml = $this->opmlExporter->build($folders, $feeds)->saveXML();
-        return new TextDownloadResponse($opml, 'subscriptions.opml', 'text/xml');
+        $name = 'subscriptions.opml';
+        $mimeType = 'text/xml';
+        return new TextDownloadResponse($opml, $name, $mimeType);
     }
 
 
diff --git a/controller/feedapicontroller.php b/controller/feedapicontroller.php
index c75cd5879..2e48b5afe 100644
--- a/controller/feedapicontroller.php
+++ b/controller/feedapicontroller.php
@@ -66,7 +66,8 @@ class FeedApiController extends ApiController {
 
 
         try {
-            $result['newestItemId'] = $this->itemService->getNewestItemId($this->userId);
+            $result['newestItemId'] =
+                $this->itemService->getNewestItemId($this->userId);
 
         // in case there are no items, ignore
         } catch(ServiceNotFoundException $ex) {}
@@ -92,7 +93,8 @@ class FeedApiController extends ApiController {
             $result = ['feeds' => [$feed]];
 
             try {
-                $result['newestItemId'] = $this->itemService->getNewestItemId($this->userId);
+                $result['newestItemId'] =
+                    $this->itemService->getNewestItemId($this->userId);
 
             // in case there are no items, ignore
             } catch(ServiceNotFoundException $ex) {}
@@ -207,7 +209,7 @@ class FeedApiController extends ApiController {
     public function update($userId, $feedId) {
         try {
             $this->feedService->update($feedId, $userId);
-        // ignore update failure (feed could not be reachable etc, we don't care)
+        // ignore update failure
         } catch(\Exception $ex) {
             $this->logger->debug('Could not update feed ' . $ex->getMessage(),
                     $this->loggerParams);
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php
index d5ccc7c62..e5ad9a24f 100644
--- a/controller/foldercontroller.php
+++ b/controller/foldercontroller.php
@@ -148,7 +148,9 @@ class FolderController extends Controller {
      * @return array
      */
     public function read($folderId, $highestItemId) {
-        $this->itemService->readFolder($folderId, $highestItemId, $this->userId);
+        $this->itemService->readFolder(
+            $folderId, $highestItemId, $this->userId
+        );
 
         return ['feeds' => $this->feedService->findAll($this->userId)];
     }
diff --git a/controller/itemapicontroller.php b/controller/itemapicontroller.php
index 3674d644c..187a2b6b1 100644
--- a/controller/itemapicontroller.php
+++ b/controller/itemapicontroller.php
@@ -120,7 +120,9 @@ class ItemApiController extends ApiController {
 
     private function setStarred($isStarred, $feedId, $guidHash) {
         try {
-            $this->itemService->star($feedId, $guidHash, $isStarred, $this->userId);
+            $this->itemService->star(
+                $feedId, $guidHash, $isStarred, $this->userId
+            );
         } catch(ServiceNotFoundException $ex){
             return $this->error($ex, Http::STATUS_NOT_FOUND);
         }
diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php
index 89dd51d03..4aee6402a 100644
--- a/controller/itemcontroller.php
+++ b/controller/itemcontroller.php
@@ -59,8 +59,8 @@ class ItemController extends Controller {
     public function index($type, $id, $limit=50, $offset=0) {
         $showAll = $this->settings->getUserValue($this->userId, $this->appName,
             'showAll') === '1';
-        $oldestFirst = $this->settings->getUserValue($this->userId, $this->appName,
-            'oldestFirst') === '1';
+        $oldestFirst = $this->settings->getUserValue($this->userId,
+            $this->appName, 'oldestFirst') === '1';
 
         $this->settings->setUserValue($this->userId, $this->appName,
             'lastViewedFeedId', $id);
@@ -78,7 +78,8 @@ class ItemController extends Controller {
                 $params['newestItemId'] =
                     $this->itemService->getNewestItemId($this->userId);
                 $params['feeds'] = $this->feedService->findAll($this->userId);
-                $params['starred'] = $this->itemService->starredCount($this->userId);
+                $params['starred'] =
+                    $this->itemService->starredCount($this->userId);
             }
 
             $params['items'] = $this->itemService->findAll(
@@ -109,9 +110,11 @@ class ItemController extends Controller {
         $params = [];
 
         try {
-            $params['newestItemId'] = $this->itemService->getNewestItemId($this->userId);
+            $params['newestItemId'] =
+                $this->itemService->getNewestItemId($this->userId);
             $params['feeds'] = $this->feedService->findAll($this->userId);
-            $params['starred'] = $this->itemService->starredCount($this->userId);
+            $params['starred'] =
+                $this->itemService->starredCount($this->userId);
             $params['items'] = $this->itemService->findAllNew($id, $type,
                 $lastModified, $showAll, $this->userId);
 
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 90f702d49..f55900a39 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -59,7 +59,12 @@ class PageController extends Controller {
      * @NoAdminRequired
      */
     public function settings() {
-        $settings = ['showAll', 'compact', 'preventReadOnScroll', 'oldestFirst'];
+        $settings = [
+          'showAll',
+          'compact',
+          'preventReadOnScroll',
+          'oldestFirst'
+        ];
 
         $result = ['language' => $this->l10n->getLanguageCode()];
 
@@ -80,8 +85,13 @@ class PageController extends Controller {
      * @param bool $preventReadOnScroll
      * @param bool $oldestFirst
      */
-    public function updateSettings($showAll, $compact, $preventReadOnScroll, $oldestFirst) {
-        $settings = ['showAll', 'compact', 'preventReadOnScroll', 'oldestFirst'];
+    public function updateSettings($showAll, $compact, $preventReadOnScroll,
+                                   $oldestFirst) {
+        $settings = ['showAll',
+            'compact',
+            'preventReadOnScroll',
+            'oldestFirst'
+        ];
 
         foreach ($settings as $setting) {
             $this->settings->setUserValue($this->userId, $this->appName,