style(legacy): force semicolon on same line (#1534)

legacy/application/modules/rest/controllers/MediaController.php

@@ -37,8 +37,7 @@ class Rest_MediaController extends Zend_Rest_Controller
             ->filterByDbImportStatus(0)
             ->setLimit($limit)
             ->setOffset($offset)
-            ->orderBy($sortColumn, $sortDir)
-        ;
+            ->orderBy($sortColumn, $sortDir);
         //->orderByDbId();
 
         $queryCount = $query->count();
@@ -52,8 +51,7 @@ class Rest_MediaController extends Zend_Rest_Controller
         $this->getResponse()
             ->setHttpResponseCode(200)
             ->setHeader('X-TOTAL-COUNT', $totalFileCount)
-            ->appendBody(json_encode($files_array))
-        ;
+            ->appendBody(json_encode($files_array));
 
         /* TODO: Use this simpler code instead after we upgrade to Propel 1.7 (Airtime 2.6.x branch):
          * $this->getResponse()
@@ -74,8 +72,7 @@ class Rest_MediaController extends Zend_Rest_Controller
 
         try {
             $this->getResponse()
-                ->setHttpResponseCode(200)
-            ;
+                ->setHttpResponseCode(200);
             $inline = false;
             // SAAS-1081 - download counter for station podcast downloads
             if ($key = $this->getRequest()->getParam('download_key', false)) {
@@ -105,8 +102,7 @@ class Rest_MediaController extends Zend_Rest_Controller
         try {
             $this->getResponse()
                 ->setHttpResponseCode(200)
-                ->appendBody(json_encode(CcFiles::getSanitizedFileById($id)))
-            ;
+                ->appendBody(json_encode(CcFiles::getSanitizedFileById($id)));
         } catch (LibreTimeFileNotFoundException $e) {
             $this->fileNotFoundResponse();
             Logging::error($e->getMessage());
@@ -145,16 +141,14 @@ class Rest_MediaController extends Zend_Rest_Controller
             $sanitizedFile = CcFiles::createFromUpload($fileInfo);
             $this->getResponse()
                 ->setHttpResponseCode(201)
-                ->appendBody(json_encode($sanitizedFile))
-            ;
+                ->appendBody(json_encode($sanitizedFile));
         } catch (InvalidMetadataException $e) {
             $this->invalidDataResponse();
             Logging::error($e->getMessage());
         } catch (OverDiskQuotaException $e) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
-                ->appendBody('ERROR: Disk Quota reached.')
-            ;
+                ->appendBody('ERROR: Disk Quota reached.');
         } catch (Exception $e) {
             $this->serviceUnavailableResponse();
             Logging::error($e->getMessage() . "\n" . $e->getTraceAsString());
@@ -174,8 +168,7 @@ class Rest_MediaController extends Zend_Rest_Controller
 
             $this->getResponse()
                 ->setHttpResponseCode(201)
-                ->appendBody(json_encode($sanitizedFile))
-            ;
+                ->appendBody(json_encode($sanitizedFile));
         } catch (InvalidMetadataException $e) {
             $this->invalidDataResponse();
             Logging::error($e->getMessage());
@@ -198,8 +191,7 @@ class Rest_MediaController extends Zend_Rest_Controller
         try {
             CcFiles::deleteById($id);
             $this->getResponse()
-                ->setHttpResponseCode(204)
-            ;
+                ->setHttpResponseCode(204);
         } catch (LibreTimeFileNotFoundException $e) {
             $this->fileNotFoundResponse();
             Logging::error($e->getMessage());
@@ -221,8 +213,7 @@ class Rest_MediaController extends Zend_Rest_Controller
             $data = json_decode($this->getRequest()->getRawBody(), true)['sources'];
             Application_Service_PublishService::publish($id, $data);
             $this->getResponse()
-                ->setHttpResponseCode(200)
-            ;
+                ->setHttpResponseCode(200);
         } catch (Exception $e) {
             $this->unknownErrorResponse();
             Logging::error($e->getMessage());
@@ -235,8 +226,7 @@ class Rest_MediaController extends Zend_Rest_Controller
         $sources = Application_Service_PublishService::getSourceLists($id);
         $this->getResponse()
             ->setHttpResponseCode(200)
-            ->appendBody(json_encode($sources))
-        ;
+            ->appendBody(json_encode($sources));
     }
 
     private function getId()

legacy/application/modules/rest/controllers/PodcastController.php

@@ -35,15 +35,13 @@ class Rest_PodcastController extends Zend_Rest_Controller
             // Don't return the Station podcast - we fetch it separately
             ->filterByDbId($stationPodcastId, Criteria::NOT_EQUAL)
             ->leftJoinImportedPodcast()
-            ->withColumn('auto_ingest_timestamp')
-        ;
+            ->withColumn('auto_ingest_timestamp');
         $total = $result->count();
         if ($limit > 0) {
             $result->setLimit($limit);
         }
         $result->setOffset($offset)
-            ->orderBy($sortColumn, $sortDir)
-        ;
+            ->orderBy($sortColumn, $sortDir);
         $result = $result->find();
 
         $podcastArray = $result->toArray(null, false, BasePeer::TYPE_FIELDNAME);
@@ -51,8 +49,7 @@ class Rest_PodcastController extends Zend_Rest_Controller
         $this->getResponse()
             ->setHttpResponseCode(200)
             ->setHeader('X-TOTAL-COUNT', $total)
-            ->appendBody(json_encode($podcastArray))
-        ;
+            ->appendBody(json_encode($podcastArray));
     }
 
     public function getAction()
@@ -65,8 +62,7 @@ class Rest_PodcastController extends Zend_Rest_Controller
         try {
             $this->getResponse()
                 ->setHttpResponseCode(200)
-                ->appendBody(json_encode(Application_Service_PodcastService::getPodcastById($id)))
-            ;
+                ->appendBody(json_encode(Application_Service_PodcastService::getPodcastById($id)));
         } catch (PodcastNotFoundException $e) {
             $this->podcastNotFoundResponse();
             Logging::error($e->getMessage());
@@ -100,8 +96,7 @@ class Rest_PodcastController extends Zend_Rest_Controller
         } catch (InvalidPodcastException $e) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
-                ->appendBody('Invalid podcast!')
-            ;
+                ->appendBody('Invalid podcast!');
         } catch (Exception $e) {
             Logging::error($e->getMessage());
             $this->unknownErrorResponse();
@@ -121,8 +116,7 @@ class Rest_PodcastController extends Zend_Rest_Controller
 
             $this->getResponse()
                 ->setHttpResponseCode(201)
-                ->appendBody(json_encode($podcast))
-            ;
+                ->appendBody(json_encode($podcast));
         } catch (PodcastNotFoundException $e) {
             $this->podcastNotFoundResponse();
             Logging::error($e->getMessage());
@@ -142,8 +136,7 @@ class Rest_PodcastController extends Zend_Rest_Controller
         try {
             Application_Service_PodcastService::deletePodcastById($id);
             $this->getResponse()
-                ->setHttpResponseCode(204)
-            ;
+                ->setHttpResponseCode(204);
         } catch (PodcastNotFoundException $e) {
             $this->podcastNotFoundResponse();
             Logging::error($e->getMessage());
@@ -161,8 +154,7 @@ class Rest_PodcastController extends Zend_Rest_Controller
         if ($this->_request->getMethod() != HttpRequestType::POST) {
             $this->getResponse()
                 ->setHttpResponseCode(405)
-                ->appendBody('ERROR: Method not accepted')
-            ;
+                ->appendBody('ERROR: Method not accepted');
 
             return;
         }

legacy/application/modules/rest/controllers/PodcastEpisodesController.php

@@ -35,8 +35,7 @@ class Rest_PodcastEpisodesController extends Zend_Rest_Controller
         try {
             $totalPodcastEpisodesCount = PodcastEpisodesQuery::create()
                 ->filterByDbPodcastId($id)
-                ->count()
-            ;
+                ->count();
 
             // Check if offset and limit were sent with request.
             // Default limit to zero and offset to $totalFileCount
@@ -50,8 +49,7 @@ class Rest_PodcastEpisodesController extends Zend_Rest_Controller
             $this->getResponse()
                 ->setHttpResponseCode(201)
                 ->setHeader('X-TOTAL-COUNT', $totalPodcastEpisodesCount)
-                ->appendBody(json_encode($this->_service->getPodcastEpisodes($id, $offset, $limit, $sortColumn, $sortDir)))
-            ;
+                ->appendBody(json_encode($this->_service->getPodcastEpisodes($id, $offset, $limit, $sortColumn, $sortDir)));
         } catch (PodcastNotFoundException $e) {
             $this->podcastNotFoundResponse();
             Logging::error($e->getMessage());
@@ -77,8 +75,7 @@ class Rest_PodcastEpisodesController extends Zend_Rest_Controller
         try {
             $this->getResponse()
                 ->setHttpResponseCode(201)
-                ->appendBody(json_encode($this->_service->getPodcastEpisodeById($episodeId)))
-            ;
+                ->appendBody(json_encode($this->_service->getPodcastEpisodeById($episodeId)));
         } catch (PodcastNotFoundException $e) {
             $this->podcastNotFoundResponse();
             Logging::error($e->getMessage());
@@ -115,8 +112,7 @@ class Rest_PodcastEpisodesController extends Zend_Rest_Controller
             $episode = $this->_service->importEpisode($id, $requestData['episode']);
             $this->getResponse()
                 ->setHttpResponseCode(201)
-                ->appendBody(json_encode($episode))
-            ;
+                ->appendBody(json_encode($episode));
         } catch (Exception $e) {
             $this->unknownErrorResponse();
             Logging::error($e->getMessage());
@@ -138,8 +134,7 @@ class Rest_PodcastEpisodesController extends Zend_Rest_Controller
         try {
             $this->_service->deletePodcastEpisodeById($episodeId);
             $this->getResponse()
-                ->setHttpResponseCode(204)
-            ;
+                ->setHttpResponseCode(204);
         } catch (PodcastEpisodeNotFoundException $e) {
             $this->podcastEpisodeNotFoundResponse();
             Logging::error($e->getMessage());

legacy/application/modules/rest/controllers/ShowImageController.php

@@ -56,8 +56,7 @@ class Rest_ShowImageController extends Zend_Rest_Controller
         if (!$showId) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
-                ->appendBody('No show ID provided')
-            ;
+                ->appendBody('No show ID provided');
 
             return;
         }
@@ -67,8 +66,7 @@ class Rest_ShowImageController extends Zend_Rest_Controller
         } catch (Exception $e) {
             $this->getResponse()
                 ->setHttpResponseCode(500)
-                ->appendBody('Error processing image: ' . $e->getMessage())
-            ;
+                ->appendBody('Error processing image: ' . $e->getMessage());
 
             return;
         }
@@ -88,13 +86,11 @@ class Rest_ShowImageController extends Zend_Rest_Controller
             $con->rollBack();
             $this->getResponse()
                 ->setHttpResponseCode(500)
-                ->appendBody("Couldn't add show image: " . $e->getMessage())
-            ;
+                ->appendBody("Couldn't add show image: " . $e->getMessage());
         }
 
         $this->getResponse()
-            ->setHttpResponseCode(201)
-        ;
+            ->setHttpResponseCode(201);
     }
 
     /**
@@ -107,8 +103,7 @@ class Rest_ShowImageController extends Zend_Rest_Controller
         if (!$showId) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
-                ->appendBody('No show ID provided')
-            ;
+                ->appendBody('No show ID provided');
 
             return;
         }
@@ -118,8 +113,7 @@ class Rest_ShowImageController extends Zend_Rest_Controller
         } catch (Exception $e) {
             $this->getResponse()
                 ->setHttpResponseCode(500)
-                ->appendBody('Error processing image: ' . $e->getMessage())
-            ;
+                ->appendBody('Error processing image: ' . $e->getMessage());
         }
 
         $show = CcShowQuery::create()->findPk($showId);
@@ -137,13 +131,11 @@ class Rest_ShowImageController extends Zend_Rest_Controller
             $con->rollBack();
             $this->getResponse()
                 ->setHttpResponseCode(500)
-                ->appendBody("Couldn't remove show image: " . $e->getMessage())
-            ;
+                ->appendBody("Couldn't remove show image: " . $e->getMessage());
         }
 
         $this->getResponse()
-            ->setHttpResponseCode(201)
-        ;
+            ->setHttpResponseCode(201);
     }
 
     /**