Merge pull request #10 from hrodic/1.x-dev

allow optionality of drivers and defaults

Author: hrodic

src/PHPUnit/Runner/Extension/Configuration.php

@@ -46,24 +46,32 @@ public function __construct(array $params)
         if (empty($params)) {
             throw new TestingException('Configuration parameters are empty');
         }
-        if (!isset($params[self::PDO_KEY])) {
-            $params[self::PDO_KEY] = [];
+        if (isset($params[self::PDO_KEY])) {
+            if ($invalidConfigParams = array_diff_key($params[self::PDO_KEY], self::$defaultPDOParams)) {
+                throw new TestingException(
+                    'The following elements are not valid PDO configuration params: ' . json_encode($invalidConfigParams)
+                );
+            }
+            $this->PDOParams = array_merge(self::$defaultPDOParams, $params[self::PDO_KEY]);
         }
-        if ($invalidConfigParams = array_diff_key($params[self::PDO_KEY], self::$defaultPDOParams)) {
-            throw new TestingException(
-                'The following elements are not valid PDO configuration params: ' . json_encode($invalidConfigParams)
-            );
+        if (isset($params[self::AMQP_KEY])) {
+            if ($invalidConfigParams = array_diff_key($params[self::AMQP_KEY], self::$defaultAMQPParams)) {
+                throw new TestingException(
+                    'The following elements are not valid AMQP configuration params: ' . json_encode($invalidConfigParams)
+                );
+            }
+            $this->AMQPParams = array_merge(self::$defaultAMQPParams, $params[self::AMQP_KEY]);
         }
-        if (!isset($params[self::AMQP_KEY])) {
-            $params[self::AMQP_KEY] = [];
-        }
-        if ($invalidConfigParams = array_diff_key($params[self::AMQP_KEY], self::$defaultAMQPParams)) {
-            throw new TestingException(
-                'The following elements are not valid AMQP configuration params: ' . json_encode($invalidConfigParams)
-            );
-        }
-        $this->PDOParams = array_merge(self::$defaultPDOParams, $params[self::PDO_KEY]);
-        $this->AMQPParams = array_merge(self::$defaultAMQPParams, $params[self::AMQP_KEY]);
+    }
+
+    public function hasPDOFixtures(): bool
+    {
+        return !empty($this->PDOParams);
+    }
+
+    public function hasAMQPFixtures(): bool
+    {
+        return !empty($this->AMQPParams);
     }
 
     public function getPDODSN(): string
@@ -83,7 +91,7 @@ public function getPDOPassword(): string
 
     public function getPDOFixtures(): array
     {
-        return $this->PDOParams['fixtures'];
+        return isset($this->PDOParams['fixtures']) ? $this->PDOParams['fixtures'] : [];
     }
 
     public function getAMQPHost(): string
@@ -113,6 +121,6 @@ public function getAMQPVhost(): string
 
     public function getAMQPFixtures(): array
     {
-        return $this->AMQPParams['fixtures'];
+        return isset($this->AMQPParams['fixtures']) ? $this->AMQPParams['fixtures'] : [];
     }
 }

src/PHPUnit/Runner/Extension/Handler.php

@@ -88,7 +88,7 @@ private function getConfigurationFromFileName(string $fileName): Configuration
      */
     public function initPDOFixtureLoader(Configuration $configuration): void
     {
-        if ($configuration->getPDODSN()) {
+        if ($configuration->hasPDOFixtures() && $configuration->getPDODSN()) {
             $pdoFixtureConfig = new PDOFixtureConfig($configuration->getPDOFixtures());
             $pdoConnection = new PDOConnection(
                 $configuration->getPDODSN(),
@@ -101,7 +101,7 @@ public function initPDOFixtureLoader(Configuration $configuration): void
 
     public function initAMQPFixtureLoader(Configuration $configuration): void
     {
-        if ($configuration->getAMQPFixtures()) {
+        if ($configuration->hasAMQPFixtures() && $configuration->getAMQPFixtures()) {
             $amqpFixtureConfig = new AMQPFixtureConfig($configuration->getAMQPFixtures());
             $amqpConnection = AMQPConnection::create(
                 $configuration->getAMQPHost(),

tests/unit/PHPUnit/Runner/Extension/ConfigurationTest.php

@@ -43,6 +43,16 @@ public function testConfigurationWithOnlyPDOParams(): void
         $this->assertSame('mysql:host=mariadb:3306;dbname=test;charset=utf8', $sut->getPDODSN());
         $this->assertSame('mariadb_user', $sut->getPDOUser());
         $this->assertSame('mariadb_password', $sut->getPDOPassword());
+        $this->assertSame([], $sut->getAMQPFixtures());
+    }
+
+    public function testConfigurationWithPDOParamsAndDefaultAMQP(): void
+    {
+        $arrayConfig = array_merge($this->getPDOOnlyJSONConfiguration(), ['amqp' => []]);
+        $sut = new Configuration($arrayConfig);
+        $this->assertSame('mysql:host=mariadb:3306;dbname=test;charset=utf8', $sut->getPDODSN());
+        $this->assertSame('mariadb_user', $sut->getPDOUser());
+        $this->assertSame('mariadb_password', $sut->getPDOPassword());
         $this->assertSame([
             'beforeFirstTest' => [],
             'beforeTest' => [],
@@ -59,6 +69,18 @@ public function testConfigurationWithOnlyAMQPParams(): void
         $this->assertSame('rabbitmq_user', $sut->getAMQPUser());
         $this->assertSame('rabbitmq_password', $sut->getAMQPPassword());
         $this->assertSame('/', $sut->getAMQPVhost());
+        $this->assertSame([], $sut->getPDOFixtures());
+    }
+
+   public function testConfigurationWithAMQPParamsAndDefaultPDO(): void
+    {
+        $arrayConfig = array_merge($this->getAMQPOnlyJSONConfiguration(), ['pdo' => []]);
+        $sut = new Configuration($arrayConfig);
+        $this->assertSame('rabbitmq', $sut->getAMQPHost());
+        $this->assertSame(5672, $sut->getAMQPPort());
+        $this->assertSame('rabbitmq_user', $sut->getAMQPUser());
+        $this->assertSame('rabbitmq_password', $sut->getAMQPPassword());
+        $this->assertSame('/', $sut->getAMQPVhost());
         $this->assertSame([
             'beforeFirstTest' => [],
             'beforeTest' => [],