diff --git a/Changelog b/Changelog index 75249e5d9..ffa890f6f 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-09-12 DariusIII + * Chg: Add genealabs/laravel-caffeine again, update to version 0.7.1 * Chg: Update some of the regexes in NameFixer to prevent bypassing of file extensions (ie. file.jpg.php) * Chg: Use Carbon in place of time() for time calculations in ReleaseRemover class 2018-09-11 DariusIII diff --git a/composer.json b/composer.json index a12fb11ef..9a2de3e65 100755 --- a/composer.json +++ b/composer.json @@ -72,8 +72,8 @@ "ext-ctype": "*", "ext-curl": "*", "ext-exif": "*", + "ext-fileinfo": "*", "ext-filter": "*", - "ext-fileinfo":"*", "ext-gd": "*", "ext-hash": "*", "ext-iconv": "*", @@ -135,6 +135,7 @@ "fideloper/proxy": "~4.0", "foolz/sphinxql-query-builder": "^1.2", "fxp/composer-asset-plugin": "~1.1", + "genealabs/laravel-caffeine": "^0.7.1", "geoip2/geoip2": "^2.9", "google/recaptcha": "~1.1", "guzzlehttp/guzzle": "^6.3", diff --git a/composer.lock b/composer.lock index 4b9ebb302..0b1216914 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a71d89d56a4bfc93b8057fdb8926b6f9", + "content-hash": "bf04baca76c76e5d906867a4b7ffe011", "packages": [ { "name": "adrenth/thetvdb2", @@ -2734,6 +2734,63 @@ ], "time": "2018-07-02T11:37:17+00:00" }, + { + "name": "genealabs/laravel-caffeine", + "version": "0.7.1", + "source": { + "type": "git", + "url": "https://github.com/GeneaLabs/laravel-caffeine.git", + "reference": "2d728885825e57f37a518be1c0471340ca37f593" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GeneaLabs/laravel-caffeine/zipball/2d728885825e57f37a518be1c0471340ca37f593", + "reference": "2d728885825e57f37a518be1c0471340ca37f593", + "shasum": "" + }, + "require": { + "illuminate/routing": "5.3 - 5.7", + "illuminate/support": "5.3 - 5.7", + "jenssegers/model": "*", + "php": ">=7.1.3" + }, + "require-dev": { + "codedungeon/phpunit-result-printer": "*", + "mockery/mockery": "*", + "orchestra/testbench": "3.7.x-dev", + "orchestra/testbench-browser-kit": "3.7.x-dev", + "orchestra/testbench-dusk": "3.7.x-dev@dev", + "php-coveralls/php-coveralls": "*", + "phpmd/phpmd": "*", + "phpunit/phpunit": "*", + "sebastian/phpcpd": "*" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "GeneaLabs\\LaravelCaffeine\\Providers\\Service" + ] + } + }, + "autoload": { + "psr-4": { + "GeneaLabs\\LaravelCaffeine\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike Bronner", + "email": "hello@genealabs.com" + } + ], + "description": "Keeping Your Laravel Forms Awake", + "time": "2018-09-12T00:01:17+00:00" + }, { "name": "geoip2/geoip2", "version": "v2.9.0", @@ -3300,6 +3357,54 @@ ], "time": "2017-10-26T18:34:37+00:00" }, + { + "name": "jenssegers/model", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/jenssegers/model.git", + "reference": "eedaeedc1977bb78f69dbb1c5893d0c994958790" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jenssegers/model/zipball/eedaeedc1977bb78f69dbb1c5893d0c994958790", + "reference": "eedaeedc1977bb78f69dbb1c5893d0c994958790", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^5.0", + "illuminate/support": "^4.0|^5.0", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0|^5.0", + "satooshi/php-coveralls": "^0.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Jenssegers\\Model\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jens Segers", + "homepage": "https://jenssegers.com" + } + ], + "description": "An Laravel eloquent-like model class, for Laravel and other frameworks", + "homepage": "https://github.com/jenssegers/model", + "keywords": [ + "eloquent", + "laravel", + "model" + ], + "time": "2018-07-21T14:41:19+00:00" + }, { "name": "jeremeamia/SuperClosure", "version": "2.4.0", @@ -10381,8 +10486,8 @@ "ext-ctype": "*", "ext-curl": "*", "ext-exif": "*", - "ext-filter": "*", "ext-fileinfo": "*", + "ext-filter": "*", "ext-gd": "*", "ext-hash": "*", "ext-iconv": "*",