Skip to content

Commit

Permalink
Fix indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
neeckeloo committed Dec 12, 2012
1 parent 37277ab commit 0ef37c6
Showing 1 changed file with 58 additions and 52 deletions.
110 changes: 58 additions & 52 deletions tests/ZendTest/Mvc/Router/Http/PartTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,38 +94,44 @@ public static function getRoute()
)
);
}
public static function getRouteAlternative ()

public static function getRouteAlternative()
{
$routePlugins = new RoutePluginManager();
$routePlugins->setInvokableClass('part', 'Zend\Mvc\Router\Http\Part');

return new Part(
array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => '/[:controller[/:action]]',
'defaults' => array(
'controller' => 'fo-fo',
'action' => 'index'
)
)
), true, $routePlugins,
array(
'wildcard' => array(
'type' => 'Zend\Mvc\Router\Http\Wildcard',
'options' => array(
'key_value_delimiter' => '/',
'param_delimiter' => '/'
)
),
'query' => array(
'type' => 'Zend\Mvc\Router\Http\Query',
'options' => array(
'key_value_delimiter' => '=',
'param_delimiter' => '&'
)
)
));
array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => '/[:controller[/:action]]',
'defaults' => array(
'controller' => 'fo-fo',
'action' => 'index'
)
)
),
true,
$routePlugins,
array(
'wildcard' => array(
'type' => 'Zend\Mvc\Router\Http\Wildcard',
'options' => array(
'key_value_delimiter' => '/',
'param_delimiter' => '/'
)
),
'query' => array(
'type' => 'Zend\Mvc\Router\Http\Query',
'options' => array(
'key_value_delimiter' => '=',
'param_delimiter' => '&'
)
)
)
);
}

public static function routeProvider()
{
return array(
Expand Down Expand Up @@ -207,35 +213,35 @@ public static function routeProvider()
array('foo' => 'bar')
),
'simple-match' => array(
self::getRouteAlternative(),
'/',
null,
null,
array(
'controller' => 'fo-fo',
'action' => 'index'
)
self::getRouteAlternative(),
'/',
null,
null,
array(
'controller' => 'fo-fo',
'action' => 'index'
)
),
'match-wildcard' => array(
self::getRouteAlternative(),
'/fo-fo/index/param1/value1',
null,
'wildcard',
array(
'controller' => 'fo-fo',
'action' => 'index',
'param1' => 'value1'
)
self::getRouteAlternative(),
'/fo-fo/index/param1/value1',
null,
'wildcard',
array(
'controller' => 'fo-fo',
'action' => 'index',
'param1' => 'value1'
)
),
'match-query' => array(
self::getRouteAlternative(),
'/fo-fo/index?param1=value1',
0,
'query',
array(
'controller' => 'fo-fo',
'action' => 'index'
)
self::getRouteAlternative(),
'/fo-fo/index?param1=value1',
0,
'query',
array(
'controller' => 'fo-fo',
'action' => 'index'
)
)
);
}
Expand Down

0 comments on commit 0ef37c6

Please sign in to comment.