diff --git a/.travis.yml b/.travis.yml index fe2367d976..2db6f4a00a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,6 @@ before_script: - echo "extension=imagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` php: - - 5.3 - 5.4 - 5.5 diff --git a/composer.json b/composer.json index 7fe9d435a6..eaec81f445 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "bin-dir" : "bin/" }, "require": { - "php" : ">=5.3.3", + "php" : ">=5.4", "alchemy/oauth2php" : "1.0.0", "alchemy/phlickr" : "0.2.7", "alchemy/task-manager" : "~1.0", diff --git a/composer.lock b/composer.lock index 8a3b5eae03..8ca6e4bc07 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "824ef5ec6611bd40f198e043c19d409e", + "hash": "9adc21c7c8c7337bf913c5c3f5ba65fb", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -1635,16 +1635,16 @@ }, { "name": "monolog/monolog", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f72392d0e6eb855118f5a84e89ac2d257c704abd" + "reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f72392d0e6eb855118f5a84e89ac2d257c704abd", - "reference": "f72392d0e6eb855118f5a84e89ac2d257c704abd", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/6225b22de9dcf36546be3a0b2fa8e3d986153f57", + "reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57", "shasum": "" }, "require": { @@ -1652,21 +1652,26 @@ "psr/log": "~1.0" }, "require-dev": { + "aws/aws-sdk-php": "~2.4.8", "doctrine/couchdb": "dev-master", "mlehner/gelf-php": "1.0.*", - "raven/raven": "0.5.*" + "phpunit/phpunit": "~3.7.0", + "raven/raven": "0.5.*", + "ruflin/elastica": "0.90.*" }, "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", - "raven/raven": "Allow sending log messages to a Sentry server" + "raven/raven": "Allow sending log messages to a Sentry server", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -1693,7 +1698,7 @@ "logging", "psr-3" ], - "time": "2013-07-28 22:38:30" + "time": "2013-11-14 19:48:31" }, { "name": "mrclay/minify", @@ -2821,12 +2826,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "b76ac2f865bae2e2ca87302935f5d9a458f1401f" + "reference": "4e9332b6b66d52750142e5b32cc754620f875fe7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/b76ac2f865bae2e2ca87302935f5d9a458f1401f", - "reference": "b76ac2f865bae2e2ca87302935f5d9a458f1401f", + "url": "https://api.github.com/repos/symfony/symfony/zipball/4e9332b6b66d52750142e5b32cc754620f875fe7", + "reference": "4e9332b6b66d52750142e5b32cc754620f875fe7", "shasum": "" }, "require": { @@ -2926,7 +2931,7 @@ "keywords": [ "framework" ], - "time": "2013-11-09 16:01:15" + "time": "2013-11-17 08:45:14" }, { "name": "themattharris/tmhoauth", @@ -4103,7 +4108,7 @@ "behat/gherkin": 20 }, "platform": { - "php": ">=5.3.3" + "php": ">=5.4" }, "platform-dev": [ diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php index 44584c2c39..e7c84a4720 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/SystemRequirements.php @@ -15,7 +15,7 @@ use Alchemy\Phrasea\Setup\RequirementCollection; class SystemRequirements extends RequirementCollection implements RequirementInterface { - const REQUIRED_PHP_VERSION = '5.3.3'; + const REQUIRED_PHP_VERSION = '5.4.0'; public function __construct() { @@ -34,12 +34,6 @@ class SystemRequirements extends RequirementCollection implements RequirementInt sprintf('Install PHP %s or newer (installed version is %s)', self::REQUIRED_PHP_VERSION, $installedPhpVersion) ); - $this->addRequirement( - version_compare($installedPhpVersion, '5.3.16', '!='), - 'PHP version must not be 5.3.16 as Phraseanet won\'t work properly with it', - 'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)' - ); - $this->addRequirement( is_dir($baseDir.'/vendor/composer'), 'Vendor libraries must be installed', @@ -152,18 +146,6 @@ class SystemRequirements extends RequirementCollection implements RequirementInt 'Install the PCRE extension (version 8.0+).' ); - $this->addRecommendation( - version_compare($installedPhpVersion, '5.3.4', '>='), - 'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions', - 'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.' - ); - - $this->addRecommendation( - version_compare($installedPhpVersion, '5.3.8', '>='), - 'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156', - 'Install PHP 5.3.8 or newer if your project uses annotations.' - ); - $this->addRecommendation( version_compare($installedPhpVersion, '5.4.0', '!='), 'You should not use PHP 5.4.0 due to the PHP bug #61453',