11
11
12
12
use Zend \Navigation \Navigation ;
13
13
use Zend \Config \Factory as ConfigFactory ;
14
- use Zend \Mvc \Router \RouteMatch ;
14
+ use Zend \Mvc \Router \RouteMatch as V2RouteMatch ;
15
15
use Zend \Mvc \Service \ServiceManagerConfig ;
16
16
use Zend \Permissions \Acl \Acl ;
17
17
use Zend \Permissions \Acl \Role \GenericRole ;
18
18
use Zend \Permissions \Acl \Resource \GenericResource ;
19
+ use Zend \Router \ConfigProvider as RouterConfigProvider ;
20
+ use Zend \Router \RouteMatch as V3RouteMatch ;
21
+ use Zend \ServiceManager \Config ;
19
22
use Zend \ServiceManager \ServiceManager ;
20
23
use Zend \I18n \Translator \Translator ;
21
24
use Zend \View \Renderer \PhpRenderer ;
@@ -83,6 +86,10 @@ protected function setUp()
83
86
{
84
87
$ cwd = __DIR__ ;
85
88
89
+ $ this ->routeMatchType = class_exists (V2RouteMatch::class)
90
+ ? V2RouteMatch::class
91
+ : V3RouteMatch::class;
92
+
86
93
// read navigation config
87
94
$ this ->_files = $ cwd . '/_files ' ;
88
95
$ config = ConfigFactory::fromFile ($ this ->_files . '/navigation.xml ' , true );
@@ -130,6 +137,12 @@ protected function setUp()
130
137
$ sm ->setAllowOverride (true );
131
138
132
139
(new ServiceManagerConfig ())->configureServiceManager ($ sm );
140
+
141
+ if (class_exists (RouterConfigProvider::class)) {
142
+ $ routerConfig = new Config ((new RouterConfigProvider ())->getDependencyConfig ());
143
+ $ routerConfig ->configureServiceManager ($ sm );
144
+ }
145
+
133
146
$ sm ->setService ('ApplicationConfig ' , $ smConfig );
134
147
$ sm ->get ('ModuleManager ' )->loadModules ();
135
148
$ sm ->get ('Application ' )->bootstrap ();
@@ -141,7 +154,7 @@ protected function setUp()
141
154
$ sm ->setAllowOverride (false );
142
155
143
156
$ app = $ this ->serviceManager ->get ('Application ' );
144
- $ app ->getMvcEvent ()->setRouteMatch (new RouteMatch ([
157
+ $ app ->getMvcEvent ()->setRouteMatch (new $ this -> routeMatchType ([
145
158
'controller ' => 'post ' ,
146
159
'action ' => 'view ' ,
147
160
'id ' => '1337 ' ,
0 commit comments