Merge pull request #17 from Mizzrym/issue-15

issue-15

composer.json

@@ -17,6 +17,11 @@
       "name": "Uni-tel",
       "homepage": "https://github.com/Uni-tel",
       "role": "Developer"
+    },
+    {
+      "name": "geoffroya",
+      "homepage": "https://github.com/geoffroya",
+      "role": "Developer"
     }
   ],
   "require": {

src/SendNsca.php

@@ -64,7 +64,7 @@ class SendNsca implements NagiosCodes {
 	 * @param string $connectionString Examples: 127.0.0.1, localhost:5667, some.server.local:5555, nagios.local
 	 * @param null|EncryptorInterface $encryptor (optional) Class to encrypt the package with
 	 */
-	public function __construct(string $connectionString, EncryptorInterface $encryptor = null) {
+	public function __construct(string $connectionString, EncryptorInterface $encryptor) {
 		if (strpos($connectionString, ':')) {
 			$connect = explode(':', $connectionString);
 			$this->hostname = $connect[0];
@@ -121,8 +121,7 @@ public function sendHostCheck(string $host, int $returncode, string $message = n
 	 * @param string $message Message (optional).
 	 * @return bool
 	 */
-	public function send(string $host, string $service, int $returncode, string $message = null): bool {
-		$message = $message ?? '';
+	public function send(string $host, string $service, int $returncode, string $message = ''): bool {
 		try {
 			if ($this->hostname === null) {
 				throw new Exception('No hostname for NSCA daemon given, don\'t know where to connect to - class not properly initialized');
@@ -166,11 +165,7 @@ public function send(string $host, string $service, int $returncode, string $mes
 			$crcPacket = pack('nxxxxxxNna64a128a512xx', 3, $timestamp, $returncode, $host, $service, $message);
 			$crc = crc32($crcPacket);
 			$packet = pack('nxxNNna64a128a512xx', 3, $crc, $timestamp, $returncode, $host, $service, $message);
-
-			// encrypt
-			if ($this->encryptor) {
-				$packet = $this->encryptor->encryptPacket($packet, $iv);
-			}
+			$packet = $this->encryptor->encryptPacket($packet, $iv);
 
 			// send it
 			fflush($connection);

src/SendNscaFactory.php

@@ -2,6 +2,7 @@
 
 namespace PhpSendNsca;
 
+use PhpSendNsca\encryptors\NullEncryptor;
 use PhpSendNsca\interfaces\Ciphers;
 use PhpSendNsca\encryptors\XorEncryptor;
 use PhpSendNsca\encryptors\LegacyEncryptor;
@@ -31,16 +32,14 @@ class SendNscaFactory implements Ciphers {
 	 * @return SendNsca
      * @throws \Exception
      */
-    public function getSendNsca(string $connectionString, int $encryptionCipher = null, string $encryptionPassword = null): SendNsca {
-        $password = $encryptionPassword ?? '';
-        $cipher = $encryptionCipher ?? Ciphers::ENCRYPT_NONE;
-        $key = md5($connectionString . ':' . $cipher . ':' . $password);
+    public function getSendNsca(string $connectionString, int $encryptionCipher = Ciphers::ENCRYPT_NONE, string $encryptionPassword = ''): SendNsca {
+        $key = md5($connectionString . ':' . $encryptionCipher . ':' . $encryptionPassword);
         if (false === isset(static::$instances[$key])) {
-            static::$instances[$key] = new SendNsca($connectionString, $this->getEncryptor($cipher, $password));
+            static::$instances[$key] = new SendNsca($connectionString, $this->getEncryptor($encryptionCipher, $encryptionPassword));
         }
         return static::$instances[$key];
     }
-	
+    
 	/**
 	 * Tries to figure out correct encryptor for a given cipher
 	 *
@@ -49,17 +48,17 @@ public function getSendNsca(string $connectionString, int $encryptionCipher = nu
 	 * @return EncryptorInterface
 	 * @throws \Exception
 	 */
-    protected function getEncryptor(int $cipher, string $password): ?EncryptorInterface {
+    protected function getEncryptor(int $cipher, string $password): EncryptorInterface {
 		try {
 			if ($cipher === Ciphers::ENCRYPT_NONE) {
-				return null;
+				return new NullEncryptor(Ciphers::ENCRYPT_NONE, '');
 			}
 			if ($cipher === Ciphers::ENCRYPT_XOR) {
 				return $this->getXorEncryptor($cipher, $password);
 			}
             $encryptor = $this->getOpenSslEncryptor($cipher, $password);
         } catch (\Exception $exc) {
-            trigger_error('Falling back to legacy encryption, openssl failed: ' . $exc->getMessage(), \E_DEPRECATED);
+            trigger_error('Falling back to legacy encryption, openssl failed: ' . $exc->getMessage(), E_USER_DEPRECATED);
             $encryptor = $this->getLegacyEncryptor($cipher, $password);
         }
         return $encryptor;

src/encryptors/NullEncryptor.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace PhpSendNsca\encryptors;
+
+use PhpSendNsca\interfaces\EncryptorInterface;
+
+/**
+ * Doesn't really encrypt.
+ * Is needed so typehints work with PHP 7.0, where nullable typehints aren't available
+ */
+class NullEncryptor implements EncryptorInterface
+{
+    public function __construct(int $encryptionCipher, string $password)
+    {
+    }
+
+    public function encryptPacket(string $packet, string $initialisationVector): string
+    {
+        return $packet;
+    }
+
+    public function getSupportedEncryptionCiphers(): array
+    {
+        return [ self::ENCRYPT_NONE ];
+    }
+
+    public function isEncryptionCipherSupported(int $encryptionCipher): bool
+    {
+        return $encryptionCipher === self::ENCRYPT_NONE;
+    }
+
+}