hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-08-27 09:48:55 +02:00
Code Issues Releases Wiki Activity

Remove SPYC library for Yamls and use Symfony/Component/Yaml instead.

Browse Source
This commit is contained in:
Andrés Montañez
2013-12-19 16:27:53 -02:00
parent 72a1a19518
commit d6e7e5b6ab
16 changed files with 1769 additions and 1050 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Autoload.php
+4 -1
View File
@@ -23,8 +23,11 @@ class Autoload
*/
public static function autoload($className)
{
$isVendor = explode('\\', $className);
$isVendor = $isVendor[0] == 'Mage' ? false : true;
$baseDir = dirname(dirname(__FILE__));
$classFile = $baseDir . '/' . str_replace(array('_', '\\'), '/', $className . '.php');
$classFile = $baseDir . '/' . ($isVendor ? 'vendor/' : '') . str_replace(array('_', '\\'), '/', $className . '.php');
require_once $classFile;
}
Mage/Config.php
+3 -2
View File
@@ -10,6 +10,7 @@
namespace Mage;
use Symfony\Component\Yaml\Yaml;
use Exception;
/**
@@ -99,7 +100,7 @@ class Config
protected function loadGeneral()
{
if (file_exists('.mage/config/general.yml')) {
$this->config['general'] = spyc_load_file('.mage/config/general.yml');
$this->config['general'] = Yaml::parse('.mage/config/general.yml');
}
}
@@ -113,7 +114,7 @@ class Config
{
$environment = $this->getEnvironment();
if (($environment != false) && file_exists('.mage/config/environment/' . $environment . '.yml')) {
$this->config['environment'] = spyc_load_file('.mage/config/environment/' . $environment . '.yml');
$this->config['environment'] = Yaml::parse('.mage/config/environment/' . $environment . '.yml');
// Create temporal directory for clone
if (isset($this->config['environment']['deployment']['source']) && is_array($this->config['environment']['deployment']['source'])) {
Mage/spyc.php
-1046
View File
File diff suppressed because it is too large Load Diff