Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/fix travis build fails #92

Open
wants to merge 12 commits into
base: staging
Choose a base branch
from
15 changes: 14 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
sudo: false
sudo: enabled

language: php

php:
- 7.1

before_script:
- cp api/.env.example api/.env
- cd api
- composer install --prefer-source --no-interaction --dev

script:
- composer test

services:
- postgresql
4 changes: 2 additions & 2 deletions api/app/Audit.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

class Audit extends Model
{
protected $table = 'audits';
protected $table = 'audits';

/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
protected $fillable = [
'description', 'old_value', 'new_value', 'user_id',
];
}
10 changes: 5 additions & 5 deletions api/app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Kernel extends ConsoleKernel
*
* @var array
*/
protected $commands = [
protected $commands = [
//
];

Expand All @@ -22,8 +22,8 @@ class Kernel extends ConsoleKernel
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @return void
*/
protected function schedule(Schedule $schedule)
{
//
}
protected function schedule(Schedule $schedule)
{
//
}
}
12 changes: 6 additions & 6 deletions api/app/Departament.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ class Departament extends Model
use SoftDeletes;

// set custom table name
protected $table = 'departamente';
protected $table = 'departamente';

/**
* The attributes that should be mutated to dates.
*
* @var array
*/
protected $dates = ['deleted_at'];
protected $dates = ['deleted_at'];

/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
protected $fillable = [
'nume', 'descriere', 'adresa', 'cod_postal', 'localitate', 'judet', 'telefon',
];

/**
* Get the unitati that is owened by the departament.
*/
public function unitati() {
return $this -> hasMany(Unitate::class);
}
public function unitati() {
return $this -> hasMany(Unitate::class);
}
}
8 changes: 4 additions & 4 deletions api/app/Events/ExampleEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ class ExampleEvent extends Event
*
* @return void
*/
public function __construct()
{
//
}
public function __construct()
{
//
}
}
22 changes: 11 additions & 11 deletions api/app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Handler extends ExceptionHandler
*
* @var array
*/
protected $dontReport = [
protected $dontReport = [
AuthorizationException::class,
HttpException::class,
ModelNotFoundException::class,
Expand All @@ -31,13 +31,13 @@ class Handler extends ExceptionHandler
* @param \Exception $e
* @return void
*/
public function report(Exception $e)
{
if (app()->bound('sentry') && $this->shouldReport($e)) {
app('sentry')->captureException($e);
}
parent::report($e);
public function report(Exception $e)
{
if (app()->bound('sentry') && $this->shouldReport($e)) {
app('sentry')->captureException($e);
}
parent::report($e);
}

/**
* Render an exception into an HTTP response.
Expand All @@ -46,8 +46,8 @@ public function report(Exception $e)
* @param \Exception $e
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
{
return parent::render($request, $e);
}
public function render($request, Exception $e)
{
return parent::render($request, $e);
}
}
Loading