tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Replaced use of deprecated split() with preg_split() and fixed use of "&new Class()" which is deprecated in PHP 5.3

Browse Source 
ENHANCEMENT E_DEPRECATED and E_USER_DEPRECATED are now handled as notice level errors in Debug.
This commit is contained in:
Sean Harvey 2012-03-27 22:54:13 +13:00
parent a4b668d130
commit cf014dc56d
10 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/code/CMSBatchActionHandler.php
View File

@ -81,7 +81,7 @@ class CMSBatchActionHandler extends RequestHandler {
$actionHandler = new $actionClass(); $actionHandler = new $actionClass();
// Sanitise ID list and query the database for apges // Sanitise ID list and query the database for apges
$ids = split(' *, *', trim($request->requestVar('csvIDs'))); $ids = preg_split('/ *, */', trim($request->requestVar('csvIDs')));
foreach($ids as $k => $v) if(!is_numeric($v)) unset($ids[$k]); foreach($ids as $k => $v) if(!is_numeric($v)) unset($ids[$k]);
if($ids) { if($ids) {
@ -135,7 +135,7 @@ class CMSBatchActionHandler extends RequestHandler {
$actionHandler = new $actionClass['class'](); $actionHandler = new $actionClass['class']();
// Sanitise ID list and query the database for apges // Sanitise ID list and query the database for apges
$ids = split(' *, *', trim($request->requestVar('csvIDs'))); $ids = preg_split('/ *, */', trim($request->requestVar('csvIDs')));
foreach($ids as $k => $id) $ids[$k] = (int)$id; foreach($ids as $k => $id) $ids[$k] = (int)$id;
$ids = array_filter($ids); $ids = array_filter($ids);
@ -157,7 +157,7 @@ class CMSBatchActionHandler extends RequestHandler {
$actionHandler = new $actionClass(); $actionHandler = new $actionClass();
// Sanitise ID list and query the database for apges // Sanitise ID list and query the database for apges
$ids = split(' *, *', trim($request->requestVar('csvIDs'))); $ids = preg_split('/ *, */', trim($request->requestVar('csvIDs')));
foreach($ids as $k => $id) $ids[$k] = (int)$id; foreach($ids as $k => $id) $ids[$k] = (int)$id;
$ids = array_filter($ids); $ids = array_filter($ids);

2
core/Core.php
View File

@ -38,7 +38,7 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// ENVIRONMENT CONFIG // ENVIRONMENT CONFIG
if(defined('E_DEPRECATED')) error_reporting(E_ALL & ~(E_DEPRECATED | E_STRICT)); if(defined('E_DEPRECATED')) error_reporting(E_ALL & ~(E_STRICT));
else error_reporting(E_ALL); else error_reporting(E_ALL);
/** /**

2
core/Diff.php
View File

@ -800,7 +800,7 @@ class Diff
if(is_array($content)) $content = implode(',', $content); if(is_array($content)) $content = implode(',', $content);
$content = str_replace(array("&nbsp;","<", ">"),array(" "," <", "> "),$content); $content = str_replace(array("&nbsp;","<", ">"),array(" "," <", "> "),$content);
$candidateChunks = split("[\t\r\n ]+", $content); $candidateChunks = preg_split("/[\t\r\n ]+/", $content);
while(list($i,$item) = each($candidateChunks)) { while(list($i,$item) = each($candidateChunks)) {
if(isset($item[0]) && $item[0] == "<") { if(isset($item[0]) && $item[0] == "<") {
$newChunk = $item; $newChunk = $item;

1
dev/Debug.php
View File

@ -697,6 +697,7 @@ function errorHandler($errno, $errstr, $errfile, $errline) {
case E_NOTICE: case E_NOTICE:
case E_USER_NOTICE: case E_USER_NOTICE:
case E_DEPRECATED:
case E_USER_DEPRECATED: case E_USER_DEPRECATED:
Debug::noticeHandler($errno, $errstr, $errfile, $errline, null); Debug::noticeHandler($errno, $errstr, $errfile, $errline, null);
break; break;

4
dev/DebugView.php
View File

@ -30,6 +30,10 @@ class DebugView extends Object {
'title' => 'User Notice', 'title' => 'User Notice',
'class' => 'notice' 'class' => 'notice'
), ),
E_DEPRECATED => array(
'title' => 'Deprecation',
'class' => 'notice'
),
E_USER_DEPRECATED => array( E_USER_DEPRECATED => array(
'title' => 'Deprecation', 'title' => 'Deprecation',
'class' => 'notice' 'class' => 'notice'

4
thirdparty/simpletest/form.php vendored
View File

@ -172,7 +172,7 @@ class SimpleForm {
*/ */
function _addRadioButton(&$tag) { function _addRadioButton(&$tag) {
if (! isset($this->_radios[$tag->getName()])) { if (! isset($this->_radios[$tag->getName()])) {
$this->_widgets[] = &new SimpleRadioGroup(); $this->_widgets[] = new SimpleRadioGroup();
$this->_radios[$tag->getName()] = count($this->_widgets) - 1; $this->_radios[$tag->getName()] = count($this->_widgets) - 1;
} }
$this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag); $this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag);
@ -191,7 +191,7 @@ class SimpleForm {
$index = $this->_checkboxes[$tag->getName()]; $index = $this->_checkboxes[$tag->getName()];
if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) { if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
$previous = &$this->_widgets[$index]; $previous = &$this->_widgets[$index];
$this->_widgets[$index] = &new SimpleCheckboxGroup(); $this->_widgets[$index] = new SimpleCheckboxGroup();
$this->_widgets[$index]->addWidget($previous); $this->_widgets[$index]->addWidget($previous);
} }
$this->_widgets[$index]->addWidget($tag); $this->_widgets[$index]->addWidget($tag);

12
thirdparty/simpletest/http.php vendored
View File

@ -98,9 +98,9 @@ class SimpleRoute {
*/ */
function &_createSocket($scheme, $host, $port, $timeout) { function &_createSocket($scheme, $host, $port, $timeout) {
if (in_array($scheme, array('https'))) { if (in_array($scheme, array('https'))) {
$socket = &new SimpleSecureSocket($host, $port, $timeout); $socket = new SimpleSecureSocket($host, $port, $timeout);
} else { } else {
$socket = &new SimpleSocket($host, $port, $timeout); $socket = new SimpleSocket($host, $port, $timeout);
} }
return $socket; return $socket;
} }
@ -279,7 +279,7 @@ class SimpleHttpRequest {
* @access protected * @access protected
*/ */
function &_createResponse(&$socket) { function &_createResponse(&$socket) {
$response = &new SimpleHttpResponse( $response = new SimpleHttpResponse(
$socket, $socket,
$this->_route->getUrl(), $this->_route->getUrl(),
$this->_encoding); $this->_encoding);
@ -516,13 +516,13 @@ class SimpleHttpResponse extends SimpleStickyError {
function _parse($raw) { function _parse($raw) {
if (! $raw) { if (! $raw) {
$this->_setError('Nothing fetched'); $this->_setError('Nothing fetched');
$this->_headers = &new SimpleHttpHeaders(''); $this->_headers = new SimpleHttpHeaders('');
} elseif (! strstr($raw, "\r\n\r\n")) { } elseif (! strstr($raw, "\r\n\r\n")) {
$this->_setError('Could not split headers from content'); $this->_setError('Could not split headers from content');
$this->_headers = &new SimpleHttpHeaders($raw); $this->_headers = new SimpleHttpHeaders($raw);
} else { } else {
list($headers, $this->_content) = split("\r\n\r\n", $raw, 2); list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
$this->_headers = &new SimpleHttpHeaders($headers); $this->_headers = new SimpleHttpHeaders($headers);
} }
} }

8
thirdparty/simpletest/page.php vendored
View File

@ -163,7 +163,7 @@ class SimplePageBuilder extends SimpleSaxListener {
* @access protected * @access protected
*/ */
function &_createPage($response) { function &_createPage($response) {
$page = &new SimplePage($response); $page = new SimplePage($response);
return $page; return $page;
} }
@ -175,7 +175,7 @@ class SimplePageBuilder extends SimpleSaxListener {
* @access protected * @access protected
*/ */
function &_createParser(&$listener) { function &_createParser(&$listener) {
$parser = &new SimpleHtmlSaxParser($listener); $parser = new SimpleHtmlSaxParser($listener);
return $parser; return $parser;
} }
@ -188,7 +188,7 @@ class SimplePageBuilder extends SimpleSaxListener {
* @access public * @access public
*/ */
function startElement($name, $attributes) { function startElement($name, $attributes) {
$factory = &new SimpleTagBuilder(); $factory = new SimpleTagBuilder();
$tag = $factory->createTag($name, $attributes); $tag = $factory->createTag($name, $attributes);
if (! $tag) { if (! $tag) {
return true; return true;
@ -641,7 +641,7 @@ class SimplePage {
* @access public * @access public
*/ */
function acceptFormStart(&$tag) { function acceptFormStart(&$tag) {
$this->_open_forms[] = &new SimpleForm($tag, $this); $this->_open_forms[] = new SimpleForm($tag, $this);
} }
/** /**

4
thirdparty/simpletest/parser.php vendored
View File

@ -197,7 +197,7 @@ class SimpleLexer {
$this->_case = $case; $this->_case = $case;
$this->_regexes = array(); $this->_regexes = array();
$this->_parser = &$parser; $this->_parser = &$parser;
$this->_mode = &new SimpleStateStack($start); $this->_mode = new SimpleStateStack($start);
$this->_mode_handlers = array($start => $start); $this->_mode_handlers = array($start => $start);
} }
@ -579,7 +579,7 @@ class SimpleHtmlSaxParser {
* @static * @static
*/ */
function &createLexer(&$parser) { function &createLexer(&$parser) {
$lexer = &new SimpleHtmlLexer($parser); $lexer = new SimpleHtmlLexer($parser);
return $lexer; return $lexer;
} }

6
thirdparty/simpletest/url.php vendored
View File

@ -106,7 +106,7 @@ class SimpleUrl {
} }
if (preg_match('/^([^\/]*)@(.*)/', $url, $matches)) { if (preg_match('/^([^\/]*)@(.*)/', $url, $matches)) {
$url = $prefix . $matches[2]; $url = $prefix . $matches[2];
$parts = split(":", $matches[1]); $parts = preg_split('/:/', $matches[1]);
return array( return array(
urldecode($parts[0]), urldecode($parts[0]),
isset($parts[1]) ? urldecode($parts[1]) : false); isset($parts[1]) ? urldecode($parts[1]) : false);
@ -184,7 +184,7 @@ class SimpleUrl {
function _parseRequest($raw) { function _parseRequest($raw) {
$this->_raw = $raw; $this->_raw = $raw;
$request = new SimpleGetEncoding(); $request = new SimpleGetEncoding();
foreach (split("&", $raw) as $pair) { foreach (preg_split('/&/', $raw) as $pair) {
if (preg_match('/(.*?)=(.*)/', $pair, $matches)) { if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
$request->add($matches[1], urldecode($matches[2])); $request->add($matches[1], urldecode($matches[2]));
} elseif ($pair) { } elseif ($pair) {
@ -379,7 +379,7 @@ class SimpleUrl {
*/ */
function clearRequest() { function clearRequest() {
$this->_raw = false; $this->_raw = false;
$this->_request = &new SimpleGetEncoding(); $this->_request = new SimpleGetEncoding();
} }
/** /**