Add support for Symfony 5

AlexMasterov · Dec 27, 2019 · 5d53139 · 5d53139
1 parent 20a0dca
commit 5d53139
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 ## PsyshBundle
 
 [![Latest Stable Version](https://poser.pugx.org/alexmasterov/psysh-bundle/v/stable)](https://packagist.org/packages/alexmasterov/psysh-bundle)
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/AlexMasterov/psysh-bundle/master/LICENSE)
 [![Build Status](https://travis-ci.org/AlexMasterov/psysh-bundle.svg)](https://travis-ci.org/AlexMasterov/psysh-bundle)
 [![Code Coverage](https://scrutinizer-ci.com/g/AlexMasterov/psysh-bundle/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/AlexMasterov/psysh-bundle/?branch=master)
 [![Code Quality](https://scrutinizer-ci.com/g/AlexMasterov/psysh-bundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AlexMasterov/psysh-bundle/?branch=master)
@@ -54,7 +53,6 @@ $ php bin/console psysh:shell
 >>> ls
 Variables: $someController, $mail, $someService, $db
 ```
-_WIP_...
 
 ## Configuration
 Some common options. For a more detailed list, see [wiki](https://github.com/bobthecow/psysh/wiki/Config-options).
@@ -80,3 +78,6 @@ Some common options. For a more detailed list, see [wiki](https://github.com/bob
 | `use_tab_completion`      | `bool`                                |
 | `matchers`                | `array` [`string`]                    |
 | `variables`               | `array` [`string`]                    |
+
+## License
+[MIT](LICENSE)
diff --git a/composer.json b/composer.json
@@ -9,9 +9,9 @@
     "email": "alex.masterow@gmail.com"
   }],
   "keywords": [
-    "psysh",
     "symfony",
-    "bundle"
+    "bundle",
+    "psysh"
   ],
   "config": {
     "preferred-install": {
@@ -38,11 +38,11 @@
   "require": {
     "php": "^7.1.0",
     "psy/psysh": "^0.9",
-    "symfony/config": "^4.0",
-    "symfony/dependency-injection": "^4.0",
-    "symfony/http-kernel": "^4.0"
+    "symfony/config": "^4.0|^5.0",
+    "symfony/dependency-injection": "^4.0|^5.0",
+    "symfony/http-kernel": "^4.0|^5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.1"
+    "phpunit/phpunit": "^8.5.1"
   }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -26,8 +26,8 @@ class Configuration implements ConfigurationInterface
     /** {@inheritdoc} */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('psysh');
+        $treeBuilder = new TreeBuilder('psysh');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

diff --git a/tests/DependencyInjection/ExtensionTest.php b/tests/DependencyInjection/ExtensionTest.php
@@ -17,6 +17,8 @@ final class ExtensionTest extends TestCase
     /** @test */
     public function it_valid_register(): void
     {
+        static $SERVICE_NAME = 'psysh.shell';
+
         // Stub
         $config = [
             'variables' => [
@@ -34,12 +36,15 @@ public function it_valid_register(): void
         $container = $this->loadExtension($config);
 
         // Verify
-        self::assertTrue($container->has('psysh.shell'));
-        self::assertInstanceOf(Shell::class, $container->get('psysh.shell'));
-        self::assertArraySubset(
-            array_keys($config['variables']),
-            $container->get('psysh.shell')->getScopeVariableNames()
-        );
+        self::assertTrue($container->has($SERVICE_NAME));
+
+        $shell = $container->get($SERVICE_NAME);
+        self::assertInstanceOf(Shell::class, $shell);
+
+        $scopeVariables = $shell->getScopeVariableNames();
+        foreach (array_keys($config['variables']) as $variable) {
+            self::assertContains($variable, $scopeVariables);
+        }
     }
 
     private function loadExtension(array $config = [], ContainerBuilder $container = null): ContainerBuilder