diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made schemes and methods available in YamlFileLoader

Browse Source
This commit is contained in:
Tobias Schultze 2012-11-15 13:20:40 +01:00
parent 2834e7ef21
commit d374e70f7e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Component/Routing/Loader/YamlFileLoader.php
View File

@ -28,7 +28,7 @@ use Symfony\Component\Config\Loader\FileLoader;
class YamlFileLoader extends FileLoader class YamlFileLoader extends FileLoader
{ {
private static $availableKeys = array( private static $availableKeys = array(
'resource', 'type', 'prefix', 'pattern', 'hostname_pattern', 'defaults', 'requirements', 'options', 'resource', 'type', 'prefix', 'pattern', 'hostname_pattern', 'schemes', 'methods', 'defaults', 'requirements', 'options',
); );
/** /**
@ -98,9 +98,11 @@ class YamlFileLoader extends FileLoader
$defaults = isset($config['defaults']) ? $config['defaults'] : array(); $defaults = isset($config['defaults']) ? $config['defaults'] : array();
$requirements = isset($config['requirements']) ? $config['requirements'] : array(); $requirements = isset($config['requirements']) ? $config['requirements'] : array();
$options = isset($config['options']) ? $config['options'] : array(); $options = isset($config['options']) ? $config['options'] : array();
$hostnamePattern = isset($config['hostname_pattern']) ? $config['hostname_pattern'] : null; $hostnamePattern = isset($config['hostname_pattern']) ? $config['hostname_pattern'] : '';
$schemes = isset($config['schemes']) ? $config['schemes'] : array();
$methods = isset($config['methods']) ? $config['methods'] : array();
$route = new Route($config['pattern'], $defaults, $requirements, $options, $hostnamePattern); $route = new Route($config['pattern'], $defaults, $requirements, $options, $hostnamePattern, $schemes, $methods);
$collection->add($name, $route); $collection->add($name, $route);
} }
@ -121,6 +123,8 @@ class YamlFileLoader extends FileLoader
$requirements = isset($config['requirements']) ? $config['requirements'] : array(); $requirements = isset($config['requirements']) ? $config['requirements'] : array();
$options = isset($config['options']) ? $config['options'] : array(); $options = isset($config['options']) ? $config['options'] : array();
$hostnamePattern = isset($config['hostname_pattern']) ? $config['hostname_pattern'] : null; $hostnamePattern = isset($config['hostname_pattern']) ? $config['hostname_pattern'] : null;
$schemes = isset($config['schemes']) ? $config['schemes'] : null;
$methods = isset($config['methods']) ? $config['methods'] : null;
$this->setCurrentDir(dirname($path)); $this->setCurrentDir(dirname($path));
@ -130,6 +134,12 @@ class YamlFileLoader extends FileLoader
if (null !== $hostnamePattern) { if (null !== $hostnamePattern) {
$subCollection->setHostnamePattern($hostnamePattern); $subCollection->setHostnamePattern($hostnamePattern);
} }
if (null !== $schemes) {
$subCollection->setSchemes($schemes);
}
if (null !== $methods) {
$subCollection->setMethods($methods);
}
$subCollection->addDefaults($defaults); $subCollection->addDefaults($defaults);
$subCollection->addRequirements($requirements); $subCollection->addRequirements($requirements);
$subCollection->addOptions($options); $subCollection->addOptions($options);