Removing functions from basics.php that where added as workarounds for PHP < 4.3.

Removing legacy.php and all references to the file

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3717 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-10-19 00:37:29 +00:00
parent fd4d9e41e2
commit 64359fe7ba
4 changed files with 7 additions and 107 deletions

View file

@ -36,7 +36,6 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
require(CAKE . 'basics.php'); require(CAKE . 'basics.php');
require(LIBS . 'folder.php'); require(LIBS . 'folder.php');
require(LIBS . 'file.php'); require(LIBS . 'file.php');
require(LIBS . 'legacy.php');
/** /**
* Enter description here... * Enter description here...
* *

View file

@ -37,14 +37,14 @@
define('MONTH', 30 * DAY); define('MONTH', 30 * DAY);
define('YEAR', 365 * DAY); define('YEAR', 365 * DAY);
/** /**
* Patch for PHP < 4.3 * Patch for PHP < 5.0
*/ */
if (!function_exists("ob_get_clean")) { if (version_compare(phpversion(), '5.0') < 0) {
function ob_get_clean() { eval ('
$ob_contents = ob_get_contents(); function clone($object)
ob_end_clean(); {
return $ob_contents; return $object;
} }');
} }
/** /**
* Loads all models. * Loads all models.
@ -851,35 +851,6 @@
} }
return null; return null;
} }
/**
* Returns contents of a file as a string.
*
* @param string $fileName Name of the file.
* @param boolean $useIncludePath Wheter the function should use the include path or not.
* @return mixed Boolean false or contents of required file.
*/
if (!function_exists('file_get_contents')) {
function file_get_contents($fileName, $useIncludePath = false) {
$res=fopen($fileName, 'rb', $useIncludePath);
if ($res === false) {
trigger_error('file_get_contents() failed to open stream: No such file or directory', E_USER_WARNING);
return false;
}
clearstatcache();
if ($fileSize = @filesize($fileName)) {
$data = fread($res, $fileSize);
} else {
$data = '';
while(!feof($res)) {
$data .= fread($res, 8192);
}
}
return "$data\n";
}
}
/** /**
* Writes data into file. * Writes data into file.
* *

View file

@ -1,69 +0,0 @@
<?php
/* SVN FILE: $Id$ */
/**
* Backwards compatibility functions.
*
* With this hack you can use clone() in PHP4 code
* use "clone($object)" not "clone $object"! the former works in both PHP4 and PHP5
*
* PHP versions 4 and 5
*
* CakePHP : Rapid Development Framework <http://www.cakephp.org/>
* Copyright (c) 2006, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
* @filesource
* @copyright Copyright (c) 2006, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
* @package cake
* @subpackage cake.cake.libs
* @since CakePHP v 0.2.9
* @version $Revision$
* @modifiedby $LastChangedBy$
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
if (version_compare(phpversion(), '5.0') < 0) {
eval ('
function clone($object)
{
return $object;
}');
}
/**
* Replace file_get_contents()
*
* @internal resource_context is not supported
* @since PHP 5
* require PHP 4.0.0 (user_error)
*
* @param unknown_type $filename
* @param unknown_type $incpath
* @return unknown
*/
if (!function_exists('file_get_contents')) {
function file_get_contents($filename, $incpath = false) {
if (false === $fh = fopen($filename, 'rb', $incpath)) {
user_error('file_get_contents() failed to open stream: No such file or directory', E_USER_WARNING);
return false;
}
clearstatcache();
if ($fsize = @filesize($filename)) {
$data = fread($fh, $fsize);
} else {
$data='';
while(!feof($fh)) {
$data .= fread($fh, 8192);
}
}
fclose ($fh);
return $data;
}
}
?>

View file

@ -33,7 +33,6 @@
require(CAKE . 'basics.php'); require(CAKE . 'basics.php');
require(LIBS . 'folder.php'); require(LIBS . 'folder.php');
require(LIBS . 'file.php'); require(LIBS . 'file.php');
require(LIBS . 'legacy.php');
/** /**
* Enter description here... * Enter description here...
* *