writesdown / app-cms

backend/controllers/MediaCommentController.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
      * If there is media, the action will generate list of all MediaComment models based on Media ID.
      *
      * @param null|integer $media Media ID
-     * @return mixed
+     * @return string
      */
     public function actionIndex($media = null)
     {
@@ -104,7 +104,7 @@ 
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

backend/controllers/MenuController.php

Doc Comments +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
      * Displays menu page consists of CRUD for Menu and MenuItem model.
      *
      * @param null $id
-     * @return mixed
+     * @return string
      */
     public function actionIndex($id = null)
     {
@@ -90,7 +90,7 @@ 
      * Creates a new Menu model.
      * If creation is successful, the browser will be redirected to the 'index' page.
      *
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionCreate()
     {
@@ -108,7 +108,7 @@ 
      * If update is successful, the browser will be redirected to the 'view' page.
      *
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionUpdate($id)
     {
@@ -129,7 +129,7 @@ 
      * Deletes an existing Menu model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
-     * @return mixed
+     * @return \yii\web\Response
      * @throws NotFoundHttpException
      * @throws \Exception
      */

backend/controllers/PostCommentController.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

backend/controllers/PostController.php

Doc Comments +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
      * @param null|string $user
      * @throws \yii\web\ForbiddenHttpException
      * @throws \yii\web\NotFoundHttpException
-     * @return mixed
+     * @return string
      */
     public function actionIndex($type, $user = null)
     {
@@ -179,7 +179,7 @@ 
      * @throws \Exception
      * @throws \yii\web\ForbiddenHttpException
      * @throws \yii\web\NotFoundHttpException
-     * @return mixed
+     * @return Response
      */
     public function actionDelete($id)
     {

backend/controllers/SettingController.php

Doc Comments +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * Lists all Option models.
      *
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -74,7 +74,7 @@ 
      * Displays single Option model.
      *
      * @param integer $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {
@@ -127,7 +127,7 @@ 
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {
@@ -189,7 +189,7 @@ 
      * If the models are not found, a 404 HTTP exception will be thrown.
      *
      * @param string $id
-     * @return Option the loaded model
+     * @return string the loaded model
      * @throws NotFoundHttpException if the models cannot be found
      */
     protected function findModelByGroup($id)

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
             return $this->redirect(['group', 'id' => $id]);
         }
 
-        if (is_file($this->getViewPath() . '/' . strtolower($id) . '.php')) {
+        if (is_file($this->getViewPath().'/'.strtolower($id).'.php')) {
             return $this->render(strtolower($id), [
                 'model' => (object)$model,
                 'group' => $id,

backend/controllers/TaxonomyController.php

Doc Comments +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
     /**
      * Lists all Taxonomy models.
      *
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -148,7 +148,7 @@ 
      * If deletion is successful, the browser will be redirected to the 'index' page.
      *
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {
@@ -211,7 +211,7 @@ 
      * @param integer $term
      * @throws \Exception
      * @throws \yii\web\NotFoundHttpException
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDeleteTerm($id, $term)
     {
@@ -257,7 +257,7 @@ 
      * If the model is not found, a 404 HTTP exception will be thrown.
      *
      * @param integer $id
-     * @return Term the loaded model
+     * @return integer the loaded model
      * @throws NotFoundHttpException if the model cannot be found
      */
     protected function findTerm($id)

Indentation -2 removed lines

@@ -173,7 +173,6 @@ 
 
     /**
      * Updates an existing Term on 'view taxonomy' page.
-
      *
 *@param $id
      * @param $term
@@ -205,7 +204,6 @@ 
     /**
      * Delete an existing Term of a taxonomy on 'view taxonomy' page.
      * If deletion is successful, the browser will be redirected to the 'view taxonomy' page.
-
      *
 *@param integer $id
      * @param integer $term

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return '<br />'
-            . Html::label(Html::checkbox('taxonomy_ids[]', true, ['value' => $model->id]) . ' ' . $model->name);
+            . Html::label(Html::checkbox('taxonomy_ids[]', true, ['value' => $model->id]).' '.$model->name);
         }
 
         return '';

backend/controllers/UserController.php

Doc Comments +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
     /**
      * Lists all User models.
      *
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -75,7 +75,7 @@ 
      * Displays a single User model.
      *
      * @param integer $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {
@@ -144,7 +144,7 @@ 
      * @throws \Exception
      * @throws \yii\web\ForbiddenHttpException
      * @throws \yii\web\NotFoundHttpException
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

backend/controllers/WidgetController.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     /**
      * Scan widget directory to get list of all available widgets and list all active widgets.
      *
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {

Spacing +9 added lines, -9 removed lines

@@ -89,8 +89,8 @@ 
         }
 
         foreach (scandir($this->_dir) as $widget) {
-            if (is_dir($this->_dir . $widget) && $widget !== '.' && $widget !== '..') {
-                $configPath = $this->_dir . $widget . '/config/main.php';
+            if (is_dir($this->_dir.$widget) && $widget !== '.' && $widget !== '..') {
+                $configPath = $this->_dir.$widget.'/config/main.php';
                 if (is_file($configPath)) {
                     $config = require($configPath);
                     $config['directory'] = $widget;
@@ -137,7 +137,7 @@ 
         }
 
         if (($model->file = UploadedFile::getInstance($model, 'file')) && $model->validate(['file'])) {
-            $tmpPath = $this->_tmp . $model->file->name;
+            $tmpPath = $this->_tmp.$model->file->name;
 
             if (!$model->file->saveAs($tmpPath)) {
                 return $this->render('create', [
@@ -161,7 +161,7 @@ 
 
             $baseDir = substr($zipArchive->getNameIndex(0), 0, strpos($zipArchive->getNameIndex(0), '/'));
             $zipArchive->close();
-            $configPath = $this->_tmp . $baseDir . '/config/main.php';
+            $configPath = $this->_tmp.$baseDir.'/config/main.php';
 
             if (!is_file($configPath)) {
                 FileHelper::removeDirectory($this->_tmp);
@@ -174,10 +174,10 @@ 
 
             $config = require($configPath);
 
-            if (is_dir($this->_dir . $baseDir)) {
+            if (is_dir($this->_dir.$baseDir)) {
                 $errors['dirExist'] = Yii::t('writesdown', 'Widget with the same directory already exist.');
             } else {
-                rename($this->_tmp . $baseDir, $this->_dir . $baseDir);
+                rename($this->_tmp.$baseDir, $this->_dir.$baseDir);
             }
 
             FileHelper::removeDirectory($this->_tmp);
@@ -194,7 +194,7 @@ 
                 return $this->redirect(['index']);
             } else {
                 if (!$errors['dirExist']) {
-                    FileHelper::removeDirectory($this->_dir . $baseDir);
+                    FileHelper::removeDirectory($this->_dir.$baseDir);
                 }
 
                 $errors = ArrayHelper::merge($errors, $model->getFirstErrors());
@@ -216,7 +216,7 @@ 
      */
     public function actionDelete($id)
     {
-        FileHelper::removeDirectory($this->_dir . $id);
+        FileHelper::removeDirectory($this->_dir.$id);
         Widget::deleteAll(['directory' => $id]);
 
         return $this->redirect(['index']);
@@ -233,7 +233,7 @@ 
     {
         $model = new Widget(['scenario' => 'activate']);
         if ($model->load(Yii::$app->request->post())) {
-            $configPath = $this->_dir . $id . '/config/main.php';
+            $configPath = $this->_dir.$id.'/config/main.php';
             $config = require($configPath);
 
             // Set attribute of model

common/components/MediaUploadHandler.php

Doc Comments +6 added lines, -6 removed lines

@@ -141,8 +141,8 @@ 
     /**
      * Get server var based on id. Return null when it's not exist.
      *
-     * @param $id
-     * @return mixed
+     * @param string $id
+     * @return string
      */
     protected function getServerVar($id)
     {
@@ -208,7 +208,7 @@ 
      * If the model is not found it will return null.
      *
      * @param integer $id
-     * @return Media|array
+     * @return Media
      */
     protected function findMedia($id)
     {
@@ -331,7 +331,7 @@ 
      * The number before fileName extension is replaced by upCountNameCallback.
      *
      * @param string $fileName
-     * @return mixed
+     * @return string
      * @see upCountNameCallback
      */
     protected function upCountName($fileName)
@@ -410,7 +410,7 @@ 
     }
 
     /**
-     * @param $fileName
+     * @param string $fileName
      * @param $version
      * @param $options
      * @return bool|\imagine\Image\ManipulatorInterface
@@ -570,7 +570,7 @@ 
     }
 
     /**
-     * @param $pages Pagination
+     * @param Pagination $pages Pagination
      * @return array
      */
     protected function getPaging($pages)

Spacing +16 added lines, -16 removed lines

@@ -243,7 +243,7 @@ 
     protected function getUserPath()
     {
         if ($this->options['user_dirs'] && !Yii::$app->user->isGuest) {
-            return Yii::$app->user->identity->username . '/';
+            return Yii::$app->user->identity->username.'/';
         }
 
         return '';
@@ -271,7 +271,7 @@ 
      */
     protected function getUploadPath($fileName = null)
     {
-        return $this->getOption('upload_dir') . $this->getUserPath() . $this->getYearMonthPath() . $fileName;
+        return $this->getOption('upload_dir').$this->getUserPath().$this->getYearMonthPath().$fileName;
     }
 
     /**
@@ -282,7 +282,7 @@ 
      */
     protected function getFilePath($fileName = null)
     {
-        return $this->getOption('upload_dir') . $fileName;
+        return $this->getOption('upload_dir').$fileName;
     }
 
     /**
@@ -324,7 +324,7 @@ 
         $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1;
         $ext = isset($matches[2]) ? $matches[2] : '';
 
-        return '-' . $index . $ext;
+        return '-'.$index.$ext;
     }
 
     /**
@@ -351,7 +351,7 @@ 
     {
         $index = 0;
         $fileName = $this->generateSlug($file->baseName);
-        $fileName .= '.' . $file->extension;
+        $fileName .= '.'.$file->extension;
         $fileName = trim(basename(stripslashes($fileName)), ".\x00..\x20");
 
         if (!$fileName) {
@@ -365,7 +365,7 @@ 
 
         if ($index !== 0) {
             // Replace media title
-            $this->_media->title = $file->baseName . ' ' . $index;
+            $this->_media->title = $file->baseName.' '.$index;
         }
 
         return $fileName;
@@ -442,10 +442,10 @@ 
             if (empty($options['crop'])) {
                 $newWidth = round($imageWidth * $scale);
                 $newHeight = round($imageHeight * $scale);
-                $newFileName = substr($fileName, 0, -(strlen($this->_media->file->extension) + 1)) .
-                    '-' . $newWidth .
-                    'x' . $newHeight .
-                    '.' . $this->_media->file->extension;
+                $newFileName = substr($fileName, 0, -(strlen($this->_media->file->extension) + 1)).
+                    '-'.$newWidth.
+                    'x'.$newHeight.
+                    '.'.$this->_media->file->extension;
                 $newFilePath = $this->getFilePath($newFileName);
                 $success = $image->thumbnail(new Box($newWidth, $newHeight))
                     ->save($newFilePath);
@@ -466,10 +466,10 @@ 
                 }
                 $pointX = abs(round(($newWidth - $maxWidth) / 2));
                 $pointY = abs(round(($newHeight - $maxHeight) / 2));
-                $newFileName = substr($fileName, 0, -(strlen($this->_media->file->extension) + 1)) .
-                    '-' . $maxWidth .
-                    'x' . $maxHeight .
-                    '.' . $this->_media->file->extension;
+                $newFileName = substr($fileName, 0, -(strlen($this->_media->file->extension) + 1)).
+                    '-'.$maxWidth.
+                    'x'.$maxHeight.
+                    '.'.$this->_media->file->extension;
                 $newFilePath = $this->getFilePath($newFileName);
                 $success = $image->thumbnail(new Box($newWidth, $newHeight), ManipulatorInterface::THUMBNAIL_OUTBOUND)
                     ->crop(new Point($pointX, $pointY), new Box($maxWidth, $maxHeight))
@@ -698,9 +698,9 @@ 
 
         if (preg_match('/^image\//', $media->mime_type)) {
             $response['type'] = 'image';
-            $response['icon_url'] = $this->getOption('upload_url') . $metadata['icon_url'];
+            $response['icon_url'] = $this->getOption('upload_url').$metadata['icon_url'];
         } else {
-            $response['icon_url'] = Yii::getAlias('@web') . '/' . $metadata['icon_url'];
+            $response['icon_url'] = Yii::getAlias('@web').'/'.$metadata['icon_url'];
             if (preg_match('/^video\//', $media->mime_type)) {
                 $response['type'] = 'video';
             } elseif (preg_match('/^audio\//', $media->mime_type)) {