arbory / arbory

src/Admin/Grid/Column.php

Spacing +31 added lines, -31 removed lines

@@ -61,7 +61,7 @@ 
      * @param string $name
      * @param string $label
      */
-    public function __construct( $name = null, $label = null )
+    public function __construct($name = null, $label = null)
     {
         $this->name = $name;
         $this->label = $label;
@@ -95,7 +95,7 @@ 
      * @param Grid $grid
      * @return Column
      */
-    public function setGrid( Grid $grid )
+    public function setGrid(Grid $grid)
     {
         $this->grid = $grid;
 
@@ -106,7 +106,7 @@ 
      * @param Closure $callable
      * @return Column
      */
-    public function display( Closure $callable )
+    public function display(Closure $callable)
     {
         $this->displayer = $callable;
 
@@ -117,7 +117,7 @@ 
      * @param bool $isSortable
      * @return Column
      */
-    public function sortable( $isSortable = true )
+    public function sortable($isSortable = true)
     {
         $this->sortable = $isSortable;
 
@@ -128,7 +128,7 @@ 
      * @param bool $isSearchable
      * @return Column
      */
-    public function searchable( $isSearchable = true )
+    public function searchable($isSearchable = true)
     {
         $this->searchable = $isSearchable;
 
@@ -140,7 +140,7 @@ 
      */
     public function isSortable()
     {
-        return $this->sortable && empty( $this->relationName );
+        return $this->sortable && empty($this->relationName);
     }
 
     /**
@@ -156,79 +156,79 @@ 
      * @param $string
      * @return QueryBuilder
      */
-    public function searchConditions( QueryBuilder $query, $string )
+    public function searchConditions(QueryBuilder $query, $string)
     {
-        if( $this->relationName )
+        if ($this->relationName)
         {
-            return $query->orWhereHas( $this->relationName, function( QueryBuilder $query ) use ( $string )
+            return $query->orWhereHas($this->relationName, function(QueryBuilder $query) use ($string)
             {
-                $query->where( $this->relationColumn, 'like', "%$string%" );
+                $query->where($this->relationColumn, 'like', "%$string%");
             } );
         }
 
-        return $query->where( $this->getName(), 'like', "%$string%", 'OR' );
+        return $query->where($this->getName(), 'like', "%$string%", 'OR');
     }
 
     /**
      * @param Model $model
      * @return mixed
      */
-    protected function getValue( Model $model )
+    protected function getValue(Model $model)
     {
-        if( $this->relationName )
+        if ($this->relationName)
         {
-            if ( $this->relationName === 'translations' )
+            if ($this->relationName === 'translations')
             {
-                $translation = $model->getTranslation( null, true );
+                $translation = $model->getTranslation(null, true);
 
-                if ( !$translation )
+                if (!$translation)
                 {
                     return null;
                 }
 
-                return $translation->getAttribute( $this->relationColumn );
+                return $translation->getAttribute($this->relationColumn);
             }
 
-            $relation = $model->getAttribute( $this->relationName );
+            $relation = $model->getAttribute($this->relationName);
 
-            return ( $relation instanceof Relation )
-                ? $relation->getAttribute( $this->relationColumn )
+            return ($relation instanceof Relation)
+                ? $relation->getAttribute($this->relationColumn)
                 : $relation;
         }
 
-        return $model->getAttribute( $this->getName() );
+        return $model->getAttribute($this->getName());
     }
 
     /**
      * @param Model $model
      * @return Element
      */
-    public function callDisplayCallback( Model $model )
+    public function callDisplayCallback(Model $model)
     {
-        $value = $this->getValue( $model );
+        $value = $this->getValue($model);
 
-        if( $this->displayer === null )
+        if ($this->displayer === null)
         {
             $value = (string) $value;
 
-            if( $this->grid->hasTool( 'create' ) )
+            if ($this->grid->hasTool('create'))
             {
-                return Html::link( $value )->addAttributes( [
-                    'href' => $this->grid->getModule()->url( 'edit', [ $model->getKey() ] )
-                ] );
+                return Html::link($value)->addAttributes([
+                    'href' => $this->grid->getModule()->url('edit', [ $model->getKey() ])
+                ]);
             }
 
-            return Html::span( $value );
+            return Html::span($value);
         }
 
-        return call_user_func_array( $this->displayer, [ $value, $this, $model ] );
+        return call_user_func_array($this->displayer, [ $value, $this, $model ]);
     }
 
     /**
      * @param $relationName
      * @param $relationColumn
      */
-    public function setRelation( $relationName, $relationColumn )
+    public function setRelation($relationName, $relationColumn)
     {
         $this->relationName = $relationName;
         $this->relationColumn = $relationColumn;

src/Http/Controllers/Admin/UsersController.php

Spacing +39 added lines, -39 removed lines

@@ -37,61 +37,61 @@ 
      * @return Form
      * @throws \InvalidArgumentException
      */
-    protected function form( Model $model )
+    protected function form(Model $model)
     {
-        $form = $this->module()->form( $model, function ( Form $form ) use ( $model )
+        $form = $this->module()->form($model, function(Form $form) use ($model)
         {
-            $form->addField( new Text( 'first_name' ) )->rules('required');
-            $form->addField( new Text( 'last_name' ) )->rules('required');
-            $form->addField( new Text( 'email' ) )->rules('required|unique:admin_users,email,' . $model->getKey());
-            $form->addField( new Password( 'password' ) )->rules('min:6|' . ( $model->exists ? 'nullable' : 'required' ));
-            $form->addField( new Boolean( 'active' ) )->setValue( Activation::completed( $model ) );
-            $form->addField( new BelongsToMany( 'roles' ) );
+            $form->addField(new Text('first_name'))->rules('required');
+            $form->addField(new Text('last_name'))->rules('required');
+            $form->addField(new Text('email'))->rules('required|unique:admin_users,email,' . $model->getKey());
+            $form->addField(new Password('password'))->rules('min:6|' . ($model->exists ? 'nullable' : 'required'));
+            $form->addField(new Boolean('active'))->setValue(Activation::completed($model));
+            $form->addField(new BelongsToMany('roles'));
         } );
 
-        $form->on( 'delete.before', function ( Form $form )
+        $form->on('delete.before', function(Form $form)
         {
-            if( Sentinel::getUser()->getKey() === $form->getModel()->getKey() )
+            if (Sentinel::getUser()->getKey() === $form->getModel()->getKey())
             {
-                throw new \InvalidArgumentException( 'You cannot remove yourself!' );
+                throw new \InvalidArgumentException('You cannot remove yourself!');
             }
         } );
 
-        $form->addEventListener('create.before', function() use ( $model )
+        $form->addEventListener('create.before', function() use ($model)
         {
-            unset( $model->active );
+            unset($model->active);
         } );
 
-        $form->addEventListener( 'update.before', function( Request $request ) use ( $model )
+        $form->addEventListener('update.before', function(Request $request) use ($model)
         {
-            if( $model->exists && !$request->has( 'resource.password' ) )
+            if ($model->exists && !$request->has('resource.password'))
             {
-                $parameters = $request->except( [ 'resource.password' ] );
+                $parameters = $request->except([ 'resource.password' ]);
 
-                $request->request->replace( $parameters );
+                $request->request->replace($parameters);
             }
         } );
 
-        $form->addEventListeners( [ 'update.before', 'create.after' ], function( Request $request ) use ( $model )
+        $form->addEventListeners([ 'update.before', 'create.after' ], function(Request $request) use ($model)
         {
-            unset( $model->active );
+            unset($model->active);
 
-            $active = $request->input( 'resource.active' );
+            $active = $request->input('resource.active');
 
-            if( $active && Activation::completed( $model ) )
+            if ($active && Activation::completed($model))
             {
                 return;
             }
 
-            if( $active )
+            if ($active)
             {
-                $activation = Activation::create( $model );
+                $activation = Activation::create($model);
 
-                Activation::complete( $model, array_get( $activation, 'code' ) );
+                Activation::complete($model, array_get($activation, 'code'));
             }
             else
             {
-                Activation::remove( $model );
+                Activation::remove($model);
             }
         } );
 
@@ -103,33 +103,33 @@ 
      */
     public function grid()
     {
-        return $this->module()->grid( $this->resource(), function ( Grid $grid )
+        return $this->module()->grid($this->resource(), function(Grid $grid)
         {
-            $grid->column( 'email', 'avatar' )
-                ->display( function ( $value )
+            $grid->column('email', 'avatar')
+                ->display(function($value)
                 {
                     return Html::span(
-                        Html::image()->addAttributes( [
-                            'src' => '//www.gravatar.com/avatar/' . md5( $value ) . '?d=retro',
+                        Html::image()->addAttributes([
+                            'src' => '//www.gravatar.com/avatar/' . md5($value) . '?d=retro',
                             'width' => 32,
                             'alt' => $value,
-                        ] )
+                        ])
                     );
                 } );
-            $grid->column( 'email' )->sortable();
-            $grid->column( 'first_name' );
-            $grid->column( 'last_name' );
-            $grid->column( 'roles.name' )
-                ->display( function( Collection $value )
+            $grid->column('email')->sortable();
+            $grid->column('first_name');
+            $grid->column('last_name');
+            $grid->column('roles.name')
+                ->display(function(Collection $value)
                 {
                     return Html::ul(
-                        $value->map( function( $role )
+                        $value->map(function($role)
                         {
-                            return Html::li( (string) $role );
+                            return Html::li((string) $role);
                         } )->toArray()
                     );
                 } );
-            $grid->column( 'last_login' );
+            $grid->column('last_login');
         } );
     }