Skip to content

Commit 761d07c

Browse files
committed
use propper JSON response for actionProgress controller
1 parent 9d06103 commit 761d07c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/controllers/DefaultController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212

1313
use Craft;
1414
use craft\errors\AssetDisallowedExtensionException;
15-
use craft\helpers\Json as JsonHelper;
1615
use craft\helpers\Path as PathHelper;
1716
use craft\web\Controller;
17+
use craft\web\Response;
1818
use nystudio107\transcoder\Transcoder;
1919
use yii\base\ExitException;
2020
use yii\web\BadRequestHttpException;
21+
2122
use function count;
2223
use function is_array;
2324

@@ -28,7 +29,6 @@
2829
*/
2930
class DefaultController extends Controller
3031
{
31-
3232
// Protected Properties
3333
// =========================================================================
3434

@@ -100,9 +100,9 @@ public function actionDownloadFile($url): void
100100
*
101101
* @param $filename
102102
*
103-
* @return string
103+
* @return Response
104104
*/
105-
public function actionProgress($filename): string
105+
public function actionProgress($filename): Response
106106
{
107107
$result = [];
108108
$progressFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $filename . '.progress';
@@ -173,6 +173,6 @@ public function actionProgress($filename): string
173173
}
174174
}
175175

176-
return JsonHelper::encode($result);
176+
return $this->asJson($result);
177177
}
178178
}

0 commit comments

Comments
 (0)