FEATURE #1423: add uploading of title photo for content pages

app/Models/File.php

@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Events\UploadFile;
-use App\Http\Requests\UploadRequest;
+use App\Http\Requests\Request;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
@@ -49,13 +49,13 @@ class File extends Model
     /**
      * Saves file into FS and creates new record in database
      *
-     * @param UploadedFile  $file
-     * @param UploadRequest $request
+     * @param UploadedFile $file
+     * @param Request      $request
      *
      * @return array associative array - key 'file' is type of SymphonyFile and contains info about real file, key 'id'
      *               is ID of row in files table
      */
-    public function upload(UploadedFile $file, UploadRequest $request)
+    public function upload(UploadedFile $file, Request $request)
     {
         $destination = config('app.upload_path');
         $filename = $this->getFilename($file);
@@ -70,8 +70,9 @@ class File extends Model
         Event::fire(new UploadFile($uploadedFile, $id));
 
         return [
-            'file' => $file,
-            'id'   => $id
+            'filename' => $filename,
+            'file'     => $file,
+            'id'       => $id
         ];
     }
 
@@ -81,12 +82,12 @@ class File extends Model
      * This file saves new record into database. It also calculates hash of given file, obtains MIME type etc.
      *
      * @param SymphonyFile  $file
-     * @param UploadRequest $request
+     * @param Request       $request
      * @param               $originalFilename
      *
      * @return mixed
      */
-    protected function saveIntoDatabase(SymphonyFile $file, UploadRequest $request, $originalFilename)
+    protected function saveIntoDatabase(SymphonyFile $file, Request $request, $originalFilename)
     {
         // get path and hash of uploaded file
         $path = config('app.upload_path') . DIRECTORY_SEPARATOR . $file->getFilename();
@@ -101,13 +102,14 @@ class File extends Model
         $newFile->hash_algorithm = self::HASH_ALGORITHM;
         $newFile->mime_type = $file->getMimeType();
         $newFile->file_size = $file->getSize();
-        $newFile->directory_id = $request->directoryId;
 
         // save optional fields
-        $optionalFields = ['description', 'keywords'];
+        $optionalFields = ['description', 'keywords', 'directoryId'];
         foreach ($optionalFields as $field) {
             if ($request->has($field)) {
-                $newFile->$field = $request->$field;
+
+                $snakeField = snake_case($field);
+                $newFile->$snakeField = $request->$field;
             }
         }