Skip to content

Append trailing slash to path when calling loadConfig directly #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghost wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Append trailing slash to path when calling loadConfig directly #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Configula/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ public function __construct($configPath = null, $defaults = array())

//Load the config files
if ($configPath) {
//Append trailing slash
if (substr($configPath, strlen($configPath) - 1) != DIRECTORY_SEPARATOR) {
$configPath .= DIRECTORY_SEPARATOR;
}

$this->loadConfig($configPath);
}
}
Expand All @@ -68,6 +63,11 @@ public function __construct($configPath = null, $defaults = array())
*/
public function loadConfig($configPath)
{
//Append trailing slash
if (substr($configPath, strlen($configPath) - 1) != DIRECTORY_SEPARATOR) {
$configPath .= DIRECTORY_SEPARATOR;
}

//Array to hold the configuration items as we get them
$config = array();

Expand Down