diff --git a/Blacklight/Console.php b/Blacklight/Console.php index 3bbab3b10..7e7904086 100755 --- a/Blacklight/Console.php +++ b/Blacklight/Console.php @@ -704,7 +704,7 @@ class Console $bestMatch = false; $gamePlatform = $this->_replacePlatform($gamePlatform); - if (config('services.igdb.key') !== '') { + if (config('config.credentials.client_id') !== '' && config('config.credentials.client_secret') !== '') { try { $result = Game::where('name', $gameInfo)->get(); if (! empty($result)) { diff --git a/composer.json b/composer.json index 2efe092e1..af09a30d5 100755 --- a/composer.json +++ b/composer.json @@ -28,7 +28,12 @@ "*": "dist" }, "sort-packages": true, - "optimize-autoloader": true + "optimize-autoloader": true, + "allow-plugins": { + "composer/package-versions-deprecated": true, + "captainhook/plugin-composer": true, + "treeware/plant": true + } }, "description": "A Usenet Indexer", "keywords": [ @@ -125,7 +130,7 @@ "laravel/ui": "^3.0", "laravelcollective/html": "^6.0", "league/climate": "^3.4", - "marcreichel/igdb-laravel": "^2.0", + "marcreichel/igdb-laravel": "^3.0", "mhor/php-mediainfo": "^5.0", "monicahq/laravel-cloudflare": "^1.3", "monolog/monolog": "^2.0", diff --git a/composer.lock b/composer.lock index e2aae1891..d4665da31 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": "85dcd99951b69ef4995bbec2e3ce7ea0", + "content-hash": "8f1757816e3ec90790a646909157b04a", "packages": [ { "name": "aharen/omdbapi", @@ -4960,32 +4960,46 @@ }, { "name": "marcreichel/igdb-laravel", - "version": "2.4.6", + "version": "3.5.3", "source": { "type": "git", "url": "https://github.com/marcreichel/igdb-laravel.git", - "reference": "aaaf7da764553f4318688266db0850c5164b25f2" + "reference": "aedf47f8968925738413227ee62f48337e404f45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/marcreichel/igdb-laravel/zipball/aaaf7da764553f4318688266db0850c5164b25f2", - "reference": "aaaf7da764553f4318688266db0850c5164b25f2", + "url": "https://api.github.com/repos/marcreichel/igdb-laravel/zipball/aedf47f8968925738413227ee62f48337e404f45", + "reference": "aedf47f8968925738413227ee62f48337e404f45", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/guzzle": "~6.0|~7.0", "laravel/framework": "^8.40.0", - "php": "^7.3 | ^7.4 | ^8.0" + "nesbot/carbon": "^2.53.1", + "php": "^8.0" }, "require-dev": { + "brainmaestro/composer-git-hooks": "^2.8", "nunomaduro/collision": "^5.3", + "nunomaduro/larastan": "^1.0.0", "orchestra/testbench": "^6.0", "phpunit/phpunit": "^9.5.4", "roave/security-advisories": "dev-latest" }, "type": "library", "extra": { + "hooks": { + "config": { + "stop-on-failure": [ + "pre-push" + ] + }, + "pre-push": [ + "composer stan", + "composer test" + ] + }, "laravel": { "providers": [ "MarcReichel\\IGDBLaravel\\IGDBLaravelServiceProvider" @@ -5018,7 +5032,7 @@ ], "support": { "issues": "https://github.com/marcreichel/igdb-laravel/issues", - "source": "https://github.com/marcreichel/igdb-laravel/tree/2.4.6" + "source": "https://github.com/marcreichel/igdb-laravel/tree/3.5.3" }, "funding": [ { @@ -5026,7 +5040,7 @@ "type": "github" } ], - "time": "2021-06-27T09:36:13+00:00" + "time": "2021-11-07T19:58:47+00:00" }, { "name": "maxmind-db/reader", @@ -13889,9 +13903,6 @@ "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" - }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", @@ -16620,5 +16631,5 @@ "ext-zlib": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } diff --git a/config/igdb.php b/config/igdb.php index 86d577984..74f1ca425 100644 --- a/config/igdb.php +++ b/config/igdb.php @@ -18,7 +18,15 @@ return [ 'cache_lifetime' => env('IGDB_CACHE_LIFETIME', 3600), /* - * This is the per-page limit for your tier. + * Path where the webhooks should be handled. */ - 'per_page_limit' => 500, + 'webhook_path' => 'igdb-webhook/handle', + + /* + * The webhook secret. + * + * This needs to be a string of your choice in order to use the webhook + * functionality. + */ + 'webhook_secret' => env('IGDB_WEBHOOK_SECRET'), ]; diff --git a/config/services.php b/config/services.php index 614a47758..0aa3b7410 100644 --- a/config/services.php +++ b/config/services.php @@ -42,11 +42,6 @@ return [ 'secret' => env('STRIPE_WEBHOOK_SECRET'), 'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300), ], - ], - - 'igdb' => [ - 'key' => env('IGDB_KEY', ''), - 'url' => 'https://api-v3.igdb.com', - ], + ] ];