Merge pull request #396 from carusogabriel/phpunit

Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase and update composer.json to use phpunit v4.8.35.

Author: fiboknacky

composer.json

@@ -14,7 +14,7 @@
   },
   "require-dev": {
     "php": ">=5.5.17",
-    "phpunit/phpunit": "^4.8"
+    "phpunit/phpunit": "^4.8.35"
   },
   "suggest": {
     "php-64bit": ">=5.5.9"

tests/Google/AdsApi/AdWords/AdWordsGuzzleLogMessageFormatterProviderTest.php

@@ -20,7 +20,7 @@
 use Google\Auth\FetchAuthTokenInterface;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for `AdWordsGuzzleLogMessageFormatterProvider`.
@@ -29,14 +29,14 @@
  * @small
  */
 class AdWordsGuzzleLogMessageFormatterProviderTest
-    extends PHPUnit_Framework_TestCase {
+    extends TestCase {
 
   private $adWordsGuzzleLogMessageFormatter;
   private $reportDownloadResult;
   private $awql;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $fetchAuthTokenInterfaceStub = $this

tests/Google/AdsApi/AdWords/AdWordsHeaderHandlerTest.php

@@ -17,21 +17,21 @@
 namespace Google\AdsApi\AdWords;
 
 use Google\Auth\FetchAuthTokenInterface;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for `AdWordsHeaderHandler`.
  *
  * @see AdWordsHeaderHandler
  * @small
  */
-class AdWordsHeaderHandlerTest extends PHPUnit_Framework_TestCase {
+class AdWordsHeaderHandlerTest extends TestCase {
 
   private $adWordsHeaderHandler;
   private $adWordsSessionBuilder;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $this->adWordsHeaderHandler = new AdWordsHeaderHandler();

tests/Google/AdsApi/AdWords/AdWordsNormalizerTest.php

@@ -21,7 +21,7 @@
 use Google\AdsApi\AdWords\Testing\FakeBudget;
 use Google\AdsApi\AdWords\Testing\FakeMoney;
 use Google\AdsApi\AdWords\Testing\FakeMutateResult;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Serializer;
@@ -32,12 +32,12 @@
  * @see AdWordsNormalizer
  * @small
  */
-class AdWordsNormalizerTest extends PHPUnit_Framework_TestCase {
+class AdWordsNormalizerTest extends TestCase {
 
   private $serializer;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $this->serializer = new Serializer(

tests/Google/AdsApi/AdWords/AdWordsServicesIntegrationTest.php

@@ -27,7 +27,7 @@
 use Google\Auth\FetchAuthTokenInterface;
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Integration test for `AdWordsServices`.
@@ -39,7 +39,7 @@
  * @see AdWordsServices
  * @large
  */
-class AdWordsServicesIntegrationTest extends PHPUnit_Framework_TestCase {
+class AdWordsServicesIntegrationTest extends TestCase {
 
   private static $WSDL_FILE_DIR;
 
@@ -50,7 +50,7 @@ class AdWordsServicesIntegrationTest extends PHPUnit_Framework_TestCase {
   private $adWordsServices;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     error_reporting(E_ALL & ~E_USER_NOTICE);

tests/Google/AdsApi/AdWords/AdWordsSessionBuilderTest.php

@@ -21,7 +21,7 @@
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -30,13 +30,13 @@
  * @see AdWordsSessionBuilder
  * @small
  */
-class AdWordsSessionBuilderTest extends PHPUnit_Framework_TestCase {
+class AdWordsSessionBuilderTest extends TestCase {
 
   private $adWordsSessionBuilder;
   private $fetchAuthTokenInterfaceMock;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $this->adWordsSessionBuilder = new AdWordsSessionBuilder();

tests/Google/AdsApi/AdWords/AdWordsSoapLogMessageFormatterProviderTest.php

@@ -17,7 +17,7 @@
 namespace Google\AdsApi\AdWords;
 
 use Google\AdsApi\Common\Testing\FakeSoapPayloadsAndLogsProvider;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for `AdWordsSoapLogMessageFormatterProvider`.
@@ -26,15 +26,15 @@
  * @small
  */
 class AdWordsSoapLogMessageFormatterProviderTest
-    extends PHPUnit_Framework_TestCase {
+    extends TestCase {
 
   private $adWordsSoapLogMessageFormatter;
   private $requestHttpHeadersMock;
   private $requestSoapXmlMock;
   private $responseSoapXmlMock;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $this->adWordsSoapLogMessageFormatter =

tests/Google/AdsApi/AdWords/BatchJobs/BatchJobUploadStatusTest.php

@@ -25,15 +25,15 @@
 use GuzzleHttp\Psr7\Response;
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for `BatchJobUploadStatus`.
  *
  * @see BatchJobUploadStatus
  * @small
  */
-class BatchJobUploadStatusTest extends PHPUnit_Framework_TestCase {
+class BatchJobUploadStatusTest extends TestCase {
 
   private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
   private static $DUMMY_RESUMABLE_UPLOAD_URL =
@@ -43,7 +43,7 @@ class BatchJobUploadStatusTest extends PHPUnit_Framework_TestCase {
   private $adWordsSession;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $fetchAuthTokenInterfaceStub = $this

tests/Google/AdsApi/AdWords/BatchJobs/v201702/BatchJobsDelegateTest.php

@@ -30,15 +30,15 @@
 use GuzzleHttp\Psr7\Response;
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for `BatchJobsDelegate`.
  *
  * @see BatchJobsDelegate
  * @small
  */
-class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
+class BatchJobsDelegateTest extends TestCase {
 
   private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
   private static $DUMMY_RESUMABLE_UPLOAD_URL =
@@ -50,7 +50,7 @@ class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
   private $adWordsSession;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $fetchAuthTokenInterfaceStub = $this

tests/Google/AdsApi/AdWords/BatchJobs/v201705/BatchJobsDelegateTest.php

@@ -30,15 +30,15 @@
 use GuzzleHttp\Psr7\Response;
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for `BatchJobsDelegate`.
  *
  * @see BatchJobsDelegate
  * @small
  */
-class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
+class BatchJobsDelegateTest extends TestCase {
 
   private static $DUMMY_UPLOAD_URL = 'https://www.googleapis.com/upload';
   private static $DUMMY_RESUMABLE_UPLOAD_URL =
@@ -50,7 +50,7 @@ class BatchJobsDelegateTest extends PHPUnit_Framework_TestCase {
   private $adWordsSession;
 
   /**
-   * @see PHPUnit_Framework_TestCase::setUp
+   * @see PHPUnit\Framework\TestCase::setUp
    */
   protected function setUp() {
     $fetchAuthTokenInterfaceStub = $this