This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/config-refactoring-rebase' of https://github.co…
…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
48 parents
4357e80
+
7d43d02
+
421a0f4
+
e7aa329
+
6d05bfe
+
f27c5e2
+
6cb3b21
+
1ecb5ed
+
b66b0e2
+
0b91e40
+
6bda391
+
b932fa5
+
a431b75
+
9ce83ec
+
a35dff6
+
60e4965
+
0f071e9
+
3fe17b4
+
196ca18
+
17cbc64
+
8f4a51f
+
88ec12d
+
31ab35e
+
59c83c4
+
d50da4c
+
01af50b
+
6a46af5
+
4308adc
+
1c3d629
+
18a268d
+
1987408
+
abc72db
+
175f7ab
+
8a85704
+
7706019
+
cc5d38c
+
fbaa5aa
+
0555415
+
20ae04b
+
0680687
+
e65301c
+
424e30a
+
d36a7f1
+
64bb794
+
c74649b
+
b14bb6b
+
4e73e4e
+
a10e1fd
commit e07cb7b
Showing
95 changed files
with
2,831 additions
and
4,883 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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,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; | ||
} | ||
} |
Oops, something went wrong.