Make the package compatible with last google API version (v201702)

Edujugon · Apr 11, 2017 · 3d9b6f5 · 3d9b6f5
1 parent bdd23fe
commit 3d9b6f5
Show file tree

Hide file tree

Showing 13 changed files with 187 additions and 180 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/GoogleAds.php b/src/GoogleAds.php
@@ -107,7 +107,7 @@ public function fields()
     /**
      * Set the google adwords service.
      *
-     * @param \Google\AdsApi\AdWords\v201609\cm\*  $service
+     * @param \Google\AdsApi\AdWords\v201702\cm\*  $service
      * @return \Edujugon\GoogleAds\Services\Service
      */
     public function service($service)

diff --git a/src/Reports/Fields.php b/src/Reports/Fields.php
@@ -3,7 +3,7 @@
 
 use Edujugon\GoogleAds\Session\AdwordsSession;
 use Google\AdsApi\AdWords\AdWordsServices;
-use Google\AdsApi\AdWords\v201609\cm\ReportDefinitionService;
+use Google\AdsApi\AdWords\v201702\cm\ReportDefinitionService;
 
 
 /**

diff --git a/src/Reports/Format.php b/src/Reports/Format.php
@@ -11,7 +11,7 @@
 
 
 use Edujugon\GoogleAds\Exceptions\ReportFormat;
-use Google\AdsApi\AdWords\Reporting\v201609\DownloadFormat;
+use Google\AdsApi\AdWords\Reporting\v201702\DownloadFormat;
 use ReflectionClass;
 
 abstract  class Format

diff --git a/src/Reports/Report.php b/src/Reports/Report.php
@@ -11,8 +11,8 @@
 
 
 use Edujugon\GoogleAds\Session\AdwordsSession;
-use Google\AdsApi\AdWords\Reporting\v201609\ReportDownloader;
-use Google\AdsApi\AdWords\v201609\cm\ApiException;
+use Google\AdsApi\AdWords\Reporting\v201702\ReportDownloader;
+use Google\AdsApi\AdWords\v201702\cm\ApiException;
 
 class Report
 {

diff --git a/src/Reports/ReportTypes.php b/src/Reports/ReportTypes.php
@@ -1,7 +1,7 @@
 <?php
 namespace Edujugon\GoogleAds\Reports;
 
-use Google\AdsApi\AdWords\v201609\cm\ReportDefinitionReportType;
+use Google\AdsApi\AdWords\v201702\cm\ReportDefinitionReportType;
 use Edujugon\GoogleAds\Exceptions\ReportTypes as ReportException;
 use ReflectionClass;
 

diff --git a/src/Services/AdGroup.php b/src/Services/AdGroup.php
@@ -11,7 +11,7 @@
 
 
 use Google\AdsApi\AdWords\AdWordsSession;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupService;
+use Google\AdsApi\AdWords\v201702\cm\AdGroupService;
 
 class AdGroup extends Service
 {

diff --git a/src/Services/AdGroupAd.php b/src/Services/AdGroupAd.php
@@ -11,7 +11,7 @@
 
 
 use Google\AdsApi\AdWords\AdWordsSession;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupAdService;
+use Google\AdsApi\AdWords\v201702\cm\AdGroupAdService;
 
 class AdGroupAd extends Service
 {

diff --git a/src/Services/Campaign.php b/src/Services/Campaign.php
@@ -10,7 +10,7 @@
 namespace Edujugon\GoogleAds\Services;
 
 use Google\AdsApi\AdWords\AdWordsSession;
-use Google\AdsApi\AdWords\v201609\cm\CampaignService;
+use Google\AdsApi\AdWords\v201702\cm\CampaignService;
 
 class Campaign extends Service
 {

diff --git a/src/Services/Service.php b/src/Services/Service.php
@@ -13,9 +13,6 @@
 use Edujugon\GoogleAds\Exceptions\Session;
 use Edujugon\GoogleAds\Session\AdwordsSession;
 use Google\AdsApi\AdWords\AdWordsServices;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupAdService;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupService;
-use Google\AdsApi\AdWords\v201609\cm\CampaignService;
 
 class Service
 {

diff --git a/src/Services/ServiceCollection.php b/src/Services/ServiceCollection.php
@@ -9,12 +9,12 @@
 
 namespace Edujugon\GoogleAds\Services;
 
-use Google\AdsApi\AdWords\v201609\cm\AdGroupAdOperation;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupAdService;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupOperation;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupService;
-use Google\AdsApi\AdWords\v201609\cm\CampaignOperation;
-use Google\AdsApi\AdWords\v201609\cm\CampaignService;
+use Google\AdsApi\AdWords\v201702\cm\AdGroupAdOperation;
+use Google\AdsApi\AdWords\v201702\cm\AdGroupAdService;
+use Google\AdsApi\AdWords\v201702\cm\AdGroupOperation;
+use Google\AdsApi\AdWords\v201702\cm\AdGroupService;
+use Google\AdsApi\AdWords\v201702\cm\CampaignOperation;
+use Google\AdsApi\AdWords\v201702\cm\CampaignService;
 use Illuminate\Support\Collection;
 
 class ServiceCollection

diff --git a/tests/GoogleAdsTest.php b/tests/GoogleAdsTest.php
@@ -3,8 +3,8 @@
 
 use Edujugon\GoogleAds\GoogleAds;
 use Edujugon\GoogleAds\Reports\MyReport;
-use Google\AdsApi\AdWords\v201609\cm\AdGroupService;
-use Google\AdsApi\AdWords\v201609\cm\CampaignService;
+use Google\AdsApi\AdWords\v201702\cm\AdGroupService;
+use Google\AdsApi\AdWords\v201702\cm\CampaignService;
 
 class GoogleAdsTest extends PHPUnit_Framework_TestCase {
 

diff --git a/tests/ServicesTest.php b/tests/ServicesTest.php
@@ -8,7 +8,7 @@
 use Google\AdsApi\AdWords\v201609\cm\BudgetBudgetDeliveryMethod;
 use Google\AdsApi\AdWords\v201609\cm\BudgetOperation;
 use Google\AdsApi\AdWords\v201609\cm\CampaignOperation;
-use Google\AdsApi\AdWords\v201609\cm\CampaignService;
+use Google\AdsApi\AdWords\v201702\cm\CampaignService;
 use Google\AdsApi\AdWords\v201609\cm\Money;
 use Google\AdsApi\AdWords\v201609\cm\Operator;
 
@@ -22,7 +22,7 @@ class ServicesTest extends PHPUnit_Framework_TestCase {
     public function add_service()
     {
         $service = (new \Edujugon\GoogleAds\Services\Service(CampaignService::class));
-        $this->assertInstanceOf(\Google\AdsApi\AdWords\v201609\cm\CampaignService::class,$service->getService());
+        $this->assertInstanceOf(\Google\AdsApi\AdWords\v201702\cm\CampaignService::class,$service->getService());
     }
 
 
@@ -117,15 +117,18 @@ public function update_campaign_name()
         $results = $campaignService->select('CampaignId','CampaignName')->get();
 
         $campaign = $results->where('id',$this->testedCampaignId)->set('name','hello !!');
+        if(! $campaign->isEmpty()){
 
-        $campaign = $campaign->save();
+            $changed = $campaign->save();
 
-        if($campaign)
-        {
-            $this->assertInstanceOf(\Google\AdsApi\AdWords\v201609\cm\CampaignReturnValue::class,$campaign);
+            if($changed)
+            {
+                $this->assertInstanceOf(\Google\AdsApi\AdWords\v201702\cm\CampaignReturnValue::class,$changed);
 
-            $this->assertEquals('hello !!',$campaign->getValue()[0]->getName());
+                $this->assertEquals('hello !!',$changed->getValue()[0]->getName());
+            }
         }
+
     }
 
     /** @test */
@@ -134,16 +137,16 @@ public function create_new_campaign()
 //        $campaignService = (new \Edujugon\GoogleAds\Services\Service(CampaignService::class))->getService();
 //
 //        //Create the campaign
-//        $campaign = new \Google\AdsApi\AdWords\v201609\cm\Campaign();
+//        $campaign = new \Google\AdsApi\AdWords\v201702\cm\Campaign();
 //        $campaign->setName('My first campaign');
-//        $campaign->setStatus(\Google\AdsApi\AdWords\v201609\cm\CampaignStatus::PAUSED);
+//        $campaign->setStatus(\Google\AdsApi\AdWords\v201702\cm\CampaignStatus::PAUSED);
 //
 //        $biddingStrategyConfiguration = new BiddingStrategyConfiguration();
 //        $biddingStrategyConfiguration->setBiddingStrategyType(BiddingStrategyType::MANUAL_CPC);
 //        $campaign->setBiddingStrategyConfiguration($biddingStrategyConfiguration);
 //
 //        //Budget
-//        $budgetService = (new \Edujugon\GoogleAds\Services\Service(\Google\AdsApi\AdWords\v201609\cm\BudgetService::class))->getService();
+//        $budgetService = (new \Edujugon\GoogleAds\Services\Service(\Google\AdsApi\AdWords\v201702\cm\BudgetService::class))->getService();
 //        $sharedBudget = new Budget();
 //        $budget = new Budget();
 //