From 36756b16fc1c74037cfd6d6384f1f5611067d951 Mon Sep 17 00:00:00 2001 From: Arne Blankerts Date: Sun, 2 Jul 2017 15:06:28 +0200 Subject: [PATCH] Revert "Add notice to output about deprecation of HHVM and PHP < 5.6" This reverts commit 57dcf453cd48ca987a3ecb85d6c7c2961bbca3eb. --- build/phar/autoload.php.in | 2 -- phpdox | 16 ++++++++++++++-- src/runtimecheck.php | 33 --------------------------------- 3 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 src/runtimecheck.php diff --git a/build/phar/autoload.php.in b/build/phar/autoload.php.in index 0052e79a..090a810c 100644 --- a/build/phar/autoload.php.in +++ b/build/phar/autoload.php.in @@ -22,8 +22,6 @@ spl_autoload_register( Phar::mapPhar('phpdox.phar'); define('PHPDOX_PHAR', 'phpdox.phar'); -require 'phar://phpdox.phar/phpdox/runtimecheck.php'; - $factory = new TheSeer\phpDox\Factory( new \TheSeer\phpDox\FileInfo('phar://' . PHPDOX_PHAR), new \TheSeer\phpDox\Version('___VERSION___') diff --git a/phpdox b/phpdox index 6030bfaf..4f19b1ea 100755 --- a/phpdox +++ b/phpdox @@ -40,7 +40,19 @@ * */ -require __DIR__ . '/src/runtimecheck.php'; +if (!defined('HHVM_VERSION') && (version_compare(phpversion(), '5.5', 'lt'))) { + fwrite( + STDERR, + sprintf( + "phpDox requires PHP 5.5 or later; " . + "Upgrading to the latest version of PHP is highly recommended. (Version used: %s)\n\n", + phpversion() + ) + ); + + die(1); +} + require __DIR__ . '/src/autoload.php'; $found = false; @@ -61,7 +73,7 @@ if (!$found) { $factory = new TheSeer\phpDox\Factory( new \TheSeer\phpDox\FileInfo(__DIR__), - new \TheSeer\phpDox\Version('0.10.1') + new \TheSeer\phpDox\Version('0.11.0-dev') ); exit($factory->getCLI()->run( new TheSeer\phpDox\CLIOptions($_SERVER['argv']) diff --git a/src/runtimecheck.php b/src/runtimecheck.php deleted file mode 100644 index e17ada22..00000000 --- a/src/runtimecheck.php +++ /dev/null @@ -1,33 +0,0 @@ -