Junker / YamlConfigurationServiceProvider

src/Junker/Silex/Provider/YamlConfigurationServiceProvider.php

Indentation +60 added lines, -60 removed lines

@@ -11,64 +11,64 @@
 
 class YamlConfigurationServiceProvider implements ServiceProviderInterface
 {
-    protected $cacheDirPath;
-    protected $configFilePath;
-    protected $configCacheFactory;
-
-    public function __construct($configFilePath, $options = null)
-    {
-        if (is_array($options)) {
-            if (isset($options['cache_dir'])) {
-                $this->cacheDirPath = $options['cache_dir'];
-            }
-        }
-
-        $this->configFilePath = $configFilePath;
-    }
-
-    public function register(Application $app)
-    {
-        $app['config'] = $app->share(function(Application $app) {
-            if ($this->cacheDirPath) {
-                $cache = $this->getConfigCacheFactory($app['debug'])->cache($this->cacheDirPath.'/config.cache.php',
-                    function(ConfigCacheInterface $cache) {
-                        $config = $this->loadConfig();
-
-                        $content = sprintf('<?php use Junker\Silex\Config; $c = new Config(%s);', var_export($config->data, true)).PHP_EOL;
-                        $content .= 'return $c;';
-
-                        $cache->write($content, $config->getResources());
-                    }
-                );
-
-                $config = include $cache->getPath();
-            } else {
-                $config = $this->loadConfig();
-            }
-
-            return $config->data;
-        });
-    }
-
-    public function boot(Application $app)
-    {
-    }
-
-    private function getConfigCacheFactory($debug = false)
-    {
-        if ($this->configCacheFactory === null) {
-            $this->configCacheFactory = new ConfigCacheFactory($debug);
-        }
-
-        return $this->configCacheFactory;
-    }
-
-    protected function loadConfig()
-    {
-        $loader = new YamlFileLoader(new FileLocator(dirname($this->configFilePath)));
-
-        $config = $loader->load($this->configFilePath);
-
-        return $config;
-    }
+	protected $cacheDirPath;
+	protected $configFilePath;
+	protected $configCacheFactory;
+
+	public function __construct($configFilePath, $options = null)
+	{
+		if (is_array($options)) {
+			if (isset($options['cache_dir'])) {
+				$this->cacheDirPath = $options['cache_dir'];
+			}
+		}
+
+		$this->configFilePath = $configFilePath;
+	}
+
+	public function register(Application $app)
+	{
+		$app['config'] = $app->share(function(Application $app) {
+			if ($this->cacheDirPath) {
+				$cache = $this->getConfigCacheFactory($app['debug'])->cache($this->cacheDirPath.'/config.cache.php',
+					function(ConfigCacheInterface $cache) {
+						$config = $this->loadConfig();
+
+						$content = sprintf('<?php use Junker\Silex\Config; $c = new Config(%s);', var_export($config->data, true)).PHP_EOL;
+						$content .= 'return $c;';
+
+						$cache->write($content, $config->getResources());
+					}
+				);
+
+				$config = include $cache->getPath();
+			} else {
+				$config = $this->loadConfig();
+			}
+
+			return $config->data;
+		});
+	}
+
+	public function boot(Application $app)
+	{
+	}
+
+	private function getConfigCacheFactory($debug = false)
+	{
+		if ($this->configCacheFactory === null) {
+			$this->configCacheFactory = new ConfigCacheFactory($debug);
+		}
+
+		return $this->configCacheFactory;
+	}
+
+	protected function loadConfig()
+	{
+		$loader = new YamlFileLoader(new FileLocator(dirname($this->configFilePath)));
+
+		$config = $loader->load($this->configFilePath);
+
+		return $config;
+	}
 }

src/Junker/Silex/YamlFileLoader.php

Indentation +63 added lines, -63 removed lines

@@ -10,87 +10,87 @@
 
 class YamlFileLoader extends FileLoader
 {
-    private $yamlParser;
+	private $yamlParser;
 
-    public function load($file, $type = null)
-    {
-        $path = $this->locator->locate($file);
+	public function load($file, $type = null)
+	{
+		$path = $this->locator->locate($file);
 
-        $data = $this->loadFile($path);
+		$data = $this->loadFile($path);
 
-        // empty file
-        if ($data === null) {
-            $data = array();
-        }
+		// empty file
+		if ($data === null) {
+			$data = array();
+		}
 
-        // not an array
-        if (!is_array($data)) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $file));
-        }
+		// not an array
+		if (!is_array($data)) {
+			throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $file));
+		}
 
-        $config = new Config($data);
-        $config->addResource(new FileResource($path));
+		$config = new Config($data);
+		$config->addResource(new FileResource($path));
 
-        // imports
-        $this->parseImports($config, $path);
+		// imports
+		$this->parseImports($config, $path);
 
-        return $config;
-    }
+		return $config;
+	}
 
-    protected function loadFile($file)
-    {
-        if (!class_exists('Symfony\Component\Yaml\Parser')) {
-            throw new \RuntimeException('Unable to load YAML config files as the Symfony Yaml Component is not installed.');
-        }
+	protected function loadFile($file)
+	{
+		if (!class_exists('Symfony\Component\Yaml\Parser')) {
+			throw new \RuntimeException('Unable to load YAML config files as the Symfony Yaml Component is not installed.');
+		}
 
-        if (!stream_is_local($file)) {
-            throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $file));
-        }
+		if (!stream_is_local($file)) {
+			throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $file));
+		}
 
-        if (!file_exists($file)) {
-            throw new \InvalidArgumentException(sprintf('The service file "%s" is not valid.', $file));
-        }
+		if (!file_exists($file)) {
+			throw new \InvalidArgumentException(sprintf('The service file "%s" is not valid.', $file));
+		}
 
-        if ($this->yamlParser === null) {
-            $this->yamlParser = new YamlParser();
-        }
+		if ($this->yamlParser === null) {
+			$this->yamlParser = new YamlParser();
+		}
 
-        try {
-            $data = $this->yamlParser->parse(file_get_contents($file));
-        } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);
-        }
+		try {
+			$data = $this->yamlParser->parse(file_get_contents($file));
+		} catch (ParseException $e) {
+			throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 
-    private function parseImports(Config &$config, $file)
-    {
-        if (!isset($config->data['imports'])) {
-            return;
-        }
-        if (!is_array($config->data['imports'])) {
-            throw new \InvalidArgumentException(sprintf('The "imports" key should contain an array in %s. Check your YAML syntax.', $file));
-        }
+	private function parseImports(Config &$config, $file)
+	{
+		if (!isset($config->data['imports'])) {
+			return;
+		}
+		if (!is_array($config->data['imports'])) {
+			throw new \InvalidArgumentException(sprintf('The "imports" key should contain an array in %s. Check your YAML syntax.', $file));
+		}
 
-        $defaultDirectory = dirname($file);
+		$defaultDirectory = dirname($file);
 
-        foreach ($config->data['imports'] as $import) {
-            if (!is_array($import)) {
-                throw new \InvalidArgumentException(sprintf('The values in the "imports" key should be arrays in %s. Check your YAML syntax.', $file));
-            }
+		foreach ($config->data['imports'] as $import) {
+			if (!is_array($import)) {
+				throw new \InvalidArgumentException(sprintf('The values in the "imports" key should be arrays in %s. Check your YAML syntax.', $file));
+			}
 
-            $this->setCurrentDir($defaultDirectory);
-            $sub_config = $this->import($import['resource'], null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);
+			$this->setCurrentDir($defaultDirectory);
+			$sub_config = $this->import($import['resource'], null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);
 
-            $config->addConfig($sub_config);
+			$config->addConfig($sub_config);
 
-            unset($config->data['imports']);
-        }
-    }
+			unset($config->data['imports']);
+		}
+	}
 
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'yml' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'yaml' === $type);
-    }
+	public function supports($resource, $type = null)
+	{
+		return is_string($resource) && 'yml' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'yaml' === $type);
+	}
 }

tests/Config/ConfigTest.php

Indentation +22 added lines, -22 removed lines

@@ -6,38 +6,38 @@
 
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
-    const CONFIG_FILE = __DIR__ . '/../res/config.yml';
-    const CACHE_PATH = '/tmp/cache_config_123634f3d';
+	const CONFIG_FILE = __DIR__ . '/../res/config.yml';
+	const CACHE_PATH = '/tmp/cache_config_123634f3d';
 
-    public function testConfig()
-    {
-        $app = new Application();
+	public function testConfig()
+	{
+		$app = new Application();
 
-        $app->register(new YamlConfigurationServiceProvider(self::CONFIG_FILE));
+		$app->register(new YamlConfigurationServiceProvider(self::CONFIG_FILE));
 
-        $this->assertEquals($app['config']['db']['pass'], '123123');
-        $this->assertEquals($app['config']['facebook']['debug'], true);
-        $this->assertEquals(count($app['config']['security']['rules']['IS_AUTHENTICATED_ANONYMOUSLY']), 2);
-    }
+		$this->assertEquals($app['config']['db']['pass'], '123123');
+		$this->assertEquals($app['config']['facebook']['debug'], true);
+		$this->assertEquals(count($app['config']['security']['rules']['IS_AUTHENTICATED_ANONYMOUSLY']), 2);
+	}
 
-    public function testCache()
-    {
-        $app = new Application();
+	public function testCache()
+	{
+		$app = new Application();
 
-        system("rm -rf " . escapeshellarg(self::CACHE_PATH));
+		system("rm -rf " . escapeshellarg(self::CACHE_PATH));
 
-        $app->register(new YamlConfigurationServiceProvider(self::CONFIG_FILE, ['cache_dir' => self::CACHE_PATH]));
+		$app->register(new YamlConfigurationServiceProvider(self::CONFIG_FILE, ['cache_dir' => self::CACHE_PATH]));
 
-        $this->assertEquals($app['config']['db']['pass'], '123123');
+		$this->assertEquals($app['config']['db']['pass'], '123123');
 
-        $this->assertFileExists(self::CACHE_PATH . '/config.cache.php');
-        $this->assertFileExists(self::CACHE_PATH . '/config.cache.php.meta');
+		$this->assertFileExists(self::CACHE_PATH . '/config.cache.php');
+		$this->assertFileExists(self::CACHE_PATH . '/config.cache.php.meta');
 
-        $app = new Application();
+		$app = new Application();
 
-        $app->register(new YamlConfigurationServiceProvider(self::CONFIG_FILE, ['cache_dir' => self::CACHE_PATH]));
+		$app->register(new YamlConfigurationServiceProvider(self::CONFIG_FILE, ['cache_dir' => self::CACHE_PATH]));
 
-        $this->assertEquals($app['config']['db']['pass'], '123123');
-    }
+		$this->assertEquals($app['config']['db']['pass'], '123123');
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
-    const CONFIG_FILE = __DIR__ . '/../res/config.yml';
+    const CONFIG_FILE = __DIR__.'/../res/config.yml';
     const CACHE_PATH = '/tmp/cache_config_123634f3d';
 
     public function testConfig()
@@ -24,14 +24,14 @@ 
     {
         $app = new Application();
 
-        system("rm -rf " . escapeshellarg(self::CACHE_PATH));
+        system("rm -rf ".escapeshellarg(self::CACHE_PATH));
 
         $app->register(new YamlConfigurationServiceProvider(self::CONFIG_FILE, ['cache_dir' => self::CACHE_PATH]));
 
         $this->assertEquals($app['config']['db']['pass'], '123123');
 
-        $this->assertFileExists(self::CACHE_PATH . '/config.cache.php');
-        $this->assertFileExists(self::CACHE_PATH . '/config.cache.php.meta');
+        $this->assertFileExists(self::CACHE_PATH.'/config.cache.php');
+        $this->assertFileExists(self::CACHE_PATH.'/config.cache.php.meta');
 
         $app = new Application();