Update monolog and collect package to resolved dependencies conflicts

composer.json

@@ -5,18 +5,18 @@
     "require": {
         "php": ">=7.1.0",
         "php-di/php-di": "^6.0.0",
-        "rareloop/router": "^4.4.0",
+        "rareloop/router": "^6.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "blast/facades": "^1.0",
-        "timber/timber": "^1.7",
-        "monolog/monolog": "^1.23",
+        "timber/timber": "^1.19",
+        "monolog/monolog": "^2.3",
         "http-interop/response-sender": "^1.0",
         "symfony/debug": "^4.1",
-        "tightenco/collect": "^5.6.0",
+        "tightenco/collect": "^8.34",
         "statamic/stringy": "~3.1.0",
-        "laminas/laminas-diactoros": "^2.4",
+        "laminas/laminas-diactoros": "^2.8",
         "rareloop/psr7-server-request-extension": "^2.1.0",
         "mmeyer2k/dcrypt": "^8.0.1",
         "spatie/macroable": "^1.0",

phpunit.xml

@@ -9,7 +9,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
+         >
     <testsuites>
         <testsuite name="Rareloop Router Test Suite">
             <directory>tests</directory>

src/Bootstrappers/RegisterExceptionHandler.php

@@ -10,7 +10,7 @@
 use Rareloop\Lumberjack\Exceptions\HandlerInterface;
 use Rareloop\Router\Responsable;
 use Symfony\Component\Debug\Exception\FatalErrorException;
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\ServerRequestFactory;
 use function Http\Response\send;
 
 /**

src/Exceptions/Handler.php

@@ -9,7 +9,7 @@
 use Rareloop\Lumberjack\Facades\Config;
 use Symfony\Component\Debug\ExceptionHandler as SymfonyExceptionHandler;
 use Symfony\Component\Debug\Exception\FlattenException;
-use Zend\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\HtmlResponse;
 
 class Handler implements HandlerInterface
 {

src/Http/Responses/RedirectResponse.php

@@ -3,7 +3,7 @@
 namespace Rareloop\Lumberjack\Http\Responses;
 
 use Rareloop\Lumberjack\Helpers;
-use Zend\Diactoros\Response\RedirectResponse as DiactorosRedirectResponse;
+use Laminas\Diactoros\Response\RedirectResponse as DiactorosRedirectResponse;
 
 class RedirectResponse extends DiactorosRedirectResponse
 {

src/Http/Responses/TimberResponse.php

@@ -6,7 +6,7 @@
 use Rareloop\Lumberjack\Contracts\Arrayable;
 use Rareloop\Lumberjack\Exceptions\TwigTemplateNotFoundException;
 use Timber\Timber;
-use Zend\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\HtmlResponse;
 
 class TimberResponse extends HtmlResponse
 {

src/Http/ServerRequest.php

@@ -5,7 +5,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Rareloop\Psr7ServerRequestExtension\InteractsWithInput;
 use Rareloop\Psr7ServerRequestExtension\InteractsWithUri;
-use Zend\Diactoros\ServerRequest as DiactorosServerRequest;
+use Laminas\Diactoros\ServerRequest as DiactorosServerRequest;
 
 class ServerRequest extends DiactorosServerRequest
 {

src/Providers/RouterServiceProvider.php

@@ -9,7 +9,7 @@
 use Rareloop\Lumberjack\Http\Router;
 use Rareloop\Lumberjack\Http\ServerRequest;
 use Rareloop\Router\MiddlewareResolver as MiddlewareResolverInterface;
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\ServerRequestFactory;
 
 class RouterServiceProvider extends ServiceProvider
 {

src/Providers/WordPressControllersServiceProvider.php

@@ -8,7 +8,7 @@
 use Rareloop\Router\ResponseFactory;
 use Stringy\Stringy;
 use Tightenco\Collect\Support\Collection;
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\ServerRequestFactory;
 use mindplay\middleman\Dispatcher;
 
 class WordPressControllersServiceProvider extends ServiceProvider
@@ -85,7 +85,7 @@ public function handleRequest(RequestInterface $request, $controllerName, $metho
         $middlewares[] = function ($request) use ($controller, $methodName) {
             $invoker = new Invoker($this->app);
             $output = $invoker->setRequest($request)->call([$controller, $methodName]);
-            return ResponseFactory::create($output, $request);
+            return ResponseFactory::create($request, $output);
         };
 
         $dispatcher = $this->createDispatcher($middlewares);

tests/Unit/ApplicationTest.php

@@ -16,13 +16,13 @@ class ApplicationTest extends TestCase
 {
     use \Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
-    public function setUp()
+    protected function setUp(): void
     {
         Monkey\setUp();
         parent::setUp();
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         Monkey\tearDown();
         Mock::disableAll();
@@ -593,7 +593,9 @@ class TestInterfaceImplementation implements TestInterface
 
 class TestInterfaceImplementationWithConstructorParams implements TestInterface
 {
-    public function __construct(TestServiceProvider $provider) {}
+    public function __construct(TestServiceProvider $provider)
+    {
+    }
 }
 
 interface TestSubInterface
@@ -608,8 +610,12 @@ class TestSubInterfaceImplementation implements TestSubInterface
 
 class TestServiceProvider extends ServiceProvider
 {
-    public function register() {}
-    public function boot() {}
+    public function register()
+    {
+    }
+    public function boot()
+    {
+    }
 }
 
 class EmptyServiceProvider extends ServiceProvider
@@ -621,15 +627,19 @@ class TestBootServiceProvider extends ServiceProvider
 {
     private $bootCallback;
 
-    public function register() {}
+    public function register()
+    {
+    }
 
-    public function boot(Application $app, TestInterface $test) {
+    public function boot(Application $app, TestInterface $test)
+    {
         if (isset($this->bootCallback)) {
             call_user_func($this->bootCallback, func_get_args());
         }
     }
 
-    public function addBootCallback(\Closure $callback) {
+    public function addBootCallback(\Closure $callback)
+    {
         $this->bootCallback = $callback;
     }
 }

tests/Unit/Bootstrappers/RegisterExceptionHandlerTest.php

@@ -15,9 +15,9 @@
 use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 use Rareloop\Router\Responsable;
 use Symfony\Component\Debug\Exception\FatalErrorException;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Response\TextResponse;
-use Zend\Diactoros\ServerRequest;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Response\TextResponse;
+use Laminas\Diactoros\ServerRequest;
 
 /**
  * @runTestsInSeparateProcesses

tests/Unit/BrainMonkeyPHPUnitIntegration.php

@@ -8,13 +8,13 @@ trait BrainMonkeyPHPUnitIntegration
 {
     use \Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Monkey\setUp();
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         Monkey\tearDown();

tests/Unit/Exceptions/HandlerTest.php

@@ -9,8 +9,8 @@
 use Rareloop\Lumberjack\Application;
 use Rareloop\Lumberjack\Config;
 use Rareloop\Lumberjack\Exceptions\Handler;
-use Zend\Diactoros\Response\HtmlResponse;
-use Zend\Diactoros\ServerRequest;
+use Laminas\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\ServerRequest;
 
 class HandlerTest extends TestCase
 {
@@ -124,4 +124,6 @@ class HandlerWithBlacklist extends Handler
     ];
 }
 
-class BlacklistedException extends \Exception {}
+class BlacklistedException extends \Exception
+{
+}

tests/Unit/GlobalFunctionsTest.php

@@ -14,7 +14,7 @@ class GlobalFunctionsTest extends TestCase
 {
     use \Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
-    public function setUp()
+    protected function setUp(): void
     {
         include_once(__DIR__ . '/../../src/functions.php');
 

tests/Unit/Http/ServerRequestTest.php

@@ -8,7 +8,7 @@
 use Rareloop\Lumberjack\Http\ServerRequest;
 use Rareloop\Psr7ServerRequestExtension\InteractsWithInput;
 use Rareloop\Psr7ServerRequestExtension\InteractsWithUri;
-use Zend\Diactoros\ServerRequest as DiactorosServerRequest;
+use Laminas\Diactoros\ServerRequest as DiactorosServerRequest;
 
 class ServerRequestTest extends TestCase
 {

tests/Unit/PostQueryBuilderTest.php

@@ -14,7 +14,7 @@ class PostQueryBuilderTest extends TestCase
 {
     use \Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->app = new Application;
         $this->app->bind(QueryBuilderContract::class, QueryBuilder::class);

tests/Unit/Providers/RouterServiceProviderTest.php

@@ -18,10 +18,10 @@
 use Rareloop\Lumberjack\Providers\RouterServiceProvider;
 use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 use Rareloop\Router\MiddlewareResolver;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Response\HtmlResponse;
-use Zend\Diactoros\Response\TextResponse;
-use Zend\Diactoros\ServerRequest;
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\TextResponse;
+use Laminas\Diactoros\ServerRequest;
 
 class RouterServiceProviderTest extends TestCase
 {
@@ -79,7 +79,8 @@ public function configured_router_can_resolve_middleware_aliases()
         $store->set('middleware-key', new RSPAddHeaderMiddleware('X-Key', 'abc'));
         $request = new ServerRequest([], [], '/test/123', 'GET');
 
-        $router->get('/test/123', function () {})->middleware('middleware-key');
+        $router->get('/test/123', function () {
+        })->middleware('middleware-key');
         $response = $router->match($request);
 
         $this->assertTrue($response->hasHeader('X-Key'));
@@ -274,7 +275,8 @@ public function unmatched_request_will_not_mark_request_handled_in_app()
         $this->assertFalse($app->hasRequestBeenHandled());
     }
 
-    private function setSiteUrl($url) {
+    private function setSiteUrl($url)
+    {
         Functions\when('get_bloginfo')->alias(function ($key) use ($url) {
             if ($key === 'url') {
                 return $url;

tests/Unit/Providers/WordPressControllersServiceProviderTest.php

@@ -21,8 +21,8 @@
 use Rareloop\Lumberjack\Providers\WordPressControllersServiceProvider;
 use Rareloop\Lumberjack\Test\Unit\BrainMonkeyPHPUnitIntegration;
 use Rareloop\Router\Responsable;
-use Zend\Diactoros\Response\TextResponse;
-use Zend\Diactoros\ServerRequest;
+use Laminas\Diactoros\Response\TextResponse;
+use Laminas\Diactoros\ServerRequest;
 use \Mockery;
 
 class WordPressControllersServiceProviderTest extends TestCase
@@ -343,28 +343,24 @@ class TestController
 {
     public function handle()
     {
-
     }
 }
 
 class TestControllerWithConstructorParams
 {
     public function __construct(Application $app)
     {
-
     }
 
     public function handle()
     {
-
     }
 }
 
 class TestControllerWithHandleParams
 {
     public function handle(Application $app)
     {
-
     }
 }
 
@@ -388,7 +384,6 @@ class TestControllerWithMiddleware extends Controller
 {
     public function handle()
     {
-
     }
 }
 

tests/Unit/ScopedQueryBuilderTest.php

@@ -16,7 +16,7 @@ class ScopedQueryBuilderTest extends TestCase
 {
     use \Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->app = new Application;
         $this->app->bind(QueryBuilderContract::class, QueryBuilder::class);
@@ -173,4 +173,3 @@ public function scopeWithout($query, $id1, $id2)
         return $query->whereIdNotIn([$id1, $id2]);
     }
 }
-

tests/Unit/Session/FileSessionHandlerTest.php

@@ -14,7 +14,7 @@ class FileSessionHandlerTest extends TestCase
 
     private $rootFileSystem;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->rootFileSystem = vfsStream::setup('exampleDir');
     }