Skip to content

Commit

Permalink
Merge branch '2.0' into jms-pimcore-object-serializer
Browse files Browse the repository at this point in the history
  • Loading branch information
dpfaffenbauer authored Jan 10, 2019
2 parents a9f1838 + 9f63ce0 commit 015baae
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class StorePrice extends Model\DataObject\ClassDefinition\Data implements Custom
*
* @var string
*/
public $fieldtype = 'int';
public $fieldtype = 'coreShopStorePrice';

/**
* @var float
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/MoneyBundle/CoreExtension/Money.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Money extends Model\DataObject\ClassDefinition\Data implements ResourcePer
*
* @var string
*/
public $fieldtype = 'int';
public $fieldtype = 'coreShopMoney';

/**
* @var float
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class SerializedData extends Model\DataObject\ClassDefinition\Data implements Re
*
* @var string
*/
public $fieldtype = 'SerializedData';
public $fieldtype = 'coreShopSerializedData';

/**
* Type for the generated phpdoc.
Expand Down

0 comments on commit 015baae

Please sign in to comment.