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

[Routing] Tweaking the ApacheMatcherDumper formatting - no real change.

Browse Source
This commit is contained in:
Ryan Weaver 2010-11-25 08:09:51 -06:00 committed by Fabien Potencier
parent 1e9e1b346d
commit acb977aa88
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
View File

@ -65,11 +65,11 @@ class ApacheMatcherDumper extends MatcherDumper
$conditions[] = sprintf('RewriteCond %%{REQUEST_METHOD} =%s', strtoupper($method));
}
$conditions = implode(" [OR]\n", $conditions)."\n";
$conditions = count($conditions) ? implode(" [OR]\n", $conditions)."\n" : '';
$regexes[] = sprintf("%sRewriteCond %%{PATH_INFO} %s\nRewriteRule .* %s [QSA,L,%s]", $conditions, $regex, $options['script_name'], $variables);
}
return implode("\n", $regexes);
return implode("\n\n", $regexes);
}
}

2
tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.apache
View File

@ -1,6 +1,6 @@
RewriteCond %{PATH_INFO} ^/foo/(baz|symfony)$
RewriteRule .* app.php [QSA,L,E=_ROUTING__route:foo,E=_ROUTING_bar:%1,E=_ROUTING_def:test]
RewriteCond %{REQUEST_METHOD} =GET [OR]
RewriteCond %{REQUEST_METHOD} =HEAD
RewriteCond %{PATH_INFO} ^/bar/([^/\.]+?)$