Merge pull request #14932 from snipe/fixes/small_deprecations
Fixed small deprecation warnings for PHP8.2
This commit is contained in:
@@ -568,7 +568,7 @@ class Asset extends Depreciable
|
||||
*/
|
||||
public function assignedType()
|
||||
{
|
||||
return strtolower(class_basename($this->assigned_type));
|
||||
return $this->assigned_type ? strtolower(class_basename($this->assigned_type)) : null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -173,10 +173,14 @@ class Depreciable extends SnipeModel
|
||||
|
||||
public function depreciated_date()
|
||||
{
|
||||
$date = date_create($this->purchase_date);
|
||||
date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months.' months'));
|
||||
if (($this->purchase_date) && ($this->get_depreciation())) {
|
||||
$date = date_create($this->purchase_date);
|
||||
|
||||
return date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months.' months'));//date_format($date, 'Y-m-d'); //don't bake-in format, for internationalization
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
return $date; //date_format($date, 'Y-m-d'); //don't bake-in format, for internationalization
|
||||
}
|
||||
|
||||
// it's necessary for unit tests
|
||||
|
||||
Reference in New Issue
Block a user