Merge pull request #7 from mybuilder/symfony-5-support

Add support for Symfony 5
mybuilder · May 6, 2020 · 4b6b812 · 4b6b812
2 parents a2d3cd1 + 07ddb44
commit 4b6b812
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,13 +16,18 @@ matrix:
       env: SYMFONY_VERSION="3.4.*"
     - php: 7.3
       env: SYMFONY_VERSION="4.4.*"
+    - php: 7.3
+      env: SYMFONY_VERSION="5.0.*"
     - php: 7.4
       env: SYMFONY_VERSION="3.4.*"
     - php: 7.4
       env: SYMFONY_VERSION="4.4.*"
+    - php: 7.4
+      env: SYMFONY_VERSION="5.0.*"
 
 before_install:
   - composer self-update
+  - composer validate
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/framework-bundle:"${SYMFONY_VERSION}"; fi
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/console:"${SYMFONY_VERSION}"; fi
 

diff --git a/Command/DumpCommand.php b/Command/DumpCommand.php
@@ -32,6 +32,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $exporter = $this->getContainer()->get('mybuilder.supervisor_bundle.annotation_supervisor_exporter');
 
         $output->write($exporter->export($commands, $this->parseOptions($input)));
+
+        return 0;
     }
 
     private function parseOptions(InputInterface $input): array

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/mybuilder/supervisor-bundle.svg?branch=master)](https://travis-ci.org/mybuilder/supervisor-bundle)
 
-A bundle for Symfony 3/4 which allows you to use `@Supervisor` annotations to configure how [Supervisor](http://supervisord.org/) runs your console commands.
+A bundle for Symfony 3/4/5 which allows you to use `@Supervisor` annotations to configure how [Supervisor](http://supervisord.org/) runs your console commands.
 
 ## Installation
 
@@ -18,7 +18,7 @@ $ php composer.phar require mybuilder/supervisor-bundle
 
 Enable the bundle in the `app/AppKernel.php` for Symfony 3:
 
-``` php
+```php
 public function registerBundles(): array
 {
     return [
@@ -27,7 +27,7 @@ public function registerBundles(): array
 }
 ```
 
-Enable the bundle in the `config/bundles.php` for Symfony 4:
+Enable the bundle in the `config/bundles.php` for Symfony 4/5:
 
 ```php
 return [
@@ -37,7 +37,7 @@ return [
 
 ### Configure the bundle
 
-You can add the following to your `config.yml` (Symfony 3) / `packages/my_builder_supervisor.yaml` (Symfony 4) to define your global export configuration.
+You can add the following to your `config.yml` (Symfony 3) / `packages/my_builder_supervisor.yaml` (Symfony 4/5) to define your global export configuration.
 
 ```yaml
 my_builder_supervisor:

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "mybuilder/supervisor-bundle",
-  "description": "Symfony 3/4 bundle which allows you to use @Supervisor annotations to configure how Supervisor runs your console commands.",
+  "description": "Symfony 3/4/5 bundle which allows you to use @Supervisor annotations to configure how Supervisor runs your console commands.",
   "keywords": [
     "supervisor",
     "supervisord"
@@ -17,10 +17,10 @@
   "require": {
     "francodacosta/supervisord": "~1.0",
     "doctrine/annotations": "~1.0",
-    "symfony/console": "~3.0||~4.0",
-    "symfony/config": "~3.0||~4.0",
-    "symfony/framework-bundle": "~3.0||~4.0",
-    "symfony/yaml": "~3.0||^4.0",
+    "symfony/console": "~3.0||~4.0||~5.0",
+    "symfony/config": "~3.0||~4.0||~5.0",
+    "symfony/framework-bundle": "~3.0||~4.0||~5.0",
+    "symfony/yaml": "~3.0||^4.0||~5.0",
     "php": ">=7.3"
   },
   "require-dev": {