Merge pull request #5 from OpenConext/feature/add-symfony-4-support

Add Symfony 4 support

Author: pablothedude

.travis.yml

@@ -7,15 +7,19 @@
 
 language: php
 
+addons:
+  apt:
+    packages:
+      - ant
+
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.4
 
 matrix:
   allow_failures:
     - php: 7.0
-    - php: 7.1
+    - php: 7.4
 
 env:
   global:

composer.json

@@ -1,14 +1,14 @@
 {
   "name": "openconext/monitor-bundle",
   "type": "symfony-bundle",
-  "description": "A Symfony 3 bundle that facilitates health and info endpoints to a Symfony application. The bundle is backwards compatible with Symfony 2 projects.",
+  "description": "A Symfony 4 bundle that facilitates health and info endpoints to a Symfony application. The bundle is backwards compatible with Symfony 2 projects.",
   "keywords": ["SURFnet", "StepUp", "OpenConext", "monitoring", "health"],
   "license": "Apache-2.0",
   "minimum-stability": "stable",
   "require": {
     "php": ">=5.4,<8.0-dev",
-    "symfony/dependency-injection": ">=2.7,<4",
-    "symfony/framework-bundle": ">=2.7,<4",
+    "symfony/dependency-injection": ">=3.4,<5",
+    "symfony/framework-bundle": ">=3.4,<5",
     "webmozart/assert": "^1.2"
   },
   "require-dev": {

src/Resources/config/services.yml

@@ -5,11 +5,15 @@ services:
             - '~'
             - '%kernel.environment%'
             - '%kernel.debug%'
+        public: true
+        tags: ['controller.service_arguments']
 
     openconext.monitor.controller.health:
         class: OpenConext\MonitorBundle\Controller\HealthController
         arguments:
             - '@openconext.monitor.health_check_chain'
+        public: true
+        tags: ['controller.service_arguments']
 
     openconext.monitor.health_check_chain:
         class: OpenConext\MonitorBundle\HealthCheck\HealthCheckChain

src/Value/HealthReport.php

@@ -77,7 +77,9 @@ public function getStatusCode()
 
     public function jsonSerialize()
     {
-        $report['status'] = $this->status;
+        $report = [
+            'status' => $this->status
+        ];
         if (trim($this->message) !== '') {
             $report['message'] = $this->message;
         }