Functionality and checks related to adding producers data to ProducersDataBag move to ProducersDataBag

Author: paveljanda

src/AbstractDataBag.php

@@ -16,7 +16,7 @@ abstract class AbstractDataBag
 	/**
 	 * @var array
 	 */
-	private $data = [];
+	protected $data = [];
 
 
 	public function __construct(array $data)

src/DI/Helpers/ProducersHelper.php

@@ -20,7 +20,7 @@ final class ProducersHelper extends AbstractHelper
 {
 
 	public const DELIVERY_MODES = [
-		Producer::DELIVERY_MODE_PERSISTENT,
+		Producer::DELIVERY_MODE_NON_PERSISTENT,
 		Producer::DELIVERY_MODE_PERSISTENT,
 	];
 
@@ -45,22 +45,6 @@ public function setup(ContainerBuilder $builder, array $config = []): ServiceDef
 				$producerData
 			);
 
-			if (!in_array($producerConfig['deliveryMode'], self::DELIVERY_MODES, true)) {
-				throw new \InvalidArgumentException(
-					"Unknown exchange type [{$producerConfig['type']}]"
-				);
-			}
-
-			/**
-			 * 1, Producer has to be subscribed to either a queue or an exchange
-			 * 2, A producer can be subscribed to both a queue and an exchange
-			 */
-			if (empty($producerConfig['queue']) && empty($producerConfig['exchange'])) {
-				throw new \InvalidArgumentException(
-					'Producer has to be subscribed to either a queue or an exchange'
-				);
-			}
-
 			$producersConfig[$producerName] = $producerConfig;
 		}
 

src/Producer/ProducersDataBag.php

@@ -11,7 +11,48 @@
 namespace Gamee\RabbitMQ\Producer;
 
 use Gamee\RabbitMQ\AbstractDataBag;
+use Gamee\RabbitMQ\DI\Helpers\ProducersHelper;
 
 final class ProducersDataBag extends AbstractDataBag
 {
+
+	/**
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct(array $data)
+	{
+		foreach ($data as $producerName => $producer) {
+			$this->addProducerByData($producerName, $producer);
+		}
+	}
+
+
+	/**
+	 * @throws \InvalidArgumentException
+	 */
+	public function addProducerByData(string $producerName, array $data): void
+	{
+		$data['deliveryMode'] = $data['deliveryMode'] ?? Producer::DELIVERY_MODE_PERSISTENT;
+		$data['contentType'] = $data['contentType'] ?? 'text/plain';
+		$data['exchange'] = $data['exchange'] ?? null;
+		$data['queue'] = $data['queue'] ?? null;
+
+		if (!in_array($data['deliveryMode'], ProducersHelper::DELIVERY_MODES, true)) {
+			throw new \InvalidArgumentException(
+				"Unknown exchange type [{$data['type']}]"
+			);
+		}
+
+		/**
+		 * 1, Producer has to be subscribed to either a queue or an exchange
+		 * 2, A producer can be subscribed to both a queue and an exchange
+		 */
+		if (empty($data['queue']) && empty($data['exchange'])) {
+			throw new \InvalidArgumentException(
+				'Producer has to be subscribed to either a queue or an exchange'
+			);
+		}
+
+		$this->data[$producerName] = $data;
+	}
 }