Laravel 9 support

Author: schulzefelix

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 All Notable changes to `laravel-search-console` will be documented in this file.
+## [1.8.0] - 2022-03-11
+- Add Compatibility With Laravel 9
+- Drop support for Laravel 8
+- Minimum PHP 8.0.2
+- Drop Support for Laravel Lumen
+
 ## [1.7.1] - 2021-04-11
 - Add 'AggregationType' request and response parameter
 

README.md

@@ -10,9 +10,20 @@
 
 Using this package you can easily retrieve data from Google Search Console API.
 
-## Install
+Here are a few examples of the provided methods:
+
+```php
+use SearchConsole;
 
-> For Laravel 5.8, use version 1.2.0 of this package!
+//list all available sites for that token
+SearchConsole::setAccessToken($token)->listSites();
+
+//get site details (permissionLevel) for specific site
+SearchConsole::setAccessToken($token)->getSite('http://blog.example.com/');
+```
+
+
+## Install
 
 This package can be installed through Composer.
 
@@ -105,6 +116,9 @@ $sites = SearchConsole::setAccessToken($token)->listSites();
 ### Search Analytics
 
 ```php
+use SearchConsole;
+use SchulzeFelix\SearchConsole\Period;
+
     $data = SearchConsole::setAccessToken($token)->setQuotaUser('uniqueQuotaUserString')
         ->searchAnalyticsQuery(
             'https://www.example.com/',

composer.json

@@ -20,15 +20,16 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.0.2",
         "google/apiclient": "^2.0",
-        "illuminate/support": "^8.0",
-        "symfony/cache": "^4.3|^5.0"
+        "illuminate/support": "^9.0",
+        "symfony/cache": "^6.0"
+
     },
     "require-dev": {
-        "mockery/mockery": "^1.4.2",
-        "orchestra/testbench": "^5.0|^6.0",
-        "phpunit/phpunit" : "^8.0|^9.0"
+        "mockery/mockery": "^1.4",
+        "orchestra/testbench": "^7.0",
+        "phpunit/phpunit": "^9.4"
     },
     "autoload": {
         "psr-4": {
@@ -52,5 +53,7 @@
     },
     "config": {
         "sort-packages": true
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/SearchConsoleServiceProvider.php

@@ -2,9 +2,7 @@
 
 namespace SchulzeFelix\SearchConsole;
 
-use Illuminate\Foundation\Application as LaravelApplication;
 use Illuminate\Support\ServiceProvider;
-use Laravel\Lumen\Application as LumenApplication;
 use SchulzeFelix\SearchConsole\Exceptions\InvalidConfiguration;
 
 class SearchConsoleServiceProvider extends ServiceProvider
@@ -28,13 +26,16 @@ public function register()
     {
         $this->mergeConfigFrom(__DIR__.'/../config/search-console.php', 'search-console');
 
-        $searchConsoleConfig = config('search-console');
 
-        $this->app->bind(SearchConsoleClient::class, function () use ($searchConsoleConfig) {
+        $this->app->bind(SearchConsoleClient::class, function () {
+            $searchConsoleConfig = config('search-console');
+
             return SearchConsoleClientFactory::createForConfig($searchConsoleConfig);
         });
 
-        $this->app->bind(SearchConsole::class, function () use ($searchConsoleConfig) {
+        $this->app->bind(SearchConsole::class, function () {
+            $searchConsoleConfig = config('search-console');
+
             $this->guardAgainstInvalidConfiguration($searchConsoleConfig);
 
             $client = app(SearchConsoleClient::class);
@@ -64,11 +65,7 @@ protected function setupConfig()
     {
         $source = realpath(__DIR__.'/../config/search-console.php');
 
-        if ($this->app instanceof LaravelApplication) {
-            $this->publishes([$source => config_path('search-console.php')]);
-        } elseif ($this->app instanceof LumenApplication) {
-            $this->app->configure('search-console');
-        }
+        $this->publishes([$source => config_path('search-console.php')]);
 
         $this->mergeConfigFrom($source, 'search-console');
     }