Skip to content

Commit

Permalink
Hot fix for config path retrieval for bundles outside the vendor dire…
Browse files Browse the repository at this point in the history
…ctory
  • Loading branch information
JAC - Frederic Bauer committed Dec 23, 2020
1 parent 03d2199 commit 1a02a55
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
8 changes: 7 additions & 1 deletion Resources/doc/changelogs/CHANGELOG-3.x.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CJW-Network ConfigProcessor Bundle 3.x changelog

## 3.0.1 (xx.12.2020)
## 3.0.1 (23.12.2020)

* Fixed an issue with difference highlighting: When the state was saved in the url,
the highlighting would trigger immediately before any other JS had loaded which caused
Expand All @@ -24,6 +24,12 @@
cut badly (it was tried to cut the project directory out of the path which didn't feature
the directory), leading to false paths in the frontend.

* Fixed an issue with config path retrieval for bundles outside the vendor directory,
where the general config directory would be found and added to the list of custom paths,
leading to immense loading times and endless loops of configuration, which would often amount
to an error


## 3.0 (11.12.2020)

* This changelog has been created to ship with the first full version of the bundle
Expand Down
3 changes: 1 addition & 2 deletions src/LocationAwareConfigLoadBundle/ConfigPathUtility.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ public static function convertExtensionPathToConfigDirectory(string $extensionPa
if (file_exists($configDirPath.DIRECTORY_SEPARATOR."Resources".DIRECTORY_SEPARATOR."config")) {
$configDirPath = $configDirPath.DIRECTORY_SEPARATOR."Resources".DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR;
break;
} else if (file_exists($configDirPath.DIRECTORY_SEPARATOR."config")) {
$configDirPath = $configDirPath.DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR;
} else if (file_exists($configDirPath.DIRECTORY_SEPARATOR."composer.json")) {
break;
}

Expand Down

0 comments on commit 1a02a55

Please sign in to comment.