From 0e46b6fd424597cff367b6c902ee8cde403573e1 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 5 Sep 2018 14:57:30 -0700 Subject: [PATCH 01/13] Fixed #6152 - typo in upgrade script --- upgrade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade.php b/upgrade.php index 44a7e6679..030d26207 100644 --- a/upgrade.php +++ b/upgrade.php @@ -88,7 +88,7 @@ echo "--------------------------------------------------------\n\n"; if (file_exists('bootstrap/cache/compiled.php')) { - echo "-- Deleting bootstrap/cache/compiled.php. It it no longer used.\n"; + echo "-- Deleting bootstrap/cache/compiled.php. It is no longer used.\n"; @unlink('bootstrap/cache/compiled.php'); } else { echo "-- No bootstrap/cache/compiled.php, so nothing to delete.\n"; From bd40bd5a2277eec9ee5ce90dee224e60c0e68206 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 5 Sep 2018 14:58:02 -0700 Subject: [PATCH 02/13] Upgrade to laravel 5.7.0 --- composer.json | 2 +- composer.lock | 414 +++++++++++++++++++++++++------------------------- 2 files changed, 206 insertions(+), 210 deletions(-) diff --git a/composer.json b/composer.json index 1ed5fe51a..e6f95b3f7 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "fideloper/proxy": "~4.0", "intervention/image": "^2.3", "javiereguiluz/easyslugger": "^1.0", - "laravel/framework": "5.6.30", + "laravel/framework": "5.7.0", "laravel/passport": "~6.0", "laravel/tinker": "^1.0", "laravelcollective/html": "^5.3", diff --git a/composer.lock b/composer.lock index cc02e53f9..09d3bfe40 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "7b050f7017c0a510b08aa4837462f58c", + "content-hash": "57ad210d5cd379ab6d0f1ec5e546a55e", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.65.1", + "version": "3.67.5", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "70235697503c6b0501e58e5898f9825d800fe647" + "reference": "fa7689ba2865e9e00ac44efefc2c3f2ea8424c63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/70235697503c6b0501e58e5898f9825d800fe647", - "reference": "70235697503c6b0501e58e5898f9825d800fe647", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fa7689ba2865e9e00ac44efefc2c3f2ea8424c63", + "reference": "fa7689ba2865e9e00ac44efefc2c3f2ea8424c63", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2018-08-21T20:10:44+00:00" + "time": "2018-09-04T21:04:34+00:00" }, { "name": "bacon/bacon-qr-code", @@ -134,29 +134,29 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.1.5", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f" + "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/d3cdca2ad6cc6e67735b4a63e7551c690a497f5f", - "reference": "d3cdca2ad6cc6e67735b4a63e7551c690a497f5f", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/5b68f3972083a7eeec0d6f161962fcda71a127c0", + "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0", "shasum": "" }, "require": { - "illuminate/routing": "5.5.x|5.6.x", - "illuminate/session": "5.5.x|5.6.x", - "illuminate/support": "5.5.x|5.6.x", + "illuminate/routing": "5.5.x|5.6.x|5.7.x", + "illuminate/session": "5.5.x|5.6.x|5.7.x", + "illuminate/support": "5.5.x|5.6.x|5.7.x", "maximebf/debugbar": "~1.15.0", "php": ">=7.0", "symfony/debug": "^3|^4", "symfony/finder": "^3|^4" }, "require-dev": { - "illuminate/framework": "5.5.x" + "laravel/framework": "5.5.x" }, "type": "library", "extra": { @@ -198,7 +198,7 @@ "profiler", "webprofiler" ], - "time": "2018-05-03T18:27:04+00:00" + "time": "2018-08-22T11:06:19+00:00" }, { "name": "defuse/php-encryption", @@ -919,16 +919,16 @@ }, { "name": "doctrine/persistence", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5" + "reference": "af1ec238659a83e320f03e0e454e200f689b4b97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/17896f6d56a2794a1619e019596ae627aabd8fd5", - "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/af1ec238659a83e320f03e0e454e200f689b4b97", + "reference": "af1ec238659a83e320f03e0e454e200f689b4b97", "shasum": "" }, "require": { @@ -993,7 +993,7 @@ "keywords": [ "persistence" ], - "time": "2018-06-14T18:57:48+00:00" + "time": "2018-07-12T12:37:50+00:00" }, { "name": "doctrine/reflection", @@ -1692,42 +1692,42 @@ }, { "name": "laravel/framework", - "version": "v5.6.30", + "version": "v5.7.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "38506212abdfe489f7ec914f9c43c77e3347aebe" + "reference": "9f313ce9bb5ad49a06ae78d33fbdd1c92a0e21f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/38506212abdfe489f7ec914f9c43c77e3347aebe", - "reference": "38506212abdfe489f7ec914f9c43c77e3347aebe", + "url": "https://api.github.com/repos/laravel/framework/zipball/9f313ce9bb5ad49a06ae78d33fbdd1c92a0e21f6", + "reference": "9f313ce9bb5ad49a06ae78d33fbdd1c92a0e21f6", "shasum": "" }, "require": { - "doctrine/inflector": "~1.1", - "dragonmantank/cron-expression": "~2.0", - "erusev/parsedown": "~1.7", + "doctrine/inflector": "^1.1", + "dragonmantank/cron-expression": "^2.0", + "erusev/parsedown": "^1.7", "ext-mbstring": "*", "ext-openssl": "*", "league/flysystem": "^1.0.8", - "monolog/monolog": "~1.12", - "nesbot/carbon": "1.25.*", + "monolog/monolog": "^1.12", + "nesbot/carbon": "^1.26.3", "php": "^7.1.3", - "psr/container": "~1.0", + "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", - "swiftmailer/swiftmailer": "~6.0", - "symfony/console": "~4.0", - "symfony/debug": "~4.0", - "symfony/finder": "~4.0", - "symfony/http-foundation": "~4.0", - "symfony/http-kernel": "~4.0", - "symfony/process": "~4.0", - "symfony/routing": "~4.0", - "symfony/var-dumper": "~4.0", + "swiftmailer/swiftmailer": "^6.0", + "symfony/console": "^4.1", + "symfony/debug": "^4.1", + "symfony/finder": "^4.1", + "symfony/http-foundation": "^4.1", + "symfony/http-kernel": "^4.1", + "symfony/process": "^4.1", + "symfony/routing": "^4.1", + "symfony/var-dumper": "^4.1", "tijsverkoyen/css-to-inline-styles": "^2.2.1", - "vlucas/phpdotenv": "~2.2" + "vlucas/phpdotenv": "^2.2" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -1763,43 +1763,44 @@ "illuminate/view": "self.version" }, "require-dev": { - "aws/aws-sdk-php": "~3.0", - "doctrine/dbal": "~2.6", + "aws/aws-sdk-php": "^3.0", + "doctrine/dbal": "^2.6", "filp/whoops": "^2.1.4", - "league/flysystem-cached-adapter": "~1.0", - "mockery/mockery": "~1.0", + "league/flysystem-cached-adapter": "^1.0", + "mockery/mockery": "^1.0", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.6.*", - "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~7.0", + "orchestra/testbench-core": "3.7.*", + "pda/pheanstalk": "^3.0", + "phpunit/phpunit": "^7.0", "predis/predis": "^1.1.1", - "symfony/css-selector": "~4.0", - "symfony/dom-crawler": "~4.0" + "symfony/css-selector": "^4.1", + "symfony/dom-crawler": "^4.1", + "true/punycode": "^2.1" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).", + "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", - "laravel/tinker": "Required to use the tinker console command (~1.0).", - "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", - "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", - "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).", - "nexmo/client": "Required to use the Nexmo transport (~1.0).", - "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", - "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)." + "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).", + "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).", + "laravel/tinker": "Required to use the tinker console command (^1.0).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", + "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", + "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).", + "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", + "nexmo/client": "Required to use the Nexmo transport (^1.0).", + "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0).", + "predis/predis": "Required to use the redis cache and queue drivers (^1.0).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).", + "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).", + "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.7-dev" } }, "autoload": { @@ -1827,7 +1828,7 @@ "framework", "laravel" ], - "time": "2018-08-08T18:36:40+00:00" + "time": "2018-09-04T13:13:04+00:00" }, { "name": "laravel/passport", @@ -1963,35 +1964,35 @@ }, { "name": "laravelcollective/html", - "version": "v5.6.10", + "version": "v5.7.1", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d" + "reference": "777b6d390811ba249255ed5750bf17a019cd88a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d", - "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/777b6d390811ba249255ed5750bf17a019cd88a5", + "reference": "777b6d390811ba249255ed5750bf17a019cd88a5", "shasum": "" }, "require": { - "illuminate/http": "5.6.*", - "illuminate/routing": "5.6.*", - "illuminate/session": "5.6.*", - "illuminate/support": "5.6.*", - "illuminate/view": "5.6.*", + "illuminate/http": "5.7.*", + "illuminate/routing": "5.7.*", + "illuminate/session": "5.7.*", + "illuminate/support": "5.7.*", + "illuminate/view": "5.7.*", "php": ">=7.1.3" }, "require-dev": { - "illuminate/database": "5.6.*", + "illuminate/database": "5.7.*", "mockery/mockery": "~1.0", "phpunit/phpunit": "~7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.7-dev" }, "laravel": { "providers": [ @@ -2027,7 +2028,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "https://laravelcollective.com", - "time": "2018-06-18T15:04:16+00:00" + "time": "2018-09-05T18:32:53+00:00" }, { "name": "lcobucci/jwt", @@ -2206,16 +2207,16 @@ }, { "name": "league/flysystem", - "version": "1.0.45", + "version": "1.0.46", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6" + "reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6", - "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2", + "reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2", "shasum": "" }, "require": { @@ -2227,7 +2228,7 @@ "require-dev": { "ext-fileinfo": "*", "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^5.7.10" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -2286,7 +2287,7 @@ "sftp", "storage" ], - "time": "2018-05-07T08:44:23+00:00" + "time": "2018-08-22T07:45:22+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -2773,16 +2774,16 @@ }, { "name": "nesbot/carbon", - "version": "1.25.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4" + "reference": "55667c1007a99e82030874b1bb14d24d07108413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4", - "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/55667c1007a99e82030874b1bb14d24d07108413", + "reference": "55667c1007a99e82030874b1bb14d24d07108413", "shasum": "" }, "require": { @@ -2795,13 +2796,15 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.23-dev" + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] } }, "autoload": { "psr-4": { - "Carbon\\": "src/Carbon/" + "": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2822,7 +2825,7 @@ "datetime", "time" ], - "time": "2018-03-19T15:50:49+00:00" + "time": "2018-08-07T08:39:47+00:00" }, { "name": "nikic/php-parser", @@ -2939,33 +2942,29 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.17", + "version": "v9.99.99", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d" + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": "^7" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" }, "suggest": { "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -2984,7 +2983,7 @@ "pseudorandom", "random" ], - "time": "2018-07-04T16:31:37+00:00" + "time": "2018-07-02T15:55:56+00:00" }, { "name": "patchwork/utf8", @@ -3348,21 +3347,21 @@ }, { "name": "pragmarx/google2fa", - "version": "v3.0.2", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa.git", - "reference": "d9d960370277958c700552c551e136018b915499" + "reference": "6949226739e4424f40031e6f1c96b1fd64047335" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/d9d960370277958c700552c551e136018b915499", - "reference": "d9d960370277958c700552c551e136018b915499", + "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/6949226739e4424f40031e6f1c96b1fd64047335", + "reference": "6949226739e4424f40031e6f1c96b1fd64047335", "shasum": "" }, "require": { "paragonie/constant_time_encoding": "~1.0|~2.0", - "paragonie/random_compat": ">=1 <9.99", + "paragonie/random_compat": ">=1", "php": ">=5.4", "symfony/polyfill-php56": "~1.2" }, @@ -3405,7 +3404,7 @@ "google2fa", "laravel" ], - "time": "2018-07-31T23:31:19+00:00" + "time": "2018-08-29T13:28:06+00:00" }, { "name": "pragmarx/google2fa-laravel", @@ -3770,16 +3769,16 @@ }, { "name": "psy/psysh", - "version": "v0.9.7", + "version": "v0.9.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932" + "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f5b6c090948773a8bfeea6a0f07ab7d0b24e932", - "reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", + "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", "shasum": "" }, "require": { @@ -3840,7 +3839,7 @@ "interactive", "shell" ], - "time": "2018-08-11T15:54:43+00:00" + "time": "2018-09-05T11:40:09+00:00" }, { "name": "ramsey/uuid", @@ -4351,16 +4350,16 @@ }, { "name": "spatie/db-dumper", - "version": "2.10.0", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/spatie/db-dumper.git", - "reference": "ee745fba17bcf77c916f231a571bbde8dae8e001" + "reference": "1192bb0df9f49ee1f0bdecb7aa921d2647b4c7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/db-dumper/zipball/ee745fba17bcf77c916f231a571bbde8dae8e001", - "reference": "ee745fba17bcf77c916f231a571bbde8dae8e001", + "url": "https://api.github.com/repos/spatie/db-dumper/zipball/1192bb0df9f49ee1f0bdecb7aa921d2647b4c7c7", + "reference": "1192bb0df9f49ee1f0bdecb7aa921d2647b4c7c7", "shasum": "" }, "require": { @@ -4397,29 +4396,24 @@ "mysqldump", "spatie" ], - "time": "2018-04-27T15:10:51+00:00" + "time": "2018-08-30T12:10:16+00:00" }, { "name": "spatie/laravel-backup", - "version": "5.10.0", + "version": "5.10.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "5a1d8caa865e0228018d446fe2eaad019e0bb3af" + "reference": "20598fb6fd8695809ffceacfbaf22a816f546bca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/5a1d8caa865e0228018d446fe2eaad019e0bb3af", - "reference": "5a1d8caa865e0228018d446fe2eaad019e0bb3af", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/20598fb6fd8695809ffceacfbaf22a816f546bca", + "reference": "20598fb6fd8695809ffceacfbaf22a816f546bca", "shasum": "" }, "require": { - "illuminate/console": "~5.5.0|~5.6.0", - "illuminate/contracts": "~5.5.0|~5.6.0", - "illuminate/events": "~5.5.0|~5.6.0", - "illuminate/filesystem": "~5.5.0|~5.6.0", - "illuminate/notifications": "~5.5.0|~5.6.0", - "illuminate/support": "~5.5.0|~5.6.0", + "laravel/framework": "~5.5.0|~5.6.0|~5.5.0|~5.7.0", "league/flysystem": "^1.0.27", "php": "^7.1", "spatie/db-dumper": "^2.10", @@ -4428,8 +4422,8 @@ }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "~3.5.0|~3.6.0", - "phpunit/phpunit": "^6.5 || ^7.0" + "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0", + "phpunit/phpunit": "^7.3" }, "suggest": { "guzzlehttp/guzzle": "Allows notifications to be sent via Slack" @@ -4470,7 +4464,7 @@ "laravel-backup", "spatie" ], - "time": "2018-08-09T06:51:50+00:00" + "time": "2018-08-24T09:10:11+00:00" }, { "name": "spatie/temporary-directory", @@ -4579,7 +4573,7 @@ }, { "name": "symfony/console", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -4700,16 +4694,16 @@ }, { "name": "symfony/debug", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "9316545571f079c4dd183e674721d9dc783ce196" + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9316545571f079c4dd183e674721d9dc783ce196", - "reference": "9316545571f079c4dd183e674721d9dc783ce196", + "url": "https://api.github.com/repos/symfony/debug/zipball/47ead688f1f2877f3f14219670f52e4722ee7052", + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052", "shasum": "" }, "require": { @@ -4752,11 +4746,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -4819,7 +4813,7 @@ }, { "name": "symfony/finder", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -4868,16 +4862,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1" + "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7d93e3547660ec7ee3dad1428ba42e8076a0e5f1", - "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3a5c91e133b220bb882b3cd773ba91bf39989345", + "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345", "shasum": "" }, "require": { @@ -4918,20 +4912,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-08-01T14:07:44+00:00" + "time": "2018-08-27T17:47:02+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6347be5110efb27fe45ea04bf213078b67a05036" + "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6347be5110efb27fe45ea04bf213078b67a05036", - "reference": "6347be5110efb27fe45ea04bf213078b67a05036", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33de0a1ff2e1720096189e3ced682d7a4e8f5e35", + "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35", "shasum": "" }, "require": { @@ -5005,7 +4999,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-08-01T15:30:34+00:00" + "time": "2018-08-28T06:17:42+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5289,16 +5283,16 @@ }, { "name": "symfony/process", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56" + "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/f01fc7a4493572f7f506c49dcb50ad01fb3a2f56", - "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56", + "url": "https://api.github.com/repos/symfony/process/zipball/86cdb930a6a855b0ab35fb60c1504cb36184f843", + "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843", "shasum": "" }, "require": { @@ -5334,38 +5328,39 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/psr-http-message-bridge", - "version": "v1.0.2", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "c2b757934f2d9681a287e662efbc27c41fe8ef86" + "reference": "53c15a6a7918e6c2ab16ae370ea607fb40cab196" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/c2b757934f2d9681a287e662efbc27c41fe8ef86", - "reference": "c2b757934f2d9681a287e662efbc27c41fe8ef86", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/53c15a6a7918e6c2ab16ae370ea607fb40cab196", + "reference": "53c15a6a7918e6c2ab16ae370ea607fb40cab196", "shasum": "" }, "require": { - "php": ">=5.3.3", - "psr/http-message": "~1.0", - "symfony/http-foundation": "~2.3|~3.0|~4.0" + "php": "^5.3.3 || ^7.0", + "psr/http-message": "^1.0", + "symfony/http-foundation": "^2.3.42 || ^3.4 || ^4.0" }, "require-dev": { - "symfony/phpunit-bridge": "~3.2|4.0" + "symfony/phpunit-bridge": "^3.4 || 4.0" }, "suggest": { + "psr/http-factory-implementation": "To use the PSR-17 factory", "psr/http-message-implementation": "To use the HttpFoundation factory", "zendframework/zend-diactoros": "To use the Zend Diactoros factory" }, "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -5394,20 +5389,20 @@ "http-message", "psr-7" ], - "time": "2017-12-19T00:31:44+00:00" + "time": "2018-08-30T16:28:28+00:00" }, { "name": "symfony/routing", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b" + "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b", - "reference": "6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b", + "url": "https://api.github.com/repos/symfony/routing/zipball/a5784c2ec4168018c87b38f0e4f39d2278499f51", + "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51", "shasum": "" }, "require": { @@ -5471,20 +5466,20 @@ "uri", "url" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T07:58:40+00:00" }, { "name": "symfony/translation", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65" + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65", - "reference": "6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65", + "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f", + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f", "shasum": "" }, "require": { @@ -5540,20 +5535,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-07T12:45:11+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "69e174f4c02ec43919380171c6f7550753299316" + "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/69e174f4c02ec43919380171c6f7550753299316", - "reference": "69e174f4c02ec43919380171c6f7550753299316", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a05426e27294bba7b0226ffc17dd01a3c6ef9777", + "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777", "shasum": "" }, "require": { @@ -5615,7 +5610,7 @@ "debug", "dump" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-02T09:24:26+00:00" }, { "name": "tecnickcom/tc-lib-barcode", @@ -5772,20 +5767,20 @@ }, { "name": "tightenco/ziggy", - "version": "v0.6.7", + "version": "v0.6.8.1", "source": { "type": "git", "url": "https://github.com/tightenco/ziggy.git", - "reference": "cf6dc47db14304cd6fe2b6d3fae22b411586e8dc" + "reference": "b78e4d9334cb5301158400da4957a81ebee63e62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tightenco/ziggy/zipball/cf6dc47db14304cd6fe2b6d3fae22b411586e8dc", - "reference": "cf6dc47db14304cd6fe2b6d3fae22b411586e8dc", + "url": "https://api.github.com/repos/tightenco/ziggy/zipball/b78e4d9334cb5301158400da4957a81ebee63e62", + "reference": "b78e4d9334cb5301158400da4957a81ebee63e62", "shasum": "" }, "require": { - "laravel/framework": "~5.6.7" + "laravel/framework": "~5.4" }, "require-dev": { "mikey179/vfsstream": "^1.6", @@ -5819,7 +5814,7 @@ } ], "description": "Generates a Blade directive exporting all of your named Laravel routes. Also provides a nice route() helper function in JavaScript.", - "time": "2018-07-06T02:53:28+00:00" + "time": "2018-08-28T01:27:55+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5980,24 +5975,24 @@ }, { "name": "watson/validating", - "version": "3.1.6", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/dwightwatson/validating.git", - "reference": "572430eff445844ac231db535b57d443fac57e86" + "reference": "22edd06d45893f5d4f79c9e901bd7fbce174a79f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/validating/zipball/572430eff445844ac231db535b57d443fac57e86", - "reference": "572430eff445844ac231db535b57d443fac57e86", + "url": "https://api.github.com/repos/dwightwatson/validating/zipball/22edd06d45893f5d4f79c9e901bd7fbce174a79f", + "reference": "22edd06d45893f5d4f79c9e901bd7fbce174a79f", "shasum": "" }, "require": { - "illuminate/contracts": "5.3.* || 5.4.* || 5.5.* || 5.6.*", - "illuminate/database": "5.3.* || 5.4.* || 5.5.* || 5.6.*", - "illuminate/events": "5.3.* || 5.4.* || 5.5.* || 5.6.*", - "illuminate/support": "5.3.* || 5.4.* || 5.5.* || 5.6.*", - "illuminate/validation": "5.3.* || 5.4.* || 5.5.* || 5.6.*", + "illuminate/contracts": ">=5.3", + "illuminate/database": ">=5.3", + "illuminate/events": ">=5.3", + "illuminate/support": ">=5.3", + "illuminate/validation": ">=5.3", "php": ">=5.4.0" }, "require-dev": { @@ -6026,7 +6021,7 @@ "laravel", "validation" ], - "time": "2018-06-19T17:37:15+00:00" + "time": "2017-11-06T21:35:49+00:00" }, { "name": "webmozart/assert", @@ -6080,16 +6075,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.8.5", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87" + "reference": "20da13beba0dde8fb648be3cc19765732790f46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87", - "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e", + "reference": "20da13beba0dde8fb648be3cc19765732790f46e", "shasum": "" }, "require": { @@ -6102,6 +6097,7 @@ "require-dev": { "ext-dom": "*", "ext-libxml": "*", + "php-http/psr7-integration-tests": "dev-master", "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", "zendframework/zend-coding-standard": "~1.0" }, @@ -6139,7 +6135,7 @@ "psr", "psr-7" ], - "time": "2018-08-10T14:16:32+00:00" + "time": "2018-09-05T19:29:37+00:00" } ], "packages-dev": [ @@ -7620,7 +7616,7 @@ }, { "name": "symfony/browser-kit", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -7734,16 +7730,16 @@ }, { "name": "symfony/yaml", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c" + "reference": "b832cc289608b6d305f62149df91529a2ab3c314" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/46bc69aa91fc4ab78a96ce67873a6b0c148fd48c", - "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", + "reference": "b832cc289608b6d305f62149df91529a2ab3c314", "shasum": "" }, "require": { @@ -7789,7 +7785,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "theseer/tokenizer", From 84cc90e4270d1628384eb6e569ce818b137df544 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 5 Sep 2018 18:57:36 -0700 Subject: [PATCH 03/13] Added alt text to email headers --- resources/views/vendor/mail/html/header.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php index bc71460b4..686ee632f 100644 --- a/resources/views/vendor/mail/html/header.blade.php +++ b/resources/views/vendor/mail/html/header.blade.php @@ -4,13 +4,13 @@ @if ($snipeSettings->brand == '3') @if ($snipeSettings->logo!='') - + @endif {{ $snipeSettings->site_name }} @elseif ($snipeSettings->brand == '2') @if ($snipeSettings->logo!='') - + @endif @else {{ $snipeSettings->site_name }} From 60459d07ce256e26cd17c5cdcef0743941c491cb Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 5 Sep 2018 18:57:49 -0700 Subject: [PATCH 04/13] Added email image auto-embed support --- .env.example | 2 + composer.json | 3 +- composer.lock | 97 +++++++++++++++++++++++++++++--------- config/mail-auto-embed.php | 28 +++++++++++ 4 files changed, 108 insertions(+), 22 deletions(-) create mode 100644 config/mail-auto-embed.php diff --git a/.env.example b/.env.example index 650bd8fb4..f6ad25fc1 100644 --- a/.env.example +++ b/.env.example @@ -43,6 +43,8 @@ MAIL_FROM_ADDR=you@example.com MAIL_FROM_NAME='Snipe-IT' MAIL_REPLYTO_ADDR=you@example.com MAIL_REPLYTO_NAME='Snipe-IT' +MAIL_AUTO_EMBED=true +MAIL_AUTO_EMBED_METHOD=base64 # -------------------------------------------- # REQUIRED: IMAGE LIBRARY diff --git a/composer.json b/composer.json index e6f95b3f7..5e48fb671 100644 --- a/composer.json +++ b/composer.json @@ -13,11 +13,12 @@ "doctrine/dbal": "^2.8.0", "doctrine/inflector": "1.3.*", "doctrine/instantiator": "1.1.*", + "eduardokum/laravel-mail-auto-embed": "^1.0", "erusev/parsedown": "^1.6", "fideloper/proxy": "~4.0", "intervention/image": "^2.3", "javiereguiluz/easyslugger": "^1.0", - "laravel/framework": "5.7.0", + "laravel/framework": "5.7.*", "laravel/passport": "~6.0", "laravel/tinker": "^1.0", "laravelcollective/html": "^5.3", diff --git a/composer.lock b/composer.lock index 09d3bfe40..d45e9b14c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "57ad210d5cd379ab6d0f1ec5e546a55e", + "content-hash": "3a690057aecb60995a6ad77a3019da2f", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.67.5", + "version": "3.67.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "fa7689ba2865e9e00ac44efefc2c3f2ea8424c63" + "reference": "3e594391b8c60552cedcb3036c198d63315afc7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fa7689ba2865e9e00ac44efefc2c3f2ea8424c63", - "reference": "fa7689ba2865e9e00ac44efefc2c3f2ea8424c63", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3e594391b8c60552cedcb3036c198d63315afc7e", + "reference": "3e594391b8c60552cedcb3036c198d63315afc7e", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2018-09-04T21:04:34+00:00" + "time": "2018-09-05T23:24:12+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1119,6 +1119,61 @@ ], "time": "2018-06-06T03:12:17+00:00" }, + { + "name": "eduardokum/laravel-mail-auto-embed", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/eduardokum/laravel-mail-auto-embed.git", + "reference": "918c3aff220d965fbaee96ae4d48a09036381bdf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/918c3aff220d965fbaee96ae4d48a09036381bdf", + "reference": "918c3aff220d965fbaee96ae4d48a09036381bdf", + "shasum": "" + }, + "require": { + "illuminate/contracts": ">=5.3", + "illuminate/mail": ">=5.3", + "illuminate/support": ">=5.3", + "php": ">=5.5.0" + }, + "require-dev": { + "orchestra/testbench": "~3.0", + "phpunit/phpunit": "~5.0|~6.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Eduardokum\\LaravelMailAutoEmbed\\ServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Eduardokum\\LaravelMailAutoEmbed\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Gusmão", + "email": "eduguscontra3@hotmail.com" + } + ], + "description": "Library for embed images in emails automatically", + "homepage": "https://github.com/eduardokum/laravel-mail-auto-embed", + "keywords": [ + "eduardokum", + "laravel-mail-auto-embed" + ], + "time": "2017-09-21T12:11:32+00:00" + }, { "name": "egulias/email-validator", "version": "2.1.5", @@ -1692,16 +1747,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.0", + "version": "v5.7.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "9f313ce9bb5ad49a06ae78d33fbdd1c92a0e21f6" + "reference": "4a5955e325faa2054420eeb7320cc2c81111a2f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/9f313ce9bb5ad49a06ae78d33fbdd1c92a0e21f6", - "reference": "9f313ce9bb5ad49a06ae78d33fbdd1c92a0e21f6", + "url": "https://api.github.com/repos/laravel/framework/zipball/4a5955e325faa2054420eeb7320cc2c81111a2f2", + "reference": "4a5955e325faa2054420eeb7320cc2c81111a2f2", "shasum": "" }, "require": { @@ -1828,7 +1883,7 @@ "framework", "laravel" ], - "time": "2018-09-04T13:13:04+00:00" + "time": "2018-09-04T18:28:50+00:00" }, { "name": "laravel/passport", @@ -5975,24 +6030,24 @@ }, { "name": "watson/validating", - "version": "3.1.2", + "version": "3.1.7", "source": { "type": "git", "url": "https://github.com/dwightwatson/validating.git", - "reference": "22edd06d45893f5d4f79c9e901bd7fbce174a79f" + "reference": "0264ff53f69fc32de480f3105706a4c255ead325" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/validating/zipball/22edd06d45893f5d4f79c9e901bd7fbce174a79f", - "reference": "22edd06d45893f5d4f79c9e901bd7fbce174a79f", + "url": "https://api.github.com/repos/dwightwatson/validating/zipball/0264ff53f69fc32de480f3105706a4c255ead325", + "reference": "0264ff53f69fc32de480f3105706a4c255ead325", "shasum": "" }, "require": { - "illuminate/contracts": ">=5.3", - "illuminate/database": ">=5.3", - "illuminate/events": ">=5.3", - "illuminate/support": ">=5.3", - "illuminate/validation": ">=5.3", + "illuminate/contracts": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", + "illuminate/database": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", + "illuminate/events": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", + "illuminate/support": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", + "illuminate/validation": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", "php": ">=5.4.0" }, "require-dev": { @@ -6021,7 +6076,7 @@ "laravel", "validation" ], - "time": "2017-11-06T21:35:49+00:00" + "time": "2018-09-05T23:01:34+00:00" }, { "name": "webmozart/assert", diff --git a/config/mail-auto-embed.php b/config/mail-auto-embed.php new file mode 100644 index 000000000..bc1d038e0 --- /dev/null +++ b/config/mail-auto-embed.php @@ -0,0 +1,28 @@ + env('MAIL_AUTO_EMBED', true), + + /* + |-------------------------------------------------------------------------- + | Mail embed method + |-------------------------------------------------------------------------- + | + | Supported: "attachment", "base64" + | + */ + + 'method' => env('MAIL_AUTO_EMBED_METHOD', 'base64'), + +]; From b80b91514de26fbe837f94614c6d1a6a6f054f44 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 5 Sep 2018 19:27:37 -0700 Subject: [PATCH 05/13] Fixed Laravel 5.7 compatibility issue re: boot() method This was causing the error: Undefined index: App\Models\CustomField (View: /Users/snipe/Sites/snipe-it/snipe-it/resources/views/hardware/index.blade.php) and pointed to the Eloquent model library method: ``` protected function initializeTraits() { foreach (static::$traitInitializers[static::class] as $method) { $this->{$method}(); } } ``` Thanks to https://github.com/laravel/framework/issues/25455 for the clue. --- app/Models/CustomField.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index eef6a55d9..390c6500b 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -87,6 +87,7 @@ class CustomField extends Model */ public static function boot() { + parent::boot(); self::created(function ($custom_field) { // Column already exists on the assets table - nothing to do here. From 26fd7f7e793e84ba7c9bde2cccc971adb35e8165 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 6 Sep 2018 14:28:04 -0700 Subject: [PATCH 06/13] I have no idea why this was necessary suddenly --- .../Controllers/CustomFieldsetsController.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php index c035e130e..fae646e9d 100644 --- a/app/Http/Controllers/CustomFieldsetsController.php +++ b/app/Http/Controllers/CustomFieldsetsController.php @@ -42,14 +42,19 @@ class CustomFieldsetsController extends Controller if ($cfset) { $custom_fields_list = ["" => "Add New Field to Fieldset"] + CustomField::pluck("name", "id")->toArray(); + $maxid = 0; foreach ($cfset->fields() as $field) { - if ($field->pivot->order > $maxid) { - $maxid=$field->pivot->order; - } - if (isset($custom_fields_list[$field->id])) { - unset($custom_fields_list[$field->id]); + + if ($field) { + if ($field->pivot->order > $maxid) { + $maxid=$field->pivot->order; + } + if (isset($custom_fields_list[$field->id])) { + unset($custom_fields_list[$field->id]); + } } + } return view("custom_fields.fieldsets.view") From 77cdb2f409ccf8cfbd94fb26847b3ea205a3e22a Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 7 Sep 2018 02:24:41 -0700 Subject: [PATCH 07/13] Added console command to send inventory reports to users --- .../Commands/SendCurrentInventoryToUsers.php | 53 +++++++++++++++ app/Console/Kernel.php | 1 + app/Notifications/CurrentInventory.php | 66 +++++++++++++++++++ .../markdown/user-inventory.blade.php | 39 +++++++++++ 4 files changed, 159 insertions(+) create mode 100644 app/Console/Commands/SendCurrentInventoryToUsers.php create mode 100644 app/Notifications/CurrentInventory.php create mode 100644 resources/views/notifications/markdown/user-inventory.blade.php diff --git a/app/Console/Commands/SendCurrentInventoryToUsers.php b/app/Console/Commands/SendCurrentInventoryToUsers.php new file mode 100644 index 000000000..2ea8ac378 --- /dev/null +++ b/app/Console/Commands/SendCurrentInventoryToUsers.php @@ -0,0 +1,53 @@ +whereNotNull('email')->with('assets', 'accessories', 'consumables', 'licenses')->get(); + + foreach ($users as $user) { + $this->info($user->email); + $user->notify((new CurrentInventory($user))); + } + + + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index fed6c0398..750369df5 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -31,6 +31,7 @@ class Kernel extends ConsoleKernel Commands\RegenerateAssetTags::class, Commands\SyncAssetCounters::class, Commands\RestoreDeletedUsers::class, + Commands\SendCurrentInventoryToUsers::class, ]; /** diff --git a/app/Notifications/CurrentInventory.php b/app/Notifications/CurrentInventory.php new file mode 100644 index 000000000..b39c7245c --- /dev/null +++ b/app/Notifications/CurrentInventory.php @@ -0,0 +1,66 @@ +user = $user; + } + + /** + * Get the notification's delivery channels. + * + * @param mixed $notifiable + * @return array + */ + public function via($notifiable) + { + return ['mail']; + } + + /** + * Get the mail representation of the notification. + * + * @param mixed $notifiable + * @return \Illuminate\Notifications\Messages\MailMessage + */ + public function toMail($notifiable) + { + $message = (new MailMessage)->markdown('notifications.markdown.user-inventory', + [ + 'assets' => $this->user->assets, + 'accessories' => $this->user->accessories, + 'licenses' => $this->user->licenses, + ]) + ->subject('Inventory Report'); + + return $message; + } + + /** + * Get the array representation of the notification. + * + * @param mixed $notifiable + * @return array + */ + public function toArray($notifiable) + { + return [ + // + ]; + } +} diff --git a/resources/views/notifications/markdown/user-inventory.blade.php b/resources/views/notifications/markdown/user-inventory.blade.php new file mode 100644 index 000000000..4efe69e01 --- /dev/null +++ b/resources/views/notifications/markdown/user-inventory.blade.php @@ -0,0 +1,39 @@ +@component('mail::message') + +This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email {{ config('mail.reply_to.name') }} at {{ config('mail.reply_to.address') }}. + + +@component('mail::table') + +@if ($assets->count() > 0) +## {{ $assets->count() }} Assets +|{{ trans('mail.name') }} |{{ trans('mail.asset_tag') }} | +|:------------- |:-------------|:---------| +@foreach($assets as $asset) +|{{ $asset->present()->name }} |{{ $asset->asset_tag }} | +@endforeach +@endif + +@if ($accessories->count() > 0) +## {{ $accessories->count() }} Accessories +|{{ trans('mail.name') }} | +| |:------------- | +@foreach($accessories as $accessory) +|{{ $accessory->name }} | +@endforeach +@endif + +@if ($licenses->count() > 0) +## {{ $licenses->count() }} Licenses + +| |:------------- | +@foreach($licenses as $license) +|{{ $asset->$license }} | +@endforeach +@endif + + +@endcomponent + + +@endcomponent From 451f4c3320a73ba051f4ff8eb2c3a300d1030a17 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 7 Sep 2018 03:08:08 -0700 Subject: [PATCH 08/13] Bumped watson validating package version, laravel to v5.7.2 --- composer.json | 2 +- composer.lock | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 5e48fb671..92cf0420b 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "tecnickcom/tc-lib-barcode": "^1.15", "tightenco/ziggy": "^0.6.3", "unicodeveloper/laravel-password": "^1.0", - "watson/validating": "^3.0" + "watson/validating": "3.1.7" }, "require-dev": { "codeception/codeception": "^2.4", diff --git a/composer.lock b/composer.lock index d45e9b14c..71f418dad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "3a690057aecb60995a6ad77a3019da2f", + "content-hash": "7652fb9115a7813a1b3f5c466046a4b5", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.67.6", + "version": "3.67.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "3e594391b8c60552cedcb3036c198d63315afc7e" + "reference": "002577f67703af64a1be35d65edd6a74842c1e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3e594391b8c60552cedcb3036c198d63315afc7e", - "reference": "3e594391b8c60552cedcb3036c198d63315afc7e", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/002577f67703af64a1be35d65edd6a74842c1e65", + "reference": "002577f67703af64a1be35d65edd6a74842c1e65", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2018-09-05T23:24:12+00:00" + "time": "2018-09-06T22:05:51+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1747,16 +1747,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.1", + "version": "v5.7.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "4a5955e325faa2054420eeb7320cc2c81111a2f2" + "reference": "86e1f98a6d2aab018e0257a7cb2ef2110d64a873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/4a5955e325faa2054420eeb7320cc2c81111a2f2", - "reference": "4a5955e325faa2054420eeb7320cc2c81111a2f2", + "url": "https://api.github.com/repos/laravel/framework/zipball/86e1f98a6d2aab018e0257a7cb2ef2110d64a873", + "reference": "86e1f98a6d2aab018e0257a7cb2ef2110d64a873", "shasum": "" }, "require": { @@ -1844,6 +1844,7 @@ "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", + "moontoast/math": "Required to use ordered UUIDs (^1.1).", "nexmo/client": "Required to use the Nexmo transport (^1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0).", "predis/predis": "Required to use the redis cache and queue drivers (^1.0).", @@ -1883,7 +1884,7 @@ "framework", "laravel" ], - "time": "2018-09-04T18:28:50+00:00" + "time": "2018-09-06T14:01:05+00:00" }, { "name": "laravel/passport", @@ -3980,16 +3981,16 @@ }, { "name": "rollbar/rollbar", - "version": "v1.6.2", + "version": "v1.6.3", "source": { "type": "git", "url": "https://github.com/rollbar/rollbar-php.git", - "reference": "1deec89b870899d12794bb75377ca60359f18723" + "reference": "149590adc3bd5ed1188c48f8159f257aa1bf2d19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rollbar/rollbar-php/zipball/1deec89b870899d12794bb75377ca60359f18723", - "reference": "1deec89b870899d12794bb75377ca60359f18723", + "url": "https://api.github.com/repos/rollbar/rollbar-php/zipball/149590adc3bd5ed1188c48f8159f257aa1bf2d19", + "reference": "149590adc3bd5ed1188c48f8159f257aa1bf2d19", "shasum": "" }, "require": { @@ -4036,7 +4037,7 @@ "logging", "monitoring" ], - "time": "2018-08-14T23:59:30+00:00" + "time": "2018-09-06T21:34:17+00:00" }, { "name": "rollbar/rollbar-laravel", From 827a86b2efef3e706048490435cc3153e7e9f962 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 7 Sep 2018 03:08:32 -0700 Subject: [PATCH 09/13] Only send inventory report to users if they have things checked out to them --- .../Commands/SendCurrentInventoryToUsers.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/SendCurrentInventoryToUsers.php b/app/Console/Commands/SendCurrentInventoryToUsers.php index 2ea8ac378..be267e73e 100644 --- a/app/Console/Commands/SendCurrentInventoryToUsers.php +++ b/app/Console/Commands/SendCurrentInventoryToUsers.php @@ -41,13 +41,21 @@ class SendCurrentInventoryToUsers extends Command public function handle() { - $users = User::whereNull('deleted_at')->whereNotNull('email')->with('assets', 'accessories', 'consumables', 'licenses')->get(); + $users = User::whereNull('deleted_at')->whereNotNull('email')->with('assets', 'accessories', 'licenses')->get(); + $count = 0; foreach ($users as $user) { - $this->info($user->email); - $user->notify((new CurrentInventory($user))); + + if (($user->assets->count() > 0) || ($user->accessories->count() > 0) || ($user->licenses->count() > 0)) + { + $count++; + $user->notify((new CurrentInventory($user))); + } + } + $this->info($count.' users notified.'); + } } From 181e75adb49dc4ba09136384067289c4c86e4cbc Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 7 Sep 2018 03:56:17 -0700 Subject: [PATCH 10/13] Apply hotfix for fixed category model scope --- app/Models/Asset.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 4805602f3..4d8ca1c89 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -1360,8 +1360,8 @@ class Asset extends Depreciable */ public function scopeInCategory($query, $category_id) { - return $query->join('models', 'assets.model_id', '=', 'models.id') - ->join('categories', 'models.category_id', '=', 'categories.id')->where('models.category_id', '=', $category_id); + return $query->join('models as category_models', 'assets.model_id', '=', 'category_models.id') + ->join('categories', 'category_models.category_id', '=', 'categories.id')->where('category_models.category_id', '=', $category_id); } /** From e89b33f86512dbda424aba9fef691a1c9b160eb6 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 7 Sep 2018 05:09:24 -0700 Subject: [PATCH 11/13] Enable popovers --- resources/views/layouts/default.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index a54e23fdf..8e1663f2b 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -803,8 +803,11 @@ @show -@endpush \ No newline at end of file +@endpush