Merge pull request #214 from mentax/master

Php8 compatibility - Fix #213
Garethp · Sep 17, 2021 · 5141e1e · 5141e1e
2 parents fccadcf + 6effbe1
commit 5141e1e
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 8.0
 
 before_script:
   - chmod a+x ./.travis.sh

diff --git a/...endar/APITest.testDeleteCalendarItem.json → .../CalendarTest.testDeleteCalendarItem.json b/...endar/APITest.testDeleteCalendarItem.json → .../CalendarTest.testDeleteCalendarItem.json
diff --git a/...Calendar/APITest.testGetCalendarItem.json → ...dar/CalendarTest.testGetCalendarItem.json b/...Calendar/APITest.testGetCalendarItem.json → ...dar/CalendarTest.testGetCalendarItem.json
diff --git a/...alendar/APITest.testGetCalendarItems.json → ...ar/CalendarTest.testGetCalendarItems.json b/...alendar/APITest.testGetCalendarItems.json → ...ar/CalendarTest.testGetCalendarItems.json
diff --git a/...est/Calendar/APITest.testListChanges.json → ...alendar/CalendarTest.testListChanges.json b/...est/Calendar/APITest.testListChanges.json → ...alendar/CalendarTest.testListChanges.json
diff --git a/...st/Calendar/APITest.testPickCalendar.json → ...lendar/CalendarTest.testPickCalendar.json b/...st/Calendar/APITest.testPickCalendar.json → ...lendar/CalendarTest.testPickCalendar.json
diff --git a/...endar/APITest.testUpdateCalendarItem.json → .../CalendarTest.testUpdateCalendarItem.json b/...endar/APITest.testUpdateCalendarItem.json → .../CalendarTest.testUpdateCalendarItem.json
diff --git a/composer.json b/composer.json
@@ -30,8 +30,8 @@
 	"require-dev": {
 		"phpunit/phpunit": "~9.5",
 		"squizlabs/php_codesniffer": "~3.6.0",
-		"mockery/mockery": "~0.9.4",
-		"goetas/xsd2php": "2.*@dev",
-		"goetas/xsd-reader": "2.*@dev"
+		"mockery/mockery": "^1.4",
+		"goetas/xsd2php": "^2.1",
+		"goetas/xsd-reader": "^2.0-dev"
 	}
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -11,19 +11,4 @@
 			<directory>tests/</directory>
 		</testsuite>
 	</testsuites>
-	<filter>
-		<whitelist>
-			<directory suffix=".php">src/</directory>
-			<exclude>
-				<directory>Type</directory>
-				<directory>Enumeration</directory>
-			</exclude>
-		</whitelist>
-		<blacklist>
-			<directory>tests</directory>
-			<directory>vendor</directory>
-			<directory>src/Type</directory>
-			<directory>src/Enumeration</directory>
-		</blacklist>
-	</filter>
 </phpunit>
diff --git a/src/API/ExchangeWebServices.php b/src/API/ExchangeWebServices.php
@@ -277,14 +277,20 @@ protected function createClient($server, $auth, $options)
         $this->server = $server;
         $this->version = $options['version'];
 
-        $backup = libxml_disable_entity_loader(false);
+        if (version_compare(PHP_VERSION, '8', '<')) {
+            $backup = libxml_disable_entity_loader(false);
+        }
+
         $this->soap = new NTLMSoapClient(
             $location,
             $auth,
             dirname(__FILE__) . '/../../Resources/wsdl/services.wsdl',
             $options
         );
-        libxml_disable_entity_loader($backup);
+
+        if (version_compare(PHP_VERSION, '8', '<')) {
+            libxml_disable_entity_loader($backup);
+        }
 
         if (isset($options['primarySmtpEmailAddress'])) {
             $this->setPrimarySmtpEmailAddress($options['primarySmtpEmailAddress']);

diff --git a/tests/src/Calendar/CalendarTest.php b/tests/src/Calendar/CalendarTest.php
@@ -4,7 +4,7 @@
 
 use garethp\ews\Test\BaseTestCase;
 
-class APITest extends BaseTestCase
+class CalendarTest extends BaseTestCase
 {
     public function setUp(): void
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ php: @@
       - 5.5
       - 5.6
       - 7.0
+      - 8.0
     before_script:
       - chmod a+x ./.travis.sh
@@ Expand Down @@