Skip to content
Permalink
Browse files

Upgrade to laravel 5.5

Also updated dependencies and changed permission to 644

Change-Id: I11ac2cec53d4fe3986a7ffaa94363d6060741c06
  • Loading branch information...
adamyi committed Jan 12, 2018
1 parent af27930 commit f6ca86804896431ea2c2a9642b217c929fb2c61d
Showing 669 changed files with 432 additions and 4,615 deletions.
0 .env.example 100755 → 100644
No changes.
0 .gitattributes 100755 → 100644
No changes.
1 .gitignore 100755 → 100644
@@ -10,6 +10,7 @@ bootstrap/cache/
.env

composer.lock
yarn.lock

# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
.rocketeer/
@@ -0,0 +1 @@
MUNPANEL, an all-in-one platform for Model United Nations.
No changes.
No changes.
No changes.
No changes.
0 app/Artisan/AppJobMakeCommand.php 100755 → 100644
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
0 app/Artisan/stubs/blank.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/console.stub 100755 → 100644
No changes.
No changes.
No changes.
0 app/Artisan/stubs/controller.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/create.stub 100755 → 100644
No changes.
No changes.
No changes.
0 app/Artisan/stubs/event.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/job-queued.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/job.stub 100755 → 100644
No changes.
No changes.
0 app/Artisan/stubs/listener.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/mail.stub 100755 → 100644
No changes.
No changes.
No changes.
0 app/Artisan/stubs/markdown.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/middleware.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/model.stub 100755 → 100644
No changes.
No changes.
No changes.
0 app/Artisan/stubs/policy.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/provider.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/request.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/routes.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/seeder.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/test.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/unit-test.stub 100755 → 100644
No changes.
0 app/Artisan/stubs/update.stub 100755 → 100644
No changes.
0 app/Assignment.php 100755 → 100644
No changes.
0 app/Card.php 100755 → 100644
No changes.
0 app/Committee.php 100755 → 100644
No changes.
0 app/Conference.php 100755 → 100644
No changes.
1 app/Console/Kernel.php 100755 → 100644
@@ -72,6 +72,7 @@ protected function schedule(Schedule $schedule)
*/
protected function commands()
{
$this->load(__DIR__.'/Commands');
require base_path('routes/console.php');
}
}
0 app/Dais.php 100755 → 100644
No changes.
0 app/Delegate.php 100755 → 100644
No changes.
0 app/Delegategroup.php 100755 → 100644
No changes.
0 app/Document.php 100755 → 100644
No changes.
0 app/Email.php 100755 → 100644
No changes.
0 app/Entrust.php 100755 → 100644
No changes.
0 app/EntrustFacade.php 100755 → 100644
No changes.
0 app/Event.php 100755 → 100644
No changes.
0 app/Eventtype.php 100755 → 100644
No changes.
17 app/Exceptions/Handler.php 100755 → 100644
@@ -24,12 +24,7 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
\Illuminate\Auth\AuthenticationException::class,
\Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class,
\Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Session\TokenMismatchException::class,
\Illuminate\Validation\ValidationException::class,
// put additional non-reporting exception types here.
];
private $sentryID;
@@ -44,7 +39,7 @@ class Handler extends ExceptionHandler
*/
public function report(Exception $exception)
{
if ((!config('app.debug')) && $this->shouldReport($exception)) { //Sentry for production
if (app()->bound('sentry') && (!config('app.debug')) && $this->shouldReport($exception)) { //Sentry for production
$this->sentryID = app('sentry')->captureException($exception);
}
parent::report($exception);
@@ -100,10 +95,8 @@ public function render($request, Exception $exception)
*/
protected function unauthenticated($request, AuthenticationException $exception)
{
if ($request->expectsJson()) {
return response()->json(['error' => 'Unauthenticated.'], 401);
}
return redirect()->guest(route('login'));
return $request->expectsJson()
? response()->json(['error' => 'Unauthenticated.'], 401)
: redirect()->guest(route('login'));
}
}
0 app/Form.php 100755 → 100644
No changes.
0 app/Good.php 100755 → 100644
No changes.
0 app/Handin.php 100755 → 100644
No changes.
0 app/Helpers/DateHelper.php 100755 → 100644
No changes.
0 app/Helpers/EncryptionHelper.php 100755 → 100644
No changes.
0 app/Helpers/EnumsHelper.php 100755 → 100644
No changes.
0 app/Helpers/InterfaceHelper.php 100755 → 100644
No changes.
0 app/Helpers/StatHelper.php 100755 → 100644
No changes.
0 app/Helpers/StringHelper.php 100755 → 100644
No changes.
0 app/Helpers/UrlHelper.php 100755 → 100644
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
2 app/Http/Kernel.php 100755 → 100644
@@ -24,7 +24,7 @@ class Kernel extends HttpKernel
*/
protected $middleware = [
\App\Http\Middleware\CheckForMaintenanceMode::class,
\Fideloper\Proxy\TrustProxies::class,
\App\Http\Middleware\TrustProxies::class,
];
/**
@@ -1,4 +1,13 @@
<?php
/**
* Copyright (C) MUNPANEL
* This file is part of MUNPANEL System.
*
* Unauthorized copying of this file, via any medium is strictly prohibited
* Proprietary and confidential
*
* Developed by Adam Yi <xuan@yiad.am>
*/
namespace App\Http\Middleware;
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
0 app/Http/Middleware/Optimize.php 100755 → 100644
No changes.
No changes.
No changes.
@@ -0,0 +1,38 @@
<?php
/**
* Copyright (C) MUNPANEL
* This file is part of MUNPANEL System.
*
* Unauthorized copying of this file, via any medium is strictly prohibited
* Proprietary and confidential
*
* Developed by Adam Yi <xuan@yiad.am>
*/
namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
*/
protected $proxies = "**";
/**
* The current proxy header mappings.
*
* @var array
*/
protected $headers = [
Request::HEADER_FORWARDED => 'FORWARDED',
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
];
}
No changes.
0 app/Interview.php 100755 → 100644
No changes.
0 app/Interviewer.php 100755 → 100644
No changes.
No changes.
0 app/Mail/GeneralMail.php 100755 → 100644
No changes.
0 app/Nation.php 100755 → 100644
No changes.
0 app/Nationgroup.php 100755 → 100644
No changes.
0 app/Note.php 100755 → 100644
No changes.
0 app/Observer.php 100755 → 100644
No changes.
0 app/Option.php 100755 → 100644
No changes.
0 app/Order.php 100755 → 100644
No changes.
0 app/Orgteam.php 100755 → 100644
No changes.
0 app/Permission.php 100755 → 100644
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
No changes.
0 app/Reg.php 100755 → 100644
No changes.
0 app/Role.php 100755 → 100644
No changes.
0 app/School.php 100755 → 100644
No changes.
0 app/Teamadmin.php 100755 → 100644
No changes.
0 app/User.php 100755 → 100644
No changes.
0 app/Volunteer.php 100755 → 100644
No changes.
@@ -1,6 +1,8 @@
#!/usr/bin/env php
<?php
define('LARAVEL_START', microtime(true));
/*
|--------------------------------------------------------------------------
| Register The Auto Loader
@@ -13,7 +15,7 @@
|
*/
require __DIR__.'/bootstrap/autoload.php';
require __DIR__.'/vendor/autoload.php';
$app = require_once __DIR__.'/bootstrap/app.php';
0 bootstrap/app.php 100755 → 100644
No changes.
0 bootstrap/autoload.php 100755 → 100644
No changes.
72 composer.json 100755 → 100644
@@ -5,47 +5,57 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.4.*",
"yajra/laravel-datatables-oracle": "^6.0",
"maatwebsite/excel": "~2.1.0",
"chumper/zipper": "1.0.x",
"gloudemans/shoppingcart": "*",
"php": ">=7.0.0",
"aloha/twilio": "^3.0",
"bacon/bacon-qr-code": "~1.0",
"barryvdh/laravel-debugbar": "^3.1",
"chumper/zipper": "1.0.x",
"dingo/api": "1.0.*@dev",
"z38/metzli": "^1.0",
"vinkla/pusher": "^2.5",
"predis/predis": "^1.1",
"wpb/string-blade-compiler": "3.4.x-dev",
"fideloper/proxy": "^3.3",
"geoip2/geoip2": "~2.0",
"gloudemans/shoppingcart": "*",
"laravel/framework": "5.5.*",
"laravel/tinker": "~1.0",
"maatwebsite/excel": "~2.1.0",
"maxmind-db/reader": "~1.0",
"pragmarx/google2fa": "^1.0",
"bacon/bacon-qr-code": "~1.0",
"aloha/twilio": "^3.0",
"predis/predis": "^1.1",
"pusher/pusher-http-laravel": "^4.0",
"qiniu/php-sdk": "^7.2",
"rackspace/php-opencloud": "dev-master",
"qiniu/php-sdk": "^7.1",
"fideloper/proxy": "^3.3",
"sentry/sentry-laravel": "^0.8.0",
"torann/geoip": "^1.0",
"geoip2/geoip2": "^2.4",
"sentry/sentry-laravel": "^0.7.0",
"barryvdh/laravel-debugbar": "^2.3"
"wpb/string-blade-compiler": "3.5.*",
"yajra/laravel-datatables-oracle": "^6.0",
"z38/metzli": "^1.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.7",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~6.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"symfony/dom-crawler": "3.1.*",
"filp/whoops": "~2.0"
},
"autoload": {