feat: try to fix conflicts

Author: Chris53897

CHANGELOG.md

@@ -1,10 +1,13 @@
 # Changelog
 
-## 2.0.1
+## 3.0.0
 Add support for Symfony 5 and 6. Bump PHP to >= 7.2
 
-## 2.00
-SF4 and PHP 7.2 support
+## 2.1.0
+Add opcache information to the info endpoint when available #7
+
+## 2.0.0
+Added Symfony 4 support
 
 ## 1.0.5
 Take two of improving the DoctrineConnectionHealthCheck

src/Value/Information.php

@@ -40,20 +40,25 @@ class Information implements JsonSerializable
      * @var bool
      */
     private $debuggerEnabled;
+    /**
+     * @var array
+     */
+    private $systemInfo;
 
-    public static function buildFrom(BuildPath $buildPath, string $environment, bool $debuggerEnabled): Information
+    public static function buildFrom(BuildPath $buildPath, string $environment, bool $debuggerEnabled, array $systemInfo): Information
     {
         Assert::stringNotEmpty($environment, 'Environment must have a non empty string value');
         Assert::boolean($debuggerEnabled, 'Debugger enabled must have a boolean value');
 
-        return new self($buildPath, $environment, $debuggerEnabled);
+        return new self($buildPath, $environment, $debuggerEnabled, $systemInfo);
     }
 
-    public function __construct(BuildPath $buildPath, string $environment, bool $debuggerEnabled)
+    public function __construct(BuildPath $buildPath, string $environment, bool $debuggerEnabled, array $systemInfo)
     {
         $this->buildPath = $buildPath;
         $this->environment = $environment;
         $this->debuggerEnabled = $debuggerEnabled;
+        $this->systemInfo = $systemInfo;
     }
 
     public function jsonSerialize(): array