tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 12:49:06 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: fix up some E_STRICT errors

Browse Source
This commit is contained in:
Mateusz Uzdowski 2012-04-17 11:51:55 +12:00
parent 311bfba6e2
commit 59663f9289
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/VersionedRestfulServer.php
View File

@ -11,7 +11,7 @@ class VersionedRestfulServer extends Controller {
'index' 'index'
); );
function handleRequest($request, $model) { function handleRequest(SS_HTTPRequest $request, DataModel $model) {
$this->setModel($model); $this->setModel($model);
Versioned::reading_stage('Live'); Versioned::reading_stage('Live');
$restfulserver = new RestfulServer(); $restfulserver = new RestfulServer();

4
dev/CodeViewer.php
View File

@ -36,7 +36,7 @@ class CodeViewer extends Controller {
'{' => 'classBody', '{' => 'classBody',
), ),
'classBody' => array( 'classBody' => array(
T_FUNCTION => array('methodName','createMethod'), T_FUNCTION => array('methodName','createBodyMethod'),
'}' => array('start', 'completeClass'), '}' => array('start', 'completeClass'),
T_DOC_COMMENT => array('', 'saveMethodComment'), T_DOC_COMMENT => array('', 'saveMethodComment'),
), ),
@ -159,7 +159,7 @@ class CodeViewer extends Controller {
$this->classes[] = $this->currentClass; $this->classes[] = $this->currentClass;
} }
function createMethod($token) { function createBodyMethod($token) {
$this->currentMethod = array(); $this->currentMethod = array();
$this->currentMethod['content'] = "<pre>"; $this->currentMethod['content'] = "<pre>";
$this->currentMethod['description'] = $this->methodComment['pretty']; $this->currentMethod['description'] = $this->methodComment['pretty'];

4
dev/TestViewer.php
View File

@ -22,7 +22,7 @@ class TestViewer extends Controller {
'{' => 'classBody', '{' => 'classBody',
), ),
'classBody' => array( 'classBody' => array(
T_FUNCTION => array('methodName','createMethod'), T_FUNCTION => array('methodName','createBodyMethod'),
'}' => array('start', 'completeClass'), '}' => array('start', 'completeClass'),
), ),
'methodName' => array( 'methodName' => array(
@ -84,7 +84,7 @@ class TestViewer extends Controller {
$this->classes[] = $this->currentClass; $this->classes[] = $this->currentClass;
} }
function createMethod($token) { function createBodyMethod($token) {
$this->currentMethod = array(); $this->currentMethod = array();
$this->currentMethod['content'] = "<pre>"; $this->currentMethod['content'] = "<pre>";
} }

2
forms/DisabledTransformation.php
View File

@ -5,7 +5,7 @@
* @subpackage transformations * @subpackage transformations
*/ */
class DisabledTransformation extends FormTransformation { class DisabledTransformation extends FormTransformation {
public function transform($field) { function transform(FormField $field) {
return $field->performDisabledTransformation($this); return $field->performDisabledTransformation($this);
} }
} }

3
model/fieldtypes/MultiEnum.php
View File

@ -41,7 +41,7 @@ class MultiEnum extends Enum {
/** /**
* Return a {@link CheckboxSetField} suitable for editing this field * Return a {@link CheckboxSetField} suitable for editing this field
*/ */
function formField($title = null, $name = null, $hasEmpty = false, $value = "", $form = null) { function formField($title = null, $name = null, $hasEmpty = false, $value = "", $form = null, $emptyString = null) {
if(!$title) $title = $this->name; if(!$title) $title = $this->name;
if(!$name) $name = $this->name; if(!$name) $name = $this->name;
@ -51,4 +51,3 @@ class MultiEnum extends Enum {
} }
} }
?>

2
parsers/HTML/HTMLBBCodeParser.php
View File

@ -177,7 +177,7 @@ class SSHTMLBBCodeParser
$this->addFilters($this->_options['filters']); $this->addFilters($this->_options['filters']);
} }
function &getStaticProperty($class, $var) static function &getStaticProperty($class, $var)
{ {
static $properties; static $properties;
if (!isset($properties[$class])) { if (!isset($properties[$class])) {