Sap::getAttributes() throws exception when not connected

Author: jsoumelidis

classes/Sap.php

@@ -93,6 +93,8 @@ public function getFunctionClass(): string
      * Get connection attributes
      *
      * @return array
+     *
+     * @throws SapConnectionException if no connection is available
      */
     public function getAttributes(): array
     {

php_sap.c

@@ -2266,7 +2266,8 @@ PHP_METHOD(Sap, getAttributes)
     int utf8len;
 
     if (NULL == intern->connection) {
-        zend_error_noreturn(E_ERROR, "No active connection found");
+        zend_throw_exception(sap_ce_SapConnectionException, PHP_SAP_NO_CONNECTION, -1);
+        return;
     }
 
     if (RFC_OK != RfcGetConnectionAttributes(intern->connection->handle, &attributes, (RFC_ERROR_INFO*)&err))

tests/sap_Sap___construct_basic.phpt

@@ -13,11 +13,26 @@ if (!$config) {
 /** test constructor no arguments */
 $s = new Sap();
 
+/** test connect() is not called */
+try { $s->getAttributes(); }
+catch (SapConnectionException $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
 /** test constructor passing null as logon parameters is ok */
 $s = new Sap(null);
 
+/** test connect() is not called */
+try { $s->getAttributes(); }
+catch (SapConnectionException $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+
 $config = include 'config.inc';
 
+/** test can connect */
 $s = new Sap($config);
 ?>
---EXPECT--
+--EXPECT--
+There is no connection to a SAP R/3 system
+There is no connection to a SAP R/3 system

tests/sap_Sap_getAttributes_error.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Sap::getAttributes error behavior
+--FILE--
+<?php
+$s = new Sap();
+
+try { $s->getAttributes(); }
+catch (SapConnectionException $e) {
+	echo $e->getMessage(), PHP_EOL;
+}
+?>
+--EXPECT--
+There is no connection to a SAP R/3 system