From 0b151d7137ef89ba28acf3899b74bba08a5a3c76 Mon Sep 17 00:00:00 2001
From: Androlax2 <theo.benoit16@gmail.com>
Date: Wed, 18 Aug 2021 15:05:55 +0200
Subject: [PATCH 1/6] :bug: Fix issue
 https://github.com/Rareloop/lumberjack/issues/26

---
 src/Providers/CustomPostTypesServiceProvider.php       | 10 ++++++----
 .../Providers/CustomPostTypesServiceProviderTest.php   |  6 ++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Providers/CustomPostTypesServiceProvider.php b/src/Providers/CustomPostTypesServiceProvider.php
index ae5830f..3530103 100644
--- a/src/Providers/CustomPostTypesServiceProvider.php
+++ b/src/Providers/CustomPostTypesServiceProvider.php
@@ -8,10 +8,12 @@ class CustomPostTypesServiceProvider extends ServiceProvider
 {
     public function boot(Config $config)
     {
-        $postTypesToRegister = $config->get('posttypes.register');
+        add_action('init', function () use ($config) {
+            $postTypesToRegister = $config->get('posttypes.register');
 
-        foreach ($postTypesToRegister as $postType) {
-            $postType::register();
-        }
+            foreach ($postTypesToRegister as $postType) {
+                $postType::register();
+            }
+        });
     }
 }
diff --git a/tests/Unit/Providers/CustomPostTypesServiceProviderTest.php b/tests/Unit/Providers/CustomPostTypesServiceProviderTest.php
index ae58e05..95f019c 100644
--- a/tests/Unit/Providers/CustomPostTypesServiceProviderTest.php
+++ b/tests/Unit/Providers/CustomPostTypesServiceProviderTest.php
@@ -3,12 +3,14 @@
 namespace Rareloop\Lumberjack\Test;
 
 use Brain\Monkey\Functions;
+use Brain\Monkey\Actions;
 use Mockery;
 use PHPUnit\Framework\TestCase;
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Post;
 use Rareloop\Lumberjack\Providers\CustomPostTypesServiceProvider;
+use Rareloop\Lumberjack\Providers\ServiceProvider;
 use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 
 class CustomPostTypesServiceProviderTest extends TestCase
@@ -30,6 +32,10 @@ public function should_call_register_post_type_for_each_configured_post_type()
         Functions\expect('register_post_type')
             ->times(2);
 
+        Actions\expectAdded('init')
+            ->once()
+            ->whenHappen(fn ($callback) => $callback());
+
         $provider = new CustomPostTypesServiceProvider($app);
         $provider->boot($config);
     }

From 922e23d17a334aa2c8783394da55201b5b4146aa Mon Sep 17 00:00:00 2001
From: Androlax2 <39646949+Androlax2@users.noreply.github.com>
Date: Sun, 14 Nov 2021 22:46:30 +0100
Subject: [PATCH 2/6] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b21ecb9..2409193 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "symfony/debug": "^4.1",
         "tightenco/collect": "^5.6.0",
         "statamic/stringy": "~3.1.0",
-        "laminas/laminas-diactoros": "^2.4",
+        "laminas/laminas-diactoros": "2.6",
         "rareloop/psr7-server-request-extension": "^2.1.0",
         "mmeyer2k/dcrypt": "^8.0.1",
         "spatie/macroable": "^1.0",

From e18f836bb2325f6f840cc5b85d5bc58847ef052e Mon Sep 17 00:00:00 2001
From: Androlax2 <39646949+Androlax2@users.noreply.github.com>
Date: Sun, 14 Nov 2021 22:46:37 +0100
Subject: [PATCH 3/6] Create composer.json


From 6b6c781e2a9730972aa37741e56520a6846e8931 Mon Sep 17 00:00:00 2001
From: Androlax2 <39646949+Androlax2@users.noreply.github.com>
Date: Sun, 14 Nov 2021 22:47:08 +0100
Subject: [PATCH 4/6] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2409193..a3de744 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "symfony/debug": "^4.1",
         "tightenco/collect": "^5.6.0",
         "statamic/stringy": "~3.1.0",
-        "laminas/laminas-diactoros": "2.6",
+        "laminas/laminas-diactoros": "2.4",
         "rareloop/psr7-server-request-extension": "^2.1.0",
         "mmeyer2k/dcrypt": "^8.0.1",
         "spatie/macroable": "^1.0",

From 818a4caef83b1febe1aa9fd75e863018f095a956 Mon Sep 17 00:00:00 2001
From: Androlax2 <39646949+Androlax2@users.noreply.github.com>
Date: Sun, 14 Nov 2021 22:47:50 +0100
Subject: [PATCH 5/6] Update composer.json

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index a3de744..cc10e62 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,6 @@
         "symfony/debug": "^4.1",
         "tightenco/collect": "^5.6.0",
         "statamic/stringy": "~3.1.0",
-        "laminas/laminas-diactoros": "2.4",
         "rareloop/psr7-server-request-extension": "^2.1.0",
         "mmeyer2k/dcrypt": "^8.0.1",
         "spatie/macroable": "^1.0",

From 8a84982134dcb1f8dee1bd49675f10c550be2568 Mon Sep 17 00:00:00 2001
From: Androlax2 <39646949+Androlax2@users.noreply.github.com>
Date: Sun, 14 Nov 2021 22:50:05 +0100
Subject: [PATCH 6/6] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index cc10e62..8e215b1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "rareloop/lumberjack-core",
+    "name": "androlax2/lumberjack-core",
     "description": "A powerful MVC framework for the modern WordPress developer. Write better, more expressive and easier to maintain code",
     "license": "MIT",
     "require": {