Better naming.

php-forge · Jun 7, 2024 · 9497199 · 9497199
1 parent 66e2258
commit 9497199
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/resources/doc/config.md b/resources/doc/config.md
@@ -379,7 +379,7 @@ You can define the custom directory for `package.json` file with the option `roo
 {
     "config": {
         "foxy": {
-            "root-package-dir": "./module/theme"
+            "root-package-json-dir": "module/theme"
         }
     }
 }

diff --git a/src/Asset/AbstractAssetManager.php b/src/Asset/AbstractAssetManager.php
@@ -137,7 +137,7 @@ public function run(): int
             return 0;
         }
 
-        $rootPackageDir = $this->config->get('root-package-dir');
+        $rootPackageDir = $this->config->get('root-package-json-dir');
 
         if (is_string($rootPackageDir) && !empty($rootPackageDir)) {
             if (!is_dir($rootPackageDir)) {

diff --git a/src/Util/AssetUtil.php b/src/Util/AssetUtil.php
@@ -64,7 +64,7 @@ public static function getPath(
             if (null !== $composerJsonPath && \file_exists($composerJsonPath)) {
                 /** @var array[] $composerJson */
                 $composerJson = \json_decode(\file_get_contents($composerJsonPath), true);
-                $rootPackageDir = $composerJson['config']['foxy']['root-package-dir'] ?? null;
+                $rootPackageDir = $composerJson['config']['foxy']['root-package-json-dir'] ?? null;
 
                 if (null !== $installPath && \is_string($rootPackageDir)) {
                     $installPath .= '/' . $rootPackageDir;

diff --git a/tests/Asset/AssetManager.php b/tests/Asset/AssetManager.php
@@ -294,11 +294,11 @@ public function testSpecifyCustomDirectoryFromPackageJson(): void
     {
         $this->config = new Config(
             [],
-            ['run-asset-manager' => true, 'root-package-dir' => $this->cwd],
+            ['run-asset-manager' => true, 'root-package-json-dir' => $this->cwd],
         );
         $this->manager = $this->getManager();
 
-        $this->assertSame($this->cwd, $this->config->get('root-package-dir'));
+        $this->assertSame($this->cwd, $this->config->get('root-package-json-dir'));
         $this->assertSame(0, $this->getManager()->run());
     }
 
@@ -309,7 +309,7 @@ public function testSpecifyCustomDirectoryFromPackageJsonException(): void
 
         $this->config = new Config(
             [],
-            ['run-asset-manager' => true, 'root-package-dir' => 'path/to/invalid'],
+            ['run-asset-manager' => true, 'root-package-json-dir' => 'path/to/invalid'],
         );
         $this->manager = $this->getManager();
 

diff --git a/tests/Fixtures/package/global/composer.json b/tests/Fixtures/package/global/composer.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "foxy": {
-            "root-package-dir": "theme",
+            "root-package-json-dir": "theme",
             "global-composer-foo": 70,
             "global-composer-bar": 70
         }