Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-10-07 00:59:13 +0400
committermattab <matthieu.aubry@gmail.com>2014-10-07 00:59:13 +0400
commit733ef22246b50e91533e518ea407f74c9587d30e (patch)
treece72e2ff509d8daa5c110717da7ce93eefd831e5
parentb2af823c5c299a04ab38923da161e4d68c119213 (diff)
Increasing PHP requirements to 5.3.3 refs #6390
-rw-r--r--README.md2
-rw-r--r--composer.json2
-rw-r--r--composer.lock4
-rw-r--r--core/testMinimumPhpVersion.php4
4 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index 6a71dffb56..d1760329f0 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Piwik is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](mi
## Requirements
- * PHP 5.3.2 or greater
+ * PHP 5.3.3 or greater
* MySQL 4.1 or greater, and either MySQLi or PDO library must be enabled
* Piwik is OS / server independent
diff --git a/composer.json b/composer.json
index 270968a3ba..4badd4c57b 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
}
},
"require": {
- "php": ">=5.3.2",
+ "php": ">=5.3.3",
"twig/twig": "1.*",
"leafo/lessphp": "0.4",
"symfony/console": ">=v2.3.5",
diff --git a/composer.lock b/composer.lock
index a8676c511e..f801f0e7bd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -109,7 +109,7 @@
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.3.3"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
@@ -1221,7 +1221,7 @@
},
"prefer-stable": false,
"platform": {
- "php": ">=5.3.2"
+ "php": ">=5.3.3"
},
"platform-dev": []
}
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 3dd3defd3e..542279f872 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -15,8 +15,8 @@
$piwik_errorMessage = '';
-// Minimum requirement: stream_resolve_include_path in 5.3.2, namespaces in 5.3
-$piwik_minimumPHPVersion = '5.3.2';
+// Minimum requirement: stream_resolve_include_path, working json_encode in 5.3.3, namespaces in 5.3
+$piwik_minimumPHPVersion = '5.3.3';
$piwik_currentPHPVersion = PHP_VERSION;
$minimumPhpInvalid = version_compare($piwik_minimumPHPVersion, $piwik_currentPHPVersion) > 0;
if ($minimumPhpInvalid) {