Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

[2.3.0] change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3 #5604

Merged
merged 17 commits into from Mar 4, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.md
Expand Up @@ -8,7 +8,7 @@ and add the library directory to your PHP `include_path`.
## SYSTEM REQUIREMENTS
-------------------

Zend Framework 2 requires PHP 5.3.3 or later.
Zend Framework 2 requires PHP 5.3.23 or later.

## DEVELOPMENT VERSIONS

Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Authentication/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Authentication",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Barcode/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Barcode",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Cache/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Cache",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-servicemanager": "self.version",
"zendframework/zend-eventmanager": "self.version"
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Captcha/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Captcha",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-math": "self.version",
"zendframework/zend-stdlib": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Code/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Code",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-eventmanager": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Config/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Config",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Console/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Console",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"extra": {
Expand Down
16 changes: 0 additions & 16 deletions library/Zend/Crypt/Password/Bcrypt.php
Expand Up @@ -121,22 +121,6 @@ public function verify($password, $hash)
if ($result === $hash) {
return true;
}
if (strlen($result) <= 13) {
/* This should only happen if the algorithm that generated hash is
* either unsupported by this version of crypt(), or is invalid.
*
* An example of when this can happen, is if you generate
* non-backwards-compatible hashes on 5.3.7+, and then try to verify
* them on < 5.3.7.
*
* This is needed, because version comparisons are not possible due
* to back-ported functionality by some distributions.
*/
throw new Exception\RuntimeException(
'The supplied password hash could not be verified. Please check ' .
'backwards compatibility settings.'
);
}
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Crypt/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Crypt",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-math": "self.version",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-servicemanager": "self.version"
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Db/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Db",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"require-dev": {
"zendframework/zend-eventmanager": "self.version",
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Debug/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Debug",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"require-dev": {
"zendframework/zend-escaper": "*"
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Di/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Di",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-code": "self.version",
"zendframework/zend-stdlib": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Dom/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Dom",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Escaper/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Escaper",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/EventManager/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/EventManager",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"extra": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Feed/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Feed",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-escaper": "self.version",
"zendframework/zend-stdlib": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/File/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/File",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Filter/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Filter",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Form/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Form",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-inputfilter": "self.version",
"zendframework/zend-stdlib": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Http/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Http",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-loader": "self.version",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-uri": "self.version",
Expand Down
5 changes: 0 additions & 5 deletions library/Zend/I18n/View/Helper/DateFormat.php
Expand Up @@ -89,11 +89,6 @@ public function __invoke(
);
}

// DateTime support for IntlDateFormatter::format() was only added in 5.3.4
if ($date instanceof DateTime && (PHP_VERSION_ID < 50304)) {
$date = $date->getTimestamp();
}

return $this->formatters[$formatterId]->format($date);
}

Expand Down
2 changes: 1 addition & 1 deletion library/Zend/I18n/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/I18n",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/InputFilter/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/InputFilter",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-filter": "self.version",
"zendframework/zend-validator": "self.version",
"zendframework/zend-stdlib": "self.version"
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Json/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Json",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Ldap/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Ldap",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Loader/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Loader",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Log/composer.json
Expand Up @@ -14,7 +14,7 @@
},
"target-dir": "Zend/Log",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-servicemanager": "self.version",
"zendframework/zend-stdlib": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Mail/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Mail",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-crypt": "self.version",
"zendframework/zend-loader": "self.version",
"zendframework/zend-mime": "self.version",
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Math/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Math",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"suggest": {
"ext-bcmath": "If using the bcmath functionality",
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Memory/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Memory",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"require-dev": {
"zendframework/zend-cache": "self.version"
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Mime/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Mime",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/ModuleManager/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/ModuleManager",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-eventmanager": "self.version",
"zendframework/zend-stdlib": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Mvc/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Mvc",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-eventmanager": "self.version",
"zendframework/zend-servicemanager": "self.version",
"zendframework/zend-stdlib": "self.version"
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Navigation/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Navigation",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Paginator/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Paginator",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Permissions/Acl/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Permissions/Acl",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Permissions/Rbac/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Permissions/Rbac",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"extra": {
"branch-alias": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/ProgressBar/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/ProgressBar",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Serializer/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Serializer",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-json": "self.version",
"zendframework/zend-math": "self.version"
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Server/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/Server",
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-code": "self.version"
},
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/ServiceManager/composer.json
Expand Up @@ -13,7 +13,7 @@
},
"target-dir": "Zend/ServiceManager",
"require": {
"php": ">=5.3.3"
"php": ">=5.3.23"
},
"require-dev": {
"zendframework/zend-di": "self.version"
Expand Down