Merge pull request #29 from stefanak-michal/phpunit

Phpunit

Author: stefanak-michal

.gitignore

@@ -1,2 +1,3 @@
 .idea/
-
+.vscode/
+phpunit*.phar

composer.json

@@ -12,6 +12,9 @@
         "ext-sockets": "*",
         "ext-mbstring": "*"
     },
+    "require-dev": {
+        "phpunit/phpunit": ">=7.5.0"
+    },
     "support": {
         "issues": "https://github.com/stefanak-michal/Bolt/issues",
         "source": "https://github.com/stefanak-michal/Bolt"
@@ -30,7 +33,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Bolt\\": "/"
+            "Bolt\\": "src/"
         }
     }
 }

index.php

@@ -8,7 +8,7 @@
  * @link https://github.com/stefanak-michal/Bolt
  */
 
-require_once 'autoload.php';
+require_once 'src' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 set_time_limit(3);
 

phpunit.xml

@@ -0,0 +1,19 @@
+<phpunit bootstrap="src/autoload.php">
+    <testsuites>
+        <testsuite name="Bolt">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <var name="NEO_USER" value="neo4j"/>
+        <var name="NEO_PASS" value="nothing"/>
+    </php>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">connection</directory>
+            <directory suffix=".php">PackStream</directory>
+            <directory suffix=".php">protocol</directory>
+            <file>Bolt.php</file>
+        </whitelist>
+    </filter>
+</phpunit>

Bolt.php renamed to src/Bolt.php

@@ -5,6 +5,7 @@
 use Exception;
 use Bolt\PackStream\{IPacker, IUnpacker};
 use Bolt\protocol\AProtocol;
+use Bolt\connection\IConnection;
 
 /**
  * Main class Bolt
@@ -32,9 +33,9 @@ final class Bolt
     private $protocol;
 
     /**
-     * @var Socket
+     * @var IConnection
      */
-    private $socket;
+    private $connection;
 
     /**
      * @var array
@@ -77,7 +78,7 @@ final class Bolt
      */
     public function __construct(string $ip = '127.0.0.1', int $port = 7687, int $timeout = 15)
     {
-        $this->socket = new Socket($ip, $port, $timeout);
+        $this->connection = new \Bolt\connection\Socket($ip, $port, $timeout);
 
         $packerClass = "\\Bolt\\PackStream\\v" . $this->packStreamVersion . "\\Packer";
         if (!class_exists($packerClass)) {
@@ -142,8 +143,8 @@ private function handshake(): bool
         if (self::$debug)
             echo 'HANDSHAKE';
 
-        $this->socket->write(chr(0x60) . chr(0x60) . chr(0xb0) . chr(0x17));
-        $this->socket->write($this->packProtocolVersions());
+        $this->connection->write(chr(0x60) . chr(0x60) . chr(0xb0) . chr(0x17));
+        $this->connection->write($this->packProtocolVersions());
 
         $this->unpackProtocolVersion();
         if (empty($this->version)) {
@@ -155,7 +156,7 @@ private function handshake(): bool
         if (!class_exists($protocolClass)) {
             Bolt::error('Requested Protocol version (' . $this->version . ') not yet implemented');
         } else {
-            $this->protocol = new $protocolClass($this->packer, $this->unpacker, $this->socket);
+            $this->protocol = new $protocolClass($this->packer, $this->unpacker, $this->connection);
         }
 
         return $this->protocol instanceof AProtocol;
@@ -168,7 +169,7 @@ private function unpackProtocolVersion()
     {
         $result = [];
 
-        foreach (str_split($this->socket->read(4)) as $ch)
+        foreach (str_split($this->connection->read(4)) as $ch)
             $result[] = unpack('C', $ch)[1] ?? 0;
 
         $result = array_filter($result);
@@ -218,6 +219,9 @@ private function packProtocolVersions(): string
      */
     public function init(string $name, string $user, string $password, array $routing = null): bool
     {
+        if (!$this->connection->connect())
+            return false;
+
         if (!$this->handshake())
             return false;
 
@@ -397,6 +401,8 @@ public function __destruct()
                 echo 'GOODBYE';
             $this->protocol->goodbye();
         }
+
+        $this->connection->disconnect();
     }
 
 }

PackStream/IPacker.php renamed to src/PackStream/IPacker.php

@@ -5,14 +5,16 @@
 spl_autoload_register(function ($name) {
     $parts = explode("\\", $name);
     $parts = array_filter($parts);
-	array_shift($parts);
+    if ($parts[0] != 'Bolt')
+        return;
+    array_shift($parts);
 
     /*
      * namespace calls
      */
 
     //compose standart namespaced path to file
-    $path = '.' . DS . implode(DS, $parts) . '.php';
+    $path = __DIR__ . DS . implode(DS, $parts) . '.php';
     if (file_exists($path)) {
         require_once $path;
         return;