Remove some references to PHP5

narfbg · narfbg · commit ff731854218a · 2014-09-28T20:33:50.000+03:00
... implying that we support PHP4, which is of course not true.
diff --git a/system/core/Common.php b/system/core/Common.php
@@ -32,9 +32,6 @@
 /**
 * Determines if the current version of PHP is greater then the supplied value
 *
-* Since there are a few places where we conditionally test for PHP > 5
-* we'll set a static variable.
-*
 * @access	public
 * @param	string
 * @return	bool	TRUE if the current version is $version or higher
@@ -470,9 +467,6 @@ function _exception_handler($severity, $message, $filepath, $line)
 	{
 		 // We don't bother with "strict" notices since they tend to fill up
 		 // the log file with excess information that isn't normally very helpful.
-		 // For example, if you are running PHP 5 and you use version 4 style
-		 // class functions (without prefixes like "public", "private", etc.)
-		 // you'll get notices telling you that these have been deprecated.
 		if ($severity == E_STRICT)
 		{
 			return;
diff --git a/system/core/Security.php b/system/core/Security.php
@@ -385,7 +385,7 @@ public function xss_clean($str, $is_image = FALSE)
 
 		/*
 		 * Remove disallowed Javascript in links or img tags
-		 * We used to do some version comparisons and use of stripos for PHP5,
+		 * We used to do some version comparisons and use of stripos(),
 		 * but it is dog slow compared to these simplified non-capturing
 		 * preg_match(), especially if the pattern exists in the string
 		 */
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
@@ -238,7 +238,7 @@ function get_dir_file_info($source_dir, $top_level_only = TRUE, $_recursion = FA
 				$source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 			}
 
-			// foreach (scandir($source_dir, 1) as $file) // In addition to being PHP5+, scandir() is simply not as fast
+			// Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
 			while (FALSE !== ($file = readdir($fp)))
 			{
 				if (@is_dir($source_dir.$file) AND strncmp($file, '.', 1) !== 0 AND $top_level_only === FALSE)
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
@@ -299,15 +299,6 @@ function highlight_code($str)
 		// All the magic happens here, baby!
 		$str = highlight_string($str, TRUE);
 
-		// Prior to PHP 5, the highligh function used icky <font> tags
-		// so we'll replace them with <span> tags.
-
-		if (abs(PHP_VERSION) < 5)
-		{
-			$str = str_replace(array('<font ', '</font>'), array('<span ', '</span>'), $str);
-			$str = preg_replace('#color="(.*?)"#', 'style="color: \\1"', $str);
-		}
-
 		// Remove our artificially added PHP, and the syntax highlighting that came with it
 		$str = preg_replace('/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i', '<span style="color: #$1">', $str);
 		$str = preg_replace('/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is', "$1</span>\n</span>\n</code>", $str);
diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php
@@ -5,7 +5,7 @@
 $lang['ftp_unable_to_login']		= "Unable to login to your FTP server. Please check your username and password.";
 $lang['ftp_unable_to_makdir']		= "Unable to create the directory you have specified.";
 $lang['ftp_unable_to_changedir']	= "Unable to change directories.";
-$lang['ftp_unable_to_chmod']		= "Unable to set file permissions. Please check your path. Note: This feature is only available in PHP 5 or higher.";
+$lang['ftp_unable_to_chmod']		= "Unable to set file permissions. Please check your path.";
 $lang['ftp_unable_to_upload']		= "Unable to upload the specified file. Please check your path.";
 $lang['ftp_unable_to_download']		= "Unable to download the specified file. Please check your path.";
 $lang['ftp_no_source_file']			= "Unable to locate the source file. Please check your path.";
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
@@ -465,7 +465,6 @@ function chmod($path, $perm)
 			return FALSE;
 		}
 
-		// Permissions can only be set when running PHP 5
 		if ( ! function_exists('ftp_chmod'))
 		{
 			if ($this->debug == TRUE)
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
@@ -79,8 +79,6 @@ <h1><a name="select">&nbsp;</a>Selecting Data</h1>
 
 <p>The following functions allow you to build SQL <strong>SELECT</strong> statements.</p>
 
-<p><strong>Note: If you are using PHP 5 you can use method chaining for more compact syntax. This is described at the end of the page.</strong></p>
-
 
 <h2>$this->db->get();</h2>
 
@@ -760,8 +758,6 @@ <h1><a name="chaining">&nbsp;</a>Method Chaining</h1>
 <br />
 $query = $this->db->get();</code>
 
-<p class="important"><strong>Note:</strong> Method chaining only works with PHP 5.</p>
-
 <p>&nbsp;</p>
 
 <h1><a name="caching">&nbsp;</a>Active Record Caching</h1>

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,6 @@`
`32`	`32`	`/**`
`33`	`33`	`* Determines if the current version of PHP is greater then the supplied value`
`34`	`34`	`*`
`35`		`-* Since there are a few places where we conditionally test for PHP > 5`
`36`		`-* we'll set a static variable.`
`37`		`-*`
`38`	`35`	`* @access public`
`39`	`36`	`* @param string`
`40`	`37`	`* @return bool TRUE if the current version is $version or higher`
`@@ -470,9 +467,6 @@ function _exception_handler($severity, $message, $filepath, $line)`
`470`	`467`	`{`
`471`	`468`	`// We don't bother with "strict" notices since they tend to fill up`
`472`	`469`	`// the log file with excess information that isn't normally very helpful.`
`473`		`- // For example, if you are running PHP 5 and you use version 4 style`
`474`		`- // class functions (without prefixes like "public", "private", etc.)`
`475`		`- // you'll get notices telling you that these have been deprecated.`
`476`	`470`	`if ($severity == E_STRICT)`
`477`	`471`	`{`
`478`	`472`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ function get_dir_file_info($source_dir, $top_level_only = TRUE, $_recursion = FA`
`238`	`238`	`$source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;`
`239`	`239`	`}`
`240`	`240`
`241`		`- // foreach (scandir($source_dir, 1) as $file) // In addition to being PHP5+, scandir() is simply not as fast`
	`241`	`+ // Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast`
`242`	`242`	`while (FALSE !== ($file = readdir($fp)))`
`243`	`243`	`{`
`244`	`244`	`if (@is_dir($source_dir.$file) AND strncmp($file, '.', 1) !== 0 AND $top_level_only === FALSE)`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,6 @@ function chmod($path, $perm)`
`465`	`465`	`return FALSE;`
`466`	`466`	`}`
`467`	`467`
`468`		`- // Permissions can only be set when running PHP 5`
`469`	`468`	`if ( ! function_exists('ftp_chmod'))`
`470`	`469`	`{`
`471`	`470`	`if ($this->debug == TRUE)`