Merge branch 'dev'

Edujugon · Jun 29, 2017 · 4810161 · 4810161
2 parents e99b182 + 178a612
commit 4810161
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/GoogleAds.php b/src/GoogleAds.php
@@ -165,7 +165,7 @@ public function report()
      */
     public function showReportTypes()
     {
-        return ReportTypes::list();
+        return ReportTypes::getList();
     }
 
     /**
@@ -174,7 +174,7 @@ public function showReportTypes()
      */
     public function showReportFormats()
     {
-        return Format::list();
+        return Format::getList();
     }
 
     /////////////////////////////////

diff --git a/src/Reports/Fields.php b/src/Reports/Fields.php
@@ -115,7 +115,7 @@ public function asQuerySelector(){
      */
     public function reportTypes()
     {
-        return ReportTypes::list();
+        return ReportTypes::getList();
     }
 
     /**

diff --git a/src/Reports/Format.php b/src/Reports/Format.php
@@ -40,7 +40,7 @@ public static function asObj()
      *
      * @return array
      */
-    public static function list()
+    public static function getList()
     {
         return array_values(static::loadConstants());
     }

diff --git a/src/Reports/Report.php b/src/Reports/Report.php
@@ -346,7 +346,7 @@ private function querify(array $data)
      */
     public function getTypes()
     {
-        return ReportTypes::list();
+        return ReportTypes::getList();
     }
 
     /**
@@ -364,7 +364,7 @@ public function getFields()
      */
     public function getFormats()
     {
-        return Format::list();
+        return Format::getList();
     }
 
     /**

diff --git a/src/Reports/ReportTypes.php b/src/Reports/ReportTypes.php
@@ -39,7 +39,7 @@ public static function asObj()
      *
      * @return array
      */
-    public static function list()
+    public static function getList()
     {
         return array_values(static::loadConstants());
     }

diff --git a/tests/ReportTest.php b/tests/ReportTest.php
@@ -18,7 +18,7 @@ public function report_fields()
     /** @test */
     public function format()
     {
-        $this->assertInternalType('array',\Edujugon\GoogleAds\Reports\Format::list());
+        $this->assertInternalType('array',\Edujugon\GoogleAds\Reports\Format::getList());
         $this->assertEquals('CSV',\Edujugon\GoogleAds\Reports\Format::get('csv'));
     }