v2.9.2

Summary: new release

Test Plan: ./vendor/bin/phpunit -c test/phpunit-travis.xml

Author: Luca Bruno

src/FacebookAds/ApiConfig.php

@@ -24,6 +24,6 @@
 namespace FacebookAds;
 class ApiConfig {
   const APIVersion = '2.9';
-  const SDKVersion = '2.9.1';
+  const SDKVersion = '2.9.2';
   const TYPE_CHECKER_STRICT_MODE = false;
 }

src/FacebookAds/Http/Adapter/Curl/Curl.php

@@ -24,6 +24,8 @@
 
 namespace FacebookAds\Http\Adapter\Curl;
 
+use FacebookAds\Http\FileParameter;
+
 class Curl extends AbstractCurl {
 
   /**
@@ -53,11 +55,24 @@ public function pause($bitmask) {
   }
 
   /**
-   * @param string $filepath
+   * FIXME should introduce v2.10 breaking change:
+   * implement abstract support for FileParameter in AdapterInterface
+   *
+   * @param string|FileParameter $filepath
    * @return string
    */
   public function preparePostFileField($filepath) {
-    return "@".$filepath;
+    $mime_type = $name = '';
+    if ($filepath instanceof FileParameter) {
+      $mime_type = $filepath->getMimeType() !== null
+        ? sprintf(';type=%s', $filepath->getMimeType())
+        : '';
+      $name = $filepath->getName() !== null
+        ? sprintf(';filename=%s', $filepath->getName())
+        : '';
+      $filepath = $filepath->getPath();
+    }
+    return sprintf('@%s%s%s', $filepath, $mime_type, $name);
   }
 
   /**

src/FacebookAds/Http/Adapter/Curl/Curl55.php

@@ -24,6 +24,8 @@
 
 namespace FacebookAds\Http\Adapter\Curl;
 
+use FacebookAds\Http\FileParameter;
+
 class Curl55 extends AbstractCurl {
 
   /**
@@ -53,11 +55,20 @@ public function pause($bitmask) {
   }
 
   /**
-   * @param string $filepath
+   * FIXME should introduce v2.10 breaking change:
+   * implement abstract support for FileParameter in AdapterInterface
+   *
+   * @param string|FileParameter $filepath
    * @return \CURLFile
    */
   public function preparePostFileField($filepath) {
-    return new \CURLFile($filepath);
+    $mime_type = $name = ''; // can't be null in HHVM
+    if ($filepath instanceof FileParameter) {
+      $mime_type = $filepath->getMimeType() ?: '';
+      $name = $filepath->getName() ?: '';
+      $filepath = $filepath->getPath();
+    }
+    return new \CURLFile($filepath, $mime_type, $name);
   }
 
   /**

src/FacebookAds/Http/FileParameter.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * You are hereby granted a non-exclusive, worldwide, royalty-free license to
+ * use, copy, modify, and distribute this software in source code or binary
+ * form for use in connection with the web services and APIs provided by
+ * Facebook.
+ *
+ * As with any software that integrates with the Facebook platform, your use
+ * of this software is subject to the Facebook Developer Principles and
+ * Policies [http://developers.facebook.com/policy/]. This copyright notice
+ * shall be included in all copies or substantial portions of the software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+namespace FacebookAds\Http;
+
+class FileParameter {
+
+  /**
+   * @var string
+   */
+  protected $path;
+
+  /**
+   * @var string|null
+   */
+  protected $mimeType;
+
+  /**
+   * @var string|null
+   */
+  protected $name;
+
+  /**
+   * @param string $path
+   */
+  public function __construct($path) {
+    $this->path = $path;
+  }
+
+  /**
+   * @return string
+   */
+  public function getPath() {
+    return $this->path;
+  }
+
+  /**
+   * @return null|string
+   */
+  public function getMimeType() {
+    return $this->mimeType;
+  }
+
+  /**
+   * @param null|string $mime_type
+   * @return $this
+   */
+  public function setMimeType($mime_type) {
+    $this->mimeType = $mime_type;
+    return $this;
+  }
+
+  /**
+   * @return null|string
+   */
+  public function getName() {
+    return $this->name;
+  }
+
+  /**
+   * @param null|string $name
+   * @return $this
+   */
+  public function setName($name) {
+    $this->name = $name;
+    return $this;
+  }
+}

src/FacebookAds/Object/AbstractCrudObject.php

@@ -163,7 +163,7 @@ public function getChangedFields() {
   public function exportData() {
     $data = array();
     foreach ($this->changedFields as $key => $val) {
-      $data[$key] = $val instanceof AbstractObject ? $val->exportData() : $val;
+      $data[$key] = parent::exportValue($val);
     }
     return $data;
   }

test/FacebookAdsTest/Http/FileParameterTest.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * You are hereby granted a non-exclusive, worldwide, royalty-free license to
+ * use, copy, modify, and distribute this software in source code or binary
+ * form for use in connection with the web services and APIs provided by
+ * Facebook.
+ *
+ * As with any software that integrates with the Facebook platform, your use
+ * of this software is subject to the Facebook Developer Principles and
+ * Policies [http://developers.facebook.com/policy/]. This copyright notice
+ * shall be included in all copies or substantial portions of the software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+namespace FacebookAdsTest\Http;
+
+use FacebookAds\Http\Adapter\Curl\AbstractCurl;
+use FacebookAds\Http\FileParameter;
+use FacebookAdsTest\AbstractUnitTestCase;
+
+class FileParameterTest extends AbstractUnitTestCase {
+
+  public function argumentsProvider() {
+    return array(
+      array('PATH', 'NAME', 'MIME_TYPE'),
+      array('PATH', 'NAME', null),
+      array('PATH', 'NAME'),
+      array('PATH', null, null),
+      array('PATH'),
+    );
+  }
+
+  /**
+   * @dataProvider argumentsProvider
+   * @param string $path
+   * @param string|null $name
+   * @param string|null $mime_type
+   */
+  public function testGetters($path, $name = null, $mime_type = null) {
+    $param = (new FileParameter($path))
+      ->setName($name)
+      ->setMimeType($mime_type);
+
+    $this->assertEquals($param->getPath(), $path);
+    $this->assertEquals($param->getName(), $name);
+    $this->assertEquals($param->getMimeType(), $mime_type);
+  }
+
+  /**
+   * @dataProvider argumentsProvider
+   * @param string $path
+   * @param string|null $name
+   * @param string|null $mime_type
+   */
+  public function testCurlImplementation(
+    $path,
+    $name = null,
+    $mime_type = null) {
+    $param = (new FileParameter($path))
+      ->setName($name)
+      ->setMimeType($mime_type);
+
+    AbstractCurl::createOptimalVersion()->preparePostFileField($param);
+  }
+}