Merge branch 'develop'

This commit is contained in:
snipe 2017-10-02 21:55:25 -07:00
commit 78257d5ca6
6 changed files with 257 additions and 121 deletions

View file

@ -34,6 +34,7 @@ class Handler extends ExceptionHandler
*/ */
public function report(Exception $exception) public function report(Exception $exception)
{ {
\Log::error($exception); // rollbar
parent::report($exception); parent::report($exception);
} }

View file

@ -105,6 +105,10 @@ class AppServiceProvider extends ServiceProvider
} }
} }
if (($this->app->environment('production')) && (config('services.rollbar.access_token'))){
$this->app->register(\Jenssegers\Rollbar\RollbarServiceProvider::class);
}
foreach ($monolog->getHandlers() as $handler) { foreach ($monolog->getHandlers() as $handler) {
$handler->setLevel($log_level); $handler->setLevel($log_level);
} }

View file

@ -17,6 +17,7 @@
"fideloper/proxy": "^3.1", "fideloper/proxy": "^3.1",
"intervention/image": "^2.3", "intervention/image": "^2.3",
"javiereguiluz/easyslugger": "^1.0", "javiereguiluz/easyslugger": "^1.0",
"jenssegers/rollbar": "^1.5",
"laravel/framework": "5.4.*", "laravel/framework": "5.4.*",
"laravel/passport": "^1.0", "laravel/passport": "^1.0",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
@ -25,15 +26,15 @@
"maknz/slack": "^1.7", "maknz/slack": "^1.7",
"neitanod/forceutf8": "^2.0", "neitanod/forceutf8": "^2.0",
"patchwork/utf8": "~1.2", "patchwork/utf8": "~1.2",
"phpdocumentor/reflection-docblock": "3.2.2",
"phpspec/prophecy": "1.6.2",
"pragmarx/google2fa": "^1.0", "pragmarx/google2fa": "^1.0",
"schuppo/password-strength": "~1.5", "schuppo/password-strength": "~1.5",
"spatie/laravel-backup": "^3.0.0", "spatie/laravel-backup": "^3.0.0",
"tecnickcom/tc-lib-barcode": "^1.15", "tecnickcom/tc-lib-barcode": "^1.15",
"tightenco/ziggy": "^0.4.1", "tightenco/ziggy": "^0.4.1",
"unicodeveloper/laravel-password": "^1.0", "unicodeveloper/laravel-password": "^1.0",
"watson/validating": "^3.0", "watson/validating": "^3.0"
"phpspec/prophecy": "1.6.2",
"phpdocumentor/reflection-docblock": "3.2.2"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",

321
composer.lock generated
View file

@ -4,8 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "d6e398cc0184b0ebae5e13af04f982f3", "content-hash": "0806112cf7a9396f0a7d89649ea7060b",
"content-hash": "18a401fccef632f92ab5bf389a701648",
"packages": [ "packages": [
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
@ -85,7 +84,7 @@
"s3", "s3",
"sdk" "sdk"
], ],
"time": "2017-09-29 19:46:41" "time": "2017-09-29T19:46:41+00:00"
}, },
{ {
"name": "aws/aws-sdk-php-laravel", "name": "aws/aws-sdk-php-laravel",
@ -141,7 +140,7 @@
"s3", "s3",
"sdk" "sdk"
], ],
"time": "2016-01-18 06:57:07" "time": "2016-01-18T06:57:07+00:00"
}, },
{ {
"name": "barryvdh/laravel-debugbar", "name": "barryvdh/laravel-debugbar",
@ -190,7 +189,7 @@
"profiler", "profiler",
"webprofiler" "webprofiler"
], ],
"time": "2017-07-21 11:56:48" "time": "2017-07-21T11:56:48+00:00"
}, },
{ {
"name": "christian-riesen/base32", "name": "christian-riesen/base32",
@ -244,7 +243,7 @@
"encode", "encode",
"rfc4648" "rfc4648"
], ],
"time": "2016-05-05 11:49:03" "time": "2016-05-05T11:49:03+00:00"
}, },
{ {
"name": "defuse/php-encryption", "name": "defuse/php-encryption",
@ -307,7 +306,7 @@
"security", "security",
"symmetric key cryptography" "symmetric key cryptography"
], ],
"time": "2017-05-18 21:28:48" "time": "2017-05-18T21:28:48+00:00"
}, },
{ {
"name": "dnoegel/php-xdg-base-dir", "name": "dnoegel/php-xdg-base-dir",
@ -340,7 +339,7 @@
"MIT" "MIT"
], ],
"description": "implementation of xdg base directory specification for php", "description": "implementation of xdg base directory specification for php",
"time": "2014-10-24 07:27:01" "time": "2014-10-24T07:27:01+00:00"
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
@ -408,7 +407,7 @@
"docblock", "docblock",
"parser" "parser"
], ],
"time": "2017-02-24 16:22:25" "time": "2017-02-24T16:22:25+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
@ -478,7 +477,7 @@
"cache", "cache",
"caching" "caching"
], ],
"time": "2017-07-22 12:49:21" "time": "2017-07-22T12:49:21+00:00"
}, },
{ {
"name": "doctrine/collections", "name": "doctrine/collections",
@ -545,7 +544,7 @@
"collections", "collections",
"iterator" "iterator"
], ],
"time": "2017-01-03 10:49:41" "time": "2017-01-03T10:49:41+00:00"
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
@ -618,7 +617,7 @@
"persistence", "persistence",
"spl" "spl"
], ],
"time": "2017-07-22 08:35:12" "time": "2017-07-22T08:35:12+00:00"
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
@ -689,7 +688,7 @@
"persistence", "persistence",
"queryobject" "queryobject"
], ],
"time": "2017-07-22 20:44:48" "time": "2017-07-22T20:44:48+00:00"
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
@ -756,7 +755,7 @@
"singularize", "singularize",
"string" "string"
], ],
"time": "2015-11-06 14:35:42" "time": "2015-11-06T14:35:42+00:00"
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
@ -810,7 +809,7 @@
"constructor", "constructor",
"instantiate" "instantiate"
], ],
"time": "2015-06-14 21:17:01" "time": "2015-06-14T21:17:01+00:00"
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
@ -864,7 +863,7 @@
"lexer", "lexer",
"parser" "parser"
], ],
"time": "2014-09-09 13:34:57" "time": "2014-09-09T13:34:57+00:00"
}, },
{ {
"name": "erusev/parsedown", "name": "erusev/parsedown",
@ -906,7 +905,7 @@
"markdown", "markdown",
"parser" "parser"
], ],
"time": "2017-05-14 14:47:48" "time": "2017-05-14T14:47:48+00:00"
}, },
{ {
"name": "fideloper/proxy", "name": "fideloper/proxy",
@ -963,7 +962,7 @@
"proxy", "proxy",
"trusted proxy" "trusted proxy"
], ],
"time": "2017-06-15 17:19:42" "time": "2017-06-15T17:19:42+00:00"
}, },
{ {
"name": "firebase/php-jwt", "name": "firebase/php-jwt",
@ -1006,7 +1005,7 @@
], ],
"description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
"homepage": "https://github.com/firebase/php-jwt", "homepage": "https://github.com/firebase/php-jwt",
"time": "2016-07-18 04:51:16" "time": "2016-07-18T04:51:16+00:00"
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
@ -1071,7 +1070,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2017-06-22 18:50:49" "time": "2017-06-22T18:50:49+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@ -1122,7 +1121,7 @@
"keywords": [ "keywords": [
"promise" "promise"
], ],
"time": "2016-12-20 10:07:11" "time": "2016-12-20T10:07:11+00:00"
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
@ -1187,7 +1186,7 @@
"uri", "uri",
"url" "url"
], ],
"time": "2017-03-20 17:10:46" "time": "2017-03-20T17:10:46+00:00"
}, },
{ {
"name": "intervention/image", "name": "intervention/image",
@ -1257,7 +1256,7 @@
"thumbnail", "thumbnail",
"watermark" "watermark"
], ],
"time": "2017-09-21 16:29:17" "time": "2017-09-21T16:29:17+00:00"
}, },
{ {
"name": "jakub-onderka/php-console-color", "name": "jakub-onderka/php-console-color",
@ -1300,7 +1299,7 @@
"homepage": "http://www.acci.cz" "homepage": "http://www.acci.cz"
} }
], ],
"time": "2014-04-08 15:00:19" "time": "2014-04-08T15:00:19+00:00"
}, },
{ {
"name": "jakub-onderka/php-console-highlighter", "name": "jakub-onderka/php-console-highlighter",
@ -1344,7 +1343,7 @@
"homepage": "http://www.acci.cz/" "homepage": "http://www.acci.cz/"
} }
], ],
"time": "2015-04-20 18:58:01" "time": "2015-04-20T18:58:01+00:00"
}, },
{ {
"name": "javiereguiluz/easyslugger", "name": "javiereguiluz/easyslugger",
@ -1374,7 +1373,59 @@
"MIT" "MIT"
], ],
"description": "A fast and easy to use slugger with full UTF-8 support.", "description": "A fast and easy to use slugger with full UTF-8 support.",
"time": "2015-04-12 19:57:10" "time": "2015-04-12T19:57:10+00:00"
},
{
"name": "jenssegers/rollbar",
"version": "v1.5.1",
"source": {
"type": "git",
"url": "https://github.com/jenssegers/laravel-rollbar.git",
"reference": "d61d6797884df95f6928dee1e23d886ac7086265"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jenssegers/laravel-rollbar/zipball/d61d6797884df95f6928dee1e23d886ac7086265",
"reference": "d61d6797884df95f6928dee1e23d886ac7086265",
"shasum": ""
},
"require": {
"illuminate/support": "^4.0|^5.0",
"php": ">=5.4",
"rollbar/rollbar": "~0.15"
},
"require-dev": {
"mockery/mockery": "^0.9",
"orchestra/testbench": "^3.0",
"phpunit/phpunit": "~4.0|~5.0",
"satooshi/php-coveralls": "^1.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Jenssegers\\Rollbar\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jens Segers",
"homepage": "https://jenssegers.com"
}
],
"description": "Rollbar error monitoring integration for Laravel projects",
"homepage": "https://github.com/jenssegers/laravel-rollbar",
"keywords": [
"error",
"laravel",
"logging",
"monitoring",
"rollbar"
],
"time": "2017-01-25T08:34:12+00:00"
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
@ -1503,7 +1554,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2017-08-30 09:26:16" "time": "2017-08-30T09:26:16+00:00"
}, },
{ {
"name": "laravel/passport", "name": "laravel/passport",
@ -1567,7 +1618,7 @@
"oauth", "oauth",
"passport" "passport"
], ],
"time": "2017-07-12 20:03:53" "time": "2017-07-12T20:03:53+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
@ -1630,7 +1681,7 @@
"laravel", "laravel",
"psysh" "psysh"
], ],
"time": "2017-07-13 13:11:05" "time": "2017-07-13T13:11:05+00:00"
}, },
{ {
"name": "laravelcollective/html", "name": "laravelcollective/html",
@ -1684,7 +1735,7 @@
], ],
"description": "HTML and Form Builders for the Laravel Framework", "description": "HTML and Form Builders for the Laravel Framework",
"homepage": "http://laravelcollective.com", "homepage": "http://laravelcollective.com",
"time": "2017-08-12 15:52:38" "time": "2017-08-12T15:52:38+00:00"
}, },
{ {
"name": "lcobucci/jwt", "name": "lcobucci/jwt",
@ -1742,7 +1793,7 @@
"JWS", "JWS",
"jwt" "jwt"
], ],
"time": "2017-09-01 08:23:26" "time": "2017-09-01T08:23:26+00:00"
}, },
{ {
"name": "league/csv", "name": "league/csv",
@ -1799,7 +1850,7 @@
"read", "read",
"write" "write"
], ],
"time": "2017-07-12 07:18:20" "time": "2017-07-12T07:18:20+00:00"
}, },
{ {
"name": "league/event", "name": "league/event",
@ -1849,7 +1900,7 @@
"event", "event",
"listener" "listener"
], ],
"time": "2015-05-21 12:24:47" "time": "2015-05-21T12:24:47+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
@ -1932,7 +1983,7 @@
"sftp", "sftp",
"storage" "storage"
], ],
"time": "2017-08-06 17:41:04" "time": "2017-08-06T17:41:04+00:00"
}, },
{ {
"name": "league/oauth2-server", "name": "league/oauth2-server",
@ -2009,7 +2060,7 @@
"secure", "secure",
"server" "server"
], ],
"time": "2017-07-11 06:31:36" "time": "2017-07-11T06:31:36+00:00"
}, },
{ {
"name": "maknz/slack", "name": "maknz/slack",
@ -2058,7 +2109,7 @@
"laravel", "laravel",
"slack" "slack"
], ],
"time": "2015-06-03 03:35:16" "time": "2015-06-03T03:35:16+00:00"
}, },
{ {
"name": "maximebf/debugbar", "name": "maximebf/debugbar",
@ -2119,7 +2170,7 @@
"debug", "debug",
"debugbar" "debugbar"
], ],
"time": "2017-01-05 08:46:19" "time": "2017-01-05T08:46:19+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@ -2197,7 +2248,7 @@
"logging", "logging",
"psr-3" "psr-3"
], ],
"time": "2017-06-19 01:22:40" "time": "2017-06-19T01:22:40+00:00"
}, },
{ {
"name": "mtdowling/cron-expression", "name": "mtdowling/cron-expression",
@ -2241,7 +2292,7 @@
"cron", "cron",
"schedule" "schedule"
], ],
"time": "2017-01-23 04:29:33" "time": "2017-01-23T04:29:33+00:00"
}, },
{ {
"name": "mtdowling/jmespath.php", "name": "mtdowling/jmespath.php",
@ -2296,7 +2347,7 @@
"json", "json",
"jsonpath" "jsonpath"
], ],
"time": "2016-12-03 22:08:25" "time": "2016-12-03T22:08:25+00:00"
}, },
{ {
"name": "neitanod/forceutf8", "name": "neitanod/forceutf8",
@ -2330,7 +2381,7 @@
], ],
"description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.", "description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.",
"homepage": "https://github.com/neitanod/forceutf8", "homepage": "https://github.com/neitanod/forceutf8",
"time": "2017-05-22 18:50:57" "time": "2017-05-22T18:50:57+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
@ -2383,7 +2434,7 @@
"datetime", "datetime",
"time" "time"
], ],
"time": "2017-01-16 07:55:07" "time": "2017-01-16T07:55:07+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@ -2434,7 +2485,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2017-09-02 17:10:46" "time": "2017-09-02T17:10:46+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
@ -2482,7 +2533,7 @@
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2017-09-27 21:40:39" "time": "2017-09-27T21:40:39+00:00"
}, },
{ {
"name": "patchwork/utf8", "name": "patchwork/utf8",
@ -2541,7 +2592,7 @@
"utf-8", "utf-8",
"utf8" "utf8"
], ],
"time": "2016-05-18 13:57:10" "time": "2016-05-18T13:57:10+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
@ -2595,7 +2646,7 @@
"reflection", "reflection",
"static analysis" "static analysis"
], ],
"time": "2017-09-11 18:02:19" "time": "2017-09-11T18:02:19+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
@ -2640,7 +2691,7 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-08-08 06:39:58" "time": "2017-08-08T06:39:58+00:00"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
@ -2687,7 +2738,7 @@
"email": "me@mikevanriel.com" "email": "me@mikevanriel.com"
} }
], ],
"time": "2017-06-03 08:32:36" "time": "2017-06-03T08:32:36+00:00"
}, },
{ {
"name": "phpseclib/phpseclib", "name": "phpseclib/phpseclib",
@ -2779,7 +2830,7 @@
"x.509", "x.509",
"x509" "x509"
], ],
"time": "2017-06-05 06:31:10" "time": "2017-06-05T06:31:10+00:00"
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
@ -2842,7 +2893,7 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2016-11-21 14:58:47" "time": "2016-11-21T14:58:47+00:00"
}, },
{ {
"name": "pragmarx/google2fa", "name": "pragmarx/google2fa",
@ -2903,7 +2954,7 @@
"google2fa", "google2fa",
"laravel" "laravel"
], ],
"time": "2016-07-18 20:25:04" "time": "2016-07-18T20:25:04+00:00"
}, },
{ {
"name": "psr/http-message", "name": "psr/http-message",
@ -2953,7 +3004,7 @@
"request", "request",
"response" "response"
], ],
"time": "2016-08-06 14:39:51" "time": "2016-08-06T14:39:51+00:00"
}, },
{ {
"name": "psr/log", "name": "psr/log",
@ -3000,7 +3051,7 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2016-10-10 12:19:37" "time": "2016-10-10T12:19:37+00:00"
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
@ -3073,7 +3124,7 @@
"interactive", "interactive",
"shell" "shell"
], ],
"time": "2017-07-29 19:30:02" "time": "2017-07-29T19:30:02+00:00"
}, },
{ {
"name": "ramsey/uuid", "name": "ramsey/uuid",
@ -3155,7 +3206,57 @@
"identifier", "identifier",
"uuid" "uuid"
], ],
"time": "2017-09-22 20:46:04" "time": "2017-09-22T20:46:04+00:00"
},
{
"name": "rollbar/rollbar",
"version": "v0.18.2",
"source": {
"type": "git",
"url": "https://github.com/rollbar/rollbar-php.git",
"reference": "fafe13f8beb669d6bba0137f3703fa808d50cbb7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rollbar/rollbar-php/zipball/fafe13f8beb669d6bba0137f3703fa808d50cbb7",
"reference": "fafe13f8beb669d6bba0137f3703fa808d50cbb7",
"shasum": ""
},
"require": {
"ext-curl": "*"
},
"require-dev": {
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "4.5.*"
},
"type": "library",
"autoload": {
"classmap": [
"src/Level.php",
"src/rollbar.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Rollbar, Inc.",
"email": "support@rollbar.com",
"role": "Developer"
}
],
"description": "Monitors errors and exceptions and reports them to Rollbar",
"homepage": "http://github.com/rollbar/rollbar-php",
"keywords": [
"debugging",
"errors",
"exceptions",
"logging",
"monitoring"
],
"time": "2016-07-05T15:50:29+00:00"
}, },
{ {
"name": "schuppo/password-strength", "name": "schuppo/password-strength",
@ -3205,7 +3306,7 @@
"password strength", "password strength",
"validation" "validation"
], ],
"time": "2016-10-05 09:57:59" "time": "2016-10-05T09:57:59+00:00"
}, },
{ {
"name": "sebastian/comparator", "name": "sebastian/comparator",
@ -3269,7 +3370,7 @@
"compare", "compare",
"equality" "equality"
], ],
"time": "2017-01-29 09:50:25" "time": "2017-01-29T09:50:25+00:00"
}, },
{ {
"name": "sebastian/diff", "name": "sebastian/diff",
@ -3321,7 +3422,7 @@
"keywords": [ "keywords": [
"diff" "diff"
], ],
"time": "2017-05-22 07:24:03" "time": "2017-05-22T07:24:03+00:00"
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
@ -3388,7 +3489,7 @@
"export", "export",
"exporter" "exporter"
], ],
"time": "2016-11-19 08:54:04" "time": "2016-11-19T08:54:04+00:00"
}, },
{ {
"name": "sebastian/recursion-context", "name": "sebastian/recursion-context",
@ -3441,7 +3542,7 @@
], ],
"description": "Provides functionality to recursively process PHP variables", "description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context", "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"time": "2016-11-19 07:33:16" "time": "2016-11-19T07:33:16+00:00"
}, },
{ {
"name": "spatie/db-dumper", "name": "spatie/db-dumper",
@ -3491,7 +3592,7 @@
"mysqldump", "mysqldump",
"spatie" "spatie"
], ],
"time": "2016-06-14 13:23:01" "time": "2016-06-14T13:23:01+00:00"
}, },
{ {
"name": "spatie/laravel-backup", "name": "spatie/laravel-backup",
@ -3554,7 +3655,7 @@
"laravel-backup", "laravel-backup",
"spatie" "spatie"
], ],
"time": "2017-02-18 09:54:12" "time": "2017-02-18T09:54:12+00:00"
}, },
{ {
"name": "swiftmailer/swiftmailer", "name": "swiftmailer/swiftmailer",
@ -3608,7 +3709,7 @@
"mail", "mail",
"mailer" "mailer"
], ],
"time": "2017-05-01 15:54:03" "time": "2017-05-01T15:54:03+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
@ -3676,7 +3777,7 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-09-06 16:40:18" "time": "2017-09-06T16:40:18+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
@ -3729,7 +3830,7 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-01-02 20:31:54" "time": "2017-01-02T20:31:54+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
@ -3785,7 +3886,7 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-09-01 13:23:39" "time": "2017-09-01T13:23:39+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
@ -3848,7 +3949,7 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29 21:54:42" "time": "2017-07-29T21:54:42+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
@ -3897,7 +3998,7 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29 21:54:42" "time": "2017-07-29T21:54:42+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
@ -3950,7 +4051,7 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-09-06 17:07:39" "time": "2017-09-06T17:07:39+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
@ -4036,7 +4137,7 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-09-11 16:13:23" "time": "2017-09-11T16:13:23+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
@ -4095,7 +4196,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-14 15:44:48" "time": "2017-06-14T15:44:48+00:00"
}, },
{ {
"name": "symfony/polyfill-php56", "name": "symfony/polyfill-php56",
@ -4151,7 +4252,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-14 15:44:48" "time": "2017-06-14T15:44:48+00:00"
}, },
{ {
"name": "symfony/polyfill-util", "name": "symfony/polyfill-util",
@ -4203,7 +4304,7 @@
"polyfill", "polyfill",
"shim" "shim"
], ],
"time": "2017-07-05 15:09:33" "time": "2017-07-05T15:09:33+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
@ -4252,7 +4353,7 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29 21:54:42" "time": "2017-07-29T21:54:42+00:00"
}, },
{ {
"name": "symfony/psr-http-message-bridge", "name": "symfony/psr-http-message-bridge",
@ -4312,7 +4413,7 @@
"http-message", "http-message",
"psr-7" "psr-7"
], ],
"time": "2016-09-14 18:37:20" "time": "2016-09-14T18:37:20+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
@ -4390,7 +4491,7 @@
"uri", "uri",
"url" "url"
], ],
"time": "2017-07-29 21:54:42" "time": "2017-07-29T21:54:42+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
@ -4455,7 +4556,7 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29 21:54:42" "time": "2017-07-29T21:54:42+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
@ -4523,7 +4624,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2017-08-27 14:52:21" "time": "2017-08-27T14:52:21+00:00"
}, },
{ {
"name": "tecnickcom/tc-lib-barcode", "name": "tecnickcom/tc-lib-barcode",
@ -4613,7 +4714,7 @@
"tc-lib-barcode", "tc-lib-barcode",
"upc" "upc"
], ],
"time": "2017-02-12 13:51:39" "time": "2017-02-12T13:51:39+00:00"
}, },
{ {
"name": "tecnickcom/tc-lib-color", "name": "tecnickcom/tc-lib-color",
@ -4676,7 +4777,7 @@
"tc-lib-color", "tc-lib-color",
"web" "web"
], ],
"time": "2017-02-12 12:07:38" "time": "2017-02-12T12:07:38+00:00"
}, },
{ {
"name": "tightenco/ziggy", "name": "tightenco/ziggy",
@ -4726,7 +4827,7 @@
} }
], ],
"description": "Generates a Blade directive exporting all of your named Laravel routes. Also provides a nice route() helper function in JavaScript.", "description": "Generates a Blade directive exporting all of your named Laravel routes. Also provides a nice route() helper function in JavaScript.",
"time": "2017-08-23 11:48:08" "time": "2017-08-23T11:48:08+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@ -4773,7 +4874,7 @@
], ],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2016-09-20 12:50:39" "time": "2016-09-20T12:50:39+00:00"
}, },
{ {
"name": "unicodeveloper/laravel-password", "name": "unicodeveloper/laravel-password",
@ -4828,7 +4929,7 @@
"security", "security",
"unicodeveloper" "unicodeveloper"
], ],
"time": "2017-04-27 07:35:00" "time": "2017-04-27T07:35:00+00:00"
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
@ -4878,7 +4979,7 @@
"env", "env",
"environment" "environment"
], ],
"time": "2016-09-01 10:05:43" "time": "2016-09-01T10:05:43+00:00"
}, },
{ {
"name": "watson/validating", "name": "watson/validating",
@ -4928,7 +5029,7 @@
"laravel", "laravel",
"validation" "validation"
], ],
"time": "2017-08-25 02:12:38" "time": "2017-08-25T02:12:38+00:00"
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
@ -4978,7 +5079,7 @@
"check", "check",
"validate" "validate"
], ],
"time": "2016-11-23 20:04:58" "time": "2016-11-23T20:04:58+00:00"
}, },
{ {
"name": "zendframework/zend-diactoros", "name": "zendframework/zend-diactoros",
@ -5030,7 +5131,7 @@
"psr", "psr",
"psr-7" "psr-7"
], ],
"time": "2017-09-13 14:47:08" "time": "2017-09-13T14:47:08+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -5091,7 +5192,7 @@
"gherkin", "gherkin",
"parser" "parser"
], ],
"time": "2016-10-30 11:50:56" "time": "2016-10-30T11:50:56+00:00"
}, },
{ {
"name": "codeception/codeception", "name": "codeception/codeception",
@ -5185,7 +5286,7 @@
"functional testing", "functional testing",
"unit testing" "unit testing"
], ],
"time": "2017-09-28 23:19:49" "time": "2017-09-28T23:19:49+00:00"
}, },
{ {
"name": "facebook/webdriver", "name": "facebook/webdriver",
@ -5237,7 +5338,7 @@
"selenium", "selenium",
"webdriver" "webdriver"
], ],
"time": "2017-04-28 14:54:49" "time": "2017-04-28T14:54:49+00:00"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",
@ -5287,7 +5388,7 @@
"faker", "faker",
"fixtures" "fixtures"
], ],
"time": "2017-08-15 16:48:10" "time": "2017-08-15T16:48:10+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
@ -5329,7 +5430,7 @@
"object", "object",
"object graph" "object graph"
], ],
"time": "2017-04-12 18:52:22" "time": "2017-04-12T18:52:22+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -5392,7 +5493,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-04-02 07:44:40" "time": "2017-04-02T07:44:40+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
@ -5439,7 +5540,7 @@
"filesystem", "filesystem",
"iterator" "iterator"
], ],
"time": "2016-10-03 07:40:28" "time": "2016-10-03T07:40:28+00:00"
}, },
{ {
"name": "phpunit/php-text-template", "name": "phpunit/php-text-template",
@ -5480,7 +5581,7 @@
"keywords": [ "keywords": [
"template" "template"
], ],
"time": "2015-06-21 13:50:34" "time": "2015-06-21T13:50:34+00:00"
}, },
{ {
"name": "phpunit/php-timer", "name": "phpunit/php-timer",
@ -5529,7 +5630,7 @@
"keywords": [ "keywords": [
"timer" "timer"
], ],
"time": "2017-02-26 11:10:40" "time": "2017-02-26T11:10:40+00:00"
}, },
{ {
"name": "phpunit/php-token-stream", "name": "phpunit/php-token-stream",
@ -5578,7 +5679,7 @@
"keywords": [ "keywords": [
"tokenizer" "tokenizer"
], ],
"time": "2017-02-27 10:12:30" "time": "2017-02-27T10:12:30+00:00"
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
@ -5660,7 +5761,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-09-24 07:23:38" "time": "2017-09-24T07:23:38+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
@ -5719,7 +5820,7 @@
"mock", "mock",
"xunit" "xunit"
], ],
"time": "2017-06-30 09:13:00" "time": "2017-06-30T09:13:00+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
@ -5764,7 +5865,7 @@
], ],
"description": "Looks up which function or method a line of code belongs to", "description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"time": "2017-03-04 06:30:41" "time": "2017-03-04T06:30:41+00:00"
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
@ -5814,7 +5915,7 @@
"environment", "environment",
"hhvm" "hhvm"
], ],
"time": "2016-11-26 07:53:53" "time": "2016-11-26T07:53:53+00:00"
}, },
{ {
"name": "sebastian/global-state", "name": "sebastian/global-state",
@ -5865,7 +5966,7 @@
"keywords": [ "keywords": [
"global state" "global state"
], ],
"time": "2015-10-12 03:26:01" "time": "2015-10-12T03:26:01+00:00"
}, },
{ {
"name": "sebastian/object-enumerator", "name": "sebastian/object-enumerator",
@ -5911,7 +6012,7 @@
], ],
"description": "Traverses array structures and object graphs to enumerate all referenced objects", "description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/", "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
"time": "2017-02-18 15:18:39" "time": "2017-02-18T15:18:39+00:00"
}, },
{ {
"name": "sebastian/resource-operations", "name": "sebastian/resource-operations",
@ -5953,7 +6054,7 @@
], ],
"description": "Provides a list of PHP built-in functions that operate on resources", "description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations", "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"time": "2015-07-28 20:34:47" "time": "2015-07-28T20:34:47+00:00"
}, },
{ {
"name": "sebastian/version", "name": "sebastian/version",
@ -5996,7 +6097,7 @@
], ],
"description": "Library that helps with managing the version number of Git-hosted PHP projects", "description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version", "homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03 07:35:21" "time": "2016-10-03T07:35:21+00:00"
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
@ -6047,7 +6148,7 @@
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2017-09-19 22:47:14" "time": "2017-09-19T22:47:14+00:00"
}, },
{ {
"name": "stecman/symfony-console-completion", "name": "stecman/symfony-console-completion",
@ -6092,7 +6193,7 @@
} }
], ],
"description": "Automatic BASH completion for Symfony Console Component based applications.", "description": "Automatic BASH completion for Symfony Console Component based applications.",
"time": "2016-02-24 05:08:54" "time": "2016-02-24T05:08:54+00:00"
}, },
{ {
"name": "symfony/browser-kit", "name": "symfony/browser-kit",
@ -6149,7 +6250,7 @@
], ],
"description": "Symfony BrowserKit Component", "description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29 21:54:42" "time": "2017-07-29T21:54:42+00:00"
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
@ -6205,7 +6306,7 @@
], ],
"description": "Symfony DomCrawler Component", "description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-01-21 17:13:55" "time": "2017-01-21T17:13:55+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
@ -6260,7 +6361,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29 21:54:42" "time": "2017-07-29T21:54:42+00:00"
} }
], ],
"aliases": [], "aliases": [],

View file

@ -41,5 +41,10 @@ return [
'stripe_id' => env('STUNNING_STRIPE_ID'), 'stripe_id' => env('STUNNING_STRIPE_ID'),
], ],
'rollbar' => [
'access_token' => env('ROLLBAR_TOKEN'),
'level' => env('ROLLBAR_LEVEL', 'error'),
],
]; ];

View file

@ -8,9 +8,13 @@ if (($username=='root') || ($username=='admin')) {
die("\nERROR: This script should not be run as root/admin. Exiting.\n\n"); die("\nERROR: This script should not be run as root/admin. Exiting.\n\n");
} }
($argv[1]) ? $branch = $argv[1] : $branch = 'master';
echo "Welcome to the Snipe-IT upgrader.\n\n"; echo "Welcome to the Snipe-IT upgrader.\n\n";
echo "Please note that this script will not download the latest Snipe-IT \n"; echo "Please note that this script will not download the latest Snipe-IT \n";
echo "files for you, it simply runs the standard composer and artisan \n"; echo "files for you unless you have git installed. \n";
echo "It simply runs the standard composer and artisan \n";
echo "commands needed to finalize the upgrade after \n\n"; echo "commands needed to finalize the upgrade after \n\n";
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"; echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
@ -25,15 +29,35 @@ echo "--------------------------------------------------------\n\n";
$backup = shell_exec('php artisan snipeit:backup'); $backup = shell_exec('php artisan snipeit:backup');
echo '-- '.$backup."\n\n"; echo '-- '.$backup."\n\n";
echo "--------------------------------------------------------\n"; echo "--------------------------------------------------------\n";
echo "STEP 2: Putting application into maintenance mode: \n"; echo "STEP 2: Putting application into maintenance mode: \n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
$down = shell_exec('php artisan down'); $down = shell_exec('php artisan down');
echo '-- '.$down."\n\n"; echo '-- '.$down."\n\n";
echo "--------------------------------------------------------\n"; echo "--------------------------------------------------------\n";
echo "Step 3: Cleaning up old cached files:\n"; echo "STEP 3: Pulling latest from Git (".$branch." branch): \n";
echo "--------------------------------------------------------\n\n";
$git_version = shell_exec('git --version');
if ((strpos('git version', $git_version)) === false) {
echo "Git is installed. \n";
$git_checkout = shell_exec('git checkout '.$branch);
$git_stash = shell_exec('git stash');
$git_pull = shell_exec('git pull');
echo '-- '.$git_stash;
echo '-- '.$git_checkout;
echo '-- '.$git_pull;
} else {
echo "Git is NOT installed. You can still use this upgrade script to run common \n";
echo "migration commands, but you will have to manually download the updated files. \n\n";
}
echo "--------------------------------------------------------\n";
echo "Step 4: Cleaning up old cached files:\n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
@ -69,7 +93,7 @@ echo '-- '.$view_clear;
echo "\n"; echo "\n";
echo "--------------------------------------------------------\n"; echo "--------------------------------------------------------\n";
echo "Step 4: Updating composer dependencies:\n"; echo "Step 5: Updating composer dependencies:\n";
echo "(This may take an moment.)\n"; echo "(This may take an moment.)\n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
@ -91,7 +115,7 @@ echo $composer."\n\n";
echo "--------------------------------------------------------\n"; echo "--------------------------------------------------------\n";
echo "Step 5: Migrating database:\n"; echo "Step 6: Migrating database:\n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
$migrations = shell_exec('php artisan migrate --force'); $migrations = shell_exec('php artisan migrate --force');
@ -99,7 +123,7 @@ echo '-- '.$migrations."\n\n";
echo "--------------------------------------------------------\n"; echo "--------------------------------------------------------\n";
echo "Step 6: Checking for OAuth keys:\n"; echo "Step 7: Checking for OAuth keys:\n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
@ -113,7 +137,7 @@ if ((!file_exists('storage/oauth-public.key')) || (!file_exists('storage/oauth-p
echo "--------------------------------------------------------\n"; echo "--------------------------------------------------------\n";
echo "Step 7: Caching routes and config:\n"; echo "Step 8: Caching routes and config:\n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
$config_cache = shell_exec('php artisan config:cache'); $config_cache = shell_exec('php artisan config:cache');
$route_cache = shell_exec('php artisan route:cache'); $route_cache = shell_exec('php artisan route:cache');
@ -124,7 +148,7 @@ echo "\n";
echo "--------------------------------------------------------\n"; echo "--------------------------------------------------------\n";
echo "Step 8: Taking application out of maintenance mode:\n"; echo "Step 9: Taking application out of maintenance mode:\n";
echo "--------------------------------------------------------\n\n"; echo "--------------------------------------------------------\n\n";
$up = shell_exec('php artisan up'); $up = shell_exec('php artisan up');