-
Notifications
You must be signed in to change notification settings - Fork 136
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.
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
Parameter support #88
Open
TiMESPLiNTER
wants to merge
5
commits into
hassankhan:master
Choose a base branch
from
TiMESPLiNTER:parameters
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
57995ad
Add support for parameters
TiMESPLiNTER 67b5b19
Do not parse config for parameters if none are given
TiMESPLiNTER 7e1c8fc
Remove unnecessary continue statement
TiMESPLiNTER a6da99b
Do not throw exception if parameter is missing because else any %% en…
TiMESPLiNTER 3c235cf
Set default value to null
TiMESPLiNTER File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
namespace Noodlehaus; | ||
|
||
use Noodlehaus\Exception\FileNotFoundException; | ||
use Noodlehaus\Exception\ParseException; | ||
use Noodlehaus\Exception\UnsupportedFormatException; | ||
use Noodlehaus\Exception\EmptyDirectoryException; | ||
|
||
|
@@ -33,23 +34,23 @@ class Config extends AbstractConfig | |
/** | ||
* Static method for loading a Config instance. | ||
* | ||
* @param string|array $path | ||
* @param string|array $path | ||
* @param array $parameters | ||
* | ||
* @return Config | ||
*/ | ||
public static function load($path) | ||
public static function load($path, array $parameters = null) | ||
{ | ||
return new static($path); | ||
return new static($path, $parameters); | ||
} | ||
|
||
/** | ||
* Loads a supported configuration file format. | ||
* | ||
* @param string|array $path | ||
* | ||
* @throws EmptyDirectoryException If `$path` is an empty directory | ||
* @param string|array $path | ||
* @param array $parameters | ||
*/ | ||
public function __construct($path) | ||
public function __construct($path, array $parameters = null) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It has the same issue in the previous comment thread I mention. |
||
{ | ||
$paths = $this->getValidPath($path); | ||
$this->data = array(); | ||
|
@@ -69,9 +70,33 @@ public function __construct($path) | |
$this->data = array_replace_recursive($this->data, (array) $parser->parse($path)); | ||
} | ||
|
||
if (null !== $parameters) { | ||
$this->replaceParameters($this->data, new DataConfig($parameters)); | ||
} | ||
|
||
parent::__construct($this->data); | ||
} | ||
|
||
/** | ||
* @param array $data | ||
* @param ConfigInterface $parameters | ||
*/ | ||
protected function replaceParameters(array &$data, ConfigInterface $parameters) | ||
{ | ||
foreach ($data as &$value) { | ||
if (true === is_array($value)) { | ||
$this->replaceParameters($value, $parameters); | ||
} elseif (true === is_string($value)) { | ||
$value = preg_replace_callback('/%([^%]+)%/', function ($m) use ($parameters) { | ||
if (null === $parameterValue = $parameters->get($m[1])) { | ||
return $m[0]; | ||
} | ||
return $parameterValue; | ||
}, $value); | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Gets a parser for a given file extension | ||
* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?php | ||
|
||
namespace Noodlehaus; | ||
|
||
class DataConfig extends AbstractConfig | ||
{ | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about let the optional
$parameters
be the empty array[]
?