Small fixes from review

OpenClassrooms · Apr 15, 2024 · 48b6ea4 · 48b6ea4
1 parent 10b9cc3
commit 48b6ea4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/FrameworkBridge/Symfony/DependencyInjection/Compiler/ServiceProxyPass.php b/src/FrameworkBridge/Symfony/DependencyInjection/Compiler/ServiceProxyPass.php
@@ -44,7 +44,9 @@ private function overrideServiceDefinition(string $taggedServiceName): void
         if ($definition->getFactory() !== null) {
             $this->compiler->log($this, "Service {$taggedServiceName} is not compatible with service proxy");
 
-            return;
+            throw new \RuntimeException(
+                "Unable to override {$taggedServiceName}, remove the factory definition or the Interceptable interface."
+            );
         }
 
         $definition->setFactory([new Reference(ProxyFactory::class), 'createInstance']);

diff --git a/src/Generator/AccessInterceptorGenerator/AccessInterceptorGenerator.php b/src/Generator/AccessInterceptorGenerator/AccessInterceptorGenerator.php
@@ -18,24 +18,20 @@
 use ProxyManager\ProxyGenerator\Assertion\CanProxyAssertion;
 use ProxyManager\ProxyGenerator\ProxyGeneratorInterface;
 
-use InvalidArgumentException;
-use ReflectionClass;
-use ReflectionMethod;
-
 class AccessInterceptorGenerator implements ProxyGeneratorInterface
 {
     /**
      * {@inheritDoc}
      *
      * @param array{'methods'?: array<string>} $proxyOptions
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      * @throws InvalidProxiedClassException
      */
-    public function generate(ReflectionClass $originalClass, ClassGenerator $classGenerator, array $proxyOptions = [])
+    public function generate(\ReflectionClass $originalClass, ClassGenerator $classGenerator, array $proxyOptions = [])
     {
         if (!\array_key_exists('methods', $proxyOptions)) {
-            throw new InvalidArgumentException(sprintf('Missing methods options for %s.', __CLASS__));
+            throw new \InvalidArgumentException(sprintf('Missing methods options for %s.', __CLASS__));
         }
 
         CanProxyAssertion::assertClassCanBeProxied($originalClass, false);
@@ -69,7 +65,7 @@ private function buildMethodInterceptor(
         MethodPrefixInterceptors $prefixInterceptors,
         MethodSuffixInterceptors $suffixInterceptors
     ): callable {
-        return static function (ReflectionMethod $method) use (
+        return static function (\ReflectionMethod $method) use (
             $prefixInterceptors,
             $suffixInterceptors
         ): InterceptedMethod {

diff --git a/tests/Double/Stub/Cache/ClassWithInvalidateCacheAttributes.php b/tests/Double/Stub/Cache/ClassWithInvalidateCacheAttributes.php
@@ -11,8 +11,6 @@ class ClassWithInvalidateCacheAttributes
 {
     public const DATA = 'data';
 
-    private $data;
-
     #[Cache(tags: ['"my_tag"'])]
     public function methodWithTaggedCache(): string
     {

diff --git a/tests/Double/Stub/FinalClass.php b/tests/Double/Stub/FinalClass.php
@@ -4,8 +4,11 @@
 
 namespace OpenClassrooms\ServiceProxy\Tests\Double\Stub;
 
+use OpenClassrooms\ServiceProxy\Attribute\Cache;
+
 final class FinalClass
 {
+    #[Cache]
     public function aMethod(): void
     {
     }