Fix merge issue

Author: tjardoo

.github/workflows/php-cs-fixer.yml

@@ -1,23 +1,24 @@
-name: Check & fix styling
+name: Fix PHP code style issues
 
-on: [ push ]
+on:
+    push:
+        paths:
+            - '**.php'
 
 jobs:
-    php-cs-fixer:
+    php-code-styling:
         runs-on: ubuntu-latest
 
         steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-                with:
-                    ref: ${{ github.head_ref }}
+            - name: Checkout code
+              uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.head_ref }}
 
-            -   name: Run PHP CS Fixer
-                uses: docker://oskarstark/php-cs-fixer-ga
-                with:
-                    args: --config=.php_cs.dist.php --allow-risky=yes
+            - name: Fix PHP code style issues
+              uses: aglipanci/laravel-pint-action@1.0.0
 
-            -   name: Commit changes
-                uses: stefanzweifel/git-auto-commit-action@v4
-                with:
-                    commit_message: Fix styling
+            - name: Commit changes
+              uses: stefanzweifel/git-auto-commit-action@v4
+              with:
+                  commit_message: Fix styling

.github/workflows/phpstan.yml

@@ -11,7 +11,7 @@ jobs:
     name: phpstan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -23,4 +23,4 @@ jobs:
         uses: ramsey/composer-install@v1
 
       - name: Run PHPStan
-        run: ./vendor/bin/phpstan --error-format=github
+        run: ./vendor/bin/phpstan --error-format=github

.php_cs.dist.php

@@ -1,4 +1,4 @@
-# Laravel ActiveCampaign (WIP)
+# Laravel ActiveCampaign
 
 [![Latest Stable Version](https://poser.pugx.org/label84/laravel-active-campaign/v/stable?style=flat-square)](https://packagist.org/packages/label84/laravel-active-campaign)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
@@ -10,7 +10,6 @@ This package provides a simple interface to the ActiveCampaign API v3.
 Currently the packages only supports the endpoints `Contacts`, `Custom Fields Values` and `Tags`. Feel free to PR the remaining endpoints.
 
 - [Requirements](#requirements)
-- [Laravel support](#laravel-support)
 - [Installation](#installation)
 - [Usage](#usage)
   - [Contacts](#contacts)
@@ -99,6 +98,22 @@ use Label84\ActiveCampaign\ActiveCampaign;
 resolve(ActiveCampaign::class)->contacts()->delete(1);
 ```
 
+#### Add a tag to contact
+
+```php
+use Label84\ActiveCampaign\ActiveCampaign;
+
+resolve(ActiveCampaign::class)->contacts()->tag(1, 20);
+```
+
+#### Remove a tag from a contact
+
+```php
+use Label84\ActiveCampaign\ActiveCampaign;
+
+resolve(ActiveCampaign::class)->contacts()->untag(2340);
+```
+
 ### Custom Field Values
 
 #### Retreive an existing field value by their id

README.md

@@ -13,26 +13,32 @@
       "php": "^8.0.2",
       "illuminate/support": "^9.0|^10.0"
     },
+    "require-dev": {
+      "laravel/pint": "^1.0",
+      "orchestra/testbench": "^7.0|^8.0",
+      "nunomaduro/larastan": "^2.0",
+      "phpunit/phpunit": "^9.5"
+    },
     "autoload": {
       "psr-4": {
           "Label84\\ActiveCampaign\\": "src"
       }
     },
+    "scripts": {
+      "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi",
+      "analyse": "vendor/bin/phpstan analyse",
+      "format": "vendor/bin/pint"
+    },
     "extra": {
       "laravel": {
           "providers": [
               "Label84\\ActiveCampaign\\ActiveCampaignServiceProvider"
           ],
           "aliases": {
-            "StatsHelper": "Label84\\ActiveCampaign\\Facades\\ActiveCampaign"
+            "ActiveCampaign": "Label84\\ActiveCampaign\\Facades\\ActiveCampaign"
         }
       }
     },
-    "require-dev": {
-        "orchestra/testbench": "^7.0|^8.0",
-        "nunomaduro/larastan": "^2.0",
-        "phpunit/phpunit": "^9.5"
-    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

composer.json

@@ -5,15 +5,15 @@
     /**
      * Your Active Campaign Base URL
      * https://<your-account>.api-us1.com/api/3
-     * 
+     *
      * More information: https://developers.activecampaign.com/reference/url
      */
     'base_url' => env('ACTIVE_CAMPAIGN_BASE_URL'),
 
     /**
      * Your Active Campaign API key
-     * 
-     * Your API key can be found in your account on the Settings page under the "Developer" tab. 
+     *
+     * Your API key can be found in your account on the Settings page under the "Developer" tab.
      * Each user in your ActiveCampaign account has their own unique API key.
      */
     'api_key' => env('ACTIVE_CAMPAIGN_API_KEY'),

config/active-campaign.php

@@ -2,6 +2,17 @@
 
 namespace Label84\ActiveCampaign;
 
+use Illuminate\Http\Client\PendingRequest;
+use Label84\ActiveCampaign\Resources\ActiveCampaignContactsResource;
+use Label84\ActiveCampaign\Resources\ActiveCampaignFieldValuesResource;
+use Label84\ActiveCampaign\Resources\ActiveCampaignTagsResource;
+
+/**
+ * @method PendingRequest makeRequest()
+ * @method ActiveCampaignContactsResource contacts()
+ * @method ActiveCampaignFieldValuesResource fieldValues()
+ * @method ActiveCampaignTagsResource tags()
+ */
 class ActiveCampaign
 {
     //

src/ActiveCampaign.php

@@ -11,11 +11,11 @@
 class ActiveCampaignService
 {
     public function __construct(
-        public readonly string $baseUrl,
-        public readonly string $key,
-        public readonly int $timeout,
-        public readonly int|null $retryTimes = null,
-        public readonly int|null $retrySleep = null,
+        public string $baseUrl,
+        public string $key,
+        public int $timeout,
+        public int|null $retryTimes = null,
+        public int|null $retrySleep = null,
     ) {
     }
 

src/ActiveCampaignService.php

@@ -21,7 +21,7 @@ public function register(): void
 
     public function boot(): void
     {
-        $configPath = __DIR__ . '/../config/active-campaign.php';
+        $configPath = __DIR__.'/../config/active-campaign.php';
         $this->publishes([$configPath => $this->getConfigPath()], 'config');
     }
 
@@ -38,7 +38,7 @@ protected function getConfigPath(): string
     /**
      * Publish the config file
      *
-     * @param string $configPath
+     * @param  string  $configPath
      */
     protected function publishConfig($configPath): void
     {

src/ActiveCampaignServiceProvider.php

@@ -2,12 +2,22 @@
 
 namespace Label84\ActiveCampaign\Facades;
 
+use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Facades\Facade;
+use Label84\ActiveCampaign\Resources\ActiveCampaignContactsResource;
+use Label84\ActiveCampaign\Resources\ActiveCampaignFieldValuesResource;
+use Label84\ActiveCampaign\Resources\ActiveCampaignTagsResource;
 
+/**
+ * @method PendingRequest makeRequest()
+ * @method ActiveCampaignContactsResource contacts()
+ * @method ActiveCampaignFieldValuesResource fieldValues()
+ * @method ActiveCampaignTagsResource tags()
+ */
 class ActiveCampaign extends Facade
 {
     protected static function getFacadeAccessor(): string
     {
-        return 'active-campaign';
+        return \Label84\ActiveCampaign\ActiveCampaign::class;
     }
 }