Merge pull request #107 from szymach/php7.2-fix

Fixed TranslatationHelper for PHP7.2
fsi-open · Jan 21, 2018 · 97163cc · 97163cc
2 parents 300464b + c1c92b0
commit 97163cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
     - php: 7.1
       env:
         - COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.1
+    - php: 7.2
 
 sudo: false
 

diff --git a/lib/FSi/DoctrineExtensions/Translatable/TranslationHelper.php b/lib/FSi/DoctrineExtensions/Translatable/TranslationHelper.php
@@ -182,7 +182,7 @@ public function hasTranslatedProperties(ClassTranslationContext $context, $objec
         foreach ($properties as $property => $translationField) {
             $value = $this->propertyManipulator->getPropertyValue($object, $property);
             if ($translationMeta->isCollectionValuedAssociation($translationField)
-                && count($value)
+                && (is_iterable($value) && count($value))
                 || !$translationMeta->isCollectionValuedAssociation($translationField)
                 && null !== $value
             ) {