Merge pull request #35 from acsiomatic/create-proxy-callable-phpstan

Extract callables to dedicated methods

Author: Renan de Lima

.github/workflows/phpunit.yaml

@@ -45,12 +45,11 @@ jobs:
                   php-version: ${{ matrix.php }}
                   coverage: none
 
+            - name: Require specific dependencies versions
+              run: composer require matomo/device-detector:${{ matrix.dd }} symfony/framework-bundle:${{ matrix.sf }}
+
             - name: Install Composer dependencies
               uses: ramsey/composer-install@v2
-              with:
-                  composer-options: >
-                    --with matomo/device-detector:${{ matrix.dd }}
-                    --with symfony/framework-bundle:${{ matrix.sf }}
 
             - name: Run PHPUnit
               run: vendor/bin/phpunit --testdox

src/Factory/DeviceDetectorProxyFactory.php

@@ -7,6 +7,7 @@
 use ProxyManager\Factory\AccessInterceptorValueHolderFactory;
 use ProxyManager\FileLocator\FileLocator;
 use ProxyManager\GeneratorStrategy\FileWriterGeneratorStrategy;
+use ProxyManager\Proxy\AccessInterceptorInterface;
 
 /**
  * @internal
@@ -35,44 +36,33 @@ public function getProxyDir(): string
 
     public function createDeviceDetectorProxy(): DeviceDetector
     {
-        $parseCaller = static function (
-            DeviceDetector $proxy,
-            DeviceDetector $real
-        ): void {
-            if (!$real->isParsed()) {
-                $real->parse();
-            }
-        };
+        $configuration = $this->createConfiguration();
 
-        $magicParseCaller = static function (
-            DeviceDetector $proxy,
-            DeviceDetector $real,
-            string $method,
-            array $arguments
-        ): void {
-            if (!$real->isParsed() && 0 === stripos($arguments['methodName'] ?? '', 'is')) {
-                $real->parse();
-            }
-        };
+        $instance = new DeviceDetector();
 
-        $configuration = $this->createConfiguration();
-        $factory = new AccessInterceptorValueHolderFactory($configuration);
+        $autoParserForMagicCall = $this->buildAutoParserCallerForMagicCall();
+        $autoParser = $this->buildAutoParserCaller();
+        $prefixInterceptors = [
+            '__call' => $autoParserForMagicCall,
+            'getBot' => $autoParser,
+            'getBrand' => $autoParser,
+            'getBrandName' => $autoParser,
+            'getClient' => $autoParser,
+            'getDevice' => $autoParser,
+            'getDeviceName' => $autoParser,
+            'getModel' => $autoParser,
+            'getOs' => $autoParser,
+            'isBot' => $autoParser,
+            'isBrowser' => $autoParser,
+            'isDesktop' => $autoParser,
+            'isMobile' => $autoParser,
+        ];
 
-        return $factory->createProxy(new DeviceDetector(), [
-            '__call' => $magicParseCaller,
-            'getBot' => $parseCaller,
-            'getBrand' => $parseCaller,
-            'getBrandName' => $parseCaller,
-            'getClient' => $parseCaller,
-            'getDevice' => $parseCaller,
-            'getDeviceName' => $parseCaller,
-            'getModel' => $parseCaller,
-            'getOs' => $parseCaller,
-            'isBot' => $parseCaller,
-            'isBrowser' => $parseCaller,
-            'isDesktop' => $parseCaller,
-            'isMobile' => $parseCaller,
-        ]);
+        return (new AccessInterceptorValueHolderFactory($configuration))
+            ->createProxy(
+                $instance,
+                $prefixInterceptors
+            );
     }
 
     private function createConfiguration(): Configuration
@@ -86,4 +76,44 @@ private function createConfiguration(): Configuration
 
         return $config;
     }
+
+    /**
+     * @return callable(
+     *     AccessInterceptorInterface<DeviceDetector> $proxy,
+     *     DeviceDetector $real,
+     *     string $method,
+     *     array $arguments,
+     * )
+     */
+    private function buildAutoParserCallerForMagicCall(): callable
+    {
+        return static function (
+            AccessInterceptorInterface $proxy,
+            DeviceDetector $real,
+            string $method,
+            array $arguments
+        ): void {
+            if (!$real->isParsed() && 0 === stripos($arguments['methodName'] ?? '', 'is')) {
+                $real->parse();
+            }
+        };
+    }
+
+    /**
+     * @return callable(
+     *     AccessInterceptorInterface<DeviceDetector> $proxy,
+     *     DeviceDetector $real,
+     * )
+     */
+    private function buildAutoParserCaller(): callable
+    {
+        return static function (
+            AccessInterceptorInterface $proxy,
+            DeviceDetector $real
+        ): void {
+            if (!$real->isParsed()) {
+                $real->parse();
+            }
+        };
+    }
 }