We must not ignore simple attributes in additional

We also have hybrid attributes (like select) which are both, ISimple and
IComplex. We might also have all other kinds of combinations.
Therefore we now have the sequence of:
- Always fetch simple attributes
- Then try translated
- Finally try complex

Author: discordier

src/MetaModels/DataAccess/ItemRetriever.php

@@ -208,10 +208,9 @@ private function fetchRows(array $ids)
      */
     private function fetchAdditionalAttributes(array $ids, array $result)
     {
-        $attributeNames = array_diff(array_keys($this->attributes), array_keys($this->simpleAttributes));
-        $attributes     = array_filter($this->attributes, function ($attribute) use ($attributeNames) {
+        $attributes = array_filter($this->attributes, function ($attribute) {
             /** @var IAttribute $attribute */
-            return in_array($attribute->getColName(), $attributeNames);
+            return $attribute instanceof ITranslated || $attribute instanceof IComplex;
         });
 
         foreach ($attributes as $attributeName => $attribute) {