From 09ba9b880fab365efe53b835962b09acef560fec Mon Sep 17 00:00:00 2001 From: wangyuting Date: Wed, 15 May 2024 09:39:47 +0800 Subject: [PATCH] * Revert code. --- module/build/model.php | 16 ++++++++-------- module/build/tao.php | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/module/build/model.php b/module/build/model.php index 7d81fb6f61..182072b97d 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -237,17 +237,17 @@ class buildModel extends model * 通过条件获取版本id:name的键值对。 * Get build pairs by condition. * - * @param array|int|string $productIdList - * @param string|int $branch - * @param string $params noempty|notrunk|noterminate|withbranch|hasproject|noDeleted|singled|noreleased|releasedtag, can be a set of them - * @param int $objectID - * @param string $objectType - * @param string $buildIdList - * @param bool $replace + * @param array|int $productIdList + * @param string|int $branch + * @param string $params noempty|notrunk|noterminate|withbranch|hasproject|noDeleted|singled|noreleased|releasedtag, can be a set of them + * @param int $objectID + * @param string $objectType + * @param string $buildIdList + * @param bool $replace * @access public * @return array */ - public function getBuildPairs(array|int|string $productIdList, string|int $branch = 'all', string $params = 'noterminate, nodone', int $objectID = 0, string $objectType = 'execution', string $buildIdList = '', bool $replace = true): array + public function getBuildPairs(array|int $productIdList, string|int $branch = 'all', string $params = 'noterminate, nodone', int $objectID = 0, string $objectType = 'execution', string $buildIdList = '', bool $replace = true): array { $sysBuilds = array(); if(strpos($params, 'notrunk') === false) $sysBuilds = array('trunk' => $this->lang->trunk); diff --git a/module/build/tao.php b/module/build/tao.php index a4e9d19a51..43dde1c9c3 100644 --- a/module/build/tao.php +++ b/module/build/tao.php @@ -15,15 +15,15 @@ class buildTao extends buildModel * 根据条件获取版本列表信息。 * Get build list inormation by condition. * - * @param array|int|string $productIdList - * @param string $params hasdeleted|hasproject|singled - * @param int $objectID - * @param string $objectType - * @param array $shadows + * @param array|int $productIdList + * @param string $params hasdeleted|hasproject|singled + * @param int $objectID + * @param string $objectType + * @param array $shadows * @access protected * @return array */ - protected function fetchBuilds(array|int|string $productIdList, string $params = '', int $objectID = 0, string $objectType = '', array $shadows = array()): array + protected function fetchBuilds(array|int $productIdList, string $params = '', int $objectID = 0, string $objectType = '', array $shadows = array()): array { $fieldList = 't1.id, t1.name, t1.branch, t1.execution, t1.date, t1.deleted, t3.status as releaseStatus, t3.id as releaseID, t4.type as productType'; if($objectType == 'execution' || $objectType == 'project') $fieldList .= ', t2.status as objectStatus'; @@ -49,15 +49,15 @@ class buildTao extends buildModel * 获取项目、执行关联的版本信息。 * Get the builds that the project,execution has been linked. * - * @param string $buildIdList - * @param array|int|string $productIdList - * @param string $params hasdeleted - * @param int $objectID - * @param string $objectType + * @param string $buildIdList + * @param array|int $productIdList + * @param string $params hasdeleted + * @param int $objectID + * @param string $objectType * @access protected * @return array */ - protected function selectedBuildPairs(string $buildIdList, array|int|string $productIdList, string $params, int $objectID, string $objectType): array + protected function selectedBuildPairs(string $buildIdList, array|int $productIdList, string $params, int $objectID, string $objectType): array { $selectedBuilds = array(); if($buildIdList)