Skip to content
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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 32 additions & 7 deletions src/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Noodlehaus;

use Noodlehaus\Exception\FileNotFoundException;
use Noodlehaus\Exception\ParseException;
use Noodlehaus\Exception\UnsupportedFormatException;
use Noodlehaus\Exception\EmptyDirectoryException;

Expand Down Expand Up @@ -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)
Copy link
Contributor

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 []?

{
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)
Copy link
Contributor

Choose a reason for hiding this comment

The 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();
Expand All @@ -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
*
Expand Down
7 changes: 7 additions & 0 deletions src/DataConfig.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Noodlehaus;

class DataConfig extends AbstractConfig
{
}