Removed hardcoded values 2.0

Author: Mario Blazek

bundle/DependencyInjection/ConfigurationConstants.php

@@ -13,4 +13,6 @@ class ConfigurationConstants
     const DEFAULT_VARIABLES = 'default_variables';
 
     const SETTINGS_ROOT = 'netgen_information_collection';
+
+    const SETTINGS_DEFAULT = 'default';
 }

bundle/Factory/EmailDataFactory.php

@@ -6,6 +6,7 @@
 use eZ\Publish\Core\Helper\FieldHelper;
 use eZ\Publish\Core\Helper\TranslationHelper;
 use eZ\Publish\API\Repository\Values\Content\Content;
+use Netgen\Bundle\InformationCollectionBundle\DependencyInjection\ConfigurationConstants;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
 use Netgen\Bundle\InformationCollectionBundle\Constants;
 
@@ -87,7 +88,7 @@ protected function resolve(Content $content, $field, $property = Constants::FIEL
 
             return $fieldValue->value->$property;
         } else {
-            return $this->config['default_variables'][$field];
+            return $this->config[ConfigurationConstants::DEFAULT_VARIABLES][$field];
         }
     }
 
@@ -104,12 +105,12 @@ protected function resolveTemplate($content)
 
         $contentTypeIdentifier = $contentType->identifier;
 
-        if (array_key_exists($contentTypeIdentifier, $this->config['templates'])) {
+        if (array_key_exists($contentTypeIdentifier, $this->config[ConfigurationConstants::TEMPLATES])) {
 
-            return $this->config['templates'][$contentTypeIdentifier];
+            return $this->config[ConfigurationConstants::TEMPLATES][$contentTypeIdentifier];
 
         }
 
-        return $this->config['templates']['default'];
+        return $this->config[ConfigurationConstants::TEMPLATES][ConfigurationConstants::SETTINGS_DEFAULT];
     }
 }

bundle/FieldHandler/FieldHandlerRegistry.php

@@ -35,7 +35,7 @@ public function addHandler(CustomFieldHandlerInterface $handler)
     /**
      * @param Value $value
      *
-     * @return string
+     * @return CustomFieldHandlerInterface|null
      */
     public function handle(Value $value)
     {