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

Change deprecation notice versions for DataObject component methods

Browse Source
This commit is contained in:
Loz Calver 2015-05-06 19:36:34 +01:00
parent a1676436b7
commit d673fc1514
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
model/DataObject.php
View File

@ -1576,7 +1576,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
} }
if($filter !== null || $sort !== null || $limit !== null) { if($filter !== null || $sort !== null || $limit !== null) {
Deprecation::notice('3.2', 'The $filter, $sort and $limit parameters for DataObject::getComponents() Deprecation::notice('4.0', 'The $filter, $sort and $limit parameters for DataObject::getComponents()
have been deprecated. Please manipluate the returned list directly.', Deprecation::SCOPE_GLOBAL); have been deprecated. Please manipluate the returned list directly.', Deprecation::SCOPE_GLOBAL);
} }
@ -1731,7 +1731,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
= $this->manyManyComponent($componentName); = $this->manyManyComponent($componentName);
if($filter !== null || $sort !== null || $join !== null || $limit !== null) { if($filter !== null || $sort !== null || $join !== null || $limit !== null) {
Deprecation::notice('3.2', 'The $filter, $sort, $join and $limit parameters for Deprecation::notice('4.0', 'The $filter, $sort, $join and $limit parameters for
DataObject::getManyManyComponents() have been deprecated. DataObject::getManyManyComponents() have been deprecated.
Please manipluate the returned list directly.', Deprecation::SCOPE_GLOBAL); Please manipluate the returned list directly.', Deprecation::SCOPE_GLOBAL);
} }
@ -1767,11 +1767,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/ */
public function has_one($component = null) { public function has_one($component = null) {
if($component) { if($component) {
Deprecation::notice('3.2', 'Please use hasOneComponent() instead'); Deprecation::notice('4.0', 'Please use hasOneComponent() instead');
return $this->hasOneComponent($component); return $this->hasOneComponent($component);
} }
Deprecation::notice('3.2', 'Please use hasOne() instead'); Deprecation::notice('4.0', 'Please use hasOne() instead');
return $this->hasOne(); return $this->hasOne();
} }
@ -1786,7 +1786,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
public function hasOne($component = null) { public function hasOne($component = null) {
if($component) { if($component) {
Deprecation::notice( Deprecation::notice(
'3.2', '4.0',
'Please use DataObject::hasOneComponent() instead of passing a component name to hasOne()', 'Please use DataObject::hasOneComponent() instead of passing a component name to hasOne()',
Deprecation::SCOPE_GLOBAL Deprecation::SCOPE_GLOBAL
); );
@ -1817,11 +1817,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/ */
public function belongs_to($component = null, $classOnly = true) { public function belongs_to($component = null, $classOnly = true) {
if($component) { if($component) {
Deprecation::notice('3.2', 'Please use belongsToComponent() instead'); Deprecation::notice('4.0', 'Please use belongsToComponent() instead');
return $this->belongsToComponent($component, $classOnly); return $this->belongsToComponent($component, $classOnly);
} }
Deprecation::notice('3.2', 'Please use belongsTo() instead'); Deprecation::notice('4.0', 'Please use belongsTo() instead');
return $this->belongsTo(null, $classOnly); return $this->belongsTo(null, $classOnly);
} }
@ -1837,7 +1837,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
public function belongsTo($component = null, $classOnly = true) { public function belongsTo($component = null, $classOnly = true) {
if($component) { if($component) {
Deprecation::notice( Deprecation::notice(
'3.2', '4.0',
'Please use DataObject::belongsToComponent() instead of passing a component name to belongsTo()', 'Please use DataObject::belongsToComponent() instead of passing a component name to belongsTo()',
Deprecation::SCOPE_GLOBAL Deprecation::SCOPE_GLOBAL
); );
@ -1915,11 +1915,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/ */
public function has_many($component = null, $classOnly = true) { public function has_many($component = null, $classOnly = true) {
if($component) { if($component) {
Deprecation::notice('3.2', 'Please use hasManyComponent() instead'); Deprecation::notice('4.0', 'Please use hasManyComponent() instead');
return $this->hasManyComponent($component, $classOnly); return $this->hasManyComponent($component, $classOnly);
} }
Deprecation::notice('3.2', 'Please use hasMany() instead'); Deprecation::notice('4.0', 'Please use hasMany() instead');
return $this->hasMany(null, $classOnly); return $this->hasMany(null, $classOnly);
} }
@ -1935,7 +1935,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
public function hasMany($component = null, $classOnly = true) { public function hasMany($component = null, $classOnly = true) {
if($component) { if($component) {
Deprecation::notice( Deprecation::notice(
'3.2', '4.0',
'Please use DataObject::hasManyComponent() instead of passing a component name to hasMany()', 'Please use DataObject::hasManyComponent() instead of passing a component name to hasMany()',
Deprecation::SCOPE_GLOBAL Deprecation::SCOPE_GLOBAL
); );
@ -1977,11 +1977,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/ */
public function many_many_extraFields($component = null) { public function many_many_extraFields($component = null) {
if($component) { if($component) {
Deprecation::notice('3.2', 'Please use manyManyExtraFieldsForComponent() instead'); Deprecation::notice('4.0', 'Please use manyManyExtraFieldsForComponent() instead');
return $this->manyManyExtraFieldsForComponent($component); return $this->manyManyExtraFieldsForComponent($component);
} }
Deprecation::notice('3.2', 'Please use manyManyExtraFields() instead'); Deprecation::notice('4.0', 'Please use manyManyExtraFields() instead');
return $this->manyManyExtraFields(); return $this->manyManyExtraFields();
} }
@ -1997,7 +1997,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
public function manyManyExtraFields($component = null) { public function manyManyExtraFields($component = null) {
if($component) { if($component) {
Deprecation::notice( Deprecation::notice(
'3.2', '4.0',
'Please use DataObject::manyManyExtraFieldsForComponent() instead of passing a component name 'Please use DataObject::manyManyExtraFieldsForComponent() instead of passing a component name
to manyManyExtraFields()', to manyManyExtraFields()',
Deprecation::SCOPE_GLOBAL Deprecation::SCOPE_GLOBAL
@ -2061,11 +2061,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/ */
public function many_many($component = null) { public function many_many($component = null) {
if($component) { if($component) {
Deprecation::notice('3.2', 'Please use manyManyComponent() instead'); Deprecation::notice('4.0', 'Please use manyManyComponent() instead');
return $this->manyManyComponent($component); return $this->manyManyComponent($component);
} }
Deprecation::notice('3.2', 'Please use manyMany() instead'); Deprecation::notice('4.0', 'Please use manyMany() instead');
return $this->manyMany(); return $this->manyMany();
} }
@ -2081,7 +2081,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
public function manyMany($component = null) { public function manyMany($component = null) {
if($component) { if($component) {
Deprecation::notice( Deprecation::notice(
'3.2', '4.0',
'Please use DataObject::manyManyComponent() instead of passing a component name to manyMany()', 'Please use DataObject::manyManyComponent() instead of passing a component name to manyMany()',
Deprecation::SCOPE_GLOBAL Deprecation::SCOPE_GLOBAL
); );