scope plugin always creates a new app

Author: devosc

src/Config/ConfigTest.php

@@ -373,7 +373,7 @@ function test_clone_object_scoped()
     {
         $app = new App;
 
-        $config = (new App)(new Scope($app, Config::class));
+        $config = (new App)(new Scope([], Config::class));
 
         $this->assertEquals(clone $config, $config);
     }
@@ -385,7 +385,7 @@ function test_clone_object_scoped_true()
     {
         $app = new App(null, null, true);
 
-        $config = (new App)(new Scope($app, Config::class));
+        $config = (new App)(new Scope([], Config::class));
 
         $this->assertEquals(clone $config, $config);
     }
@@ -397,7 +397,7 @@ function test_clone_object_scoped_different_object()
     {
         $app = new App(null, null, true);
 
-        $config = (new App)(new Scope($app, \stdClass::class));
+        $config = (new App)(new Scope([], \stdClass::class));
 
         $this->assertEquals(clone $config, $config);
     }

src/Plugin/ScopeTest.php

@@ -7,8 +7,8 @@
 
 use Mvc5\Config;
 use Mvc5\App;
-use Mvc5\Plugin\Args;
 use Mvc5\Plugin\Link;
+use Mvc5\Plugin\Plugin;
 use Mvc5\Plugin\Scope;
 use Mvc5\Test\Test\TestCase;
 
@@ -20,36 +20,34 @@ class ScopeTest
      */
     function test()
     {
-        $scope = new Scope(new App, Config::class);
+        $scope = new Scope([], Config::class);
 
-        $args = [new App, new Link, Config::class];
+        $args = [new Plugin(App::class, [['services' => []], null, true, true]), new Link, Config::class];
 
         $this->assertTrue(is_callable($scope->config()));
         $this->assertEquals($args, $scope->args());
     }
 
     /**
-     *
+     * @throws \Throwable
      */
     function test_scope()
     {
-        $app = new App([
-            'services' => [
-                'bar' => function() {
-                    return 'foobar';
-                },
-                'foo' => function() {
-                    /** @var Config $this */
-                    return $this->get('bar');
-                },
-                'scope' => fn() => $this
-            ]
-        ], null, true);
-
-        $config = (new App)(new Scope($app, Config::class));
+        $plugins = [
+            'bar' => function() {
+                return 'foobar';
+            },
+            'foo' => function() {
+                /** @var Config $this */
+                return $this->get('bar');
+            },
+            'scope' => fn() => $this
+        ];
+
+        $config = (new App)(new Scope($plugins, Config::class));
 
         $this->assertInstanceOf(Config::class, $config);
-        $this->assertEquals($config, $app['scope']);
+        $this->assertInstanceOf(Config::class, $config['scope']);
         $this->assertEquals('foobar', $config['foo']);
     }
 }