Skip to content

Removed unnecessary return type EncryptedField #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 10, 2025
Merged

Removed unnecessary return type EncryptedField #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
725c44c
Removed unnecessary return type EncryptedField
blankse Apr 8, 2025
16683ef
Review
blankse Apr 8, 2025
b9ae8cc
Update ServiceResolver.php
blankse Apr 8, 2025
f7e6ace
Apply php-cs-fixer changes
blankse Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Models/DataObject/ClassDefinitionServiceResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

use Pimcore\Bundle\StaticResolverBundle\Contract\Models\DataObject\ClassDefinitionServiceResolverContract;
use Pimcore\Model\DataObject\ClassDefinition\Data;
use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
use Pimcore\Model\DataObject\ClassDefinition\Layout;
use Pimcore\Model\DataObject\ClassDefinition\Service;

Expand All @@ -31,7 +30,7 @@ public function generateLayoutTreeFromArray(
array $array,
bool $throwException = false,
bool $insideLocalizedField = false
): EncryptedField|bool|Data|Layout {
): bool|Data|Layout {
return Service::generateLayoutTreeFromArray($array, $throwException, $insideLocalizedField);
}

Expand Down
3 changes: 1 addition & 2 deletions src/Models/DataObject/ClassDefinitionServiceResolverInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
use Exception;
use Pimcore\Bundle\StaticResolverBundle\Contract\Models\DataObject\ClassDefinitionServiceResolverContractInterface;
use Pimcore\Model\DataObject\ClassDefinition\Data;
use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
use Pimcore\Model\DataObject\ClassDefinition\Layout;

/**
Expand All @@ -34,7 +33,7 @@ public function generateLayoutTreeFromArray(
array $array,
bool $throwException = false,
bool $insideLocalizedField = false
): EncryptedField|bool|Data|Layout;
): bool|Data|Layout;

public function setDoRemoveDynamicOptions(bool $doRemoveDynamicOptions): void;

Expand Down
9 changes: 2 additions & 7 deletions src/Models/DataObject/ClassificationStore/ServiceResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

namespace Pimcore\Bundle\StaticResolverBundle\Models\DataObject\ClassificationStore;

use Exception;
use Pimcore\Model\DataObject\ClassDefinition\Data;
use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
use Pimcore\Model\DataObject\Classificationstore\KeyConfig;
use Pimcore\Model\DataObject\Classificationstore\KeyGroupRelation;
use Pimcore\Model\DataObject\Classificationstore\Service;
Expand All @@ -33,16 +31,13 @@ public function clearDefinitionsCache(): void
Service::clearDefinitionsCache();
}

/**
* @throws Exception
*/
public function getFieldDefinitionFromKeyConfig(
KeyConfig|KeyGroupRelation $keyConfig
): EncryptedField|Data|null {
): ?Data {
return Service::getFieldDefinitionFromKeyConfig($keyConfig);
}

public function getFieldDefinitionFromJson(array $definition, string $type): EncryptedField|Data|null
public function getFieldDefinitionFromJson(array $definition, string $type): ?Data
{
return Service::getFieldDefinitionFromJson($definition, $type);
}
Expand Down
5 changes: 2 additions & 3 deletions src/Models/DataObject/ClassificationStore/ServiceResolverInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
namespace Pimcore\Bundle\StaticResolverBundle\Models\DataObject\ClassificationStore;

use Pimcore\Model\DataObject\ClassDefinition\Data;
use Pimcore\Model\DataObject\ClassDefinition\Data\EncryptedField;
use Pimcore\Model\DataObject\Classificationstore\KeyConfig;
use Pimcore\Model\DataObject\Classificationstore\KeyGroupRelation;

Expand All @@ -30,7 +29,7 @@ public function clearDefinitionsCache(): void;

public function getFieldDefinitionFromKeyConfig(
KeyConfig|KeyGroupRelation $keyConfig
): EncryptedField|Data|null;
): ?Data;

public function getFieldDefinitionFromJson(array $definition, string $type): EncryptedField|Data|null;
public function getFieldDefinitionFromJson(array $definition, string $type): ?Data;
}