Merge branch 'release/1.3.0'

.github/workflows/ci.yml

@@ -12,14 +12,18 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.2, 7.3, 7.4]
+        php: [8.1, 8.2]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          # Fetch 10 commits or Scrutinizer will throw ("Failed to retrieve commit parents. If you use a shallow git checkout, please checkout at least a depth of one."), see: RepositoryIntrospector at scrutinizer-ci/ocular GitHub repository
+          # 10 commits is an arbitrary value that is more than 1 commit
+          fetch-depth: 10
 
       - name: Cache dependencies
         uses: actions/cache@v1
@@ -34,16 +38,14 @@ jobs:
           coverage: pcov
 
       - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
       - name: PHP Security Checker
-        uses: symfonycorp/security-checker-action@v2
-        with:
-          disable-exit-code: 1
+        uses: symfonycorp/security-checker-action@v5
         if: ${{ matrix.stability == 'prefer-stable' }}
 
       - name: Execute tests
         run: vendor/bin/phpunit --coverage-clover=coverage.clover --verbose
 
       - name: Upload Code Coverage
-        run: wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+        run: vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover

.gitignore

@@ -2,5 +2,6 @@
 /node_modules
 phpunit.xml
 /build
+.env
 .phpunit.result.cache
 composer.lock

VERSION

@@ -1 +1 @@
-1.2.8
+1.3.0

composer.json

@@ -19,17 +19,19 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": "^8.0.2",
         "ext-json": "*",
-        "guzzlehttp/guzzle": "^6.4|^7.0",
-        "laravel/framework": "~5.8|~6|~7|~8",
-        "nesbot/carbon": "~1.2|~2"
+        "guzzlehttp/guzzle": "^7.0",
+        "laravel/framework": "^9.19|^10",
+        "nesbot/carbon": "^2.62.1"
     },
     "require-dev": {
-        "mockery/mockery": "^1.3.1",
-        "phpunit/phpunit": "^8.4|^9.0",
-        "psy/psysh": "^0.10",
-        "symfony/thanks": "^1.1"
+        "laravel/pint": "^1.4",
+        "mockery/mockery": "^1.5.1",
+        "phpunit/phpunit": "^9.5.8",
+        "psy/psysh": "^0.11",
+        "scrutinizer/ocular": "^1.9",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "autoload": {
         "psr-4": {

config/clickup.php

@@ -11,11 +11,11 @@
     |
     */
     'oauth' => [
-        'id'     => env('CLICKUP_CLIENT_ID'),
+        'id' => env('CLICKUP_CLIENT_ID'),
 
         'secret' => env('CLICKUP_CLIENT_SECRET'),
 
-        'url'    => env('CLICKUP_OAUTH_URL', 'https://app.clickup.com/api'),
+        'url' => env('CLICKUP_OAUTH_URL', 'https://app.clickup.com/api'),
     ],
 
     /*
@@ -27,11 +27,11 @@
     |
     */
     'route' => [
-        'enabled'    => true,
+        'enabled' => true,
 
         'middleware' => ['web'],
 
-        'sso'        => 'clickup/sso',
+        'sso' => 'clickup/sso',
     ],
 
     /*

database/migrations/2019_09_23_194855_add_click_up_token_to_users_table.php

@@ -2,7 +2,9 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\ColumnDefinition;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Fluent;
 
 /**
  * Class AddClickUpTokenToUsersTable
@@ -20,11 +22,9 @@ public function up()
     {
         Schema::table(
             'users',
-            function (Blueprint $table) {
-                $table->string('clickup_token', 1024)
+            fn (Blueprint $table): ColumnDefinition => $table->string('clickup_token', 1024)
                       ->after('password')
-                      ->nullable();
-            }
+                      ->nullable()
         );
     }
 
@@ -37,9 +37,7 @@ public function down()
     {
         Schema::table(
             'users',
-            function (Blueprint $table) {
-                $table->dropColumn('clickup_token');
-            }
+            fn (Blueprint $table): Fluent => $table->dropColumn('clickup_token')
         );
     }
 }

pint.json

@@ -0,0 +1,6 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "no_superfluous_phpdoc_tags": true
+    }
+}

routes/web.php

@@ -3,5 +3,5 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
 
-Route::get(rtrim(Config::get('clickup.route.sso', '/clickup/sso'), '/') . '/{user}', 'ClickUpController@processCode')
+Route::get(rtrim(Config::get('clickup.route.sso', '/clickup/sso'), '/').'/{user}', 'ClickUpController@processCode')
      ->name('clickup.sso.redirect_url');