Use Composer's runtime API to find the location of FA

derrabus · Apr 6, 2022 · da65e6c · da65e6c
1 parent 02975ea
commit da65e6c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -11,6 +11,7 @@
     ],
     "require": {
         "php": ">= 8.1",
+        "composer-runtime-api": "^2.1",
         "fortawesome/font-awesome": "^6.1",
         "symfony/dependency-injection": "^6",
         "symfony/http-kernel": "^6",

diff --git a/src/DependencyInjection/TwigAwesomeExtension.php b/src/DependencyInjection/TwigAwesomeExtension.php
@@ -4,7 +4,7 @@
 
 namespace Rabus\TwigAwesomeBundle\DependencyInjection;
 
-use Rabus\TwigAwesomeBundle\Exception\RuntimeException;
+use Composer\InstalledVersions;
 use Rabus\TwigAwesomeBundle\IconLocator;
 use Rabus\TwigAwesomeBundle\Twig\FaExtension;
 use Rabus\TwigAwesomeBundle\Twig\FaTokenParser;
@@ -30,17 +30,6 @@ public function load(array $configs, ContainerBuilder $container): void
 
     private function determineFaPath(): string
     {
-        $guessedPaths = [
-            \dirname(__DIR__, 2).\DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.self::PACKAGE_NAME,
-            \dirname(__DIR__, 4).\DIRECTORY_SEPARATOR.self::PACKAGE_NAME,
-        ];
-
-        foreach ($guessedPaths as $current) {
-            if (file_exists($current)) {
-                return $current;
-            }
-        }
-
-        throw new RuntimeException('Unable to locate FontAwesome.');
+        return realpath(InstalledVersions::getInstallPath(self::PACKAGE_NAME));
     }
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -4,6 +4,6 @@
 
 namespace Rabus\TwigAwesomeBundle\Exception;
 
-class InvalidArgumentException extends \InvalidArgumentException
+final class InvalidArgumentException extends \InvalidArgumentException
 {
 }
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php