plugin works with Laravel 10 (#9)

Author: cosmastech

src/AdapterManager.php

@@ -2,8 +2,8 @@
 
 namespace Cosmastech\LaravelStatsDAdapter;
 
-use Carbon\FactoryImmutable;
-use Carbon\WrapperClock;
+use Cosmastech\LaravelStatsDAdapter\Concerns\Laravel10AdapterTrait;
+use Cosmastech\LaravelStatsDAdapter\Utility\ClockWrapper;
 use Cosmastech\StatsDClientAdapter\Adapters\Datadog\DatadogStatsDClientAdapter;
 use Cosmastech\StatsDClientAdapter\Adapters\InMemory\InMemoryClientAdapter;
 use Cosmastech\StatsDClientAdapter\Adapters\League\LeagueStatsDClientAdapter;
@@ -23,6 +23,8 @@
  */
 class AdapterManager extends MultipleInstanceManager
 {
+    use Laravel10AdapterTrait;
+
     protected $driverKey = 'adapter';
 
     protected string $defaultInstanceName;
@@ -80,7 +82,7 @@ public function setDefaultInstance($name)
      */
     public function getInstanceConfig($name)
     {
-        return $this->config->get("statsd-adapter.channels.{$name}");
+        return $this->setDriverKeyInConfig($this->config->get("statsd-adapter.channels.{$name}"));
     }
 
     /**
@@ -124,17 +126,6 @@ protected function createMemoryAdapter(array $config): InMemoryClientAdapter
         );
     }
 
-    /**
-     * @param  array<string, mixed>  $config
-     * @return DatadogStatsDClientAdapter
-     *
-     * @throws BindingResolutionException
-     */
-    protected function createLog_datadogAdapter(array $config): DatadogStatsDClientAdapter
-    {
-        return $this->createLogDatadogAdapter($config);
-    }
-
     /**
      * @param  array<string, mixed>  $config
      * @return DatadogStatsDClientAdapter
@@ -186,6 +177,6 @@ protected function createLeagueAdapter(array $config): LeagueStatsDClientAdapter
 
     protected function getClockImplementation(): ClockInterface
     {
-        return new WrapperClock(FactoryImmutable::getDefaultInstance());
+        return new ClockWrapper();
     }
 }

src/Concerns/Laravel10AdapterTrait.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Cosmastech\LaravelStatsDAdapter\Concerns;
+
+use Cosmastech\StatsDClientAdapter\Adapters\Datadog\DatadogStatsDClientAdapter;
+use Cosmastech\StatsDClientAdapter\Adapters\InMemory\InMemoryClientAdapter;
+use Cosmastech\StatsDClientAdapter\Adapters\League\LeagueStatsDClientAdapter;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use League\StatsD\Exception\ConfigurationException;
+
+/**
+ * This trait serves as a bridge between Laravel 11's MultipleInstanceManager and Laravel 10's version of the class.
+ * - Unique driver keys were added in Laravel 11. Prior to that, the config key was required to be named "driver"
+ * - Method names for creating the adapter were not studly cased.
+ */
+trait Laravel10AdapterTrait
+{
+    /**
+     * @param  array<string, mixed>  $config
+     * @return InMemoryClientAdapter
+     */
+    protected function createMemoryDriver(array $config): InMemoryClientAdapter
+    {
+        return $this->createMemoryAdapter($config);
+    }
+
+    /**
+     * @param  array<string, mixed>  $config
+     * @return DatadogStatsDClientAdapter
+     *
+     * @throws BindingResolutionException
+     */
+    protected function createLog_datadogDriver(array $config): DatadogStatsDClientAdapter
+    {
+        return $this->createLogDatadogAdapter($config);
+    }
+
+    /**
+     * @param  array<string, mixed>  $config
+     * @return DatadogStatsDClientAdapter
+     *
+     * @throws BindingResolutionException
+     */
+    protected function createLog_datadogAdapter(array $config): DatadogStatsDClientAdapter
+    {
+        return $this->createLogDatadogAdapter($config);
+    }
+
+    /**
+     * @param  array<string, mixed>  $config
+     * @return DatadogStatsDClientAdapter
+     */
+    protected function createDatadogDriver(array $config): DatadogStatsDClientAdapter
+    {
+        return $this->createDatadogAdapter($config);
+    }
+
+    /**
+     * @param  array<string, mixed>  $config
+     * @return LeagueStatsDClientAdapter
+     *
+     * @throws ConfigurationException
+     */
+    protected function createLeagueDriver(array $config): LeagueStatsDClientAdapter
+    {
+        return $this->createLeagueAdapter($config);
+    }
+
+    /**
+     * @param  array<string, mixed>|null  $config
+     * @return array<string, mixed>|null
+     */
+    protected function setDriverKeyInConfig(?array $config): ?array
+    {
+        if (empty($config)) {
+            return $config;
+        }
+
+        if (array_key_exists("driver", $config)) {
+            return $config;
+        }
+
+        $config["driver"] = $config["adapter"] ?? null;
+
+        return $config;
+    }
+}

src/Utility/ClockWrapper.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Cosmastech\LaravelStatsDAdapter\Utility;
+
+use DateTimeImmutable;
+use Psr\Clock\ClockInterface;
+
+class ClockWrapper implements ClockInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function now(): DateTimeImmutable
+    {
+        return now()->toDateTimeImmutable();
+    }
+}