diff --git a/composer.json b/composer.json index acc5b85c6259558664b6115a81b98c40b5a0b023..cfc89fd344fd23c2ac8c4de5990888a84116ea18 100755 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "adi-ia/cbs-techstore-client-php", "description": "A PHP client used to connect with the CBS API and perform requests", - "version": "5.0.4", + "version": "6.0.0", "license": "Apache-2.0", "homepage": "https://wiki.doit.wisc.edu/confluence/display/ADIIA/CBS", "authors": [ diff --git a/src/main/edu/wisc/services/cbs/api/SoapService.php b/src/main/edu/wisc/services/cbs/api/SoapService.php index 026f5fc1b01802256ab82fa0a46a0fa1b4fea93c..ba11f825bf263f0cc2d777406016fb220e421bb7 100644 --- a/src/main/edu/wisc/services/cbs/api/SoapService.php +++ b/src/main/edu/wisc/services/cbs/api/SoapService.php @@ -7,13 +7,6 @@ namespace edu\wisc\services\cbs\api; interface SoapService extends Service { - /** Paths to QA CBS WSDLs */ - const QA_HEADER = __DIR__ . '/../../../../../resources/doit_soa_order_iface_h_v2.xml'; - const QA_LINE = __DIR__ . '/../../../../../resources/doit_soa_order_iface_l_v2.xml'; - const QA_PAYMENT = __DIR__ . '/../../../../../resources/doit_soa_payment_v2.xml'; - const QA_INTERFACING = __DIR__ . '/../../../../../resources/doit_soa_order_iface_i_v2.xml'; - const QA_PRICE = __DIR__ . '/../../../../resources/doit_soa_pricing_v2.xml'; - /** * A SOAP service is constructed with a username and password. If a {@link \SoapClient} is provided, the username * and password are ignored. diff --git a/src/main/edu/wisc/services/cbs/order/header/SoapOrderHeaderService.php b/src/main/edu/wisc/services/cbs/order/header/SoapOrderHeaderService.php index 43430848ecddaf7d7332133ecc526e23c26b0b6c..67dfaf6ec37dce11b7f13e2f393f22e136bb87bd 100644 --- a/src/main/edu/wisc/services/cbs/order/header/SoapOrderHeaderService.php +++ b/src/main/edu/wisc/services/cbs/order/header/SoapOrderHeaderService.php @@ -14,6 +14,11 @@ use edu\wisc\services\cbs\order\OrderServiceResponse; class SoapOrderHeaderService implements OrderHeaderService, SoapService { + /** URL for QA WSDL */ + const CBQA12 = 'http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_order_iface_h_v2/?wsdl'; + /** URL for DV WSDL */ + const CBDV12 = 'http://pegasus.doit.wisc.edu:8016/webservices/SOAProvider/plsql/doit_soa_order_iface_h_v2/?wsdl'; + /** @var DOIT_SOA_ORDER_IFACE_H_V2_Service */ private $soapClient; diff --git a/src/main/edu/wisc/services/cbs/order/interfacing/SoapOrderInterfacingService.php b/src/main/edu/wisc/services/cbs/order/interfacing/SoapOrderInterfacingService.php index 45d736c238bb5fcd68793d801f9c7e970c612ddb..d0f4c60a4fe6fb8ba1d8f0b68225f6c226934cea 100644 --- a/src/main/edu/wisc/services/cbs/order/interfacing/SoapOrderInterfacingService.php +++ b/src/main/edu/wisc/services/cbs/order/interfacing/SoapOrderInterfacingService.php @@ -13,6 +13,11 @@ use edu\wisc\services\cbs\order\OrderServiceResponse; class SoapOrderInterfacingService implements OrderInterfacingService, SoapService { + /** URL for QA WSDL */ + const CBQA12 = 'http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_order_iface_i_v2/?wsdl'; + /** URL for DV WSDL */ + const CBDV12 = 'http://pegasus.doit.wisc.edu:8016/webservices/SOAProvider/plsql/doit_soa_order_iface_i_v2/?wsdl'; + /** @var DOIT_SOA_ORDER_IFACE_I_V2_Service */ private $soapClient; diff --git a/src/main/edu/wisc/services/cbs/order/line/SoapOrderLineService.php b/src/main/edu/wisc/services/cbs/order/line/SoapOrderLineService.php index d36789550666d7c84d9004b666a3a8a3976b9956..d9700ed88482c18c0f8b51fc820917e2bb072389 100644 --- a/src/main/edu/wisc/services/cbs/order/line/SoapOrderLineService.php +++ b/src/main/edu/wisc/services/cbs/order/line/SoapOrderLineService.php @@ -10,6 +10,11 @@ use edu\wisc\services\cbs\order\OrderServiceResponse; class SoapOrderLineService implements SoapService, OrderLineService { + /** URL for QA WSDL */ + const CBQA12 = 'http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_order_iface_l_v2/?wsdl'; + /** URL for DV WSDL */ + const CBDV12 = 'http://pegasus.doit.wisc.edu:8016/webservices/SOAProvider/plsql/doit_soa_order_iface_l_v2/?wsdl'; + /** @var DOIT_SOA_ORDER_IFACE_L_V2_Service */ private $soapClient; diff --git a/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php b/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php index 09564d3ae1cd3f3e4b31c247d8edc26b117462cf..a2f2795118d97df09176ce23d60bbc9b5a92a8bc 100644 --- a/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php +++ b/src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php @@ -15,6 +15,11 @@ use Money\Money; class SoapOrderPaymentService implements OrderPaymentService, SoapService { + /** URL for QA WSDL */ + const CBQA12 = 'http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_payment_v2/?wsdl'; + /** URL for DV WSDL */ + const CBDV12 = 'http://pegasus.doit.wisc.edu:8016/webservices/SOAProvider/plsql/doit_soa_payment_v2/?wsdl'; + /** @var DOIT_SOA_PAYMENT_V2_Service */ private $soapClient; diff --git a/src/main/edu/wisc/services/cbs/price/SoapPriceService.php b/src/main/edu/wisc/services/cbs/price/SoapPriceService.php index c78e519596bff12cbda6be85682be286e1c3dec2..bc62667466df36c546b76425fa0150ce3199a2b0 100644 --- a/src/main/edu/wisc/services/cbs/price/SoapPriceService.php +++ b/src/main/edu/wisc/services/cbs/price/SoapPriceService.php @@ -14,6 +14,11 @@ use Money\Money; class SoapPriceService implements PriceService, SoapService { + /** URL for QA WSLD */ + const CBQA12 = 'http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_pricing_v2/?wsdl'; + /** URL for DV WSDL */ + const CBDV12 = 'http://pegasus.doit.wisc.edu:8016/webservices/SOAProvider/plsql/doit_soa_pricing_v2/?wsdl'; + /** @var \SoapClient */ private $soapClient; diff --git a/src/main/edu/wisc/services/cbs/product/SoapProductService.php b/src/main/edu/wisc/services/cbs/product/SoapProductService.php index 6896569a9d57e31deb7490096509663fbaeae833..20f2a7b4aaedd3ab028a1384bba2df3e8cf0e2fb 100755 --- a/src/main/edu/wisc/services/cbs/product/SoapProductService.php +++ b/src/main/edu/wisc/services/cbs/product/SoapProductService.php @@ -14,6 +14,13 @@ use edu\wisc\services\cbs\product\update\generated\DOIT_SOA_ITEM_UPDATE_V4_Servi class SoapProductService implements ProductService { + /** URLS for QA WSDLs */ + const CBQA12_CREATE = 'http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_item_create_v4/?wsdl'; + const CBQA12_UPDATE = 'http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_item_update_v4/?wsdl'; + /** URLs for DV WSDLs */ + const CBDV12_CREATE = 'http://pegasus.doit.wisc.edu:8016/webservices/SOAProvider/plsql/doit_soa_item_create_v4/?wsdl'; + const CBDV12_UPDATE = 'http://pegasus.doit.wisc.edu:8016/webservices/SOAProvider/plsql/doit_soa_item_update_v4/?wsdl'; + /** @var DOIT_SOA_ITEM_CREATE_V4_Service */ private $productCreateSoapClient; diff --git a/src/test/edu/wisc/services/cbs/order/header/SoapOrderHeaderServiceIT.php b/src/test/edu/wisc/services/cbs/order/header/SoapOrderHeaderServiceIT.php index a0b428ec1ead8a70e5f0ef406a468e7fc7c8d9ae..fccdf4dee5e61b90fb23f7374cfd0135f4ffba5f 100644 --- a/src/test/edu/wisc/services/cbs/order/header/SoapOrderHeaderServiceIT.php +++ b/src/test/edu/wisc/services/cbs/order/header/SoapOrderHeaderServiceIT.php @@ -35,7 +35,7 @@ class SoapOrderHeaderServiceIT extends IntegrationTestCase $soapOrderHeaderService = new SoapOrderHeaderService( static::$itData['cbs.username'], static::$itData['cbs.password'], - SoapService::QA_HEADER + SoapOrderHeaderService::CBQA12 ); static::assertNotNull($soapOrderHeaderService); }