@@ -35,7 +35,7 @@ |
||
35 | 35 | // If there is an override for this class, rename the base name to |
36 | 36 | // match. |
37 | 37 | $classname = $basename = basename($file, '.php'); |
38 | - if (isset($overrides["$namespace\\\\$basename"])) { |
|
38 | + if (isset($overrides["$namespace\\\\$basename"])) { |
|
39 | 39 | $basename = $overrides["$namespace\\\\$basename"]; |
40 | 40 | } |
41 | 41 |
@@ -292,7 +292,7 @@ |
||
292 | 292 | * Parse the hex ServerVersion value and return a valid |
293 | 293 | * Client::VERSION_* constant. |
294 | 294 | * |
295 | - * @return string|boolean A known version constant, or FALSE if it could not |
|
295 | + * @return string|false A known version constant, or FALSE if it could not |
|
296 | 296 | * be determined. |
297 | 297 | * |
298 | 298 | * @link http://msdn.microsoft.com/en-us/library/bb204122(v=exchg.140).aspx |
@@ -260,23 +260,23 @@ |
||
260 | 260 | $result = $this->trySRVRecord(); |
261 | 261 | } |
262 | 262 | |
263 | - if ($result === false and is_array($this->redirect) && array_key_exists('redirectAddr', $this->redirect)) { |
|
264 | - // redirect was found. Try again with the new address |
|
265 | - $this->email = $this->redirect['redirectAddr']; |
|
266 | - $this->username = $this->redirect['redirectAddr']; |
|
267 | - $this->setTLD(); |
|
268 | - $result = $this->discover(); |
|
269 | - } |
|
270 | - |
|
271 | - if ($result === false and is_array($this->redirect) && array_key_exists('redirectUrl', $this->redirect)) { |
|
272 | - // redirect was found. Try again with the new URL |
|
273 | - // https://stackoverflow.com/questions/27745/getting-parts-of-a-url-regex |
|
274 | - $regExp = "/^(.*:)//([A-Za-z0-9\-\.]+)(:[0-9]+)?(.*)$/"; |
|
275 | - if (preg_match($regExp, $this->redirect['redirectUrl'], $matches)) { |
|
276 | - $this->tld = $matches[2]; |
|
277 | - $result = $this->discover(); |
|
278 | - } |
|
279 | - } |
|
263 | + if ($result === false and is_array($this->redirect) && array_key_exists('redirectAddr', $this->redirect)) { |
|
264 | + // redirect was found. Try again with the new address |
|
265 | + $this->email = $this->redirect['redirectAddr']; |
|
266 | + $this->username = $this->redirect['redirectAddr']; |
|
267 | + $this->setTLD(); |
|
268 | + $result = $this->discover(); |
|
269 | + } |
|
270 | + |
|
271 | + if ($result === false and is_array($this->redirect) && array_key_exists('redirectUrl', $this->redirect)) { |
|
272 | + // redirect was found. Try again with the new URL |
|
273 | + // https://stackoverflow.com/questions/27745/getting-parts-of-a-url-regex |
|
274 | + $regExp = "/^(.*:)//([A-Za-z0-9\-\.]+)(:[0-9]+)?(.*)$/"; |
|
275 | + if (preg_match($regExp, $this->redirect['redirectUrl'], $matches)) { |
|
276 | + $this->tld = $matches[2]; |
|
277 | + $result = $this->discover(); |
|
278 | + } |
|
279 | + } |
|
280 | 280 | |
281 | 281 | if ($result === false) { |
282 | 282 | throw new \RuntimeException('Autodiscovery failed.'); |
@@ -126,13 +126,13 @@ discard block |
||
126 | 126 | public $PostalCode; |
127 | 127 | |
128 | 128 | /** |
129 | - * Represents the state of residence for a contact item. |
|
130 | - * |
|
131 | - * @since Exchange 2013 |
|
132 | - * |
|
133 | - * @var string |
|
134 | - */ |
|
135 | - public $State; |
|
129 | + * Represents the state of residence for a contact item. |
|
130 | + * |
|
131 | + * @since Exchange 2013 |
|
132 | + * |
|
133 | + * @var string |
|
134 | + */ |
|
135 | + public $State; |
|
136 | 136 | |
137 | 137 | /** |
138 | 138 | * Represents a street address for a contact item. |
@@ -144,13 +144,13 @@ discard block |
||
144 | 144 | public $Street; |
145 | 145 | |
146 | 146 | /** |
147 | - * Specifies the type of postal address or phone number. |
|
147 | + * Specifies the type of postal address or phone number. |
|
148 | 148 | * |
149 | 149 | * For example, "Home" or "Business". |
150 | - * |
|
151 | - * @since Exchange 2013 |
|
152 | - * |
|
153 | - * @var string |
|
154 | - */ |
|
155 | - public $Type; |
|
150 | + * |
|
151 | + * @since Exchange 2013 |
|
152 | + * |
|
153 | + * @var string |
|
154 | + */ |
|
155 | + public $Type; |
|
156 | 156 | } |
@@ -49,13 +49,13 @@ discard block |
||
49 | 49 | public $ParentFolderId; |
50 | 50 | |
51 | 51 | /** |
52 | - * Specifies the set of persona properties. |
|
52 | + * Specifies the set of persona properties. |
|
53 | 53 | * |
54 | - * @since Exchange 2013 |
|
55 | - * |
|
56 | - * @var \jamesiarmes\PhpEws\Type\PersonaResponseShapeType |
|
57 | - */ |
|
58 | - public $PersonaShape; |
|
54 | + * @since Exchange 2013 |
|
55 | + * |
|
56 | + * @var \jamesiarmes\PhpEws\Type\PersonaResponseShapeType |
|
57 | + */ |
|
58 | + public $PersonaShape; |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Specifies the source data for the query. |
@@ -76,13 +76,13 @@ discard block |
||
76 | 76 | public $QueryString; |
77 | 77 | |
78 | 78 | /** |
79 | - * Represents the restriction or query that is used to filter items. |
|
80 | - * |
|
81 | - * @since Exchange 2013 |
|
82 | - * |
|
83 | - * @var \jamesiarmes\PhpEws\Type\RestrictionType |
|
84 | - */ |
|
85 | - public $Restriction; |
|
79 | + * Represents the restriction or query that is used to filter items. |
|
80 | + * |
|
81 | + * @since Exchange 2013 |
|
82 | + * |
|
83 | + * @var \jamesiarmes\PhpEws\Type\RestrictionType |
|
84 | + */ |
|
85 | + public $Restriction; |
|
86 | 86 | |
87 | 87 | /** |
88 | 88 | * Internal use only. |
@@ -94,13 +94,13 @@ discard block |
||
94 | 94 | public $SearchPeopleSuggestionIndex; |
95 | 95 | |
96 | 96 | /** |
97 | - * Defines how items are sorted. |
|
98 | - * |
|
99 | - * @since Exchange 2013 |
|
100 | - * |
|
101 | - * @var \jamesiarmes\PhpEws\ArrayType\NonEmptyArrayOfFieldOrdersType |
|
102 | - */ |
|
103 | - public $SortOrder; |
|
97 | + * Defines how items are sorted. |
|
98 | + * |
|
99 | + * @since Exchange 2013 |
|
100 | + * |
|
101 | + * @var \jamesiarmes\PhpEws\ArrayType\NonEmptyArrayOfFieldOrdersType |
|
102 | + */ |
|
103 | + public $SortOrder; |
|
104 | 104 | |
105 | 105 | /** |
106 | 106 | * Specifies the query string for topic searches. |