Merge pull request #6844 from GawainLynch/tests/more-coverage-is-more

[3.3] Bootstrap tests & a couple of minor bug fixes
bolt · Jul 21, 2017 · 06bcaa0 · 06bcaa0
2 parents f02c77a + 2f65b7b
commit 06bcaa0
Show file tree

Hide file tree

Showing 3 changed files with 440 additions and 4 deletions.
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
@@ -140,9 +140,8 @@ public static function run($rootPath)
         foreach ((array) $config['services'] as $service) {
             $params = [];
             if (is_array($service)) {
-                $key = key($service);
-                $params = $service[$key];
-                $service = $key;
+                $params = reset($service);
+                $service = key($service);
             }
 
             if (is_string($service) && is_a($service, Silex\ServiceProviderInterface::class, true)) {
@@ -153,6 +152,13 @@ public static function run($rootPath)
             }
         }
 
+        if (!$config['extensions']) {
+            return $app;
+        }
+        if (!isset($app['extensions'])) {
+            throw new LogicException('Provided application object does not contain an extension service, but extensions are defined in bootstrap.');
+        }
+
         $app['extensions'] = $app->share(
             $app->extend(
                 'extensions',

diff --git a/tests/phpunit/BoltListener.php b/tests/phpunit/BoltListener.php
@@ -199,7 +199,7 @@ private function buildTestEnv()
         // Mirror in required assets.
         $fs->mirror(TEST_ROOT . '/app/resources/',      PHPUNIT_WEBROOT . '/app/resources/',      null, ['override' => true]);
         $fs->mirror(TEST_ROOT . '/app/theme_defaults/', PHPUNIT_WEBROOT . '/app/theme_defaults/', null, ['override' => true]);
-        $fs->mirror(TEST_ROOT . '/app/view/',           PHPUNIT_WEBROOT . '/app/view/',           null, ['override' => true]);
+        $fs->mirror(TEST_ROOT . '/app/view/twig',       PHPUNIT_WEBROOT . '/app/view/twig',       null, ['override' => true]);
 
         // Make sure we wipe the db file to start with a clean one
         $fs->copy($this->boltdb, PHPUNIT_WEBROOT . '/app/database/bolt.db', true);