Upgrade dependencies

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php_version: [8.1, 8.2, 8.3]
+        php_version: [8.1, 8.2, 8.3, 8.4]
         composer_flags: ['', '--prefer-lowest']
 
     steps:
@@ -20,7 +20,7 @@ jobs:
         extensions: xdebug
 
     - name: Install dependencies
-      uses: php-actions/composer@v5
+      uses: php-actions/composer@v6
       with:
         php_version: ${{ matrix.php_version }}
         args: ${{ matrix.composer_flags }}
@@ -44,4 +44,3 @@ jobs:
     #   run: |
     #     composer global require php-coveralls/php-coveralls
     #     ~/.composer/vendor/bin/php-coveralls -v
-

.gitignore

@@ -1,3 +1,4 @@
 vendor
 composer.lock
 /tests/Unit/logs
+.phpunit.result.cache

composer.json

@@ -4,36 +4,41 @@
     "license": "MIT",
     "require": {
         "php": ">=8.1",
-        "php-di/php-di": "^6.4.0",
-        "rareloop/router": "^6.0.2",
-        "psr/container": "^1.1.2",
-        "psr/http-message": "^1.1",
+        "php-di/php-di": "^7.1.1",
+        "rareloop/router": "^6.0.3",
+        "psr/container": "^2.0.2",
+        "psr/http-message": "^2",
         "psr/http-server-middleware": "^1.0.2",
-        "blast/facades": "^1.0",
-        "timber/timber": "^2.3.0",
-        "monolog/monolog": "^2.9.1",
-        "http-interop/response-sender": "^1.0",
-        "symfony/debug": "^4.4.44",
-        "illuminate/collections": "^8.53.1||^9.52.16",
+        "timber/timber": "^2.3.3",
+        "monolog/monolog": "^3.9",
+        "illuminate/collections": "^10.49",
         "statamic/stringy": "^3.1.3",
-        "laminas/laminas-diactoros": "^2.25.2",
-        "rareloop/psr7-server-request-extension": "^2.1.0",
-        "mmeyer2k/dcrypt": "^8.3.1",
+        "laminas/laminas-diactoros": "^3.6.0",
+        "rareloop/psr7-server-request-extension": "^2.2.0",
         "spatie/macroable": "^1.0.1",
-        "mindplay/middleman": "^3.1.0",
-        "psr/log": "^1.1.4",
-        "laminas/laminas-zendframework-bridge": "^1.7",
-        "symfony/var-dumper": "^5.0||^6.3.6"
+        "mindplay/middleman": "^4.0.4",
+        "psr/log": "^2.0.0",
+        "symfony/var-dumper": "^6.4.26",
+        "spatie/ignition": "^1.15.1",
+        "laminas/laminas-httphandlerrunner": "^2.13",
+        "symfony/error-handler": "^6.4.26",
+        "illuminate/support": "^10.49",
+        "illuminate/pipeline": "^10.49",
+        "spatie/backtrace": "^1.8.1",
+        "illuminate/conditionable": "^10.49",
+        "guzzlehttp/guzzle": "^7.10",
+        "spatie/flare-client-php": "^1.10.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6.13",
-        "php-coveralls/php-coveralls": "^2.6",
-        "mockery/mockery": "^1.6.6",
-        "brain/monkey": "^2.6.1",
-        "squizlabs/php_codesniffer": "^3.7.2",
-        "php-mock/php-mock": "^2.4.1",
-        "mikey179/vfsstream": "1.6.11",
-        "dms/phpunit-arraysubset-asserts": "^0.3.1"
+        "phpunit/phpunit": "^9.6.29",
+        "php-coveralls/php-coveralls": "^2.8",
+        "mockery/mockery": "^1.6.12",
+        "brain/monkey": "^2.6.2",
+        "squizlabs/php_codesniffer": "^3.13.4",
+        "php-mock/php-mock": "^2.6.2",
+        "mikey179/vfsstream": "^1.6.12",
+        "dms/phpunit-arraysubset-asserts": "^0.5.0",
+        "antecedent/patchwork": "^2.2.3"
     },
     "autoload": {
         "psr-4": {
@@ -46,8 +51,9 @@
         }
     },
     "config": {
+        "preferred-install": "dist",
         "allow-plugins": {
             "composer/installers": true
         }
     }
-}
+}

src/Application.php

@@ -3,15 +3,13 @@
 namespace Rareloop\Lumberjack;
 
 use Closure;
-use DI\ContainerBuilder;
+use DI\Container;
 use Illuminate\Support\Collection;
-use Interop\Container\ContainerInterface as InteropContainerInterface;
+use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
-use Rareloop\Router\Invoker;
-use function Http\Response\send;
 
-class Application implements ContainerInterface, InteropContainerInterface
+class Application implements ContainerInterface
 {
     private $container;
     private $loadedProviders = [];
@@ -24,7 +22,7 @@ class Application implements ContainerInterface, InteropContainerInterface
 
     public function __construct($basePath = false)
     {
-        $this->container = ContainerBuilder::buildDevContainer();
+        $this->container = new Container();
 
         $this->bind(Application::class, $this);
 
@@ -152,7 +150,7 @@ private function isSingletonClassBind($id)
      *
      * @return bool
      */
-    public function has($id)
+    public function has($id): bool
     {
         return $this->container->has($id);
     }
@@ -234,7 +232,7 @@ public function bootstrapWith(array $bootstrappers)
      *
      * @return boolean
      */
-    public function hasRequestBeenHandled() : bool
+    public function hasRequestBeenHandled(): bool
     {
         return $this->requestHandled;
     }
@@ -265,17 +263,17 @@ public function detectWhenRequestHasNotBeenHandled()
                 if ($this->has('__wp-controller-miss-template') && $this->has('__wp-controller-miss-controller')) {
                     wp_die(
                         'Loaded template <code>' .
-                        $this->get('__wp-controller-miss-template') .
-                        '</code> but couldn\'t find class <code>' .
-                        $this->get('__wp-controller-miss-controller') .
-                        '</code>'
+                            $this->get('__wp-controller-miss-template') .
+                            '</code> but couldn\'t find class <code>' .
+                            $this->get('__wp-controller-miss-controller') .
+                            '</code>'
                     );
                 }
             }
         });
     }
 
-    public function shutdown(ResponseInterface $response = null)
+    public function shutdown(?ResponseInterface $response = null)
     {
         if ($response) {
             global $wp;
@@ -284,13 +282,13 @@ public function shutdown(ResponseInterface $response = null)
             // If we're handling a WordPressController response at this point then WordPress will already have
             // sent headers as it happens earlier in the lifecycle. For this scenario we need to do a bit more
             // work to make sure that duplicate headers are not sent back.
-            send($this->removeSentHeadersAndMoveIntoResponse($response));
+            (new SapiEmitter())->emit($this->removeSentHeadersAndMoveIntoResponse($response));
         }
 
         die();
     }
 
-    protected function removeSentHeadersAndMoveIntoResponse(ResponseInterface $response) : ResponseInterface
+    protected function removeSentHeadersAndMoveIntoResponse(ResponseInterface $response): ResponseInterface
     {
         // 1. Format the previously sent headers into an array of [key, value]
         // 2. Remove all headers from the output that we find

src/Bootstrappers/RegisterExceptionHandler.php

@@ -2,16 +2,18 @@
 
 namespace Rareloop\Lumberjack\Bootstrappers;
 
-use DI\NotFoundException;
 use Error;
 use ErrorException;
-use Psr\Http\Message\ResponseInterface;
+use DI\NotFoundException;
+use function Http\Response\send;
+use Rareloop\Router\Responsable;
 use Rareloop\Lumberjack\Application;
+use Psr\Http\Message\ResponseInterface;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
 use Rareloop\Lumberjack\Exceptions\HandlerInterface;
-use Rareloop\Router\Responsable;
 use Symfony\Component\Debug\Exception\FatalErrorException;
-use Zend\Diactoros\ServerRequestFactory;
-use function Http\Response\send;
+use Symfony\Component\ErrorHandler\Error\FatalError;
 
 /**
  * Determine whether or not we should be in debug mode or not
@@ -70,7 +72,7 @@ public function handleException($e)
 
     public function send(ResponseInterface $response)
     {
-        @send($response);
+        @(new SapiEmitter())->emit($response);
     }
 
     protected function getExceptionHandler(): HandlerInterface
@@ -122,16 +124,14 @@ public function handleShutdown()
      *
      * @param  array  $error
      * @param  int|null  $traceOffset
-     * @return \Symfony\Component\Debug\Exception\FatalErrorException
+     * @return \Symfony\Component\ErrorHandler\Error\FatalError
      */
     protected function fatalExceptionFromError(array $error, $traceOffset = null)
     {
-        return new FatalErrorException(
+        return new FatalError(
             $error['message'],
-            $error['type'],
             0,
-            $error['file'],
-            $error['line'],
+            $error,
             $traceOffset
         );
     }

src/Bootstrappers/RegisterFacades.php

@@ -2,8 +2,8 @@
 
 namespace Rareloop\Lumberjack\Bootstrappers;
 
-use Blast\Facades\FacadeFactory;
 use Rareloop\Lumberjack\Application;
+use Rareloop\Lumberjack\FacadeFactory;
 
 class RegisterFacades
 {

src/Config.php

@@ -9,7 +9,7 @@ class Config
 {
     private $data = [];
 
-    public function __construct(string $path = null)
+    public function __construct(?string $path = null)
     {
         if ($path) {
             $this->load($path);

src/Contracts/QueryBuilder.php

@@ -16,7 +16,7 @@ public function offset($offset): QueryBuilder;
 
     public function orderBy($orderBy, string $order = QueryBuilder::ASC): QueryBuilder;
 
-    public function orderByMeta($metaKey, string $order = QueryBuilder::ASC, string $type = null): QueryBuilder;
+    public function orderByMeta($metaKey, string $order = QueryBuilder::ASC, ?string $type = null): QueryBuilder;
 
     public function whereIdIn(array $ids): QueryBuilder;
 

src/Dcrypt/AesCbc.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * AesCbc.php
+ *
+ * PHP version 7
+ *
+ * @category Dcrypt
+ * @package  Dcrypt
+ * @author   Michael Meyer (mmeyer2k) <m.meyer2k@gmail.com>
+ * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
+ * @link     https://github.com/mmeyer2k/dcrypt
+ */
+
+namespace Rareloop\Lumberjack\Dcrypt;
+
+/**
+ * Symmetric AES-256-CBC encryption functions powered by OpenSSL.
+ *
+ * @category Dcrypt
+ * @package  Dcrypt
+ * @author   Michael Meyer (mmeyer2k) <m.meyer2k@gmail.com>
+ * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
+ * @link     https://github.com/mmeyer2k/dcrypt
+ * @link     https://apigen.ci/github/mmeyer2k/dcrypt/namespace-Dcrypt.html
+ */
+class AesCbc extends OpensslBridge
+{
+    /**
+     * AES-256 cipher identifier that will be passed to openssl
+     *
+     * @var string
+     */
+    const CIPHER = 'aes-256-cbc';
+
+    /**
+     * Specify sha256 for message authentication
+     *
+     * @var string
+     */
+    const CHKSUM = 'sha256';
+}

src/Dcrypt/AesCtr.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * AesCtr.php
+ *
+ * PHP version 7
+ *
+ * @category Dcrypt
+ * @package  Dcrypt
+ * @author   Michael Meyer (mmeyer2k) <m.meyer2k@gmail.com>
+ * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
+ * @link     https://github.com/mmeyer2k/dcrypt
+ */
+
+namespace Rareloop\Lumberjack\Dcrypt;
+
+/**
+ * Symmetric AES-256-CTR encryption functions powered by OpenSSL.
+ *
+ * @category Dcrypt
+ * @package  Dcrypt
+ * @author   Michael Meyer (mmeyer2k) <m.meyer2k@gmail.com>
+ * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
+ * @link     https://github.com/mmeyer2k/dcrypt
+ * @link     https://apigen.ci/github/mmeyer2k/dcrypt/namespace-Dcrypt.html
+ */
+class AesCtr extends AesCbc
+{
+    /**
+     * AES-256 cipher identifier that will be passed to openssl
+     *
+     * @var string
+     */
+    const CIPHER = 'aes-256-ctr';
+}