diff --git a/web/src/composer.json b/web/src/composer.json index 47184c2..8f2db48 100644 --- a/web/src/composer.json +++ b/web/src/composer.json @@ -6,13 +6,12 @@ "type": "project", "require": { "php": "^7.1.3", - "darkaonline/l5-swagger": "^5.7", + "darkaonline/l5-swagger": "^6.0", "fideloper/proxy": "^4.0", - "jdavidbakr/laravel-cache-garbage-collector": "^1.0", - "laravel/framework": "5.8.*", + "laravel/framework": "^6.0", "laravel/tinker": "^1.0", - "lucid-arch/laravel-console": "^5.6", - "lucid-arch/laravel-foundation": "^5.6", + "lucid-arch/laravel-console": "^6.0", + "lucid-arch/laravel-foundation": "^6.0", "nicolab/php-ftp-client": "^1.4", "prettus/l5-repository": "^2.6", "spatie/ssl-certificate": "^1.12" diff --git a/web/src/composer.lock b/web/src/composer.lock index 3944116..fc79251 100644 --- a/web/src/composer.lock +++ b/web/src/composer.lock @@ -4,34 +4,34 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dace7880d02469a50299d3178f3784fb", + "content-hash": "c6cd61f65362af846ed2596fb27eebec", "packages": [ { "name": "darkaonline/l5-swagger", - "version": "5.8.3", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/DarkaOnLine/L5-Swagger.git", - "reference": "32b312a7c5f0501fc79efef812ed2dade6d97200" + "reference": "df9e72d705e7757a700ac58d41c62b10c6ddc48c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DarkaOnLine/L5-Swagger/zipball/32b312a7c5f0501fc79efef812ed2dade6d97200", - "reference": "32b312a7c5f0501fc79efef812ed2dade6d97200", + "url": "https://api.github.com/repos/DarkaOnLine/L5-Swagger/zipball/df9e72d705e7757a700ac58d41c62b10c6ddc48c", + "reference": "df9e72d705e7757a700ac58d41c62b10c6ddc48c", "shasum": "" }, "require": { - "laravel/framework": "5.6.*|5.7.*|5.8.*", - "php": ">=7.1.3", + "laravel/framework": "^6.0", + "php": "^7.2", "swagger-api/swagger-ui": "^3.0", "symfony/yaml": "^4.1", "zircote/swagger-php": "~2.0|3.*" }, "require-dev": { "mockery/mockery": "1.*", - "orchestra/testbench": "3.6.*|3.8.*", + "orchestra/testbench": "4.*", "php-coveralls/php-coveralls": "^2.0", - "phpunit/phpunit": "7.*" + "phpunit/phpunit": "8.*" }, "suggest": { "zircote/swagger-php:~2.0": "!!! Require Swagger-PHP ~2.0 for @SWG annotations support !!!" @@ -68,7 +68,7 @@ "laravel", "swagger" ], - "time": "2019-09-04T12:15:22+00:00" + "time": "2019-11-08T17:08:43+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -600,99 +600,45 @@ "description": "Highlight PHP code in terminal", "time": "2018-09-29T18:48:56+00:00" }, - { - "name": "jdavidbakr/laravel-cache-garbage-collector", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/jdavidbakr/laravel-cache-garbage-collector.git", - "reference": "6e344e405bebcfb918315a7e1a074a3d0d846cb1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jdavidbakr/laravel-cache-garbage-collector/zipball/6e344e405bebcfb918315a7e1a074a3d0d846cb1", - "reference": "6e344e405bebcfb918315a7e1a074a3d0d846cb1", - "shasum": "" - }, - "require": { - "illuminate/support": "~5.1", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "4.*", - "scrutinizer/ocular": "~1.1", - "squizlabs/php_codesniffer": "~2.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "jdavidbakr\\LaravelCacheGarbageCollector\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jon Baker", - "email": "me@jdavidbaker.com", - "homepage": "http://www.jdavidbaker.com", - "role": "Developer" - } - ], - "description": "A script that will clean up expired cache files if the system is using the files cache system", - "homepage": "https://github.com/jdavidbakr/LaravelCacheGarbageCollector", - "keywords": [ - "LaravelCacheGarbageCollector", - "jdavidbakr" - ], - "time": "2016-06-29T14:18:15+00:00" - }, { "name": "laravel/framework", - "version": "v5.8.35", + "version": "v6.6.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197" + "reference": "b48528ba5422ac909dbabf0b1cc34534928e7bce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/5a9e4d241a8b815e16c9d2151e908992c38db197", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197", + "url": "https://api.github.com/repos/laravel/framework/zipball/b48528ba5422ac909dbabf0b1cc34534928e7bce", + "reference": "b48528ba5422ac909dbabf0b1cc34534928e7bce", "shasum": "" }, "require": { "doctrine/inflector": "^1.1", "dragonmantank/cron-expression": "^2.0", - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.1.10", "erusev/parsedown": "^1.7", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", "league/flysystem": "^1.0.8", - "monolog/monolog": "^1.12", - "nesbot/carbon": "^1.26.3 || ^2.0", + "monolog/monolog": "^1.12|^2.0", + "nesbot/carbon": "^2.0", "opis/closure": "^3.1", - "php": "^7.1.3", + "php": "^7.2", "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.2", - "symfony/debug": "^4.2", - "symfony/finder": "^4.2", - "symfony/http-foundation": "^4.2", - "symfony/http-kernel": "^4.2", - "symfony/process": "^4.2", - "symfony/routing": "^4.2", - "symfony/var-dumper": "^4.2", + "symfony/console": "^4.3.4", + "symfony/debug": "^4.3.4", + "symfony/finder": "^4.3.4", + "symfony/http-foundation": "^4.3.4", + "symfony/http-kernel": "^4.3.4", + "symfony/process": "^4.3.4", + "symfony/routing": "^4.3.4", + "symfony/var-dumper": "^4.3.4", "tijsverkoyen/css-to-inline-styles": "^2.2.1", "vlucas/phpdotenv": "^3.3" }, @@ -732,47 +678,45 @@ "require-dev": { "aws/aws-sdk-php": "^3.0", "doctrine/dbal": "^2.6", - "filp/whoops": "^2.1.4", + "filp/whoops": "^2.4", "guzzlehttp/guzzle": "^6.3", "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "^1.0", + "mockery/mockery": "^1.2.3", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.8.*", + "orchestra/testbench-core": "^4.0", "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^7.5|^8.0", + "phpunit/phpunit": "^8.3", "predis/predis": "^1.1.1", - "symfony/css-selector": "^4.2", - "symfony/dom-crawler": "^4.2", + "symfony/cache": "^4.3", "true/punycode": "^2.1" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", + "ext-memcached": "Required to use the memcache cache driver.", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "filp/whoops": "Required for friendly error pages in development (^2.1.4).", + "ext-redis": "Required to use the Redis cache and queue drivers.", + "filp/whoops": "Required for friendly error pages in development (^2.4).", "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).", + "guzzlehttp/guzzle": "Required to use the Mailgun mail driver 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).", "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 (^4.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.2).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", + "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.8-dev" + "dev-master": "6.x-dev" } }, "autoload": { @@ -800,7 +744,7 @@ "framework", "laravel" ], - "time": "2019-09-03T16:44:30+00:00" + "time": "2019-11-26T15:33:08+00:00" }, { "name": "laravel/tinker", @@ -951,21 +895,20 @@ }, { "name": "lucid-arch/laravel-console", - "version": "v5.8.0", + "version": "6.0.x-dev", "source": { "type": "git", "url": "https://github.com/lucid-architecture/console-laravel.git", - "reference": "5ec3749b8204243e86e59bae82d6e89b90b3201c" + "reference": "0cb64e2faa96a4bbd02bc34103cdd461ad09ea25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lucid-architecture/console-laravel/zipball/5ec3749b8204243e86e59bae82d6e89b90b3201c", - "reference": "5ec3749b8204243e86e59bae82d6e89b90b3201c", + "url": "https://api.github.com/repos/lucid-architecture/console-laravel/zipball/0cb64e2faa96a4bbd02bc34103cdd461ad09ea25", + "reference": "0cb64e2faa96a4bbd02bc34103cdd461ad09ea25", "shasum": "" }, "require": { "phploc/phploc": "~4.0", - "stevebauman/log-reader": "^1.1", "symfony/console": "^4.1", "symfony/filesystem": "^4.1", "symfony/finder": "^4.1", @@ -999,20 +942,20 @@ "lucid", "mvc" ], - "time": "2018-11-24T14:42:41+00:00" + "time": "2019-11-30T13:41:22+00:00" }, { "name": "lucid-arch/laravel-foundation", - "version": "v5.8.1", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/lucid-architecture/foundation-laravel.git", - "reference": "e48eb49ec977490991b6ec627b50cdcd1b62b2a8" + "reference": "470fb24039862d2958ad1926ed69adec82122f42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lucid-architecture/foundation-laravel/zipball/e48eb49ec977490991b6ec627b50cdcd1b62b2a8", - "reference": "e48eb49ec977490991b6ec627b50cdcd1b62b2a8", + "url": "https://api.github.com/repos/lucid-architecture/foundation-laravel/zipball/470fb24039862d2958ad1926ed69adec82122f42", + "reference": "470fb24039862d2958ad1926ed69adec82122f42", "shasum": "" }, "type": "library", @@ -1032,25 +975,25 @@ } ], "description": "The Foundation of the Lucid Architecture project for Laravel", - "time": "2019-08-27T09:08:58+00:00" + "time": "2019-08-27T09:09:11+00:00" }, { "name": "monolog/monolog", - "version": "1.25.2", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287" + "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9d56fd2f5533322caccdfcddbb56aedd622ef1c", + "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": "^7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -1058,33 +1001,36 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -1110,7 +1056,7 @@ "logging", "psr-3" ], - "time": "2019-11-13T10:00:05+00:00" + "time": "2019-11-13T10:27:43+00:00" }, { "name": "nesbot/carbon", @@ -2087,47 +2033,6 @@ ], "time": "2019-11-18T09:24:07+00:00" }, - { - "name": "stevebauman/log-reader", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/stevebauman/log-reader.git", - "reference": "ef5e900354576c9bb76ad405cfda994414a27d5b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stevebauman/log-reader/zipball/ef5e900354576c9bb76ad405cfda994414a27d5b", - "reference": "ef5e900354576c9bb76ad405cfda994414a27d5b", - "shasum": "" - }, - "require": { - "illuminate/support": "5.*", - "php": ">=5.5.9" - }, - "require-dev": { - "mockery/mockery": "0.9.*", - "orchestra/testbench": "~3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Stevebauman\\LogReader\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Steve Bauman", - "email": "steven_bauman@outlook.com" - } - ], - "description": "An easy log reader and management tool for Laravel 5", - "time": "2015-08-27T21:07:53+00:00" - }, { "name": "swagger-api/swagger-ui", "version": "v3.24.3", diff --git a/web/src/config/cache.php b/web/src/config/cache.php index fa12e5e..25f40d5 100644 --- a/web/src/config/cache.php +++ b/web/src/config/cache.php @@ -88,7 +88,7 @@ 'prefix' => env( 'CACHE_PREFIX', - str_slug(env('APP_NAME', 'laravel'), '_').'_cache' + \Illuminate\Support\Str::slug(env('APP_NAME', 'laravel'), '_').'_cache' ), ]; diff --git a/web/src/config/session.php b/web/src/config/session.php index 736fb3c..0189402 100644 --- a/web/src/config/session.php +++ b/web/src/config/session.php @@ -124,7 +124,7 @@ 'cookie' => env( 'SESSION_COOKIE', - str_slug(env('APP_NAME', 'laravel'), '_').'_session' + \Illuminate\Support\Str::slug(env('APP_NAME', 'laravel'), '_').'_session' ), /* diff --git a/web/src/storage/framework/cache/data/.gitignore b/web/src/storage/framework/cache/data/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/web/src/storage/framework/cache/data/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore