Skip to content

Commit bd2c767

Browse files
committed
Code cleanup
Signed-off-by: Andrew Welch <andrew@nystudio107.com>
1 parent 7930409 commit bd2c767

File tree

1 file changed

+13
-31
lines changed

1 file changed

+13
-31
lines changed

src/variables/TranscoderVariable.php

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,10 @@ class TranscoderVariable
3232
* @param $videoOptions
3333
*
3434
* @return string
35-
* @throws \yii\base\Exception
3635
*/
3736
public function getVideoUrl($filePath, $videoOptions): string
3837
{
39-
$result = Transcoder::$plugin->transcode->getVideoUrl($filePath, $videoOptions);
40-
41-
return $result;
38+
return Transcoder::$plugin->transcode->getVideoUrl($filePath, $videoOptions);
4239
}
4340

4441
/**
@@ -48,13 +45,10 @@ public function getVideoUrl($filePath, $videoOptions): string
4845
* @param $thumbnailOptions
4946
*
5047
* @return string
51-
* @throws \yii\base\Exception
5248
*/
5349
public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
5450
{
55-
$result = Transcoder::$plugin->transcode->getVideoThumbnailUrl($filePath, $thumbnailOptions);
56-
57-
return $result;
51+
return Transcoder::$plugin->transcode->getVideoThumbnailUrl($filePath, $thumbnailOptions);
5852
}
5953

6054
/**
@@ -65,13 +59,10 @@ public function getVideoThumbnailUrl($filePath, $thumbnailOptions): string
6559
* @param $audioOptions
6660
*
6761
* @return string
68-
* @throws \yii\base\Exception
6962
*/
7063
public function getAudioUrl($filePath, $audioOptions): string
7164
{
72-
$result = Transcoder::$plugin->transcode->getAudioUrl($filePath, $audioOptions);
73-
74-
return $result;
65+
return Transcoder::$plugin->transcode->getAudioUrl($filePath, $audioOptions);
7566
}
7667

7768
/**
@@ -81,13 +72,10 @@ public function getAudioUrl($filePath, $audioOptions): string
8172
* @param bool $summary
8273
*
8374
* @return array
84-
* @throws \yii\base\Exception
8575
*/
8676
public function getFileInfo($filePath, $summary = false): array
8777
{
88-
$result = Transcoder::$plugin->transcode->getFileInfo($filePath, $summary);
89-
90-
return $result;
78+
return Transcoder::$plugin->transcode->getFileInfo($filePath, $summary);
9179
}
9280

9381
/**
@@ -97,12 +85,11 @@ public function getFileInfo($filePath, $summary = false): array
9785
* @param $videoOptions
9886
*
9987
* @return string
100-
* @throws \yii\base\Exception
10188
*/
10289
public function getVideoProgressUrl($filePath, $videoOptions): string
10390
{
104-
$result = "";
105-
$filename = Transcoder::$plugin->transcode->getVideoFileName($filePath, $videoOptions);
91+
$result = '';
92+
$filename = Transcoder::$plugin->transcode->getVideoFilename($filePath, $videoOptions);
10693
if (!empty($filename)) {
10794
$urlParams = [
10895
'filename' => $filename,
@@ -120,12 +107,11 @@ public function getVideoProgressUrl($filePath, $videoOptions): string
120107
* @param $audioOptions
121108
*
122109
* @return string
123-
* @throws \yii\base\Exception
124110
*/
125111
public function getAudioProgressUrl($filePath, $audioOptions): string
126112
{
127-
$result = "";
128-
$filename = Transcoder::$plugin->transcode->getAudioFileName($filePath, $audioOptions);
113+
$result = '';
114+
$filename = Transcoder::$plugin->transcode->getAudioFilename($filePath, $audioOptions);
129115
if (!empty($filename)) {
130116
$urlParams = [
131117
'filename' => $filename,
@@ -140,14 +126,13 @@ public function getAudioProgressUrl($filePath, $audioOptions): string
140126
* Get a GIF progress URL
141127
*
142128
* @param $filePath
143-
* @param $videoOptions
129+
* @param $gifOptions
144130
*
145131
* @return string
146-
* @throws \yii\base\Exception
147132
*/
148133
public function getGifProgressUrl($filePath, $gifOptions): string
149134
{
150-
$result = "";
135+
$result = '';
151136
$filename = Transcoder::$plugin->transcode->getGifFilename($filePath, $gifOptions);
152137
if (!empty($filename)) {
153138
$urlParams = [
@@ -168,7 +153,7 @@ public function getGifProgressUrl($filePath, $gifOptions): string
168153
*/
169154
public function getDownloadUrl($url): string
170155
{
171-
$result = "";
156+
$result = '';
172157
$filePath = parse_url($url, PHP_URL_PATH);
173158
$filePath = $_SERVER['DOCUMENT_ROOT'] . $filePath;
174159
if (file_exists($filePath)) {
@@ -188,12 +173,9 @@ public function getDownloadUrl($url): string
188173
* @param $gifOptions
189174
*
190175
* @return string
191-
* @throws \yii\base\Exception
192176
*/
193177
public function getGifUrl($filePath, $gifOptions): string
194178
{
195-
$result = Transcoder::$plugin->transcode->getGifUrl($filePath, $gifOptions);
196-
197-
return $result;
198-
}
179+
return Transcoder::$plugin->transcode->getGifUrl($filePath, $gifOptions);
180+
}
199181
}

0 commit comments

Comments
 (0)