Codeigniter\Entity - Fix ToArray datamap

[najdanovicivan]

Description

There are couple of issues with the way datamap works

• It keeps doubles the values original and mapped where only mapped should be kept
• If datamap is used on existing attribute it will not work properly as value is already processed through data map in the getter
• When unsetting the key we need to double check if there is not another map that uses the key in $to map as if unset it won't be accessible in the next loop

I've added the getSwappedEntity() method which returns the entity which is affected by all those issues.

Checklist:

• Securely signed commits
• Component(s) with PHPdocs
• Unit testing, with >80% coverage
• User guide updated
• Conforms to style guide

[najdanovicivan]

This PR is not final yet. This is just to understand the issue. I'm thinking about more elegant solution to avoid having all those checks and do everything in single foreach loop.

As datamap already works on magic getter the idea is to properly prepare keys and then run foreach loop to get values using those keys.

The way to prepare those keys will be done like this

1. get all keys of $this->attributes let those be named $keys
2. filter out keys starting with _underscore from $keys
3. get unique values fro the $this->datamap let those be named as $mapped_keys
4. filter out the $mapped_keys from the $key
5. Append all keys from $this->datamap to $keys
6. Run single foreach $keys as $key and pouplate $results with $this->__get($key)

Let me know what you think about doing it this way

[najdanovicivan]

I've submitted another commit which will handle this by processing keys first

[michalsn]

I like this. Nice and clean solution.

[MGatner]

Much cleaner! Elegant solution. I think you've recreated an existing function, but let me know if I've misunderstood that.

[kenjis]

@najdanovicivan
Each property (array key) in the Entity has a value, so if the column bar has two properties,
we need to discard one value when inserting to database.

The $datamap seems to be invalid. Am I something wrong?

[kenjis]

@najdanovicivan

I've added the getSwappedEntity() method which returns the entity which is affected by all those issues.

You added the swapped case, but do you really need the use case?
It seems it gives users a lot of complexity.

If we prohibit it, the Entity would be simpler.