remove connection pool

Author: gregor-j

exceptions/ConnectionNotFoundException.php

@@ -25,6 +25,11 @@
  */
 abstract class AbstractRemoteFunctionCall implements IFunction
 {
+    /**
+     * @var \phpsap\interfaces\IConnection
+     */
+    protected $connection;
+
     /**
      * @var string The connection ID of the current SAP remote connection.
      */
@@ -42,13 +47,7 @@ abstract class AbstractRemoteFunctionCall implements IFunction
     public function __construct(IConfig $config)
     {
         //create a new instance of the connection without actually connecting
-        $connection = $this->createConnectionInstance($config);
-        //determine the connection ID of the connection
-        $this->connectionId = $connection->getId();
-        //add the connection to the pool in case it doesn't exist there yet
-        if (!ConnectionPool::has($this->connectionId)) {
-            ConnectionPool::add($this->connectionId, $connection);
-        }
+        $this->connection = $this->createConnectionInstance($config);
     }
 
     /**
@@ -100,9 +99,7 @@ public function invoke($params = null)
     protected function getFunction()
     {
         if ($this->function === null) {
-            //now connect and prepare the function
-            $this->function = ConnectionPool::get($this->connectionId)
-                ->prepareFunction($this->getName());
+            $this->function = $this->connection->prepareFunction($this->getName());
         }
         return $this->function;
     }

src/AbstractRemoteFunctionCall.php

@@ -15,11 +15,8 @@
 use kbATeam\TypeCast\TypeCastValue;
 use phpsap\classes\AbstractFunction;
 use phpsap\classes\AbstractRemoteFunctionCall;
-use phpsap\classes\ConnectionPool;
-use phpsap\exceptions\ConnectionNotFoundException;
 use phpsap\interfaces\IFunction;
 use tests\phpsap\classes\helper\ConfigA;
-use tests\phpsap\classes\helper\Connection;
 use tests\phpsap\classes\helper\RemoteFunction;
 use tests\phpsap\classes\helper\RemoteFunctionCall;
 
@@ -59,38 +56,6 @@ public function testGetFunction()
         static::assertSame('awvovkms', $function->getName());
     }
 
-    /**
-     * Test using the same connection config twice which should create only one
-     * connection.
-     */
-    public function testDuplicateConnectionInPool()
-    {
-        /**
-         * Create a connection from a config and add it to the connection pool.
-         */
-        $config = new ConfigA();
-        $connection = new Connection($config);
-        ConnectionPool::add($connection->getId(), $connection);
-        /**
-         * Create a new RFC from the same config, which should add the same
-         * connection ID to the pool.
-         */
-        $rfc = new RemoteFunctionCall($config);
-        /**
-         * Now remove the connection ID we created and see if the rfc runs into an
-         * exception.
-         */
-        ConnectionPool::remove($connection->getId());
-        $this->setExpectedException(
-            ConnectionNotFoundException::class,
-            sprintf(
-                'Connection ID \'%s\' does not exist.',
-                $connection->getId()
-            )
-        );
-        $rfc->getFunction();
-    }
-
     /**
      * Test setting a parameter.
      */