From 1249e98a0fb9d3024afd36b9875a0a227b7eccb1 Mon Sep 17 00:00:00 2001
From: Tim <TimZ99@users.noreply.github.com>
Date: Mon, 17 Sep 2018 17:32:51 +0200
Subject: [PATCH] Downgraded symfony/filesystem to ~3.4 (#656)

Fixes #655.
Downgraded symfony/filesystem to v3.4 (PHP 5.5.9 compatible).
Added 7.0.8 as minimal PHP version for PHP7.
---
 CHANGELOG.rst                                  |  1 +
 README.rst                                     |  3 ++-
 composer.json                                  |  3 ++-
 composer.lock                                  | 18 +++++++++---------
 docs/requirements.rst                          |  3 ++-
 .../Install/Controller/InstallController.php   |  4 ++--
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5316e53e..c20db5df 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,7 @@ Changelog
 Not yet released
 ----------------
 
+* #656: Downgraded symfony/filesystem to ~3.4 (PHP 5.5.9 compatible) and added 7.0.8 as minimal PHP7 version.
 * #620: Added updater.sh shell script.
 * #653: Fixes wrong default type in upgrade/install query.
 * #642: Added post field as addition to #631.
diff --git a/README.rst b/README.rst
index c3a86aab..73840bce 100755
--- a/README.rst
+++ b/README.rst
@@ -78,7 +78,8 @@ Requirements
 
 * Web server
 * MySQL database
-* PHP 5.5.9+
+* For PHP5: 5.5.9+
+* For PHP7: 7.0.8+
 * PHP cURL package
 * PHP PDO mysql driver
 * PHP-XML
diff --git a/composer.json b/composer.json
index 9780cd02..96a02a10 100755
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
 	"license": "GPL-3.0-or-later",
 	"homepage": "https://www.phpservermonitor.org",
 	"require": {
-		"php": ">=5.5.9",
+		"php": "^5.5.9|>=7.0.8",
 		"ext-curl": "*",
 		"ext-pdo": "*",
 		"ext-xml": "*",
@@ -13,6 +13,7 @@
 		"symfony/dependency-injection": "~3.4",
 		"symfony/event-dispatcher": "~3.4",
 		"symfony/http-foundation": "~3.4",
+		"symfony/filesystem": "~3.4",
 		"php-pushover/php-pushover": "dev-master",
 		"paragonie/random_compat": "^2.0",
 		"twig/twig": "~1.35"
diff --git a/composer.lock b/composer.lock
index 9c3f01e3..a8c46a97 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b116489d45aab7506cedf3f94fb60ee4",
+    "content-hash": "d20236a69bef1e5b7bf138701a2b8ceb",
     "packages": [
         {
             "name": "paragonie/random_compat",
@@ -400,26 +400,26 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.1.4",
+            "version": "v3.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e"
+                "reference": "285ce5005cb01a0aeaa5b0cf590bd0cc40bb631c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e",
-                "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/285ce5005cb01a0aeaa5b0cf590bd0cc40bb631c",
+                "reference": "285ce5005cb01a0aeaa5b0cf590bd0cc40bb631c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -446,7 +446,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-18T16:52:46+00:00"
+            "time": "2018-08-10T07:29:05+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -754,7 +754,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.5.9",
+        "php": "^5.5.9|>=7.0.8",
         "ext-curl": "*",
         "ext-pdo": "*",
         "ext-xml": "*"
diff --git a/docs/requirements.rst b/docs/requirements.rst
index 279fba99..c23228bd 100644
--- a/docs/requirements.rst
+++ b/docs/requirements.rst
@@ -5,6 +5,7 @@ Requirements
 
 * Web server
 * MySQL database
-* PHP 5.5.9+
+* For PHP5: 5.5.9+
+* For PHP7: 7.0.8+
 * PHP cURL package
 * PHP PDO mysql driver
\ No newline at end of file
diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php
index 7f315ebe..110759a9 100644
--- a/src/psm/Module/Install/Controller/InstallController.php
+++ b/src/psm/Module/Install/Controller/InstallController.php
@@ -69,9 +69,9 @@ class InstallController extends AbstractController {
 		$errors = 0;
 
 		$phpv = phpversion();
-		if (version_compare($phpv, '5.5.9', '<')) {
+		if (version_compare($phpv, '5.5.9', '<') || (version_compare($phpv, '7.0.8', '<') && version_compare($phpv, '7.0.0', '>='))) {
 			$errors++;
-			$this->addMessage('PHP 5.5.9+ is required to run PHP Server Monitor. You\'re using '.$phpv.'.', 'error');
+			$this->addMessage('PHP 5.5.9+ or 7.0.8+ is required to run PHP Server Monitor. You\'re using '.$phpv.'.', 'error');
 		} else {
 			$this->addMessage('PHP version: '.$phpv, 'success');
 		}