Merge pull request #42 from dapr/add/tests

Add more tests and minor bug fixes

Author: withinboredom

src/config.php

@@ -24,9 +24,14 @@
 use Dapr\State\IManageState;
 use Dapr\State\StateManager;
 use Dapr\State\TransactionalState;
+use FastRoute\DataGenerator\GroupCountBased;
+use FastRoute\RouteCollector;
+use FastRoute\RouteParser\Std;
 use Monolog\Handler\ErrorLogHandler;
 use Monolog\Logger;
 use Monolog\Processor\PsrLogMessageProcessor;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Nyholm\Psr7Server\ServerRequestCreator;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
@@ -78,17 +83,27 @@
         get('dapr.deserializers.custom')
     ),
     ExistingOnly::class            => autowire(),
-    FileGenerator::class => autowire(),
+    FileGenerator::class           => autowire(),
     IDeserializer::class           => autowire(Deserializer::class)->constructorParameter('logger', get('dapr.logger')),
     IManageState::class            => autowire(StateManager::class)->constructorParameter('logger', get('dapr.logger')),
     ISerializer::class             => autowire(Serializer::class)->constructorParameter('logger', get('dapr.logger')),
     ProxyFactory::class            => autowire()->constructorParameter(
         'mode',
         get('dapr.actors.proxy.generation')
     ),
+    Psr17Factory::class            => autowire(),
     Publish::class                 => autowire()->constructorParameter('pubsub', get('dapr.pubsub.default')),
+    RouteCollector::class          => autowire()
+        ->constructorParameter('routeParser', create(Std::class))
+        ->constructorParameter('dataGenerator', create(GroupCountBased::class)),
     SecretManager::class           => autowire()->constructorParameter('logger', get('dapr.logger')),
     SerializationConfig::class     => autowire()->constructorParameter('serializers', get('dapr.serializers.custom')),
+    ServerRequestCreator::class    => create()->constructor(
+        get(Psr17Factory::class),
+        get(Psr17Factory::class),
+        get(Psr17Factory::class),
+        get(Psr17Factory::class)
+    ),
     Subscriptions::class           => autowire()->constructorParameter(
         'subscriptions',
         get('dapr.subscriptions')

src/lib/Actors/Actor.php

@@ -2,6 +2,14 @@
 
 namespace Dapr\Actors;
 
+/**
+ * Class Actor
+ *
+ * A base class to simplify user implementations.
+ *
+ * @package Dapr\Actors
+ * @codeCoverageIgnore Not important
+ */
 abstract class Actor implements IActor
 {
     use ActorTrait;

src/lib/Actors/ActorConfig.php

@@ -14,6 +14,9 @@
 
 /**
  * Class ActorConfig
+ *
+ * Handles configuration which is called on /dapr/config
+ *
  * @package Dapr\Actors
  */
 class ActorConfig implements ISerialize
@@ -46,6 +49,8 @@ public function __construct(
      */
     public function get_actor_type_from_dapr_type(string $dapr_type): string|null
     {
+        if($this->actor_name_to_type[$dapr_type] ?? false) return $this->actor_name_to_type[$dapr_type];
+
         $actors = array_combine($this->get_supported_actors(), $this->actor_name_to_type);
 
         return $actors[$dapr_type] ?? null;
@@ -54,6 +59,7 @@ public function get_actor_type_from_dapr_type(string $dapr_type): string|null
     /**
      * @return array An array of dapr types
      * @throws ReflectionException | LogicException
+     * @codeCoverageIgnore
      */
     public function get_supported_actors(): array
     {

src/lib/Actors/ActorProxy.php

@@ -13,6 +13,10 @@
 
 /**
  * Class ActorProxy
+ *
+ * Used by the DynamicGenerator proxy
+ *
+ * @codeCoverageIgnore
  * @package Dapr
  */
 class ActorProxy

src/lib/Actors/ActorRuntime.php

@@ -16,7 +16,11 @@
 use ReflectionNamedType;
 
 /**
- * The Actor Runtime
+ * Class ActorRuntime
+ *
+ * Handles activating, method calls, and deactivating actors.
+ *
+ * @package Dapr\Actors
  */
 class ActorRuntime
 {
@@ -57,8 +61,10 @@ public function do_method(IActor $actor, string $method, mixed $arg): mixed
         );
     }
 
-    public function deactivate_actor(IActor $actor, string $dapr_type, string $id): void
+    public function deactivate_actor(IActor $actor, string $dapr_type): void
     {
+        $id = $actor->get_id();
+
         $activation_tracker = hash('sha256', $dapr_type.$id);
         $activation_tracker = rtrim(
                                   sys_get_temp_dir(),
@@ -91,16 +97,20 @@ public function resolve_actor(string $dapr_type, string $id, callable $loan): mi
             $this->validate_actor($reflection);
             $states = $this->get_states($reflection, $dapr_type, $id);
             $actor  = $this->get_actor($reflection, $dapr_type, $id, $states);
+            // @codeCoverageIgnoreStart
         } catch (Exception $exception) {
             throw new NotFound('Actor could not be located', previous: $exception);
         }
+        // @codeCoverageIgnoreEnd
         $result = $loan($actor);
 
         try {
             $this->commit($states);
+            // @codeCoverageIgnoreStart
         } catch (DependencyException | DaprException | NotFoundException $e) {
             throw new SaveStateFailure('Failed to commit actor state', previous: $e);
         }
+        // @codeCoverageIgnoreEnd
 
         return $result;
     }
@@ -118,8 +128,10 @@ protected function locate_actor(string $dapr_type): ReflectionClass
     {
         $type = $this->actor_config->get_actor_type_from_dapr_type($dapr_type);
         if ( ! class_exists($type)) {
+            // @codeCoverageIgnoreStart
             $this->logger->critical('Unable to locate an actor for {t}', ['t' => $type]);
             throw new NotFound();
+            // @codeCoverageIgnoreEnd
         }
 
         return new ReflectionClass($type);
@@ -138,8 +150,10 @@ protected function validate_actor(ReflectionClass $reflection): bool
             return true;
         }
 
+        // @codeCoverageIgnoreStart
         $this->logger->critical('Actor does not implement the IActor interface');
         throw new NotFound();
+        // @codeCoverageIgnoreEnd
     }
 
     /**

src/lib/Actors/ActorState.php

@@ -17,6 +17,13 @@
 use ReflectionException;
 use ReflectionProperty;
 
+/**
+ * Class ActorState
+ *
+ * Handles actor state transactions.
+ *
+ * @package Dapr\Actors
+ */
 abstract class ActorState
 {
     /**

src/lib/Actors/Attributes/DaprType.php

@@ -4,6 +4,13 @@
 
 use Attribute;
 
+/**
+ * Class DaprType
+ *
+ * Annotates a class as an actor that implements a specific Dapr Type.
+ *
+ * @package Dapr\Actors\Attributes
+ */
 #[Attribute(Attribute::TARGET_CLASS)]
 class DaprType
 {

src/lib/Actors/Generators/CachedGenerator.php

@@ -6,15 +6,34 @@
 use JetBrains\PhpStorm\Pure;
 use Psr\Container\ContainerInterface;
 
+/**
+ * Class CachedGenerator
+ *
+ * Caches the generated file.
+ *
+ * @package Dapr\Actors\Generators
+ */
 class CachedGenerator extends ExistingOnly
 {
-    #[Pure] public function __construct(
+    protected string $cache_dir;
+
+    public function __construct(
         string $interface,
         string $dapr_type,
         FactoryInterface $factory,
         ContainerInterface $container
     ) {
         parent::__construct($interface, $dapr_type, $factory, $container);
+        $this->cache_dir = sys_get_temp_dir().DIRECTORY_SEPARATOR.'dapr-proxy-cache'.DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * Set the cache directory
+     *
+     * @param string $dir
+     */
+    public function set_cache_dir(string $dir) {
+        $this->cache_dir = $dir;
     }
 
     public function get_proxy(string $id): object
@@ -25,11 +44,10 @@ public function get_proxy(string $id): object
                 ['interface' => $this->interface, 'dapr_type' => $this->dapr_type]
             );
             $file           = $file_generator->generate_file();
-            $dir            = sys_get_temp_dir().DIRECTORY_SEPARATOR.'dapr-proxy-cache'.DIRECTORY_SEPARATOR;
-            if ( ! is_dir($dir)) {
-                mkdir($dir);
+            if ( ! is_dir($this->cache_dir)) {
+                mkdir($this->cache_dir);
             }
-            $filename = $dir.$this->get_short_class_name();
+            $filename = $this->cache_dir.$this->get_short_class_name();
             file_put_contents($filename, $file);
             require_once $filename;
         }

src/lib/Actors/Generators/DynamicGenerator.php

@@ -13,6 +13,13 @@
 use Nette\PhpGenerator\Method;
 use Psr\Container\ContainerInterface;
 
+/**
+ * Class DynamicGenerator
+ *
+ * Uses some quirks of PHP magic functions to provide a proxy
+ *
+ * @package Dapr\Actors\Generators
+ */
 class DynamicGenerator extends GenerateProxy
 {
 

src/lib/Actors/Generators/ExistingOnly.php

@@ -11,6 +11,13 @@
 use Nette\PhpGenerator\Method;
 use Psr\Container\ContainerInterface;
 
+/**
+ * Class ExistingOnly
+ *
+ * Only allows existing proxies to be used. Does not generate a proxy.
+ *
+ * @package Dapr\Actors\Generators
+ */
 class ExistingOnly extends GenerateProxy
 {
     #[Pure] public function __construct(
@@ -37,16 +44,30 @@ public function get_proxy(string $id)
         return $proxy;
     }
 
+    /**
+     * @codeCoverageIgnore Never happens
+     * @param Method $method
+     */
     protected function generate_failure_method(Method $method): void
     {
         throw new LogicException();
     }
 
+    /**
+     * @codeCoverageIgnore Never happens
+     * @param Method $method
+     * @param string $id
+     */
     protected function generate_proxy_method(Method $method, string $id): void
     {
         throw new LogicException();
     }
 
+    /**
+     * @codeCoverageIgnore Never happens
+     * @param Method $method
+     * @param string $id
+     */
     protected function generate_get_id(Method $method, string $id): void
     {
         throw new LogicException();