Conform to PSR2 coding standards

AsgardCms · Dec 28, 2014 · 70b9622 · 70b9622
1 parent d6174fa
commit 70b9622
Show file tree

Hide file tree

Showing 50 changed files with 162 additions and 167 deletions.
diff --git a/Config/thumbnails.php b/Config/thumbnails.php
@@ -5,9 +5,9 @@
         'fit' => [
             'width' => 50,
             'height' => 50,
-            'callback' => function($constraint) {
+            'callback' => function ($constraint) {
                 $constraint->upsize();
-            }
+            },
         ],
     ]
 ];
diff --git a/Console/RefreshThumbnailCommand.php b/Console/RefreshThumbnailCommand.php
@@ -39,5 +39,4 @@ public function fire()
 
         $this->info('All thumbnails refreshed');
     }
-
 }
diff --git a/Database/Migrations/2014_10_26_162751_create_files_table.php b/Database/Migrations/2014_10_26_162751_create_files_table.php
@@ -3,36 +3,34 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateFilesTable extends Migration {
-
-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('files', function(Blueprint $table)
-		{
+class CreateFilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('files', function (Blueprint $table) {
             $table->increments('id');
-		    $table->string('filename');
-		    $table->string('path');
-		    $table->string('extension');
-		    $table->string('mimetype');
-		    $table->string('filesize');
-		    $table->integer('folder_id')->unsigned();
+            $table->string('filename');
+            $table->string('path');
+            $table->string('extension');
+            $table->string('mimetype');
+            $table->string('filesize');
+            $table->integer('folder_id')->unsigned();
             $table->timestamps();
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('files');
-	}
+        });
+    }
 
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('files');
+    }
 }
diff --git a/Database/Migrations/2014_10_26_162811_create_file_translations_table.php b/Database/Migrations/2014_10_26_162811_create_file_translations_table.php
@@ -36,5 +36,4 @@ public function down()
     {
         Schema::drop('file_translations');
     }
-
 }
diff --git a/Database/Seeders/MediaDatabaseSeeder.php b/Database/Seeders/MediaDatabaseSeeder.php
@@ -5,7 +5,6 @@
 
 class MediaDatabaseSeeder extends Seeder
 {
-
     /**
      * Run the database seeds.
      *
@@ -15,5 +14,4 @@ public function run()
     {
         Model::unguard();
     }
-
 }
diff --git a/Entities/File.php b/Entities/File.php
@@ -19,6 +19,6 @@ class File extends Model
         'width',
         'height',
         'filesize',
-        'folder_id'
+        'folder_id',
     ];
 }
diff --git a/Helpers/FileHelper.php b/Helpers/FileHelper.php
@@ -11,7 +11,7 @@ public static function slug($name)
 
         $name = Str::slug($name);
 
-        return $name . $extension;
+        return $name.$extension;
     }
 
     /**

diff --git a/Http/Controllers/Admin/MediaController.php b/Http/Controllers/Admin/MediaController.php
@@ -76,7 +76,7 @@ public function store()
     /**
      * Show the form for editing the specified resource.
      *
-     * @param File $file
+     * @param  File     $file
      * @return Response
      */
     public function edit(File $file)
@@ -87,22 +87,23 @@ public function edit(File $file)
     /**
      * Update the specified resource in storage.
      *
-     * @param File $file
-     * @param UpdateMediaRequest $request
+     * @param  File               $file
+     * @param  UpdateMediaRequest $request
      * @return Response
      */
     public function update(File $file, UpdateMediaRequest $request)
     {
         $this->file->update($file, $request->all());
 
         Flash::success(trans('media::messages.file updated'));
+
         return Redirect::route('dashboard.media.index');
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param File $file
+     * @param  File     $file
      * @internal param int $id
      * @return Response
      */
@@ -112,6 +113,7 @@ public function destroy(File $file)
         $this->file->destroy($file);
 
         Flash::success(trans('media::messages.file deleted'));
+
         return Redirect::route('dashboard.media.index');
     }
 }
diff --git a/Http/Controllers/Api/MediaController.php b/Http/Controllers/Api/MediaController.php
@@ -19,7 +19,7 @@ public function __construct(FileService $fileService)
     /**
      * Store a newly created resource in storage.
      *
-     * @param UploadMediaRequest $request
+     * @param  UploadMediaRequest $request
      * @return Response
      */
     public function store(UploadMediaRequest $request)

diff --git a/Http/routes.php b/Http/routes.php
@@ -4,10 +4,8 @@
 
 $router->model('media', 'Modules\Media\Entities\File');
 
-$router->group(['prefix' => LaravelLocalization::setLocale(), 'before' => 'LaravelLocalizationRedirectFilter|auth.admin|permissions'], function(Router $router)
-{
-    $router->group(['prefix' => Config::get('core::core.admin-prefix'), 'namespace' => 'Modules\Media\Http\Controllers'], function(Router $router)
-    {
+$router->group(['prefix' => LaravelLocalization::setLocale(), 'before' => 'LaravelLocalizationRedirectFilter|auth.admin|permissions'], function (Router $router) {
+    $router->group(['prefix' => Config::get('core::core.admin-prefix'), 'namespace' => 'Modules\Media\Http\Controllers'], function (Router $router) {
         $router->resource('media', 'Admin\MediaController', ['except' => ['show'], 'names' => [
                 'index' => 'dashboard.media.index',
                 'create' => 'dashboard.media.create',

diff --git a/Image/Facade/Imagy.php b/Image/Facade/Imagy.php
@@ -4,5 +4,8 @@
 
 class Imagy extends Facade
 {
-    protected static function getFacadeAccessor() { return 'imagy'; }
+    protected static function getFacadeAccessor()
+    {
+        return 'imagy';
+    }
 }
diff --git a/Image/ImageFactoryInterface.php b/Image/ImageFactoryInterface.php
@@ -4,7 +4,7 @@ interface ImageFactoryInterface
 {
     /**
      * Return a new Manipulation class
-     * @param string $manipulation
+     * @param  string                                     $manipulation
      * @return \Modules\Media\Image\ImageHandlerInterface
      */
     public function make($manipulation);

diff --git a/Image/ImageHandlerInterface.php b/Image/ImageHandlerInterface.php
@@ -4,8 +4,8 @@ interface ImageHandlerInterface
 {
     /**
      * Handle the image manipulation request
-     * @param \Intervention\Image\Image $image
-     * @param array $options
+     * @param  \Intervention\Image\Image $image
+     * @param  array                     $options
      * @return \Intervention\Image\Image
      */
     public function handle($image, $options);

diff --git a/Image/ImageServiceProvider.php b/Image/ImageServiceProvider.php
@@ -24,14 +24,13 @@ public function register()
         );
 
         $this->app['imagy'] = $this->app->share(function ($app) {
-            $factory = new InterventionFactory;
+            $factory = new InterventionFactory();
             $thumbnailManager = new ThumbnailsManager($app['config'], $app['modules']);
 
             return new Imagy($factory, $thumbnailManager, $app['config']);
         });
 
-        $this->app->booting(function()
-        {
+        $this->app->booting(function () {
             $loader = AliasLoader::getInstance();
             $loader->alias('Imagy', 'Modules\Media\Image\Facade\Imagy');
         });

diff --git a/Image/Imagy.php b/Image/Imagy.php
@@ -35,8 +35,8 @@ class Imagy
 
     /**
      * @param ImageFactoryInterface $imageFactory
-     * @param ThumbnailsManager $manager
-     * @param Repository $config
+     * @param ThumbnailsManager     $manager
+     * @param Repository            $config
      */
     public function __construct(ImageFactoryInterface $imageFactory, ThumbnailsManager $manager, Repository $config)
     {
@@ -49,9 +49,9 @@ public function __construct(ImageFactoryInterface $imageFactory, ThumbnailsManag
 
     /**
      * Get an image in the given thumbnail options
-     * @param string $path
-     * @param string $thumbnail
-     * @param bool $forceCreate
+     * @param  string $path
+     * @param  string $thumbnail
+     * @param  bool   $forceCreate
      * @return string
      */
     public function get($path, $thumbnail, $forceCreate = false)
@@ -60,7 +60,7 @@ public function get($path, $thumbnail, $forceCreate = false)
             return;
         }
 
-        $filename = $this->config->get('media::config.files-path') . $this->newFilename($path, $thumbnail);
+        $filename = $this->config->get('media::config.files-path').$this->newFilename($path, $thumbnail);
 
         if ($this->returnCreatedFile($filename, $forceCreate)) {
             return $filename;
@@ -73,8 +73,8 @@ public function get($path, $thumbnail, $forceCreate = false)
 
     /**
      * Return the thumbnail path
-     * @param string $originalImage
-     * @param string $thumbnail
+     * @param  string $originalImage
+     * @param  string $thumbnail
      * @return string
      */
     public function getThumbnail($originalImage, $thumbnail)
@@ -83,7 +83,7 @@ public function getThumbnail($originalImage, $thumbnail)
             return $originalImage;
         }
 
-        return $this->config->get('media::config.files-path') . $this->newFilename($originalImage, $thumbnail);
+        return $this->config->get('media::config.files-path').$this->newFilename($originalImage, $thumbnail);
     }
 
     /**
@@ -97,8 +97,8 @@ public function createAll($path)
         }
 
         foreach ($this->manager->all() as $thumbName => $filters) {
-            $image = $this->image->make(public_path() . $path);
-            $filename = $this->config->get('media::config.files-path') . $this->newFilename($path, $thumbName);
+            $image = $this->image->make(public_path().$path);
+            $filename = $this->config->get('media::config.files-path').$this->newFilename($path, $thumbName);
             foreach ($filters as $manipulation => $options) {
                 $image = $this->imageFactory->make($manipulation)->handle($image, $options);
             }
@@ -117,18 +117,18 @@ private function newFilename($path, $thumbnail)
     {
         $filename = pathinfo($path, PATHINFO_FILENAME);
 
-        return $filename . '_' . $thumbnail . '.' . pathinfo($path, PATHINFO_EXTENSION);
+        return $filename.'_'.$thumbnail.'.'.pathinfo($path, PATHINFO_EXTENSION);
     }
 
     /**
      * Return the already created file if it exists and force create is false
-     * @param string $filename
-     * @param bool $forceCreate
+     * @param  string $filename
+     * @param  bool   $forceCreate
      * @return bool
      */
     private function returnCreatedFile($filename, $forceCreate)
     {
-        return $this->finder->isFile(public_path() . $filename) && !$forceCreate;
+        return $this->finder->isFile(public_path().$filename) && !$forceCreate;
     }
 
     /**
@@ -138,18 +138,18 @@ private function returnCreatedFile($filename, $forceCreate)
      */
     private function writeImage($filename, $image)
     {
-        $this->finder->put(public_path() . $filename, $image);
+        $this->finder->put(public_path().$filename, $image);
     }
 
     /**
      * Make a new image
-     * @param string $path
-     * @param string $filename
+     * @param string      $path
+     * @param string      $filename
      * @param string null $thumbnail
      */
     private function makeNew($path, $filename, $thumbnail)
     {
-        $image = $this->image->make(public_path() . $path);
+        $image = $this->image->make(public_path().$path);
 
         foreach ($this->manager->find($thumbnail) as $manipulation => $options) {
             $image = $this->imageFactory->make($manipulation)->handle($image, $options);
@@ -161,7 +161,7 @@ private function makeNew($path, $filename, $thumbnail)
 
     /**
      * Check if the given path is en image
-     * @param string $path
+     * @param  string $path
      * @return bool
      */
     public function isImage($path)
@@ -181,15 +181,15 @@ public function deleteAllFor(File $file)
             return $this->finder->delete($file->path);
         }
 
-        $paths[] = public_path() . $file->path;
+        $paths[] = public_path().$file->path;
         $fileName = pathinfo($file->path, PATHINFO_FILENAME);
         $extension = pathinfo($file->path, PATHINFO_EXTENSION);
         foreach ($this->manager->all() as $thumbnail => $filters) {
-            $paths[] = public_path() . $this->config->get(
+            $paths[] = public_path().$this->config->get(
                     'media::config.files-path'
-                ) . "{$fileName}_{$thumbnail}.{$extension}";
+                )."{$fileName}_{$thumbnail}.{$extension}";
         }
+
         return $this->finder->delete($paths);
     }
-
 }
diff --git a/Image/Intervention/InterventionFactory.php b/Image/Intervention/InterventionFactory.php
@@ -5,13 +5,13 @@
 class InterventionFactory implements ImageFactoryInterface
 {
     /**
-     * @param string $manipulation
+     * @param  string                                     $manipulation
      * @return \Modules\Media\Image\ImageHandlerInterface
      */
     public function make($manipulation)
     {
-        $class = 'Modules\\Media\\Image\\Intervention\\Manipulations\\'. ucfirst($manipulation);
+        $class = 'Modules\\Media\\Image\\Intervention\\Manipulations\\'.ucfirst($manipulation);
 
-        return new $class;
+        return new $class();
     }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,5 +39,4 @@ public function fire()

		$this->info('All thumbnails refreshed');
		}

		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,5 +36,4 @@ public function down() @@
         {
             Schema::drop('file_translations');
         }
     }