diff --git a/index.php b/index.php
index 8027c0dcf17f540fd904d33b17bfb9eb68fb18cc..70b82bc0b4939cfa241420706350dbd0c01bed4a 100644
--- a/index.php
+++ b/index.php
@@ -37,11 +37,7 @@
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
// ******************
diff --git a/t3lib/class.t3lib_div.php b/t3lib/class.t3lib_div.php
index e6465d38df5c4ac2390cb88d56869906c43285e0..17a28416b4f6b692a41cbfa1ad89b1969d1e77a4 100644
--- a/t3lib/class.t3lib_div.php
+++ b/t3lib/class.t3lib_div.php
@@ -1434,7 +1434,7 @@ final class t3lib_div {
*/
public static function validEmail($email) {
// enforce maximum length to prevent libpcre recursion crash bug #52929 in PHP
- // fixed in PHP 5.2+ later than Sept 2010; length restriction per SMTP RFC 2821
+ // fixed in PHP 5.3.4; length restriction per SMTP RFC 2821
if (strlen($email) > 320) {
return FALSE;
}
@@ -1535,7 +1535,7 @@ final class t3lib_div {
// CAPICOM not installed
}
}
- if ($output === '' && version_compare(PHP_VERSION, '5.3.0', '>=')) {
+ if ($output === '') {
if (function_exists('mcrypt_create_iv')) {
$output = mcrypt_create_iv($count, MCRYPT_DEV_URANDOM);
} elseif (function_exists('openssl_random_pseudo_bytes')) {
@@ -3378,22 +3378,7 @@ final class t3lib_div {
* @author Ingo Renner <ingo@typo3.org>
*/
public static function getMaximumPathLength() {
- $maximumPathLength = 0;
-
- if (version_compare(PHP_VERSION, '5.3.0', '<')) {
- // rough assumptions
- if (TYPO3_OS == 'WIN') {
- // WIN is usually 255, Vista 260, although NTFS can hold about 2k
- $maximumPathLength = 255;
- } else {
- $maximumPathLength = 2048;
- }
- } else {
- // precise information is available since PHP 5.3
- $maximumPathLength = PHP_MAXPATHLEN;
- }
-
- return $maximumPathLength;
+ return PHP_MAXPATHLEN;
}
diff --git a/t3lib/class.t3lib_superadmin.php b/t3lib/class.t3lib_superadmin.php
index 78a4b00988fc8d2765283ada35cd36d5c4c0053c..b90807a4708297b185e8ad0d6c3f9dbf8095c243 100644
--- a/t3lib/class.t3lib_superadmin.php
+++ b/t3lib/class.t3lib_superadmin.php
@@ -91,11 +91,7 @@
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
define('TYPO3_mainDir', 'typo3/'); // This is the directory of the backend administration for the sites of this TYPO3 installation.
diff --git a/t3lib/thumbs.php b/t3lib/thumbs.php
index 0ebbca8473ea598b2ee88b2796ffcdb903ac2b7f..f138a86ebebe4d32d691d3abef8f5a685539e799 100644
--- a/t3lib/thumbs.php
+++ b/t3lib/thumbs.php
@@ -54,11 +54,7 @@
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
diff --git a/typo3/init.php b/typo3/init.php
index 393176b1f838d4ad9322505d004025a0e21b4e20..c911be39d59d66b5876e27178f809419dd358a0b 100644
--- a/typo3/init.php
+++ b/typo3/init.php
@@ -59,17 +59,13 @@
// *******************************
// Checking PHP version
// *******************************
-if (version_compare(phpversion(), '5.2', '<')) die ('TYPO3 requires PHP 5.2.0 or higher.');
+if (version_compare(phpversion(), '5.3', '<')) die ('TYPO3 requires PHP 5.3.0 or higher.');
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
// *******************************
// Prevent any unwanted output that may corrupt AJAX/compression. Note: this does
diff --git a/typo3/install/index.php b/typo3/install/index.php
index a9f348b3146dd4f0e5164225470f2977326f5f2a..32a81de2a287d732be981fc29491b70abfce73f9 100755
--- a/typo3/install/index.php
+++ b/typo3/install/index.php
@@ -38,11 +38,7 @@
// Insert some security here, if you don't trust the Install Tool Password:
// **************************************************************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
$PATH_thisScript = str_replace('//', '/', str_replace('\\', '/',
(PHP_SAPI == 'fpm-fcgi' || PHP_SAPI == 'cgi' || PHP_SAPI == 'isapi' || PHP_SAPI == 'cgi-fcgi') &&
diff --git a/typo3/sysext/cms/tslib/index_ts.php b/typo3/sysext/cms/tslib/index_ts.php
index 9aa7600a929ecf0fe5834bb4a5d8428b4a6fa2e3..1554cc4f74edcaae0949ab979b37c8c7fcc005bf 100644
--- a/typo3/sysext/cms/tslib/index_ts.php
+++ b/typo3/sysext/cms/tslib/index_ts.php
@@ -45,11 +45,7 @@ if (version_compare(phpversion(), '5.2', '<')) die ('TYPO3 requires PHP 5.2.0 or
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
// ******************
diff --git a/typo3/sysext/cms/tslib/showpic.php b/typo3/sysext/cms/tslib/showpic.php
index ace495334fe5d161ac5e7abaf0584a5f7b2e2e63..aead69e4432afc6146c4b93e3c858a355585a45c 100644
--- a/typo3/sysext/cms/tslib/showpic.php
+++ b/typo3/sysext/cms/tslib/showpic.php
@@ -53,11 +53,7 @@
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
// ***********************
diff --git a/typo3/sysext/install/mod/class.tx_install_ajax.php b/typo3/sysext/install/mod/class.tx_install_ajax.php
index 531a373efd7d0f81150419f195b6d2c5f02e6238..b9177a11fc9d01fffa61aae148af308dabc055ed 100644
--- a/typo3/sysext/install/mod/class.tx_install_ajax.php
+++ b/typo3/sysext/install/mod/class.tx_install_ajax.php
@@ -30,11 +30,7 @@
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
// ***********************
diff --git a/typo3/thumbs.php b/typo3/thumbs.php
index acc4fb38838429739eca8b19fc120de968d7dddb..24f7e99fef9f128e737c0e3a5e04fe1baff52277 100644
--- a/typo3/thumbs.php
+++ b/typo3/thumbs.php
@@ -33,11 +33,7 @@
// *******************************
// Set error reporting
// *******************************
-if (defined('E_DEPRECATED')) {
- error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
- error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
define('PATH_thisScript', str_replace('//', '/', str_replace('\\', '/',