mirror of
https://github.com/Karaka-Management/oms-Organization.git
synced 2026-02-14 23:38:42 +00:00
unit test fixes, phpstan fixes, phpcs fixes
This commit is contained in:
parent
69ceb82229
commit
ed4151f9a1
|
|
@ -136,7 +136,7 @@ final class ApiController extends Controller
|
||||||
$unit->setDescription(Markdown::parse((string) ($request->getData('description') ?? $unit->getDescriptionRaw())));
|
$unit->setDescription(Markdown::parse((string) ($request->getData('description') ?? $unit->getDescriptionRaw())));
|
||||||
|
|
||||||
$parent = (int) $request->getData('parent');
|
$parent = (int) $request->getData('parent');
|
||||||
$unit->setParent(!empty($parent) ? $parent : $unit->getParent());
|
$unit->setParent(!empty($parent) ? new NullUnit($parent) : $unit->getParent());
|
||||||
$unit->setStatus((int) ($request->getData('status') ?? $unit->getStatus()));
|
$unit->setStatus((int) ($request->getData('status') ?? $unit->getStatus()));
|
||||||
|
|
||||||
return $unit;
|
return $unit;
|
||||||
|
|
@ -329,10 +329,10 @@ final class ApiController extends Controller
|
||||||
$position->setDescription(Markdown::parse((string) ($request->getData('description') ?? $position->getDescriptionRaw())));
|
$position->setDescription(Markdown::parse((string) ($request->getData('description') ?? $position->getDescriptionRaw())));
|
||||||
|
|
||||||
$parent = (int) $request->getData('parent');
|
$parent = (int) $request->getData('parent');
|
||||||
$position->setParent(!empty($parent) ? $parent : $position->getParent());
|
$position->setParent(!empty($parent) ? new NullPosition($parent) : $position->getParent());
|
||||||
|
|
||||||
$department = (int) $request->getData('department');
|
$department = (int) $request->getData('department');
|
||||||
$position->setDepartment(!empty($department) ? $department : $position->getDepartment());
|
$position->setDepartment(!empty($department) ? new NullDepartment($department) : $position->getDepartment());
|
||||||
$position->setStatus((int) ($request->getData('status') ?? $position->getStatus()));
|
$position->setStatus((int) ($request->getData('status') ?? $position->getStatus()));
|
||||||
|
|
||||||
return $position;
|
return $position;
|
||||||
|
|
@ -485,11 +485,11 @@ final class ApiController extends Controller
|
||||||
$department->setDescription(Markdown::parse((string) ($request->getData('description') ?? $department->getDescriptionRaw())));
|
$department->setDescription(Markdown::parse((string) ($request->getData('description') ?? $department->getDescriptionRaw())));
|
||||||
|
|
||||||
$parent = (int) $request->getData('parent');
|
$parent = (int) $request->getData('parent');
|
||||||
$department->setParent(!empty($parent) ? $parent : $department->getParent());
|
$department->setParent(!empty($parent) ? new NullDepartment($parent) : $department->getParent());
|
||||||
$department->setStatus((int) ($request->getData('status') ?? $department->getStatus()));
|
$department->setStatus((int) ($request->getData('status') ?? $department->getStatus()));
|
||||||
|
|
||||||
$unit = (int) $request->getData('unit');
|
$unit = (int) $request->getData('unit');
|
||||||
$department->setUnit(!empty($unit) ? $unit : $department->getUnit());
|
$department->setUnit(!empty($unit) ? new NullUnit($unit) : $department->getUnit());
|
||||||
|
|
||||||
return $department;
|
return $department;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user