ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates Laravel to 5.2

This commit is contained in:
James Campbell 2016-03-29 20:30:02 -04:00
parent 310521fff8
commit 9ffd1197e2
14 changed files with 941 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/Exceptions/Handler.php
View File

@ -3,8 +3,11 @@
namespace App\Exceptions;
use Exception;
use Illuminate\Validation\ValidationException;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Request;
//use Bugsnag\BugsnagLaravel\BugsnagExceptionHandler as ExceptionHandler;
@ -16,7 +19,10 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
'Symfony\Component\HttpKernel\Exception\HttpException',
AuthorizationException::class,
HttpException::class,
ModelNotFoundException::class,
ValidationException::class,
];
/**
@ -24,55 +30,23 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
*
* @param \Exception $e
* @return void
*/
public function report(Exception $e)
{
return parent::report($e);
parent::report($e);
}
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
{
if ($this->isHttpException($e)) {
return $this->renderHttpException($e);
}
if (config('app.debug')) {
return $this->renderExceptionWithWhoops($e);
}
return parent::render($request, $e);
}
/**
* Render an exception using Whoops.
*
* @param \Exception $e
*
* @return \Illuminate\Http\Response
*/
protected function renderExceptionWithWhoops(Exception $e)
{
$whoops = new \Whoops\Run();
if (Request::ajax()) {
$whoops->pushHandler(new \Whoops\Handler\JsonResponseHandler());
} else {
$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler());
}
return new \Illuminate\Http\Response(
$whoops->handleException($e), $e->getStatusCode(), $e->getHeaders()
);
}
}

31
app/Providers/AuthServiceProvider.php Normal file
View File

@ -0,0 +1,31 @@
<?php
namespace App\Providers;
use Illuminate\Contracts\Auth\Access\Gate as GateContract;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider
{
/**
* The policy mappings for the application.
*
* @var array
*/
protected $policies = [
'App\Model' => 'App\Policies\ModelPolicy',
];
/**
* Register any application authentication / authorization services.
*
* @param \Illuminate\Contracts\Auth\Access\Gate $gate
* @return void
*/
public function boot(GateContract $gate)
{
$this->registerPolicies($gate);
//
}
}

6
composer.json
View File

@ -6,7 +6,7 @@
"type": "project",
"homepage" : "https://www.attendize.com",
"require": {
"laravel/framework": "5.1.20",
"laravel/framework": "5.2.*",
"illuminate/html": "~5.0",
"milon/barcode": "dev-master",
"iron-io/iron_mq": "2.*",
@ -31,7 +31,9 @@
"require-dev": {
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1",
"fzaninotto/faker": "^1.5"
"fzaninotto/faker": "^1.5",
"symfony/dom-crawler": "~3.0",
"symfony/css-selector": "~3.0"
},
"autoload": {

1016
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

209
config/app.php
View File

@ -3,107 +3,133 @@
return [
/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/
|--------------------------------------------------------------------------
| Application Environment
|--------------------------------------------------------------------------
|
| This value determines the "environment" your application is currently
| running in. This may determine how you prefer to configure various
| services your application utilizes. Set this in your ".env" file.
|
*/
'env' => env('APP_ENV', 'production'),
/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/
'debug' => env('APP_DEBUG', false),
/*
|--------------------------------------------------------------------------
| Application URL
|--------------------------------------------------------------------------
|
| This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of
| your application so that it is used when running Artisan tasks.
|
*/
|--------------------------------------------------------------------------
| Application URL
|--------------------------------------------------------------------------
|
| This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of
| your application so that it is used when running Artisan tasks.
|
*/
'url' => env('APP_URL'),
/*
|--------------------------------------------------------------------------
| Application Timezone
|--------------------------------------------------------------------------
|
| Here you may specify the default timezone for your application, which
| will be used by the PHP date and date-time functions. We have gone
| ahead and set this to a sensible default for you out of the box.
|
*/
|--------------------------------------------------------------------------
| Application Timezone
|--------------------------------------------------------------------------
|
| Here you may specify the default timezone for your application, which
| will be used by the PHP date and date-time functions. We have gone
| ahead and set this to a sensible default for you out of the box.
|
*/
'timezone' => 'UTC',
/*
|--------------------------------------------------------------------------
| Application Locale Configuration
|--------------------------------------------------------------------------
|
| The application locale determines the default locale that will be used
| by the translation service provider. You are free to set this value
| to any of the locales which will be supported by the application.
|
*/
|--------------------------------------------------------------------------
| Application Locale Configuration
|--------------------------------------------------------------------------
|
| The application locale determines the default locale that will be used
| by the translation service provider. You are free to set this value
| to any of the locales which will be supported by the application.
|
*/
'locale' => 'en',
/*
|--------------------------------------------------------------------------
| Application Fallback Locale
|--------------------------------------------------------------------------
|
| The fallback locale determines the locale to use when the current one
| is not available. You may change the value to correspond to any of
| the language folders that are provided through your application.
|
*/
|--------------------------------------------------------------------------
| Application Fallback Locale
|--------------------------------------------------------------------------
|
| The fallback locale determines the locale to use when the current one
| is not available. You may change the value to correspond to any of
| the language folders that are provided through your application.
|
*/
'fallback_locale' => 'en',
/*
|--------------------------------------------------------------------------
| Encryption Key
|--------------------------------------------------------------------------
|
| This key is used by the Illuminate encrypter service and should be set
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
|
*/
|--------------------------------------------------------------------------
| Encryption Key
|--------------------------------------------------------------------------
|
| This key is used by the Illuminate encrypter service and should be set
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
|
*/
'key' => env('APP_KEY', 'SomeRandomString'),
'cipher' => MCRYPT_RIJNDAEL_128,
/*
|--------------------------------------------------------------------------
| Logging Configuration
|--------------------------------------------------------------------------
|
| Here you may configure the log settings for your application. Out of
| the box, Laravel uses the Monolog PHP logging library. This gives
| you a variety of powerful log handlers / formatters to utilize.
|
| Available Settings: "single", "daily", "syslog", "errorlog"
|
*/
|--------------------------------------------------------------------------
| Logging Configuration
|--------------------------------------------------------------------------
|
| Here you may configure the log settings for your application. Out of
| the box, Laravel uses the Monolog PHP logging library. This gives
| you a variety of powerful log handlers / formatters to utilize.
|
| Available Settings: "single", "daily", "syslog", "errorlog"
|
*/
'log' => 'daily',
/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
|--------------------------------------------------------------------------
|
| The service providers listed here will be automatically loaded on the
| request to your application. Feel free to add your own services to
| this array to grant expanded functionality to your applications.
|
*/
|--------------------------------------------------------------------------
| Autoloaded Service Providers
|--------------------------------------------------------------------------
|
| The service providers listed here will be automatically loaded on the
| request to your application. Feel free to add your own services to
| this array to grant expanded functionality to your applications.
|
*/
'providers' => [
/*
* Laravel Framework Service Providers...
*/
Illuminate\Foundation\Providers\ArtisanServiceProvider::class,
* Laravel Framework Service Providers...
*/
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
Illuminate\Bus\BusServiceProvider::class,
Illuminate\Cache\CacheServiceProvider::class,
Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
Illuminate\Routing\ControllerServiceProvider::class,
Illuminate\Cookie\CookieServiceProvider::class,
Illuminate\Database\DatabaseServiceProvider::class,
Illuminate\Encryption\EncryptionServiceProvider::class,
@ -120,19 +146,14 @@ return [
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
Illuminate\Html\HtmlServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
/*
* Application Service Providers...
*/
App\Providers\AppServiceProvider::class,
App\Providers\BusServiceProvider::class,
App\Providers\ConfigServiceProvider::class,
App\Providers\AuthServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\HelpersServiceProvider::class,
/*
* Third Party Service Providers...
@ -147,16 +168,18 @@ return [
MaxHoffmann\Parsedown\ParsedownServiceProvider::class,
Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
],
/*
|--------------------------------------------------------------------------
| Class Aliases
|--------------------------------------------------------------------------
|
| This array of class aliases will be registered when this application
| is started. However, feel free to register as many as you wish as
| the aliases are "lazy" loaded so they don't hinder performance.
|
*/
|--------------------------------------------------------------------------
| Class Aliases
|--------------------------------------------------------------------------
|
| This array of class aliases will be registered when this application
| is started. However, feel free to register as many as you wish as
| the aliases are "lazy" loaded so they don't hinder performance.
|
*/
'aliases' => [
'App' => Illuminate\Support\Facades\App::class,

6
config/attendize.php
View File

@ -2,6 +2,8 @@
return [
'ticket_status_sold_out' => 1,
'ticket_status_after_sale_date' => 2,//
'enable_test_payments' => env('ENABLE_TEST_PAYMENTS', false),
'payment_gateway_stripe' => 1,
@ -24,10 +26,8 @@ return [
'fallback_organiser_logo_url' => '/assets/images/logo-100x100-lightBg.png',
'cdn_url' => '',
'checkout_timeout_after' => app()->environment('local', 'development') ? 30 : 8, #mintutes
'checkout_timeout_after' => env('CHECKOUT_TIMEOUT_AFTER', 30), #minutes
'ticket_status_sold_out' => 1,
'ticket_status_after_sale_date' => 2,
'ticket_status_before_sale_date' => 3,
'ticket_status_on_sale' => 4,
'ticket_status_off_sale' => 5,

114
config/auth.php
View File

@ -4,64 +4,104 @@ return [
/*
|--------------------------------------------------------------------------
| Default Authentication Driver
| Authentication Defaults
|--------------------------------------------------------------------------
|
| This option controls the authentication driver that will be utilized.
| This driver manages the retrieval and authentication of the users
| attempting to get access to protected areas of your application.
| This option controls the default authentication "guard" and password
| reset options for your application. You may change these defaults
| as required, but they're a perfect start for most applications.
|
*/
'defaults' => [
'guard' => 'web',
'passwords' => 'users',
],
/*
|--------------------------------------------------------------------------
| Authentication Guards
|--------------------------------------------------------------------------
|
| Next, you may define every authentication guard for your application.
| Of course, a great default configuration has been defined for you
| here which uses session storage and the Eloquent user provider.
|
| All authentication drivers have a user provider. This defines how the
| users are actually retrieved out of your database or other storage
| mechanisms used by this application to persist your user's data.
|
| Supported: "session", "token"
|
*/
'guards' => [
'web' => [
'driver' => 'session',
'provider' => 'users',
],
'api' => [
'driver' => 'token',
'provider' => 'users',
],
],
/*
|--------------------------------------------------------------------------
| User Providers
|--------------------------------------------------------------------------
|
| All authentication drivers have a user provider. This defines how the
| users are actually retrieved out of your database or other storage
| mechanisms used by this application to persist your user's data.
|
| If you have multiple user tables or models you may configure multiple
| sources which represent each model / table. These sources may then
| be assigned to any extra authentication guards you have defined.
|
| Supported: "database", "eloquent"
|
*/
'driver' => 'eloquent',
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => App\Models\User::class,
],
// 'users' => [
// 'driver' => 'database',
// 'table' => 'users',
// ],
],
/*
|--------------------------------------------------------------------------
| Authentication Model
|--------------------------------------------------------------------------
|
| When using the "Eloquent" authentication driver, we need to know which
| Eloquent model should be used to retrieve your users. Of course, it
| is often just the "User" model but you may use whatever you like.
|
*/
'model' => 'App\Models\User',
/*
|--------------------------------------------------------------------------
| Authentication Table
|--------------------------------------------------------------------------
|
| When using the "Database" authentication driver, we need to know which
| table should be used to retrieve your users. We have chosen a basic
| default value but you may easily change it to any table you like.
|
*/
'table' => 'users',
/*
|--------------------------------------------------------------------------
| Password Reset Settings
| Resetting Passwords
|--------------------------------------------------------------------------
|
| Here you may set the options for resetting passwords including the view
| that is your password reset e-mail. You can also set the name of the
| that is your password reset e-mail. You may also set the name of the
| table that maintains all of the reset tokens for your application.
|
| You may specify multiple password reset configurations if you have more
| than one user table or model in the application and you want to have
| separate password reset settings based on the specific user types.
|
| The expire time is the number of minutes that the reset token should be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
*/
'password' => [
'email' => 'Emails.Auth.Reminder',
'table' => 'password_resets',
'expire' => 60,
'passwords' => [
'users' => [
'provider' => 'users',
'email' => 'Emails.Auth.Reminder',
'table' => 'password_resets',
'expire' => 60,
],
],
];

2
config/compile.php
View File

@ -16,8 +16,6 @@ return [
'files' => [
realpath(__DIR__.'/../app/Providers/AppServiceProvider.php'),
realpath(__DIR__.'/../app/Providers/BusServiceProvider.php'),
realpath(__DIR__.'/../app/Providers/ConfigServiceProvider.php'),
realpath(__DIR__.'/../app/Providers/EventServiceProvider.php'),
realpath(__DIR__.'/../app/Providers/RouteServiceProvider.php'),

16
config/mail.php
View File

@ -106,19 +106,5 @@ return [
|
*/
'sendmail' => '/usr/sbin/sendmail -bs',
/*
|--------------------------------------------------------------------------
| Mail "Pretend"
|--------------------------------------------------------------------------
|
| When this option is enabled, e-mail will not actually be sent over the
| web and will instead be written to your application's logs files so
| you may inspect the message. This is great for local development.
|
*/
'pretend' => false,
'sendmail' => '/usr/sbin/sendmail -bs'
];

24
database/migrations/2014_03_26_180116_create_users_table.php
View File

@ -28,7 +28,7 @@ class CreateUsersTable extends Migration
$table->integer('quantity_reserved');
$table->datetime('expires');
$table->string('session_id', 45);
$table->timestamps();
$table->timestamps()->useCurrent();
});
Schema::create('timezones', function ($t) {
@ -62,7 +62,7 @@ class CreateUsersTable extends Migration
$table->string('decimal_point', 3);
$table->string('thousand_point', 3);
$table->integer('status');
$table->timestamps();
$table->timestamps()->useCurrent();
});
@ -82,7 +82,7 @@ class CreateUsersTable extends Migration
$t->unsignedInteger('currency_id')->nullable();
//$t->unsignedInteger('payment_gateway_id')->default(config('attendize.default_payment_gateway'));
$t->timestamps();
$t->timestamps()->useCurrent();
$t->softDeletes();
$t->string('name');
@ -121,7 +121,7 @@ class CreateUsersTable extends Migration
$t->increments('id');
$t->unsignedInteger('account_id')->index();
$t->timestamps();
$t->timestamps()->useCurrent();
$t->softDeletes();
$t->string('first_name');
@ -142,7 +142,7 @@ class CreateUsersTable extends Migration
$table->increments('id')->index();
$table->timestamps();
$table->timestamps()->useCurrent();
$table->softDeletes();
$table->unsignedInteger('account_id')->index();
@ -224,7 +224,7 @@ class CreateUsersTable extends Migration
$t->boolean('is_live')->default(false);
$t->timestamps();
$t->timestamps()->useCurrent();
$t->softDeletes();
});
@ -235,7 +235,7 @@ class CreateUsersTable extends Migration
$t->increments('id');
$t->unsignedInteger('account_id')->index();
$t->unsignedInteger('order_status_id');
$t->timestamps();
$t->timestamps()->useCurrent();
$t->softDeletes();
$t->string('first_name');
@ -273,7 +273,7 @@ class CreateUsersTable extends Migration
Schema::create('tickets', function ($t) {
$t->increments('id');
$t->timestamps();
$t->timestamps()->useCurrent();
$t->softDeletes();
$t->unsignedInteger('edited_by_user_id')->nullable();
@ -333,7 +333,7 @@ class CreateUsersTable extends Migration
//
//
// Schema::create('questions', function($t) {
// $t->timestamps();
// $t->timestamps()->useCurrent();
// $t->softDeletes();
//
// $t->increments('id');
@ -449,7 +449,7 @@ class CreateUsersTable extends Migration
$t->string('reference', 20);
$t->integer('private_reference_number')->index();
$t->timestamps();
$t->timestamps()->useCurrent();
$t->softDeletes();
$t->boolean('is_cancelled')->default(false);
@ -474,7 +474,7 @@ class CreateUsersTable extends Migration
$table->unsignedInteger('event_id');
$table->unsignedInteger('is_sent', 0);
$table->dateTime('sent_at');
$table->timestamps();
$table->timestamps()->useCurrent();
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$table->foreign('event_id')->references('id')->on('events')->onDelete('cascade');
@ -485,7 +485,7 @@ class CreateUsersTable extends Migration
$t->increments('id');
$t->string('image_path');
$t->timestamps();
$t->timestamps()->useCurrent();
$t->unsignedInteger('event_id');
$t->foreign('event_id')->references('id')->on('events')->onDelete('cascade');

2
database/migrations/2014_10_12_100000_create_password_resets_table.php
View File

@ -15,7 +15,7 @@ class CreatePasswordResetsTable extends Migration
Schema::create('password_resets', function (Blueprint $table) {
$table->string('email')->index();
$table->string('token')->index();
$table->timestamp('created_at');
$table->timestamp('created_at')->useCurrent();
});
}

2
database/migrations/2014_11_07_132018_add_affiliates_table.php
View File

@ -20,7 +20,7 @@ class AddAffiliatesTable extends Migration
$table->timestamp('last_visit');
$table->unsignedInteger('account_id')->index();
$table->unsignedInteger('event_id');
$table->timestamps();
$table->timestamps()->useCurrent();
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$table->foreign('event_id')->references('id')->on('events')->onDelete('cascade');

2
database/migrations/2014_11_17_011806_create_failed_jobs_table.php
View File

@ -17,7 +17,7 @@ class CreateFailedJobsTable extends Migration
$table->text('connection');
$table->text('queue');
$table->text('payload');
$table->timestamp('failed_at');
$table->timestamp('failed_at')->useCurrent();
});
}

2
database/migrations/2016_03_16_193757_create_gateways_table.php
View File

@ -27,7 +27,7 @@ class CreateGatewaysTable extends Migration
$table->unsignedInteger('payment_gateway_id');
$table->text('config');
$table->softDeletes();
$table->timestamps();
$table->timestamps()->useCurrent();
$table->foreign('payment_gateway_id')->references('id')->on('payment_gateways')->onDelete('cascade');
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');