dsd-meetme / backend

app/Console/Commands/Optimise/OptimiseException.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 07/12/15
- * Time: 21.24
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 07/12/15
+     * Time: 21.24
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\Optimise;
 

app/Events/Optimise/OkEvent.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public function broadcastOn()
     {
-        return [];
+        return [ ];
     }
 }

app/Events/Optimise/ErrorEvent.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public function broadcastOn()
     {
-        return [];
+        return [ ];
     }
 }

app/Company.php

Spacing +9 added lines, -9 removed lines

@@ -48,14 +48,14 @@ 
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = [ 'name', 'email', 'password' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token'];
+    protected $hidden = [ 'password', 'remember_token' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -120,8 +120,8 @@ 
             ->where('calendars.enabled', '=', '1')
             ->where('timeslots.time_start', '>=', $from)
             ->where('timeslots.time_end', '<=', $to)
-            ->where('employees.company_id','=', $this->id)
-            ->select('employees.id','timeslots.time_start','timeslots.time_end')
+            ->where('employees.company_id', '=', $this->id)
+            ->select('employees.id', 'timeslots.time_start', 'timeslots.time_end')
             ->get();
     }
 
@@ -137,9 +137,9 @@ 
             ->join('meeting_timeslots', 'meetings.id', '=', 'meeting_timeslots.meeting_id')
             ->where('meeting_timeslots.time_start', '>=', $from)
             ->where('meeting_timeslots.time_end', '<=', $to)
-            ->where('groups.company_id','=', $this->id)
-            ->where('meetings.start_time','=', NULL)
-            ->select('meetings.id', 'meetings.duration','meeting_timeslots.time_start','meeting_timeslots.time_end')
+            ->where('groups.company_id', '=', $this->id)
+            ->where('meetings.start_time', '=', NULL)
+            ->select('meetings.id', 'meetings.duration', 'meeting_timeslots.time_start', 'meeting_timeslots.time_end')
             ->get();
     }
 
@@ -151,8 +151,8 @@ 
             ->join('employees', 'employee_group.employee_id', '=', 'employees.id')
             ->whereIn('employees.id', $users)
             ->whereIn('meetings.id', $meetings)
-            ->where('groups.company_id','=', $this->id) //this is not needed
-            ->where('employees.company_id','=', $this->id) //this is not needed
+            ->where('groups.company_id', '=', $this->id) //this is not needed
+            ->where('employees.company_id', '=', $this->id) //this is not needed
             ->select('employees.id as employee_id', 'meetings.id as meeting_id')
             ->get();
     }

app/Console/Commands/Optimise/Path.php

Spacing +5 added lines, -5 removed lines

@@ -76,11 +76,11 @@ 
     {
         $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure
         unlink($path->getPath()); //remove file to create a dir
-        if(file_exists($path->getPath()))
+        if (file_exists($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if(!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if(! is_dir($path->getPath()))
+        if (!@mkdir($path->getPath()))
+            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ;
+        if (!is_dir($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
         return $path;
     }
@@ -91,7 +91,7 @@ 
      * @return bool
      */
     private static function delTree($dir) {
-        $files = array_diff(scandir($dir), array('.','..'));
+        $files = array_diff(scandir($dir), array('.', '..'));
         foreach ($files as $file) {
             (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
         }

Braces +13 added lines, -8 removed lines

@@ -48,8 +48,9 @@ 
      */
     public function __destruct()
     {
-        if ($this->path && is_dir($this->path) && !self::delTree($this->path))
-            throw new OptimiseException('problems during removing of path directory');
+        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) {
+                    throw new OptimiseException('problems during removing of path directory');
+        }
     }
 
     /**
@@ -76,12 +77,16 @@ 
     {
         $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure
         unlink($path->getPath()); //remove file to create a dir
-        if(file_exists($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if(!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if(! is_dir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        if(file_exists($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
+        }
+        if(!@mkdir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');
+        }
+        ;
+        if(! is_dir($path->getPath())) {
+                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        }
         return $path;
     }
 

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 18/12/15
- * Time: 15.20
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 18/12/15
+     * Time: 15.20
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\Optimise;
 

app/Http/Middleware/GetUserAndRefresh.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 24/12/15
- * Time: 22.53
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 24/12/15
+     * Time: 22.53
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Http\Middleware;
 

Spacing +3 added lines, -3 removed lines

@@ -25,15 +25,15 @@
     public function handle($request, \Closure $next, $custom = '')
     {
         $remember = false;
-        if($this->auth->setRequest($request)->getToken() && ($remember = $this->auth->getPayload()->get('remember')) &&
-                $remember == 'true'){
+        if ($this->auth->setRequest($request)->getToken() && ($remember = $this->auth->getPayload()->get('remember')) &&
+                $remember == 'true') {
             JWTFactory::setTTL(43200);
             //config(['jwt.ttl' =>'43200']); //30 days
         }
 
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
         //overhead
-        $custom = $custom.';remember-'.$remember=='true'?'true':'false';
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
         return parent::handle($request, $next, $custom);
     }
 

app/Http/Kernel.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
         'auth' => \plunner\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class,
-        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
+        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
     ];
 }

app/Http/Controllers/Companies/Company/CompanyController.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
         $this->middleware('jwt.authandrefresh:mode-cn');
     }
 
@@ -36,7 +36,7 @@ 
     public function update(CompanyRequest $request)
     {
         $company = \Auth::user();
-        $input = $request->only(['name', 'password']);
+        $input = $request->only([ 'name', 'password' ]);
         $company->update($input);
         return $company;
     }

app/Http/routes.php

Spacing +34 added lines, -34 removed lines

@@ -18,41 +18,41 @@ 
 /**
  * Companies
  */
-Route::group(['namespace' => 'Companies', 'prefix' => 'companies'], function() {
+Route::group([ 'namespace' => 'Companies', 'prefix' => 'companies' ], function() {
 
     //\Auth
 
-    Route::group(['namespace' => 'Auth'], function() {
-        Route::group(['prefix' => 'auth'], function () {
+    Route::group([ 'namespace' => 'Auth' ], function() {
+        Route::group([ 'prefix' => 'auth' ], function() {
             // Authentication routes...
-            Route::post('login', ['as' => 'companies.auth.login','uses'=>'AuthController@postLogin']);
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]);
 
             // Registration routes...
-            Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']);
+            Route::post('register', [ 'as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister' ]);
 
         });
 
-        Route::group(['prefix' => 'password'], function () {
+        Route::group([ 'prefix' => 'password' ], function() {
             // Password reset link request routes...
-            Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']);
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]);
 
             // Password reset routes...
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']);
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]);
         });
     });
 
-    Route::group(['namespace' => 'Employees'], function() {
-        Route::resource('employees', 'EmployeesController', ['except' => ['create', 'edit']]);
+    Route::group([ 'namespace' => 'Employees' ], function() {
+        Route::resource('employees', 'EmployeesController', [ 'except' => [ 'create', 'edit' ] ]);
     });
 
-    Route::group(['namespace' => 'Groups'], function() {
-        Route::resource('groups', 'GroupsController', ['except' => ['create', 'edit']]);
-        Route::resource('groups.employees', 'EmployeesController', ['only' => ['store', 'index', 'destroy']]);
+    Route::group([ 'namespace' => 'Groups' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::resource('groups.employees', 'EmployeesController', [ 'only' => [ 'store', 'index', 'destroy' ] ]);
     });
 
-    Route::group(['namespace' => 'Company', 'prefix' => 'company'], function() {
-        Route::get('/', ['as' => 'companies.company.index', 'uses' => 'CompanyController@index']);
-        Route::put('/', ['as' => 'companies.company.update', 'uses' => 'CompanyController@update']);
+    Route::group([ 'namespace' => 'Company', 'prefix' => 'company' ], function() {
+        Route::get('/', [ 'as' => 'companies.company.index', 'uses' => 'CompanyController@index' ]);
+        Route::put('/', [ 'as' => 'companies.company.update', 'uses' => 'CompanyController@update' ]);
     });
 });
 
@@ -60,44 +60,44 @@ 
 /**
  * Employees
  */
-Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function() {
+Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() {
 
     //\Auth
-    Route::group(['namespace' => 'Auth'], function() {
-        Route::group(['prefix' => 'auth'], function () {
+    Route::group([ 'namespace' => 'Auth' ], function() {
+        Route::group([ 'prefix' => 'auth' ], function() {
             // Authentication routes...
-            Route::post('login', ['as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin']);
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses'=>'AuthController@postLogin' ]);
 
             // Registration routes...
             //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company
 
         });
 
-        Route::group(['prefix' => 'password'], function () {
+        Route::group([ 'prefix' => 'password' ], function() {
             // Password reset link request routes...
-            Route::post('email', ['as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail']);
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses'=>'PasswordController@postEmail' ]);
 
             // Password reset routes...
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']);
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset' ]);
         });
     });
 
-    Route::group(['namespace' => 'Calendars'], function() {
-        Route::resource('calendars', 'CalendarsController', ['except' => ['create', 'edit']]);
-        Route::post('calendars/caldav', ['as' => 'employees.calendars.caldav','uses'=>'CalendarsController@storeCaldav']);
-        Route::post('calendars/calendars', ['as' => 'employees.calendars.calendars','uses'=>'CalendarsController@getCalendars']); //TODO it's correct post? or not
+    Route::group([ 'namespace' => 'Calendars' ], function() {
+        Route::resource('calendars', 'CalendarsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::post('calendars/caldav', [ 'as' => 'employees.calendars.caldav', 'uses'=>'CalendarsController@storeCaldav' ]);
+        Route::post('calendars/calendars', [ 'as' => 'employees.calendars.calendars', 'uses'=>'CalendarsController@getCalendars' ]); //TODO it's correct post? or not
     });
 
-    Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function() {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
-    Route::group(['namespace' => 'Groups'], function() {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Groups' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
-    Route::group(['namespace' => 'Employee', 'prefix' => 'employee'], function() {
-        Route::get('/', ['as' => 'employees.employee.index', 'uses' => 'EmployeeController@index']);
-        Route::put('/', ['as' => 'employees.employee.update', 'uses' => 'EmployeeController@update']);
+    Route::group([ 'namespace' => 'Employee', 'prefix' => 'employee' ], function() {
+        Route::get('/', [ 'as' => 'employees.employee.index', 'uses' => 'EmployeeController@index' ]);
+        Route::put('/', [ 'as' => 'employees.employee.update', 'uses' => 'EmployeeController@update' ]);
     });
 });
\ No newline at end of file