thinktomorrow / chief

src/Pages/PageCollectionScope.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Thinktomorrow\Chief\Pages;
 

src/Pages/Page.php

Spacing +3 added lines, -3 removed lines

@@ -60,12 +60,12 @@ 
 
     public function presentForParent(ActsAsParent $parent, Relation $relation): string
     {
-        return 'Dit is de relatie weergave van een pagina onder ' . $parent->id;
+        return 'Dit is de relatie weergave van een pagina onder '.$parent->id;
     }
 
     public function presentForChild(ActsAsChild $child, Relation $relation): string
     {
-        return 'Dit is de relatie weergave van een pagina als parent voor ' . $child->id;
+        return 'Dit is de relatie weergave van een pagina als parent voor '.$child->id;
     }
 
     public function getRelationId(): string
@@ -99,7 +99,7 @@ 
     {
         $collectionKey = (new static)->collectionKey();
 
-        $names = (object) [
+        $names = (object)[
             'key'      => $collectionKey,
             'class'    => static::class,
             'singular' => $collectionKey == 'statics' ? 'pagina' : ucfirst(str_singular($collectionKey)),

src/Pages/Application/CreatePage.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     public function handle(string $collection, array $translations): Page
     {
-        try{
+        try {
             DB::beginTransaction();
 
             $page = Page::create(['collection' => $collection]);

src/Pages/HasCollection.php

Indentation +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     public function scopeCollection($query, string $collection = null)
     {
         return $query->withoutGlobalScope(PageCollectionScope::class)
-                     ->where('collection', '=', $collection);
+                        ->where('collection', '=', $collection);
     }
 
     /**

Spacing +8 added lines, -8 removed lines

@@ -16,18 +16,18 @@ 
     public function collectionKey()
     {
         // Collection key is stored at db - if not we map it from our config
-        if($this->collection) return $this->collection;
+        if ($this->collection) return $this->collection;
 
-        $mapping = config('thinktomorrow.chief.collections',[]);
+        $mapping = config('thinktomorrow.chief.collections', []);
 
         return false != ($key = array_search(static::class, $mapping)) ? $key : null;
     }
 
     public static function fromCollectionKey(string $key = null)
     {
-        $mapping = config('thinktomorrow.chief.collections',[]);
+        $mapping = config('thinktomorrow.chief.collections', []);
 
-        if(!isset($mapping[$key])){
+        if (!isset($mapping[$key])) {
             throw new \DomainException('No corresponding class found for the collection key ['.$key.']. Make sure to add this to the [thinktomorrow.chief.collections] config array.');
         }
 
@@ -45,7 +45,7 @@ 
     {
         $collectionKey = (new static)->collectionKey();
 
-        $names = (object) [
+        $names = (object)[
             'key'      => $collectionKey,
             'class'    => static::class,
             'singular' => ucfirst(str_singular($collectionKey)),
@@ -72,11 +72,11 @@ 
 
     public static function availableCollections(): Collection
     {
-        if(static::$availableCollections) return static::$availableCollections;
+        if (static::$availableCollections) return static::$availableCollections;
 
-        $mapping = config('thinktomorrow.chief.collections',[]);
+        $mapping = config('thinktomorrow.chief.collections', []);
 
-        $availableCollections = collect($mapping)->map(function($className){
+        $availableCollections = collect($mapping)->map(function($className) {
             return $className::collectionDetails();
         });
 

Braces +6 added lines, -2 removed lines

@@ -16,7 +16,9 @@ 
     public function collectionKey()
     {
         // Collection key is stored at db - if not we map it from our config
-        if($this->collection) return $this->collection;
+        if($this->collection) {
+            return $this->collection;
+        }
 
         $mapping = config('thinktomorrow.chief.collections',[]);
 
@@ -72,7 +74,9 @@ 
 
     public static function availableCollections(): Collection
     {
-        if(static::$availableCollections) return static::$availableCollections;
+        if(static::$availableCollections) {
+            return static::$availableCollections;
+        }
 
         $mapping = config('thinktomorrow.chief.collections',[]);
 

src/Pages/Console/GeneratePage.php

Spacing +17 added lines, -17 removed lines

@@ -36,11 +36,11 @@ 
 
         // Set required paths
         $this->dirs = ['base' => $this->settings['base_path'] ?? base_path()];
-        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'] . '/src';
-        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'] . '/resources/views';
-        $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'] . '/app/Http/Controllers';
+        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'].'/src';
+        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'].'/resources/views';
+        $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'].'/app/Http/Controllers';
 
-        $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'] . '/routes/web.php';
+        $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'].'/routes/web.php';
     }
 
     public function handle()
@@ -62,8 +62,8 @@ 
     private function publishModel()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/model.php.stub',
-            $to = $this->dirs['model'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/model.php.stub',
+            $to = $this->dirs['model'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'model'
         );
     }
@@ -71,8 +71,8 @@ 
     private function publishController()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/controller.php.stub',
-            $to = $this->dirs['controller'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/controller.php.stub',
+            $to = $this->dirs['controller'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'controller'
         );
     }
@@ -111,8 +111,8 @@ 
     private function modelTraits()
     {
         return [
-            '\\' . Publishable::class,
-            '\\' . Sortable::class,
+            '\\'.Publishable::class,
+            '\\'.Sortable::class,
             'q' => 'Proceed.',
         ];
     }
@@ -127,7 +127,7 @@ 
     protected function publishFile($from, $to, $type)
     {
         if ($this->filesystem->exists($to) && !$this->option('force')) {
-            if (!$this->confirm('File [' . $to . '] already exists? Overwrite this file?')) {
+            if (!$this->confirm('File ['.$to.'] already exists? Overwrite this file?')) {
                 return;
             }
         }
@@ -166,7 +166,7 @@ 
 
         $to = str_replace($this->dirs['base'], '', realpath($to));
 
-        $this->line('<info>Copied ' . $type . '</info> <comment>[' . $from . ']</comment> <info>To</info> <comment>[' . $to . ']</comment>');
+        $this->line('<info>Copied '.$type.'</info> <comment>['.$from.']</comment> <info>To</info> <comment>['.$to.']</comment>');
     }
 
     protected function replacePlaceholders($content)
@@ -185,16 +185,16 @@ 
     private function generateImportStatements(): string
     {
         return collect(['Illuminate\Database\Eloquent\Model'])
-            ->map(function ($statement) {
-                return 'use ' . $statement . ";\n    ";
+            ->map(function($statement) {
+                return 'use '.$statement.";\n    ";
             })->implode('');
     }
 
     private function generateTraitStatements(): string
     {
         return collect($this->chosenTraits)
-            ->map(function ($statement) {
-                return 'use ' . $statement . ";\n    ";
+            ->map(function($statement) {
+                return 'use '.$statement.";\n    ";
             })->implode('');
     }
 
@@ -213,6 +213,6 @@ 
 
         // We make an estimated guess based on the project name. At Think Tomorrow, we
         // have a src folder which is PSR-4 namespaced by the project name itself.
-        return ucfirst(config('thinktomorrow.chief.name', 'App')).'\\'. ucfirst($this->plural);
+        return ucfirst(config('thinktomorrow.chief.name', 'App')).'\\'.ucfirst($this->plural);
     }
 }

database/migrations/2017_07_13_112256_create_pages_table.php

Spacing +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@ 
      */
     public function up()
     {
-        Schema::create('pages', function (Blueprint $table) {
+        Schema::create('pages', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('collection',32)->index()->default('statics');
+            $table->string('collection', 32)->index()->default('statics');
             $table->boolean('published')->default(false);
             $table->boolean('featured')->default(false);
             $table->timestamp('archived_at')->default(null)->nullable();
@@ -24,7 +24,7 @@ 
             $table->softDeletes();
         });
 
-        Schema::create('page_translations', function (Blueprint $table) {
+        Schema::create('page_translations', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('page_id')->unsigned();
             $table->string('locale');

app/routes.php

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
  * SPIRIT ROUTES
  * -----------------------------------------------------------------
  */
-Route::get('spirit/{section?}/{item?}', ['as' => 'spirit.index', 'uses' => function ($section = null, $item = null) {
+Route::get('spirit/{section?}/{item?}', ['as' => 'spirit.index', 'uses' => function($section = null, $item = null) {
     if ($section && $item && view()->exists('chief::spirit.'.$section.'.'.$item)) {
         return view('chief::spirit.'.$section.'.'.$item);
     }
@@ -38,7 +38,7 @@ 
  * ADMIN ROUTES
  * -----------------------------------------------------------------
  */
-Route::group(['prefix' => 'admin','middleware' => ['web', 'web-chief', 'auth:chief']], function () {
+Route::group(['prefix' => 'admin', 'middleware' => ['web', 'web-chief', 'auth:chief']], function() {
     Route::get('logout', 'Thinktomorrow\Chief\App\Http\Controllers\Auth\LoginController@logout')->name('chief.back.logout');
 
     Route::get('/', 'Thinktomorrow\Chief\App\Http\Controllers\Back\DashboardController@show')->name('chief.back.dashboard');
@@ -49,16 +49,16 @@ 
     Route::put('password-prompt', 'Thinktomorrow\Chief\App\Http\Controllers\Auth\ChangePasswordController@update')->name('chief.back.password.update');
 
     // Pages
-    Route::get('pages/{collection}','Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@index')->name('chief.back.pages.index');
+    Route::get('pages/{collection}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@index')->name('chief.back.pages.index');
     Route::post('pages/{collection}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@store')->name('chief.back.pages.store');
     Route::get('pages/{collection}/create', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@create')->name('chief.back.pages.create');
     Route::put('pages/{id}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@update')->name('chief.back.pages.update');
-    Route::get('pages/{id}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@show')->name('chief.back.pages.show')->where('id','[0-9]+');
+    Route::get('pages/{id}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@show')->name('chief.back.pages.show')->where('id', '[0-9]+');
     Route::get('pages/{id}/edit', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@edit')->name('chief.back.pages.edit');
     Route::delete('pages/{id}', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@destroy')->name('chief.back.pages.destroy');
 
     // TODO: publish routing - below route does not work yet...
-    Route::post('pages/publish','Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@publish')->name('chief.back.pages.publish');
+    Route::post('pages/publish', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@publish')->name('chief.back.pages.publish');
 
     Route::get('media', 'Thinktomorrow\Chief\App\Http\Controllers\Back\MediaLibraryController@library')->name('media.library');
     Route::get('media-modal', 'Thinktomorrow\Chief\App\Http\Controllers\Back\MediaLibraryController@mediaModal')->name('media.modal');
@@ -69,9 +69,9 @@ 
 
     Route::post('page/{id}/upload', 'Thinktomorrow\Chief\App\Http\Controllers\Back\PagesController@upload')->name('page.upload');
 
-    Route::get('/settings', ['as' => 'chief.back.settings.index','uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\System\SettingsController::class.'@show']);
+    Route::get('/settings', ['as' => 'chief.back.settings.index', 'uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\System\SettingsController::class.'@show']);
 
-    Route::post('notes/publish', ['as' => 'notes.publish','uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\NoteController::class.'@publish']);
+    Route::post('notes/publish', ['as' => 'notes.publish', 'uses' => Thinktomorrow\Chief\App\Http\Controllers\Back\NoteController::class.'@publish']);
     Route::resource('notes', Thinktomorrow\Chief\App\Http\Controllers\Back\NoteController::class);
 
     // YOUR PROFILE MANAGEMENT
@@ -121,14 +121,14 @@ 
      * -----------------------------------------------------------------
      */
     // Developer access
-    Route::get('translations/lines/create', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.create','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@create']);
-    Route::delete('translations/lines/{id}', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.destroy','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@destroy']);
-    Route::get('translations/lines/{id}/edit', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.edit','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@edit']);
-    Route::put('translations/lines/{id}', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.update','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@update']);
-    Route::post('translations/lines', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.store','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@store']);
+    Route::get('translations/lines/create', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.create', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@create']);
+    Route::delete('translations/lines/{id}', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.destroy', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@destroy']);
+    Route::get('translations/lines/{id}/edit', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.edit', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@edit']);
+    Route::put('translations/lines/{id}', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.update', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@update']);
+    Route::post('translations/lines', ['middleware' => 'auth.superadmin', 'as' => 'squanto.lines.store', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\LineController@store']);
 
     // Client access
-    Route::get('translations/{id}/edit', ['as' => 'squanto.edit','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@edit']);
-    Route::put('translations/{id}', ['as' => 'squanto.update','uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@update']);
-    Route::get('translations', ['as' => 'squanto.index','uses' => 'Thinktomorrow\Chief\App\Http\Controllers\Back\TranslationController@index']);
+    Route::get('translations/{id}/edit', ['as' => 'squanto.edit', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@edit']);
+    Route::put('translations/{id}', ['as' => 'squanto.update', 'uses' => '\Thinktomorrow\Squanto\Manager\Http\Controllers\TranslationController@update']);
+    Route::get('translations', ['as' => 'squanto.index', 'uses' => 'Thinktomorrow\Chief\App\Http\Controllers\Back\TranslationController@index']);
 });

app/Http/Controllers/Back/PagesController.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
     {
         $page = app(CreatePage::class)->handle($collection, $request->trans);
 
-        return redirect()->route('chief.back.pages.index',$page->collectionKey())->with('messages.success', $page->title . ' is aangemaakt');
+        return redirect()->route('chief.back.pages.index', $page->collectionKey())->with('messages.success', $page->title.' is aangemaakt');
     }
 
     /**
@@ -88,7 +88,7 @@ 
     {
         $page = app(UpdatePage::class)->handle($id, $request->trans, $request->relations);
 
-        return redirect()->route('chief.back.pages.index', $page->collectionKey())->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "' . $page->title . '" werd aangepast');
+        return redirect()->route('chief.back.pages.index', $page->collectionKey())->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "'.$page->title.'" werd aangepast');
     }
 
     /**