From dc89d844c4207906808ec2422eb196b3bf0d1f86 Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Sun, 18 Apr 2021 20:30:57 +0800
Subject: [PATCH] wip

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
---
 .github/workflows/coveralls.yml | 49 +++++++++++++++++++++++++++++++++
 CHANGELOG-6.x.md                |  2 +-
 src/AvatarServiceProvider.php   | 21 ++++++++++----
 3 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/coveralls.yml

diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
new file mode 100644
index 0000000..553a4a0
--- /dev/null
+++ b/.github/workflows/coveralls.yml
@@ -0,0 +1,49 @@
+name: coveralls
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        os:
+          - "ubuntu-latest"
+        php:
+          - "7.3"
+        dependencies:
+          - "locked"
+        experimental:
+          - false
+
+    name: PHP${{ matrix.php }} on ${{ matrix.os }} (${{ matrix.dependencies }})
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo
+          coverage: xdebug
+
+      - name: Install dependencies
+        uses: "ramsey/composer-install@v1"
+        with:
+          dependency-versions: "${{ matrix.dependencies }}"
+          composer-options: "--prefer-dist"
+
+      - name: Execute tests
+        run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+
+      - name: Upload coverage results to Coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer global require php-coveralls/php-coveralls
+          php-coveralls --coverage_clover=build/logs/clover.xml -v
diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
index 93c5940..32adc04 100644
--- a/CHANGELOG-6.x.md
+++ b/CHANGELOG-6.x.md
@@ -4,7 +4,7 @@ This changelog references the relevant changes (bug and security fixes) done to
 
 ## 6.0.0
 
-Released: 2020-08-29
+Released: 2021-04-18
 
 ### Added
 
diff --git a/src/AvatarServiceProvider.php b/src/AvatarServiceProvider.php
index c38863a..917f3c6 100644
--- a/src/AvatarServiceProvider.php
+++ b/src/AvatarServiceProvider.php
@@ -16,12 +16,7 @@ class AvatarServiceProvider extends ServiceProvider implements DeferrableProvide
     public function register()
     {
         $this->app->singleton('orchestra.avatar', function (Container $app) {
-            $manager = new AvatarManager($app);
-            $namespace = $this->hasPackageRepository() ? 'orchestra/avatar::' : 'orchestra.avatar';
-
-            $manager->setConfiguration($app->make('config')->get($namespace));
-
-            return $manager;
+            return new AvatarManager($app);
         });
     }
 
@@ -39,6 +34,20 @@ public function boot()
         if (! $this->hasPackageRepository()) {
             $this->bootUsingLaravel($path);
         }
+
+        $this->bootEvents();
+    }
+
+        /**
+     * Register memory events during booting.
+     */
+    protected function bootEvents(): void
+    {
+        $this->callAfterResolving('orchestra.avatar', function ($manager, $app) {
+            $namespace = $this->hasPackageRepository() ? 'orchestra/avatar::' : 'orchestra.avatar';
+
+            $manager->setConfiguration($app->make('config')->get($namespace));
+        });
     }
 
     /**