Merge pull request #294 from dacastro4/codex/prepare-new-version-for-laravel-12

feat: prepare for Laravel 12

Author: dacastro4

CHANGELOG.md

@@ -1,5 +1,12 @@
-# CHANGELOG
+# Changelog
+
+## Unreleased
+
+- Added support for Laravel 12.
+- Switched code style to Laravel Pint and formatted project.
+- Improved token check logic in `GmailConnection`.
+- Cleaned up and expanded documentation.
 
 ## 0.1
 
-First
+- Initial release.

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Contributions are welcome, and are accepted via pull requests. Please review the
 
 ## Guidelines
 
-- Please follow the [PSR-2 Coding Style Guide](http://www.php-fig.org/psr/psr-2), enforced by [StyleCI](https://styleci.io).
+- Please run [Laravel Pint](https://laravel.com/docs/pint) before submitting your pull request.
 - Ensure that the current tests pass, and if you've added something new, add the tests where relevant.
 - Send a coherent commit history, making sure each individual commit in your pull request is meaningful.
 - You may need to [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) to avoid merge conflicts.

composer.json

@@ -15,22 +15,22 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.2",
         "google/apiclient": "^v2.12.6",
-        "illuminate/auth": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/config": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/database": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/routing": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/session": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "illuminate/support": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/auth": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/config": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/database": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/routing": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/session": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/support": "~5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
         "symfony/mime": "^5.4|^6.0|^7.0",
         "ext-json": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3|^10.5",
         "mockery/mockery": "^1.0",
-        "squizlabs/php_codesniffer": "~3.4",
-        "orchestra/testbench": "^v4.18.0|^v5.20.0|^v6.25.0|^8.0|^9.0"
+        "laravel/pint": "^1.0",
+        "orchestra/testbench": "^v4.18.0|^v5.20.0|^v6.25.0|^8.0|^9.0|^10.0"
     },
     "autoload": {
         "psr-4": {

pint.json

@@ -0,0 +1,3 @@
+{
+    "preset": "laravel"
+}

readme.md

@@ -9,19 +9,14 @@
 
 
 # Gmail
-Gmail API for Laravel 9 and 10
+Gmail API for Laravel 9 through 12
 
 You need to create an application in the [Google Console](https://console.developers.google.com/apis/credentials). Guidance [here](https://developers.google.com/gmail/api/quickstart/php#step_1_turn_on_the_api_name).
 
-if you need **Laravel 5** compatibility please use version `2.0.x`.
-if you need **Laravel 6** compatibility please use version `3.0.x`.
-if you need **Laravel 7** compatibility please use version `4.0.x`.
-if you need **Laravel 8** compatibility please use version `5.0.x`.
-
 # Requirements
 
-* PHP ^8.0
-* Laravel 9
+* PHP ^8.2
+* Laravel 9-12
 
 # Installation
 
@@ -53,31 +48,6 @@ Now add the alias.
 
 For laravel >=5.5 that's all. This package supports Laravel new [Package Discovery](https://laravel.com/docs/5.5/packages#package-discovery).
 
-For <= PHP 7.4 compatibility use version `v5.0`
-
-# Migration from 5.0 to 6.0
-
-Requires Laravel 9 and you have to change the dependency to `"laravel/laravel": "^9.0"`
-Please, follow [Upgrading To 9.0 From 8.x Guide](https://laravel.com/docs/9.x/upgrade)
-
-# Migration from 4.0 to 5.0
-
-Requires Laravel 8 and you have to change the dependency to `"laravel/laravel": "^8.0"`
-Please, follow [Upgrading To 8.0 From 7.x Guide](https://laravel.com/docs/8.x/upgrade)
-
-# Migration from 3.0 to 4.0
-
-Requires Laravel 7 and you have to change the dependency to `"laravel/laravel": "^7.0"`
-Please, follow [Upgrading To 7.0 From 6.x Guide](https://laravel.com/docs/7.x/upgrade)
-
-# Migration from 2.0 to 3.0
-
-Requires Laravel 6 and you only have to change the dependency to `"laravel/laravel": "^6.0"`
-
-# Migration from 1.0 to 2.0
-The only changed made was the multi credentials feature.
-- Change your composer.json from `"dacastro4/laravel-gmail": "^1.0"` to `"dacastro4/laravel-gmail": "^2.0"`
-
 I had to change version because of a typo and that might break apps calling those attributes.
 
 All variable with the word "threat" was change to "thread" (yeah, I know.. sorry)
@@ -91,14 +61,6 @@ Ex:
 
 and so on.
 
-# Migration from 0.6 to 1.0
-The only changed made was the multi credentials feature.
-- Change your composer.json from `"dacastro4/laravel-gmail": "^0.6"` to `"dacastro4/laravel-gmail": "^1.0"`
-
-If you don't want the multi user credentials, you don't have to do anything else, if you do, you're going to have to
-login again to create a new credentials file per user.
-
-
 # Configuration
 
 You only have to set the following variables on your `.env` file and you'll be on your way:

src/GmailConnection.php

@@ -52,25 +52,22 @@ public function __construct($config = null, $userId = null)
 	 *
 	 * @return bool
 	 */
-	public function checkPreviouslyLoggedIn()
-	{
-		$fileName = $this->getFileName();
-		$file = "gmail/tokens/$fileName.json";
-		$allowJsonEncrypt = $this->_config['gmail.allow_json_encrypt'];
-
-		if (Storage::disk('local')->exists($file)) {
-			if ($allowJsonEncrypt) {
-				$savedConfigToken = json_decode(decrypt(Storage::disk('local')->get($file)), true);
-			} else {
-				$savedConfigToken = json_decode(Storage::disk('local')->get($file), true);
-			}
-
-			return !empty($savedConfigToken['access_token']);
-
-		}
-
-		return false;
-	}
+        public function checkPreviouslyLoggedIn()
+        {
+                $fileName = $this->getFileName();
+                $file = "gmail/tokens/$fileName.json";
+                $disk = Storage::disk('local');
+
+                if (!$disk->exists($file)) {
+                        return false;
+                }
+
+                $contents = $disk->get($file);
+                $allowJsonEncrypt = $this->_config['gmail.allow_json_encrypt'];
+                $savedConfigToken = json_decode($allowJsonEncrypt ? decrypt($contents) : $contents, true);
+
+                return !empty($savedConfigToken['access_token']);
+        }
 
 	/**
 	 * Refresh the auth token if needed