Upgrade to PHP 7.1+ (#271)

GabrielAnca · web-flow · commit ea68849e4ff4 · 2019-01-15T11:09:40.000Z
* Upgrade to PHP 7

* Update README.md

Co-Authored-By: GabrielAnca &lt;GabrielAnca@users.noreply.github.com&gt;
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2
 jobs:
-  build:
+  test-7.3: &test-template
     docker:
-      - image: circleci/php:5.6
+      - image: circleci/php:7.3
 
     working_directory: ~/intercom-php
 
@@ -11,3 +11,21 @@ jobs:
       - run: composer install --no-interaction
       - run: vendor/bin/phpunit
       - run: vendor/bin/phpcs --standard=PSR2 src test
+
+  test-7.2:
+    <<: *test-template
+    docker:
+      - image: circleci/php:7.2
+
+  test-7.1:
+    <<: *test-template
+    docker:
+      - image: circleci/php:7.1
+
+workflows:
+  version: 2
+  test_on_supported_php_versions:
+    jobs:
+      - test-7.3
+      - test-7.2
+      - test-7.1
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Official PHP bindings to the Intercom API
 
 ## Installation
 
-Requires PHP 5.6.
+This library supports PHP 7.1 and later
 
 The recommended way to install intercom-php is through [Composer](https://getcomposer.org):
 
diff --git a/composer.json b/composer.json
@@ -20,12 +20,12 @@
         }
     },
     "require": {
-        "php": ">= 5.6",
+        "php": ">= 7.1",
         "ext-json": "*",
         "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0.*",
+        "phpunit/phpunit": "^7.0",
         "squizlabs/php_codesniffer": "^3.1"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -7,8 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="Intercom Test Suite">
             <directory suffix=".php">./test/</directory>
diff --git a/test/IntercomAdminsTest.php b/test/IntercomAdminsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomAdmins;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomAdminsTest extends PHPUnit_Framework_TestCase
+class IntercomAdminsTest extends TestCase
 {
     public function testAdminsList()
     {
diff --git a/test/IntercomBulkTest.php b/test/IntercomBulkTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomBulk;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomBulkTest extends PHPUnit_Framework_TestCase
+class IntercomBulkTest extends TestCase
 {
     public function testBulkUsers()
     {
diff --git a/test/IntercomClientTest.php b/test/IntercomClientTest.php
@@ -9,10 +9,10 @@
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use stdClass;
 
-class IntercomClientTest extends PHPUnit_Framework_TestCase
+class IntercomClientTest extends TestCase
 {
     public function testBasicClient()
     {
diff --git a/test/IntercomCompaniesTest.php b/test/IntercomCompaniesTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomCompanies;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomCompaniesTest extends PHPUnit_Framework_TestCase
+class IntercomCompaniesTest extends TestCase
 {
     public function testCompanyCreate()
     {
diff --git a/test/IntercomConversationsTest.php b/test/IntercomConversationsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomConversations;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomConversationsTest extends PHPUnit_Framework_TestCase
+class IntercomConversationsTest extends TestCase
 {
     public function testConversationsList()
     {
diff --git a/test/IntercomCountsTest.php b/test/IntercomCountsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomCounts;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomCountsTest extends PHPUnit_Framework_TestCase
+class IntercomCountsTest extends TestCase
 {
     public function testCountsList()
     {
diff --git a/test/IntercomEventsTest.php b/test/IntercomEventsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomEvents;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomEventsTest extends PHPUnit_Framework_TestCase
+class IntercomEventsTest extends TestCase
 {
     public function testEventCreate()
     {
diff --git a/test/IntercomLeadsTest.php b/test/IntercomLeadsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomLeads;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomLeadsTest extends PHPUnit_Framework_TestCase
+class IntercomLeadsTest extends TestCase
 {
     public function testLeadCreate()
     {
diff --git a/test/IntercomMessagesTest.php b/test/IntercomMessagesTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomMessages;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomMessagesTest extends PHPUnit_Framework_TestCase
+class IntercomMessagesTest extends TestCase
 {
     public function testMessageCreate()
     {
diff --git a/test/IntercomNotesTest.php b/test/IntercomNotesTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomNotes;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomNotesTest extends PHPUnit_Framework_TestCase
+class IntercomNotesTest extends TestCase
 {
     public function testNoteCreate()
     {
diff --git a/test/IntercomSegmentsTest.php b/test/IntercomSegmentsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomSegments;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomSegmentTest extends PHPUnit_Framework_TestCase
+class IntercomSegmentTest extends TestCase
 {
 
     public function testSegmentList()
diff --git a/test/IntercomTagsTest.php b/test/IntercomTagsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomTags;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomTagsTest extends PHPUnit_Framework_TestCase
+class IntercomTagsTest extends TestCase
 {
     public function testTagUsers()
     {
diff --git a/test/IntercomUsersTest.php b/test/IntercomUsersTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomUsers;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomUsersTest extends PHPUnit_Framework_TestCase
+class IntercomUsersTest extends TestCase
 {
     public function testUserCreate()
     {
diff --git a/test/IntercomVisitorsTest.php b/test/IntercomVisitorsTest.php
@@ -3,9 +3,9 @@
 namespace Intercom\Test;
 
 use Intercom\IntercomVisitors;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class IntercomVisitorsTest extends PHPUnit_Framework_TestCase
+class IntercomVisitorsTest extends TestCase
 {
 
     public function testVisitorUpdate()

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`"require": {`
`23`		`- "php": ">= 5.6",`
	`23`	`+ "php": ">= 7.1",`
`24`	`24`	`"ext-json": "*",`
`25`	`25`	`"guzzlehttp/guzzle": "~6.0"`
`26`	`26`	`},`
`27`	`27`	`"require-dev": {`
`28`		`- "phpunit/phpunit": "4.0.*",`
	`28`	`+ "phpunit/phpunit": "^7.0",`
`29`	`29`	`"squizlabs/php_codesniffer": "^3.1"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace Intercom\Test;`
`4`	`4`
`5`	`5`	`use Intercom\IntercomAdmins;`
`6`		`-use PHPUnit_Framework_TestCase;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`		`-class IntercomAdminsTest extends PHPUnit_Framework_TestCase`
	`8`	`+class IntercomAdminsTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function testAdminsList()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace Intercom\Test;`
`4`	`4`
`5`	`5`	`use Intercom\IntercomBulk;`
`6`		`-use PHPUnit_Framework_TestCase;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`		`-class IntercomBulkTest extends PHPUnit_Framework_TestCase`
	`8`	`+class IntercomBulkTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function testBulkUsers()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@`
`9`	`9`	`use GuzzleHttp\Psr7\Response;`
`10`	`10`	`use GuzzleHttp\HandlerStack;`
`11`	`11`	`use GuzzleHttp\Middleware;`
`12`		`-use PHPUnit_Framework_TestCase;`
	`12`	`+use PHPUnit\Framework\TestCase;`
`13`	`13`	`use stdClass;`
`14`	`14`
`15`		`-class IntercomClientTest extends PHPUnit_Framework_TestCase`
	`15`	`+class IntercomClientTest extends TestCase`
`16`	`16`	`{`
`17`	`17`	`public function testBasicClient()`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace Intercom\Test;`
`4`	`4`
`5`	`5`	`use Intercom\IntercomCompanies;`
`6`		`-use PHPUnit_Framework_TestCase;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`		`-class IntercomCompaniesTest extends PHPUnit_Framework_TestCase`
	`8`	`+class IntercomCompaniesTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function testCompanyCreate()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace Intercom\Test;`
`4`	`4`
`5`	`5`	`use Intercom\IntercomConversations;`
`6`		`-use PHPUnit_Framework_TestCase;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`		`-class IntercomConversationsTest extends PHPUnit_Framework_TestCase`
	`8`	`+class IntercomConversationsTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function testConversationsList()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace Intercom\Test;`
`4`	`4`
`5`	`5`	`use Intercom\IntercomCounts;`
`6`		`-use PHPUnit_Framework_TestCase;`
	`6`	`+use PHPUnit\Framework\TestCase;`
`7`	`7`
`8`		`-class IntercomCountsTest extends PHPUnit_Framework_TestCase`
	`8`	`+class IntercomCountsTest extends TestCase`
`9`	`9`	`{`
`10`	`10`	`public function testCountsList()`
`11`	`11`	`{`