diff --git a/composer.json b/composer.json
index a38fdb952..1ee62e382 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
}
],
"require": {
- "php": ">=5.3.2",
+ "php": ">=5.3.3",
"composer/installers": "*"
},
"extra": {
diff --git a/dev/install/install.php b/dev/install/install.php
index 703bf97e1..fb1a35655 100644
--- a/dev/install/install.php
+++ b/dev/install/install.php
@@ -4,17 +4,17 @@
************************************************************************************
** **
** If you can read this text in your browser then you don't have PHP installed. **
- ** Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+. **
+ ** Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+. **
** **
************************************************************************************
************************************************************************************/
/**
- * PHP version check. Make sure we've got at least PHP 5.3.2 in the most friendly way possible
+ * PHP version check. Make sure we've got at least PHP 5.3.3 in the most friendly way possible
*/
define('FRAMEWORK_NAME', 'framework');
-if (version_compare(phpversion(), '5.3.2', '<')) {
+if (version_compare(phpversion(), '5.3.3', '<')) {
header("HTTP/1.1 500 Server Error");
echo str_replace(
array('$PHPVersion', 'sapphire'),
diff --git a/dev/install/install.php5 b/dev/install/install.php5
index b05808276..02cf81343 100755
--- a/dev/install/install.php5
+++ b/dev/install/install.php5
@@ -4,7 +4,7 @@
************************************************************************************
** **
** If you can read this text in your browser then you don't have PHP installed. **
- ** Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+. **
+ ** Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+. **
** **
************************************************************************************
************************************************************************************/
@@ -411,7 +411,7 @@ class InstallRequirements {
$isIIS = $this->isIIS(7);
$webserver = $this->findWebserver();
- $this->requirePHPVersion('5.3.4', '5.3.2', array(
+ $this->requirePHPVersion('5.3.4', '5.3.3', array(
"PHP Configuration",
"PHP5 installed",
null,
diff --git a/dev/install/php5-required.html b/dev/install/php5-required.html
index 8db360a21..c151b77d9 100644
--- a/dev/install/php5-required.html
+++ b/dev/install/php5-required.html
@@ -1,18 +1,18 @@
- PHP 5.3.2 is required
+ PHP 5.3.3 is required
-
PHP 5.3.2 required
+
PHP 5.3.3 required
-
To run SilverStripe, please install PHP 5.3.2 or greater.
+
To run SilverStripe, please install PHP 5.3.3 or greater.
We have detected that you are running PHP version $PHPVersion. In order to run SilverStripe,
- you must have PHP version 5.3.2 or greater, and for best results we recommend PHP 5.3.4 or greater.
+ you must have PHP version 5.3.3 or greater, and for best results we recommend PHP 5.3.4 or greater.
If you are running on a shared host, you may need to ask your hosting provider how to do this.
diff --git a/docs/en/changelogs/3.2.0.md b/docs/en/changelogs/3.2.0.md
new file mode 100644
index 000000000..0300a06f4
--- /dev/null
+++ b/docs/en/changelogs/3.2.0.md
@@ -0,0 +1,9 @@
+# 3.2.0 (unreleased)
+
+## Overview
+
+ * Minimum PHP version raised to 5.3.3
+
+## Changelog
+
+### Bugfixes
\ No newline at end of file
diff --git a/docs/en/installation/server-requirements.md b/docs/en/installation/server-requirements.md
index 779109152..72a80fa2a 100644
--- a/docs/en/installation/server-requirements.md
+++ b/docs/en/installation/server-requirements.md
@@ -8,7 +8,7 @@ Our web-based [PHP installer](/installation) can check if you meet the requireme
## Web server software requirements
- * PHP 5.3.2+
+ * PHP 5.3.3+
* We recommend using a PHP accelerator or opcode cache, such as [xcache](http://xcache.lighttpd.net/) or [WinCache](http://www.iis.net/download/wincacheforphp).
* Allocate at least 48MB of memory to each PHP process. (SilverStripe can be resource hungry for some intensive operations.)
* Required modules: dom, gd2, fileinfo, hash, iconv, mbstring, mysql (or other database driver), session, simplexml, tokenizer, xml.
diff --git a/docs/en/installation/windows-manual-iis-7.md b/docs/en/installation/windows-manual-iis-7.md
index adb2f2e33..da250fe0a 100644
--- a/docs/en/installation/windows-manual-iis-7.md
+++ b/docs/en/installation/windows-manual-iis-7.md
@@ -27,7 +27,7 @@ We'll also install SQL Server 2008 R2, and support for connecting to it in PHP.
* Internet Information Services (IIS) 7.x
* SQL Server 2008 R2
- * PHP 5.4 (PHP 5.3.2+ also works, but we'll install with the latest PHP stable)
+ * PHP 5.4 (PHP 5.3.3+ also works, but we'll install with the latest PHP stable)
* SilverStripe 3
* [Microsoft URL Rewrite Module 2.0](http://www.iis.net/download/URLRewrite)
* [IIS 7 Administration Pack](http://www.iis.net/download/AdministrationPack) (ONLY required for Windows Vista or Server 2008)
diff --git a/main.php b/main.php
index f60b5d9c9..3646323d6 100644
--- a/main.php
+++ b/main.php
@@ -4,7 +4,7 @@
************************************************************************************
** **
** If you can read this text in your browser then you don't have PHP installed. **
- ** Please install PHP 5.3.2 or higher, preferably PHP 5.3.4+. **
+ ** Please install PHP 5.3.3 or higher, preferably PHP 5.3.4+. **
** **
************************************************************************************
************************************************************************************/
@@ -14,7 +14,7 @@
* @subpackage core
*/
-if (version_compare(phpversion(), '5.3.2', '<')) {
+if (version_compare(phpversion(), '5.3.3', '<')) {
header("HTTP/1.1 500 Server Error");
echo str_replace('$PHPVersion', phpversion(), file_get_contents("dev/install/php5-required.html"));
die();
diff --git a/model/Image.php b/model/Image.php
index 5c8f3e098..50f5240a0 100644
--- a/model/Image.php
+++ b/model/Image.php
@@ -442,7 +442,7 @@ class Image extends File {
array_shift($args);
$folder = $this->ParentID ? $this->Parent()->Filename : ASSETS_DIR . "/";
- $format = $format . base64_encode(json_encode($args));
+ $format = $format . base64_encode(json_encode($args, JSON_NUMERIC_CHECK));
$filename = $format . "-" . $this->Name;
$patterns = $this->getFilenamePatterns($this->Name);
if (!preg_match($patterns['FullPattern'], $filename)) {