Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/config-refactoring-rebase' of https://github.co…
Browse files Browse the repository at this point in the history
…m/DASPRiD/zf2 into feature/config-refactor

Conflicts:
	library/Zend/Config/Config.php
	library/Zend/Config/Exception.php
	library/Zend/Config/Ini.php
	library/Zend/Config/Json.php
	library/Zend/Config/Writer/AbstractFileWriter.php
	library/Zend/Config/Writer/Json.php
	library/Zend/Config/Writer/Yaml.php
	library/Zend/Config/Xml.php
	library/Zend/Config/Yaml.php
	tests/Zend/Config/IniTest.php
	tests/Zend/Config/JsonTest.php
	tests/Zend/Config/Writer/ArrayWriterTest.php
	tests/Zend/Config/Writer/JsonTest.php
	tests/Zend/Config/Writer/YamlTest.php
	tests/Zend/Config/XmlTest.php
	tests/Zend/Config/YamlTest.php
  • Loading branch information
Show file tree
Hide file tree
Showing 95 changed files with 2,831 additions and 4,883 deletions.
387 changes: 122 additions & 265 deletions src/Config.php

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions src/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Config;

/**
Expand Down
24 changes: 24 additions & 0 deletions src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
<?php
/**
* Zend Framework
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidArgumentException
extends \InvalidArgumentException
implements \Zend\Config\Exception
Expand Down
24 changes: 24 additions & 0 deletions src/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
<?php
/**
* Zend Framework
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\Config\Exception;

/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class RuntimeException
extends \RuntimeException
implements \Zend\Config\Exception
Expand Down
97 changes: 97 additions & 0 deletions src/Factory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?php
/**
* Zend Framework
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\Config;

/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Factory
{
/**
* Readers used for config files.
*
* @var array
*/
protected static $readers = array(
'ini' => 'Ini',
'xml' => 'Xml'
);

/**
* Read a config from a file.
*
* @param string $filename
* @return array
*/
public static function fromFile($filename)
{
$pathinfo = pathinfo($filename);

if (!isset($pathinfo['extension'])) {
throw new Exception\RuntimeException(sprintf(
'Filename "%s" is missing an extension and cannot be auto-detected',
$filename
));
}

$extension = strtolower($pathinfo['extension']);

if ($extension === 'php') {
if (!is_file($filename) || !is_readable($filename)) {
throw new Exception\RuntimeException(sprintf('Filename "%s" is either not a file or not readable', $filename));
}

return include $filename;
} elseif (isset(self::$readers[$extension])) {
if (is_string(self::$readers[$extension])) {
$classname = __NAMESPACE__ . '\\Reader\\' . self::$readers[$extension];
self::$readers[$extension] = new $classname();
}

return self::$readers[$extension]->fromFile($filename);
} else {
throw new Exception\RuntimeException(sprintf(
'Unsupported config file extension: .%s',
$pathinfo['extension']
));
}
}

/**
* Read configuration from multiple files and merge them.
*
* @param array $files
* @return array
*/
public static function fromFiles(array $files)
{
$config = array();

foreach ($files as $file) {
$config = array_replace_recursive($config, self::fromFile($file));
}

return $config;
}
}
Loading

0 comments on commit e07cb7b

Please sign in to comment.