[amqp] should ignore empty dsn option.

makasim · makasim · commit a9ff2d8eb4a1 · 2017-11-01T15:43:13.000+02:00
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "enqueue/dev-message-queue",
+  "name": "enqueue/enqueue-dev",
   "type": "project",
   "minimum-stability": "stable",
   "require": {
diff --git a/pkg/amqp-tools/ConnectionConfig.php b/pkg/amqp-tools/ConnectionConfig.php
@@ -131,7 +131,9 @@ public function parse()
                 $dsn = $config['dsn'];
                 unset($config['dsn']);
 
-                $config = array_replace($config, $this->parseDsn($dsn));
+                if ($dsn) {
+                    $config = array_replace($config, $this->parseDsn($dsn));
+                }
             }
         } else {
             throw new \LogicException('The config must be either an array of options, a DSN string or null');
diff --git a/pkg/amqp-tools/Tests/ConnectionConfigTest.php b/pkg/amqp-tools/Tests/ConnectionConfigTest.php
@@ -149,6 +149,31 @@ public static function provideConfigs()
             ],
         ];
 
+        yield [
+            ['dsn' => null],
+            [
+                'host' => 'localhost',
+                'port' => 5672,
+                'vhost' => '/',
+                'user' => 'guest',
+                'pass' => 'guest',
+                'read_timeout' => 3.,
+                'write_timeout' => 3.,
+                'connection_timeout' => 3.,
+                'persisted' => false,
+                'lazy' => true,
+                'qos_prefetch_size' => 0,
+                'qos_prefetch_count' => 1,
+                'qos_global' => false,
+                'heartbeat' => 0.0,
+                'ssl_on' => false,
+                'ssl_verify' => true,
+                'ssl_cacert' => null,
+                'ssl_cert' => null,
+                'ssl_key' => null,
+            ],
+        ];
+
         yield [
             'amqp:',
             [
diff --git a/var/rabbitmq_certificates/cacert.pem b/var/rabbitmq_certificates/cacert.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIJAJQiwgTxMOEsMA0GCSqGSIb3DQEBCwUAMBMxETAPBgNV
-BAMMCE15VGVzdENBMB4XDTE3MTAzMDExNDYyMFoXDTE4MTAzMDExNDYyMFowEzER
+MIICxjCCAa6gAwIBAgIJALosbIbfKPgyMA0GCSqGSIb3DQEBCwUAMBMxETAPBgNV
+BAMMCE15VGVzdENBMB4XDTE3MTEwMTExNTMwM1oXDTE4MTEwMTExNTMwM1owEzER
 MA8GA1UEAwwITXlUZXN0Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCjmnPzpeM0iBVv2JNe0p+KueGQEeCQPG7WSuIEojXa7WMjiZuCzfBEAFSytwCI
-Q90rolPuOZoy6lxOX+K4Sr20I94xPfIlV5naHBjMj5yTPGSbFtpGjhnOIOHkqzh7
-Ffz3HnBDeXbMABnCQifVnUrRv/tYLE/F8pC33uLgKrouoalLW9eWEtzXyFxpo7Jd
-LXdV60D/as5Z3Vp9R3swax4LMgV17GsQEfIT/FzgjmSiPEjqZCWbMGrQlRUrn4lF
-IB3M62ACIWfS7SRx0y5Yy7IJ4L/3OEvL+2VvOHs/9TatXhrldE/Lmp5OEsw+z5Y0
-L2e97t+Xl4OlUCP8zT9AkeIhAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0P
-BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBkyVzkXo74tW1ZpE9hLOov/ZwME7Xo
-bdgvLPlpQMURuKsosU9hMtYJ5y5dO+U6GwOvH7SYoS7oNzu+sLnMK0877UipuTi2
-puLVpCoqMpp3gonj8QL6+uNOmtLMTUcv2eZA02zsm956wr72gOwZHpdgVjLq31rX
-4E29YU8yDfRZQsP6STbEYG32Om6ko7JgWzSaUqtim4xpKTAAxC5MN8MpXoM4oMoN
-2obJDCql74nQw4UgtDLEJODJ3hOSdoel4Z272GvBb09pb9J+70xSpNWYj2PvcICK
-XGgHCweEiZQ4eUCvhRwlgA/LMe4kx81+kCaGAd879yRi61zTG2r/agLE
+AQDfD1uO8U5eMa7JATHkQ+egMy4fCBSu55K4NGxj46OscK8xz897es3kvgwcvHJh
+/UWH4cx7ge2bKh94ESniEa9dYuIrqg4uTjaKDB86tcJ6M0JYXo84yplBEf7rnfb7
+Femerm28PGQ87hw1Bi3JSKocXVgO6TTEGieOeezcp6pPy4HmLonALsROenF9bXhy
+Z3bJAJAE+/1c15i42dSmTbkeV2l/8z740mI+uM9lKUYgxksZWscqcH2i+VptPRQl
+z+K8dCYFlO2GGOqTpTjVoB/2p5hx4zJzM/NVMekwtgNnEIpUYKer4bleL3KO1LYM
+RvwFQeEO9N6Qiq/X5/UzDMLZAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0P
+BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCiItTdQ//9XlRauj5j9kMIbXngKV2k
+5ND9im2rhWFMIoyOJ95dmoeY9bzqFMLm/3S0JygnUKWk9TiDTxrJkNDm7eBM6F3z
+0d6062k90qpY2dVdeEdab3whOkqJXFNnnUH2ey44yqmmpGe6751b5eA7obiIP8F8
+mqN3Mh+6axlzY1W/Fi/qC/PtCzIMr8tGcgeWo9YfwjQ2GpEnYdw3iVct1pepGgUr
+X4J5lRrdQlneOixnf5fp2jxi0E6bmOqW03LcNXlnM1lhAjlQxTOvMPg762ZyT8Ir
+rr+EBceAzKZFZSyRr0mgQzeMjCQMWIeTMocHRGE0pXvswBSoM3OKuZ/5
 -----END CERTIFICATE-----
diff --git a/var/rabbitmq_certificates/cert.pem b/var/rabbitmq_certificates/cert.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
 MIIC5TCCAc2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDDAhNeVRl
-c3RDQTAeFw0xNzEwMzAxMTQ2NDhaFw0xODEwMzAxMTQ2NDhaMCgxFTATBgNVBAMM
-DDIxZWViZWZmMTkwMDEPMA0GA1UECgwGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArhfeHBC++s1rHiaLfqTSZKFkFMjOwqKElf01hMDQQf50
-nvg5kNifkl0ov9qC8yIPyyUPfrHNalz3uCfjnuRtad88EK/N4SD+xgFJqp8AykO+
-hRDkjCyE+ujt4hXNwrQawRxdntsXrvMacSrkFJ5Yx+l9a9tJ6f4qrEeeWc6UeosY
-EVdN+id18Zf/MPOMyIVAB201clcsOqBCVZ5tscYngELCu6DqZegUWGqMgv6CBAlY
-+enZpM8FWt2AYCajn2Lsyi/p+ob71YY3GwSox8AS0O/7sLYvAiWwsg34xPwZq79N
-dgJrwak8wJiRXZHSbPyPO8xeBP6NOBr3Nsgnj5qqkQIDAQABoy8wLTAJBgNVHRME
+c3RDQTAeFw0xNzExMDExMzE1NDBaFw0xODExMDExMzE1NDBaMCgxFTATBgNVBAMM
+DGNiNzA0YmRhYWZjNjEPMA0GA1UECgwGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAxLvg5RmUO3Ws+9D0Xh1l0k5Hg30jUWcyV4nCX2wJgxz5
+mjApsEYqSytE3Sr63Otl+yUugoL8gPdO7eWslWJycIWKFEWOmE7G3V89kjAd/sNP
+U6Wo2j4T9pCRLogOuq54SPEEdn2HGPr+JaUYRvdsXZmLy6Wa1dnx3UemxKirKpmo
+uxkqTfycZFKq8RQsOrMqMtZFExgN++ylNMDcl7rYG3cYduKN9uBq5Fwcl5oan76f
+NvTnW++bolSOVa6wKTfPt9a+XcsAxx+XSrWx17HaegrTFMizFxTWOwqfNVCTmJkD
+rI4GYoat1ymHlb5v0MQRaMSWi+USLmrKIEUqXbwHJwIDAQABoy8wLTAJBgNVHRME
 AjAAMAsGA1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQsFAAOCAQEABGCF+pODR7HL5jUWzkgeKJ5ytG3ZraCWb3kF3Xv5b3SKR2N5jJSK
-A/6wfLMyvHGCdAmJXVg/AEmq2fIvBG3Wn1Mlc4xyZjQEWBbHHz2EyreacVZAhrru
-gWhwtu/Z3efm9OcITCebwBHGXAYg/6XzMDrPQcaUL+62Xsq4fbh5UzN0vwDkFV55
-xZWAlQe/Mb+7aKDpzyF7Nka/if3I8ukQBbTmFw16JHV9wPGnJ3KzXv2Z6uf5hVQg
-MjYEBqJZnA/E6KpCfIv8jjubzk380SVfX2gONtvEfyKLpm8vT4ZmzV6jrrrwUwSq
-EI1T9q/tokHywEWB+aM83KXcUNkaosg3WA==
+AQsFAAOCAQEAhudxAnKUKXzlO2AvNYR561T9u1jTtIirInbMGPH4oVqcRyC47PeX
+vrURQg5d1VOw4Sb1Ul+sM4ur4PLt990TsOt3NZiuEeam37Ra3oyxu+9XVobxOGnV
+a/6mozFZGRcOzsbdX46DZtAl5NVJm5M1nHPNg1KqGZF+AVwTOPvPMWpn+IzckEHD
+N/4jxM6FCzc5QRQKkyEOTQz848V0HDlXB9KSwgSIQ8yUXv2ozMeqxq6J+oXpzhb9
+wT2YUIGr9thoB7CwWjnFgG7MEXQ3wk1L1SzRz57a3r+rBIMHBNEkakAoq9VmzKLA
+y6xpRqt0+CnvmQ9OIdY4jxUMVXxcQGjUnw==
 -----END CERTIFICATE-----
diff --git a/var/rabbitmq_certificates/key.pem b/var/rabbitmq_certificates/key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/var/rabbitmq_certificates/req.pem b/var/rabbitmq_certificates/req.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICbTCCAVUCAQAwKDEVMBMGA1UEAwwMMjZlZDE0OGIwZjE2MQ8wDQYDVQQKDAZj
-bGllbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI7GiCTS8V2GLd
-tZPmVmVVocVVGmaES5gc17/qft7z+/zv/2hCR0Dd3V2hpyH6fa4Y8nabC1nuMgO1
-XwGiGaPPTXX/djgSzPNneTZNSxMoxCXtIsxe5TNOdLPTzE9RSXQofplhcAt/jJx/
-wNHFFJy9oGOiiwEWNsccIcxS08kr8r3IYF7l22wTiWpxn7OahTQrH25/z/RTLDk+
-WsxfWYNApF8p3mM2V6ueBGS07TPLej4HDZzjG+ST/nCAIQLTW86DdnDTPc0Dcp7M
-ymoQwyKDRDPX0eSZ1mM5FPBR+sLm/fl2IWtek2VVu79PXaQsvAt+/y29VPTpP171
-m9LRnEhXAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAsrf3RYCxNQj7SgHJ8uC5
-H6ZWftjigtxysVX85Il9ox7I+zQtdSKZ834T9wyG+L9l870I7bM5DmjZn7uocoio
-xFo/zALdGJ/IU5br/FgtoQjRkKi+PdGB8023Ab3R2Azsf/0BccduFR5TfD18oIKo
-XGtwdLIpsfmeTWfHBN81HOXWkiRCT0IQXApIjl6H0mSKae9qOkEaL9b9iL6YaPyg
-PUroYPqJqfnJDnoSRkWhHAe/uuTRD1xUWbVZc1QQ9FzdQa83uMGRRF2Yl2TX4qS5
-UpLbwLMsjFg0uBdCMwLeHVXSVC6ozJR5IpDfhEgLvSdGx39ZCiZldRfWNz12yllI
-1g==
+MIICbTCCAVUCAQAwKDEVMBMGA1UEAwwMY2I3MDRiZGFhZmM2MQ8wDQYDVQQKDAZj
+bGllbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEu+DlGZQ7daz7
+0PReHWXSTkeDfSNRZzJXicJfbAmDHPmaMCmwRipLK0TdKvrc62X7JS6CgvyA907t
+5ayVYnJwhYoURY6YTsbdXz2SMB3+w09TpajaPhP2kJEuiA66rnhI8QR2fYcY+v4l
+pRhG92xdmYvLpZrV2fHdR6bEqKsqmai7GSpN/JxkUqrxFCw6syoy1kUTGA377KU0
+wNyXutgbdxh24o324GrkXByXmhqfvp829Odb75uiVI5VrrApN8+31r5dywDHH5dK
+tbHXsdp6CtMUyLMXFNY7Cp81UJOYmQOsjgZihq3XKYeVvm/QxBFoxJaL5RIuasog
+RSpdvAcnAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAEKbGFeikT3sY2TiC+CbS
+dXoABRRoXrqNk1nj1UF5owRWQPWr38rXANyg6GJwbyoWMjthWyPNLL5ElpxkEMg+
+9g4jXLHzmLRrgnJM0yHP6d6/QocKpGgonJdAwsZ51CZ9nEt8F4pkCG99e+wHduta
+TZireNCA71MG+AzmctgQAFINjQpJRC9YxlIPzRGXZFambL7FosxMwzSsFZ25hnC+
+T2QE59nC3t/8y+cdv7quG4vULI8JQAvVtm1PzKam92/R4/jg36PIm+JOK/Aqgrr4
+/2Kngj4HpurJZI34U0Pym2ZVe7PWtfyt0XqM1t95U08Nfgt4B9NLoub+1Ez+8QIN
+TA==
 -----END CERTIFICATE REQUEST-----

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "enqueue/dev-message-queue",`
	`2`	`+ "name": "enqueue/enqueue-dev",`
`3`	`3`	`"type": "project",`
`4`	`4`	`"minimum-stability": "stable",`
`5`	`5`	`"require": {`