Docblock fix

This commit is contained in:
Dennis Eichhorn 2018-09-22 18:22:44 +02:00
parent 6bea9e09be
commit 139ba35a0d
6 changed files with 12 additions and 12 deletions

View File

@ -16,7 +16,7 @@ namespace Modules\Tasks\Admin;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\UpdaterAbstract; use phpOMS\Module\UpdaterAbstract;
use phpOMS\System\File\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
/** /**

View File

@ -343,6 +343,6 @@ class ApiController extends Controller
$element->setDescription(Markdown::parse((string) ($request->getData('description') ?? $element->getDescriptionRaw()))); $element->setDescription(Markdown::parse((string) ($request->getData('description') ?? $element->getDescriptionRaw())));
$element->setDescriptionRaw((string) ($request->getData('description') ?? $element->getDescriptionRaw())); $element->setDescriptionRaw((string) ($request->getData('description') ?? $element->getDescriptionRaw()));
return $task; return $element;
} }
} }

View File

@ -214,7 +214,7 @@ class Task implements \JsonSerializable
$this->taskElements[] = $element; $this->taskElements[] = $element;
\end($this->taskElements); \end($this->taskElements);
$key = \key($this->taskElements); $key = (int) \key($this->taskElements);
\reset($this->taskElements); \reset($this->taskElements);
return $key; return $key;

View File

@ -33,7 +33,7 @@ class TaskElementMapper extends DataMapperAbstract
/** /**
* Columns. * Columns.
* *
* @var array<string, array<string, string>> * @var array<string, array<string, string|bool>>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $columns = [ protected static $columns = [

View File

@ -37,7 +37,7 @@ class TaskMapper extends DataMapperAbstract
/** /**
* Columns. * Columns.
* *
* @var array<string, array<string, string>> * @var array<string, array<string, string|bool>>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $columns = [ protected static $columns = [
@ -164,14 +164,14 @@ class TaskMapper extends DataMapperAbstract
$query = self::getQuery(); $query = self::getQuery();
$whereClause1 = new Builder(); $whereClause1 = new Builder(self::$db);
$whereClause1->select(TaskElementMapper::$table . '.task_element_task') $whereClause1->select(TaskElementMapper::getTable() . '.task_element_task')
->distinct() ->distinct()
->from(TaskElementMapper::$table) ->from(TaskElementMapper::getTable())
->where(TaskElementMapper::$table . '.task_elment_created_by', '=', $user) ->where(TaskElementMapper::getTable() . '.task_elment_created_by', '=', $user)
->orWhere(TaskElementMapper::$table . '.task_element_forwarded', '=', $user); ->orWhere(TaskElementMapper::getTable() . '.task_element_forwarded', '=', $user);
$whereClause2 = new Builder(); $whereClause2 = new Builder(self::$db);
$whereClause2->select(self::$table . '.' . self::$primaryField) $whereClause2->select(self::$table . '.' . self::$primaryField)
->from(self::$table) ->from(self::$table)
->where(self::$table . '.task_created_by', '=', $user); ->where(self::$table . '.task_created_by', '=', $user);

View File

@ -27,7 +27,7 @@ class TaskTemplate extends Task
/** /**
* Type. * Type.
* *
* @var TaskType * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected $type = TaskType::TEMPLATE; protected $type = TaskType::TEMPLATE;