Updated docs, composer.json and other things to mention and use PHP 5.4

yiisoft · Oct 18, 2013 · e115b0c · e115b0c
1 parent c3ba7f6
commit e115b0c
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ DIRECTORY STRUCTURE
 REQUIREMENTS
 ------------
 
-The minimum requirement by Yii is that your Web server supports PHP 5.3.?.
+The minimum requirement by Yii is that your Web server supports PHP 5.4.
 
 
 DOCUMENTATION

diff --git a/apps/advanced/README.md b/apps/advanced/README.md
@@ -52,7 +52,7 @@ environments/                contains environment-based overrides
 REQUIREMENTS
 ------------
 
-The minimum requirement by Yii is that your Web server supports PHP 5.3.?.
+The minimum requirement by Yii is that your Web server supports PHP 5.4.0.
 
 In order for captcha to work you need either GD2 extension or ImageMagick PHP extension.
 

diff --git a/apps/advanced/composer.json b/apps/advanced/composer.json
@@ -14,7 +14,7 @@
 	},
 	"minimum-stability": "dev",
 	"require": {
-		"php": ">=5.3.0",
+		"php": ">=5.4.0",
 		"yiisoft/yii2": "dev-master",
 		"yiisoft/yii2-composer": "dev-master"
 	},

diff --git a/apps/basic/README.md b/apps/basic/README.md
@@ -31,7 +31,7 @@ DIRECTORY STRUCTURE
 REQUIREMENTS
 ------------
 
-The minimum requirement by Yii is that your Web server supports PHP 5.3.?.
+The minimum requirement by Yii is that your Web server supports PHP 5.4.0.
 
 In order for captcha to work you need either GD2 extension or ImageMagick PHP extension.
 

diff --git a/apps/basic/composer.json b/apps/basic/composer.json
@@ -14,7 +14,7 @@
 	},
 	"minimum-stability": "dev",
 	"require": {
-		"php": ">=5.3.0",
+		"php": ">=5.4.0",
 		"yiisoft/yii2": "dev-master",
 		"yiisoft/yii2-composer": "dev-master"
 	},

diff --git a/apps/benchmark/README.md b/apps/benchmark/README.md
@@ -27,7 +27,7 @@ DIRECTORY STRUCTURE
 REQUIREMENTS
 ------------
 
-The minimum requirement by Yii is that your Web server supports PHP 5.3.?.
+The minimum requirement by Yii is that your Web server supports PHP 5.4.0.
 
 
 INSTALLATION

diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json
@@ -17,7 +17,7 @@
 	},
 	"minimum-stability": "dev",
 	"require": {
-		"php": ">=5.3.0",
+		"php": ">=5.4.0",
 		"yiisoft/yii2": "dev-master"
 	}
 }
diff --git a/docs/guide/apps-advanced.md b/docs/guide/apps-advanced.md
@@ -138,7 +138,7 @@ directory:
 	},
 	"minimum-stability": "dev",
 	"require": {
-		"php": ">=5.3.0",
+		"php": ">=5.4.0",
 		"yiisoft/yii2": "dev-master",
 		"yiisoft/yii2-composer": "dev-master"
 	},

diff --git a/docs/guide/apps-basic.md b/docs/guide/apps-basic.md
@@ -128,7 +128,7 @@ directory:
 	},
 	"minimum-stability": "dev",
 	"require": {
-		"php": ">=5.3.0",
+		"php": ">=5.4.0",
 		"yiisoft/yii2": "dev-master",
 		"yiisoft/yii2-composer": "dev-master"
 	},

diff --git a/docs/guide/installation.md b/docs/guide/installation.md
@@ -48,10 +48,10 @@ script via the following URL in a Web browser:
 http://hostname/path/to/yii/requirements/index.php
 ~~~
 
-Yii requires PHP 5.3.7, so the server must have PHP 5.3.7 or above installed and
+Yii requires PHP 5.4.0, so the server must have PHP 5.4.0 or above installed and
 available to the web server. Yii has been tested with [Apache HTTP server](http://httpd.apache.org/)
 on Windows and Linux. It may also run on other Web servers and platforms,
-provided PHP 5.3 is supported.
+provided PHP 5.4 is supported.
 
 
 Recommended Apache Configuration

diff --git a/docs/guide/overview.md b/docs/guide/overview.md
@@ -11,7 +11,7 @@ Requirements
 ------------
 
 To run a Yii-powered Web application, you need a Web server that supports
-PHP 5.3.? or greater.
+PHP 5.4.0 or greater.
 
 For developers who want to use Yii, understanding object-oriented
 programming (OOP) is very helpful, because Yii is a pure OOP framework.

diff --git a/framework/README.md b/framework/README.md
@@ -16,6 +16,6 @@ without prior notices. **Yii 2.0 is not ready for production use yet.**
 REQUIREMENTS
 ------------
 
-The minimum requirement by Yii is that your Web server supports PHP 5.3.?.
+The minimum requirement by Yii is that your Web server supports PHP 5.4.0.
 
 
diff --git a/framework/composer.json b/framework/composer.json
@@ -64,7 +64,7 @@
 		"source": "https://github.com/yiisoft/yii2"
 	},
 	"require": {
-		"php": ">=5.3.7",
+		"php": ">=5.4.0",
 		"ext-mbstring": "*",
 		"lib-pcre": "*",
 		"phpspec/php-diff": "1.0.*",

diff --git a/framework/yii/db/Connection.php b/framework/yii/db/Connection.php
@@ -205,8 +205,7 @@ class Connection extends Component
 	 * as specified by the database.
 	 *
 	 * Note that if you're using GBK or BIG5 then it's highly recommended to
-	 * update to PHP 5.3.6+ and to specify charset via DSN like
-	 * 'mysql:dbname=mydatabase;host=127.0.0.1;charset=GBK;'.
+	 * specify charset via DSN like 'mysql:dbname=mydatabase;host=127.0.0.1;charset=GBK;'.
 	 */
 	public $charset;
 	/**

diff --git a/framework/yii/requirements/requirements.php b/framework/yii/requirements/requirements.php
@@ -9,9 +9,9 @@
 	array(
 		'name' => 'PHP version',
 		'mandatory' => true,
-		'condition' => version_compare(PHP_VERSION, '5.3.7', '>='),
+		'condition' => version_compare(PHP_VERSION, '5.4.0', '>='),
 		'by' => '<a href="http://www.yiiframework.com">Yii Framework</a>',
-		'memo' => 'PHP 5.3.7 or higher is required.',
+		'memo' => 'PHP 5.4.0 or higher is required.',
 	),
 	array(
 		'name' => 'Reflection extension',