prepare new release, simplify code because phpstan/phpstan-src#148 wa…

…s merged

CHANGELOG.md

@@ -9,6 +9,42 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 
+## [2.6.0] - 2020-04-01
+
+### Added
+
+- Added PsrLogExceptionTransport
+
+### Changed
+
+- Upgraded PHPStan to version 0.12, various fixes 
+
+### Fixed
+
+- Fix space showing up in subject words due message folding (#66)
+
+
+## [2.5.7] - 2020-03-13
+
+### Fixed
+
+- Supports streams for FilesystemQueue.
+
+
+## [2.5.6] - 2019-12-12
+
+### Fixed
+
+- Fixes address containing quotes on the folded line
+
+
+## [2.5.5] - 2019-12-12
+
+### Fixed
+
+- Fix header value parsing, should remove line separations
+
+
 ## [2.5.4] - 2019-02-18
 
 ### Fixed

composer.json

@@ -8,7 +8,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^8.0",
-        "phpstan/phpstan": "^0.12.11",
+        "phpstan/phpstan": "^0.12.12",
         "phpstan/phpstan-phpunit": "^0.12.6",
         "friendsofphp/php-cs-fixer": "^2.9",
         "predis/predis": "^1.0",

src/Protocol/PlainTcpConnection.php

@@ -42,15 +42,9 @@ public function __construct(string $host, int $port, float $connectionTimeout =
      */
     public function upgrade(int $type): void
     {
-        if ($this->resource === null) {
+        if ($this->resource === null || \stream_socket_enable_crypto($this->resource, true, $type) === false) {
             throw new \InvalidArgumentException('Cannot upgrade connection, resource not available');
         }
-
-        /** @var int|bool $result */
-        $result = \stream_socket_enable_crypto($this->resource, true, $type);
-        if ($result === false) {
-            throw new \InvalidArgumentException('Cannot upgrade connection to requested encryption type');
-        }
     }
 
     public function connect(): void

src/Protocol/PlainTcpConnectionListener.php

@@ -71,15 +71,9 @@ public function connect(): void
              */
                 public function upgrade(int $type): void
                 {
-                    if ($this->resource === null) {
+                    if ($this->resource === null || \stream_socket_enable_crypto($this->resource, true, $type) === false) {
                         throw new \InvalidArgumentException('Cannot upgrade connection, resource not available');
                     }
-
-                    /** @var int|bool $result */
-                    $result = \stream_socket_enable_crypto($this->resource, true, $type);
-                    if ($result === false) {
-                        throw new \InvalidArgumentException('Cannot upgrade connection to requested encryption type');
-                    }
                 }
             };
         }