From aa547c3934fe1ae91c635c8549b57f8cc56b81a6 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 19 Jul 2023 15:32:44 +0300 Subject: [PATCH] fix deprecation docs --- .../Core/Container/ContainerConfiguration.php | 2 +- application/Espo/Core/InjectableFactory.php | 4 +-- application/Espo/Core/Utils/FieldManager.php | 2 +- .../Espo/Core/Utils/FieldManagerUtil.php | 2 +- .../ORM/QueryComposer/BaseQueryComposer.php | 6 ++--- application/Espo/Services/Record.php | 27 +++++++++++++------ 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/application/Espo/Core/Container/ContainerConfiguration.php b/application/Espo/Core/Container/ContainerConfiguration.php index 5d779f1c67..39d719cbe7 100644 --- a/application/Espo/Core/Container/ContainerConfiguration.php +++ b/application/Espo/Core/Container/ContainerConfiguration.php @@ -66,7 +66,7 @@ class ContainerConfiguration implements Configuration if (!$className) { /** @deprecated */ - /** @todo Remove in 8.0. */ + /** @todo Remove in v9.0. */ $className = $this->metadata->get(['app', 'loaders', ucfirst($name)]); } } catch (Exception) {} diff --git a/application/Espo/Core/InjectableFactory.php b/application/Espo/Core/InjectableFactory.php index 24bb4649fd..a568299fe0 100644 --- a/application/Espo/Core/InjectableFactory.php +++ b/application/Espo/Core/InjectableFactory.php @@ -171,7 +171,7 @@ class InjectableFactory $obj = $class->newInstanceArgs($injectionList); - // @todo Remove in 8.0. + // @todo Remove in v9.0. if ($class->implementsInterface(Injectable::class)) { $this->applyInjectable($class, $obj); @@ -476,7 +476,7 @@ class InjectableFactory /** * @deprecated * @param ReflectionClass $class - * @todo Remove in 8.0. + * @todo Remove in v9.0. */ private function applyInjectable(ReflectionClass $class, object $obj): void { diff --git a/application/Espo/Core/Utils/FieldManager.php b/application/Espo/Core/Utils/FieldManager.php index ceaafcc5b2..5f5a91e4a1 100644 --- a/application/Espo/Core/Utils/FieldManager.php +++ b/application/Espo/Core/Utils/FieldManager.php @@ -31,7 +31,7 @@ namespace Espo\Core\Utils; /** * @deprecated As of v6.0. Use FieldUtil. - * @todo Remove in 8.0. + * @todo Remove in v8.0. */ class FieldManager extends FieldUtil { diff --git a/application/Espo/Core/Utils/FieldManagerUtil.php b/application/Espo/Core/Utils/FieldManagerUtil.php index f9b5555355..6b2724d0f5 100644 --- a/application/Espo/Core/Utils/FieldManagerUtil.php +++ b/application/Espo/Core/Utils/FieldManagerUtil.php @@ -31,7 +31,7 @@ namespace Espo\Core\Utils; /** * @deprecated As of v6.0. Use FieldUtil. - * @todo Remove in 8.0. + * @todo Remove in v8.0. */ class FieldManagerUtil extends FieldUtil { diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php index 73a0978ca6..059b655480 100644 --- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php +++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php @@ -2210,7 +2210,7 @@ abstract class BaseQueryComposer implements QueryComposer * Quote a value (if needed). * @deprecated As of v6.0. Not meant to be used outside as Query Builder should be used to * build queries. - * @todo Make protected in 8.0. + * @todo Make protected in v9.0. * @param mixed $value */ public function quote($value): string @@ -2885,7 +2885,7 @@ abstract class BaseQueryComposer implements QueryComposer /** * Sanitize a string. - * @todo Make protected in 8.0. + * @todo Make protected in 9.0. * @deprecated As of v6.0. Not to be used outside. */ public function sanitize(string $string): string @@ -2895,7 +2895,7 @@ abstract class BaseQueryComposer implements QueryComposer /** * Sanitize an alias for a SELECT statement. - * @todo Make protected in 8.0. + * @todo Make protected in 9.0. * @deprecated As of v6.0. Not to be used outside. */ public function sanitizeSelectAlias(string $string): string diff --git a/application/Espo/Services/Record.php b/application/Espo/Services/Record.php index 53e0c41295..9c50b647ba 100644 --- a/application/Espo/Services/Record.php +++ b/application/Espo/Services/Record.php @@ -91,6 +91,7 @@ class Record extends RecordService implements /** * @deprecated For backward compatibility, to be removed. * @return void + * @todo Remove in v9.0. */ protected function init() {} @@ -101,6 +102,7 @@ class Record extends RecordService implements /** * @deprecated Use `$this->entityType`. + * @todo Remove in v9.0. */ public function getEntityType(): string { @@ -109,8 +111,8 @@ class Record extends RecordService implements /** * @deprecated Use `$this->config`. - * * @return \Espo\Core\Utils\Config + * @todo Remove in v9.0. */ protected function getConfig() { @@ -119,8 +121,8 @@ class Record extends RecordService implements /** * @deprecated Use `$this->serviceFactory`. - * * @return \Espo\Core\ServiceFactory + * @todo Remove in v9.0. */ protected function getServiceFactory() { @@ -130,6 +132,7 @@ class Record extends RecordService implements /** * @deprecated Since v7.0. * @return \Espo\Core\Select\SelectManagerFactory + * @todo Remove in v9.0. */ protected function getSelectManagerFactory() { @@ -138,8 +141,8 @@ class Record extends RecordService implements /** * @deprecated Use `$this->acl`. - * * @return \Espo\Core\Acl + * @todo Remove in v9.0. */ protected function getAcl() { @@ -148,8 +151,8 @@ class Record extends RecordService implements /** * @deprecated Use `$this->user`. - * * @return \Espo\Entities\User + * @todo Remove in v9.0. */ protected function getUser() { @@ -159,6 +162,7 @@ class Record extends RecordService implements /** * @deprecated Use `$this->aclManager`. * @return \Espo\Core\AclManager + * @todo Remove in v9.0. */ protected function getAclManager() { @@ -167,8 +171,8 @@ class Record extends RecordService implements /** * @deprecated Use `$this->fileManager`. - * * @return \Espo\Core\Utils\File\Manager + * @todo Remove in v9.0. */ protected function getFileManager() { @@ -177,8 +181,8 @@ class Record extends RecordService implements /** * @deprecated Use `$this->metadata`. - * * @return \Espo\Core\Utils\Metadata + * @todo Remove in v9.0. */ protected function getMetadata() { @@ -188,6 +192,7 @@ class Record extends RecordService implements /** * @deprecated Use `$this->fieldUtil`. * @return \Espo\Core\Utils\FieldUtil + * @todo Remove in v9.0. */ protected function getFieldManagerUtil() { @@ -196,8 +201,8 @@ class Record extends RecordService implements /** * @deprecated Use `$this->entityManager`. - * * @return \Espo\ORM\EntityManager + * @todo Remove in v9.0. */ protected function getEntityManager() { @@ -206,6 +211,7 @@ class Record extends RecordService implements /** * @deprecated + * @todo Remove in v9.0. * @param ?string $entityType * @return \Espo\Core\Select\SelectManager */ @@ -220,6 +226,7 @@ class Record extends RecordService implements /** * @deprecated + * @todo Remove in v9.0. * @param array $params * @return array */ @@ -238,7 +245,7 @@ class Record extends RecordService implements /** * @deprecated Use `$this->recordServiceContainer->get($name)`. - * + * @todo Remove in v9.0. * @param string $name * @return \Espo\Core\Record\Service */ @@ -252,6 +259,7 @@ class Record extends RecordService implements * @param Collection $collection * @throws ForbiddenSilent * @deprecated + * @todo Remove in v9.0. */ public function exportCollection(array $params, Collection $collection): string { @@ -285,6 +293,7 @@ class Record extends RecordService implements /** * @deprecated * @param string[] $selectAttributeList + * @todo Remove in v9.0. */ public function loadLinkMultipleFieldsForList(Entity $entity, array $selectAttributeList): void { @@ -313,6 +322,7 @@ class Record extends RecordService implements /** * @deprecated Use `Espo\Core\FieldProcessing\ListLoadProcessor`. + * @todo Remove in v9.0. * @param TEntity $entity * @return void */ @@ -323,6 +333,7 @@ class Record extends RecordService implements /** * @deprecated Use `Espo\Core\FieldProcessing\ListLoadProcessor`. + * @todo Remove in v9.0. * @param TEntity $entity * @return void */