tests working again

composer.json

@@ -16,7 +16,7 @@
     "delboy1978uk/bone-controller": "^1.1",
     "delboy1978uk/bone-firewall": "^1.1",
     "delboy1978uk/bone-http": "^2.0.4",
-    "delboy1978uk/bone-i18n": "^1.2.4",
+    "delboy1978uk/bone-i18n": "^1.2.6",
     "delboy1978uk/bone-log": "^1.0",
     "delboy1978uk/bone-router": "^1.0",
     "delboy1978uk/bone-server": "^1.1",

src/Application.php

@@ -67,7 +67,7 @@ public function bootstrap(): Container
         $config = $env->fetchConfig($this->configFolder, $this->environment);
         $config[Environment::class] = $env;
         $config[SiteConfig::class] = new SiteConfig($config, $env);
-        $package = new ApplicationPackage($config, $router);
+        $package = new ApplicationPackage($config);
         $package->addToContainer($this->container);
 
         return $this->container;

tests/_data/config/layouts.php

@@ -1,16 +1,13 @@
 <?php
 
 return [
-    'default_layout' => 'layouts/bone',
-    'available_layouts' => [
-        'layouts/bone',
-    ],
+    'default_layout' => 'layouts::bone',
     'error_pages' => [
-        'exception' => 'error/error',
-        401 => 'error/not-authorised',
-        403 => 'error/not-authorised',
-        404 => 'error/not-found',
-        405 => 'error/not-allowed',
-        500 => 'error/error',
+        'exception' => 'error::error',
+        401 => 'error::not-authorised',
+        403 => 'error::not-authorised',
+        404 => 'error::not-found',
+        405 => 'error::not-allowed',
+        500 => 'error::error',
     ],
 ];

tests/_data/config2/layouts.php

@@ -1,16 +1,13 @@
 <?php
 
 return [
-    'default_layout' => 'layouts/bone',
-    'available_layouts' => [
-        'layouts/bone',
-    ],
+    'default_layout' => 'layouts::bone',
     'error_pages' => [
-        'exception' => 'error/error',
-        401 => 'error/not-authorised',
-        403 => 'error/not-authorised',
-        404 => 'error/not-found',
-        405 => 'error/not-allowed',
-        500 => 'error/error',
+        'exception' => 'error::error',
+        401 => 'error::not-authorised',
+        403 => 'error::not-authorised',
+        404 => 'error::not-found',
+        405 => 'error::not-allowed',
+        500 => 'error::error',
     ],
 ];

tests/unit/TestPackage/TestPackagePackage.php

@@ -47,7 +47,9 @@ public function addToContainer(Container $c)
     public function addViews(): array
     {
         return [
-            'testpackage' => __DIR__ . '/View/test/'
+            'testpackage' => __DIR__ . '/View/test/',
+            'error' => __DIR__ . '/View/error/',
+            'layouts' => __DIR__ . '/View/layouts/',
         ];
     }
 
@@ -90,11 +92,10 @@ public function addRoutes(Container $c, Router $router): Router
     }
 
     /**
-     * @param Stack $stack
      * @param Container $container
      * @return array
      */
-    public function getMiddleware(Stack $stack, Container $container): array
+    public function getMiddleware(Container $container): array
     {
         return [];
     }