Skip to content

Commit 7d7eb5f

Browse files
mikaelcommikaelcom
committed
Merge branch 'feature/mandevilla' into develop
Conflicts: CHANGELOG.md
2 parents 2c49932 + f1d4f7e commit 7d7eb5f

9 files changed

+496
-137
lines changed

‎.editorconfig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# For more information about the properties used in
2+
# this file, please see the EditorConfig documentation:
3+
# http://editorconfig.org/
4+
5+
root = true
6+
7+
[*]
8+
end_of_line = lf
9+
10+
[*.php]
11+
indent_style = space
12+
indent_size = 4

‎AbstractSoapClientBase.php‎

Lines changed: 3 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -2,136 +2,8 @@
22

33
namespace WsdlToPhp\PackageBase;
44

5-
abstract class AbstractSoapClientBase
5+
abstract class AbstractSoapClientBase implements SoapClientInterface
66
{
7-
/**
8-
* @var string
9-
*/
10-
const DEFAULT_SOAP_CLIENT_CLASS = '\SoapClient';
11-
/**
12-
* @var string
13-
*/
14-
const OPTION_PREFIX = 'wsdl_';
15-
/**
16-
* Option key to define WSDL url
17-
* @var string
18-
*/
19-
const WSDL_URL = 'wsdl_url';
20-
/**
21-
* Option key to define WSDL classmap
22-
* @var string
23-
*/
24-
const WSDL_CLASSMAP = 'wsdl_classmap';
25-
/**
26-
* Option key to define WSDL login
27-
* @var string
28-
*/
29-
const WSDL_LOGIN = 'wsdl_login';
30-
/**
31-
* Option key to define WSDL password
32-
* @var string
33-
*/
34-
const WSDL_PASSWORD = 'wsdl_password';
35-
/**
36-
* Option key to define WSDL trace option
37-
* @var string
38-
*/
39-
const WSDL_TRACE = 'wsdl_trace';
40-
/**
41-
* Option key to define WSDL exceptions
42-
* @var string
43-
*/
44-
const WSDL_EXCEPTIONS = 'wsdl_exceptions';
45-
/**
46-
* Option key to define WSDL cache_wsdl
47-
* @var string
48-
*/
49-
const WSDL_CACHE_WSDL = 'wsdl_cache_wsdl';
50-
/**
51-
* Option key to define WSDL stream_context
52-
* @var string
53-
*/
54-
const WSDL_STREAM_CONTEXT = 'wsdl_stream_context';
55-
/**
56-
* Option key to define WSDL soap_version
57-
* @var string
58-
*/
59-
const WSDL_SOAP_VERSION = 'wsdl_soap_version';
60-
/**
61-
* Option key to define WSDL compression
62-
* @var string
63-
*/
64-
const WSDL_COMPRESSION = 'wsdl_compression';
65-
/**
66-
* Option key to define WSDL encoding
67-
* @var string
68-
*/
69-
const WSDL_ENCODING = 'wsdl_encoding';
70-
/**
71-
* Option key to define WSDL connection_timeout
72-
* @var string
73-
*/
74-
const WSDL_CONNECTION_TIMEOUT = 'wsdl_connection_timeout';
75-
/**
76-
* Option key to define WSDL typemap
77-
* @var string
78-
*/
79-
const WSDL_TYPEMAP = 'wsdl_typemap';
80-
/**
81-
* Option key to define WSDL user_agent
82-
* @var string
83-
*/
84-
const WSDL_USER_AGENT = 'wsdl_user_agent';
85-
/**
86-
* Option key to define WSDL features
87-
* @var string
88-
*/
89-
const WSDL_FEATURES = 'wsdl_features';
90-
/**
91-
* Option key to define WSDL keep_alive
92-
* @var string
93-
*/
94-
const WSDL_KEEP_ALIVE = 'wsdl_keep_alive';
95-
/**
96-
* Option key to define WSDL proxy_host
97-
* @var string
98-
*/
99-
const WSDL_PROXY_HOST = 'wsdl_proxy_host';
100-
/**
101-
* Option key to define WSDL proxy_port
102-
* @var string
103-
*/
104-
const WSDL_PROXY_PORT = 'wsdl_proxy_port';
105-
/**
106-
* Option key to define WSDL proxy_login
107-
* @var string
108-
*/
109-
const WSDL_PROXY_LOGIN = 'wsdl_proxy_login';
110-
/**
111-
* Option key to define WSDL proxy_password
112-
* @var string
113-
*/
114-
const WSDL_PROXY_PASSWORD = 'wsdl_proxy_password';
115-
/**
116-
* Option key to define WSDL local_cert
117-
* @var string
118-
*/
119-
const WSDL_LOCAL_CERT = 'wsdl_local_cert';
120-
/**
121-
* Option key to define WSDL passphrase
122-
* @var string
123-
*/
124-
const WSDL_PASSPHRASE = 'wsdl_passphrase';
125-
/**
126-
* Option key to define WSDL authentication
127-
* @var string
128-
*/
129-
const WSDL_AUTHENTICATION = 'wsdl_authentication';
130-
/**
131-
* Option key to define WSDL ssl_method
132-
* @var string
133-
*/
134-
const WSDL_SSL_METHOD = 'wsdl_ssl_method';
1357
/**
1368
* Soapclient called to communicate with the actual SOAP Service
1379
* @var \SoapClient
@@ -527,7 +399,7 @@ private function setLastError($lastError)
527399
* @param \SoapFault $soapFault l'objet de l'erreur
528400
* @return AbstractSoapClientBase
529401
*/
530-
protected function saveLastError($methoName, \SoapFault $soapFault)
402+
public function saveLastError($methoName, \SoapFault $soapFault)
531403
{
532404
$this->lastError[$methoName] = $soapFault;
533405
return $this;
@@ -554,7 +426,7 @@ public function getResult()
554426
* @param mixed $result
555427
* @return AbstractSoapClientBase
556428
*/
557-
protected function setResult($result)
429+
public function setResult($result)
558430
{
559431
$this->result = $result;
560432
return $this;

‎AbstractStructArrayBase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace WsdlToPhp\PackageBase;
44

5-
abstract class AbstractStructArrayBase extends AbstractStructBase implements \ArrayAccess, \Iterator, \Countable
5+
abstract class AbstractStructArrayBase extends AbstractStructBase implements StructArrayInterface
66
{
77
/**
88
* Array that contains values when only one parameter is set when calling __construct method

‎AbstractStructBase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace WsdlToPhp\PackageBase;
44

5-
abstract class AbstractStructBase
5+
abstract class AbstractStructBase implements StructInterface
66
{
77
/**
88
* Generic method called when an object has been exported with var_export() functions

‎CHANGELOG.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
CHANGELOG
22
=========
33

4+
WIP
5+
---
6+
- Update Readme
7+
- Define interfaces that must be used as interfaces in order to be able to define a usable top class for any generated ServiceType/StructType/ArrayType class by the [PackageGenerator](https://github.com/WsdlToPhp/PackageGenerator)
8+
49
0.0.3
510
-----
6-
Update dependency badge
11+
- Update dependency badge
712

813
0.0.2
914
-----
10-
Use top level namespace for SoapHeader class
15+
- use top level namespace for SoapHeader class
1116

1217
0.0.1
1318
-----
14-
Initial version
19+
- Initial version

0 commit comments

Comments
 (0)