From 0f62d7da1319fc87f8445fbde893908fadf4a1b2 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Tue, 28 Apr 2015 15:28:26 +0300 Subject: [PATCH] Metadata: code improvements --- .../Espo/Core/Utils/Database/Orm/Converter.php | 14 +++++++------- application/Espo/Core/Utils/EntityManager.php | 8 ++++---- application/Espo/Core/Utils/FieldManager.php | 12 ++++++------ application/Espo/Core/Utils/Metadata.php | 12 ++++++------ .../Core/Utils/Metadata/{Utils.php => Helper.php} | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) rename application/Espo/Core/Utils/Metadata/{Utils.php => Helper.php} (99%) diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php index e8401ef972..3287ac60fa 100644 --- a/application/Espo/Core/Utils/Database/Orm/Converter.php +++ b/application/Espo/Core/Utils/Database/Orm/Converter.php @@ -29,7 +29,7 @@ class Converter { private $metadata; private $fileManager; - private $metadataUtils; + private $metadataHelper; private $relationManager; @@ -89,7 +89,7 @@ class Converter $this->relationManager = new RelationManager($this->metadata); - $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata); + $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata); } protected function getMetadata() @@ -116,9 +116,9 @@ class Converter return $this->relationManager; } - protected function getMetadataUtils() + protected function getMetadataHelper() { - return $this->metadataUtils; + return $this->metadataHelper; } public function process() @@ -223,7 +223,7 @@ class Converter foreach($entityMeta['fields'] as $fieldName => $fieldParams) { /** check if "fields" option exists in $fieldMeta */ - $fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams); + $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams); $fieldDefs = $this->convertField($entityName, $fieldName, $fieldParams, $fieldTypeMeta); if ($fieldDefs !== false) { @@ -232,7 +232,7 @@ class Converter /** check and set the linkDefs from 'fields' metadata */ if (isset($fieldTypeMeta['linkDefs'])) { - $linkDefs = $this->getMetadataUtils()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']); + $linkDefs = $this->getMetadataHelper()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']); if (isset($linkDefs)) { if (!isset($entityMeta['links'])) { $entityMeta['links'] = array(); @@ -312,7 +312,7 @@ class Converter /** merge fieldDefs option from field definition */ if (!isset($fieldTypeMeta)) { - $fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams); + $fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams); } if (isset($fieldTypeMeta['fieldDefs'])) { diff --git a/application/Espo/Core/Utils/EntityManager.php b/application/Espo/Core/Utils/EntityManager.php index 3644937126..3eb3a791c0 100644 --- a/application/Espo/Core/Utils/EntityManager.php +++ b/application/Espo/Core/Utils/EntityManager.php @@ -35,7 +35,7 @@ class EntityManager private $fileManager; - private $metadataUtils; + private $metadataHelper; public function __construct(Metadata $metadata, Language $language, File\Manager $fileManager) { @@ -43,7 +43,7 @@ class EntityManager $this->language = $language; $this->fileManager = $fileManager; - $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata); + $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata); } protected function getMetadata() @@ -61,9 +61,9 @@ class EntityManager return $this->fileManager; } - protected function getMetadataUtils() + protected function getMetadataHelper() { - return $this->metadataUtils; + return $this->metadataHelper; } public function create($name, $type, $params = array()) diff --git a/application/Espo/Core/Utils/FieldManager.php b/application/Espo/Core/Utils/FieldManager.php index 23b9544197..3a5c3469a1 100644 --- a/application/Espo/Core/Utils/FieldManager.php +++ b/application/Espo/Core/Utils/FieldManager.php @@ -31,7 +31,7 @@ class FieldManager private $language; - private $metadataUtils; + private $metadataHelper; protected $isChanged = null; @@ -44,7 +44,7 @@ class FieldManager $this->metadata = $metadata; $this->language = $language; - $this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata); + $this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata); } protected function getMetadata() @@ -57,9 +57,9 @@ class FieldManager return $this->language; } - protected function getMetadataUtils() + protected function getMetadataHelper() { - return $this->metadataUtils; + return $this->metadataHelper; } public function read($name, $scope) @@ -209,7 +209,7 @@ class FieldManager { $fieldDef = $this->prepareFieldDef($fieldName, $fieldDef, $scope); - $metaFieldDef = $this->getMetadataUtils()->getFieldDefsInFieldMeta($fieldDef); + $metaFieldDef = $this->getMetadataHelper()->getFieldDefsInFieldMeta($fieldDef); if (isset($metaFieldDef)) { $fieldDef = Util::merge($metaFieldDef, $fieldDef); } @@ -226,7 +226,7 @@ class FieldManager ); /** Save links for a field. */ - $metaLinkDef = $this->getMetadataUtils()->getLinkDefsInFieldMeta($scope, $fieldDef); + $metaLinkDef = $this->getMetadataHelper()->getLinkDefsInFieldMeta($scope, $fieldDef); if (isset($linkDefs) || isset($metaLinkDef)) { $linkDefs = Util::merge((array) $metaLinkDef, (array) $linkDefs); $defs['links'] = array( diff --git a/application/Espo/Core/Utils/Metadata.php b/application/Espo/Core/Utils/Metadata.php index 236c2da4ca..5fe4ea1b49 100644 --- a/application/Espo/Core/Utils/Metadata.php +++ b/application/Espo/Core/Utils/Metadata.php @@ -35,7 +35,7 @@ class Metadata private $fileManager; private $converter; private $moduleConfig; - private $metadataUtils; + private $metadataHelper; /** * @var string - uses for loading default values @@ -110,13 +110,13 @@ class Metadata return $this->moduleConfig; } - protected function getMetadataUtils() + protected function getMetadataHelper() { - if (!isset($this->metadataUtils)) { - $this->metadataUtils = new Metadata\Utils($this); + if (!isset($this->metadataHelper)) { + $this->metadataHelper = new Metadata\Helper($this); } - return $this->metadataUtils; + return $this->metadataHelper; } public function isCached() @@ -248,7 +248,7 @@ class Metadata foreach ($metaCopy['entityDefs'] as $entityName => $entityParams) { foreach ($entityParams['fields'] as $fieldName => $fieldParams) { - $additionalFields = $this->getMetadataUtils()->getAdditionalFieldList($fieldName, $fieldParams, $definitionList); + $additionalFields = $this->getMetadataHelper()->getAdditionalFieldList($fieldName, $fieldParams, $definitionList); if (!empty($additionalFields)) { //merge or add to the end of meta array foreach ($additionalFields as $subFieldName => $subFieldParams) { diff --git a/application/Espo/Core/Utils/Metadata/Utils.php b/application/Espo/Core/Utils/Metadata/Helper.php similarity index 99% rename from application/Espo/Core/Utils/Metadata/Utils.php rename to application/Espo/Core/Utils/Metadata/Helper.php index bc463b66e8..3e0475d3c6 100644 --- a/application/Espo/Core/Utils/Metadata/Utils.php +++ b/application/Espo/Core/Utils/Metadata/Helper.php @@ -24,7 +24,7 @@ namespace Espo\Core\Utils\Metadata; use Espo\Core\Utils\Util; -class Utils +class Helper { private $metadata;