diff --git a/Changelog b/Changelog index f06204ef1..155db1786 100755 --- a/Changelog +++ b/Changelog @@ -1,5 +1,5 @@ 2019-10-08 DariusIII - * Chg: Rename Redis alias to RedisManager to avoid collision with phpredis + * Chg: Use monicahq/laravel-cloudflare once more 2019-10-07 DariusIII * Chg: Update redis config to use phpredis * Chg: Update user role assignment on registration diff --git a/composer.json b/composer.json index a3af3c393..81e794550 100755 --- a/composer.json +++ b/composer.json @@ -88,17 +88,17 @@ "aharen/omdbapi": "^2.0", "anhskohbo/no-captcha": "^3.0", "b3rs3rk/steamfront": "dev-master", - "dariusiii/laravel-countries": "^2.0", "canihavesomecoffee/thetvdbapi": "^1.0", - "dariusiii/zipper": "^2.0", "czproject/git-php": "^3.14", - "dariusiii/tmdb-laravel": "^2.0", - "dariusiii/laravel-cloudflare": "dev-master", + "dariusiii/l5-fixtures": "^2.0.0", + "dariusiii/laravel-countries": "^2.0", "dariusiii/laravel-database-trigger": "^2.0", "dariusiii/php-itunes-api": "^1.0", "dariusiii/rarinfo": "^2.5", - "dborsatto/php-giantbomb": "^1.0", + "dariusiii/tmdb-laravel": "^2.0", "dariusiii/token": "^3.0", + "dariusiii/zipper": "^2.0", + "dborsatto/php-giantbomb": "^1.0", "doctrine/dbal": "^2.7", "fideloper/proxy": "^4.2", "foolz/sphinxql-query-builder": "^2.0", @@ -122,8 +122,8 @@ "laravelcollective/html": "^6.0", "league/climate": "^3.4", "marcreichel/igdb-laravel": "^0.10.0", - "dariusiii/l5-fixtures": "^2.0.0", "mhor/php-mediainfo": "^4.1", + "monicahq/laravel-cloudflare": "^1.3", "monolog/monolog": "^1.22", "nesbot/carbon": "^2.14", "pear/net_nntp": "^1.5", diff --git a/composer.lock b/composer.lock index 9c8b94496..9206d523a 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": "383df6c4c5140bd8e3873605539ba2af", + "content-hash": "f7d6572c5c94f00039e710fc1b5f3c96", "packages": [ { "name": "aharen/omdbapi", @@ -525,75 +525,6 @@ ], "time": "2019-09-13T11:05:02+00:00" }, - { - "name": "dariusiii/laravel-cloudflare", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/DariusIII/laravel-cloudflare.git", - "reference": "0d7dbd0fb9929966b704df8a2b986447bbe342e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DariusIII/laravel-cloudflare/zipball/0d7dbd0fb9929966b704df8a2b986447bbe342e2", - "reference": "0d7dbd0fb9929966b704df8a2b986447bbe342e2", - "shasum": "" - }, - "require": { - "fideloper/proxy": "^4.2", - "guzzlehttp/guzzle": "^6.3", - "illuminate/console": "^5.5|^6.0", - "illuminate/http": "^5.5|^6.0", - "illuminate/support": "^5.5|^6.0", - "php": ">= 7.1.0" - }, - "require-dev": { - "laravel/framework": "^6.0", - "mockery/mockery": "^1.2", - "orchestra/testbench": "^3.8", - "phpunit/phpunit": "^7.4 || ^8.0", - "vimeo/psalm": "^2.0 || ^3.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Monicahq\\Cloudflare\\TrustedProxyServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Monicahq\\Cloudflare\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Monicahq\\Cloudflare\\Tests\\": "tests" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Alexis Saettler", - "email": "alexis@saettler.org" - } - ], - "description": "Add Cloudflare ip addresses to trusted proxies for Laravel.", - "keywords": [ - "cloudflare", - "laravel", - "php", - "proxies" - ], - "support": { - "issues": "https://github.com/monicahq/laravel-cloudflare/issues", - "source": "https://github.com/monicahq/laravel-cloudflare" - }, - "time": "2019-09-23T18:44:31+00:00" - }, { "name": "dariusiii/laravel-countries", "version": "v2.0.0", @@ -3733,6 +3664,67 @@ "description": "PHP wrapper around the mediainfo command", "time": "2018-07-03T21:29:10+00:00" }, + { + "name": "monicahq/laravel-cloudflare", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/monicahq/laravel-cloudflare.git", + "reference": "75cf29f88315266b70cf54f155d6cb812b9f1479" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/monicahq/laravel-cloudflare/zipball/75cf29f88315266b70cf54f155d6cb812b9f1479", + "reference": "75cf29f88315266b70cf54f155d6cb812b9f1479", + "shasum": "" + }, + "require": { + "fideloper/proxy": "~4.0", + "guzzlehttp/guzzle": "^6.3", + "illuminate/console": "^5.5 || ^6.0", + "illuminate/http": "^5.5 || ^6.0", + "illuminate/support": "^5.5 || ^6.0", + "php": ">= 7.2.0" + }, + "require-dev": { + "laravel/framework": "^5.6 || ^6.0", + "mockery/mockery": "^1.2", + "orchestra/testbench": "^3.8", + "phpunit/phpunit": "^7.4 || ^8.0", + "vimeo/psalm": "^2.0 || ^3.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Monicahq\\Cloudflare\\TrustedProxyServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Monicahq\\Cloudflare\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alexis Saettler", + "email": "alexis@saettler.org" + } + ], + "description": "Add Cloudflare ip addresses to trusted proxies for Laravel.", + "keywords": [ + "cloudflare", + "laravel", + "php", + "proxies" + ], + "time": "2019-09-26T18:28:20+00:00" + }, { "name": "monolog/monolog", "version": "1.25.1", @@ -12673,7 +12665,6 @@ "minimum-stability": "stable", "stability-flags": { "b3rs3rk/steamfront": 20, - "dariusiii/laravel-cloudflare": 20, "joshpinkney/tv-maze-php-api": 20 }, "prefer-stable": false,