Merge branch 'dev'

Author: agrandiere

README.md

@@ -34,19 +34,28 @@ Several moderation engines are available for you to choose from (nudity detectio
 ```php
 # Detect nudity in an image
 
-$output = $client->check(['nudity'])->image('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg')
+$output = $client->check(['nudity'])->set_url('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg')
 
 # Detect nudity, weapons, alcohol, drugs, likely fruadulant users, celebrities and faces in an image, along with image properties and type
-$output = $client->check(['nudity', 'type', 'properties', 'wad', 'face', 'scam', 'celebrity'])->image('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg')
+$output = $client->check(['nudity', 'type', 'properties', 'wad', 'face', 'scam', 'celebrity'])->set_url('http://img09.deviantart.net/2bd0/i/2009/276/c/9/magic_forrest_wallpaper_by_goergen.jpg')
 ```
 
 ## Moderate a local image:
 ```php
 # Detect nudity in an image
-$output = $client->check(['nudity'])->image('/full/path/to/image.jpg')
+$output = $client->check(['nudity'])->set_file('/full/path/to/image.jpg')
 
 # Detect nudity, weapons, alcohol, drugs and faces in an image, along with image properties and type
-$output = $client->check(['nudity', 'type', 'properties', 'wad', 'face'])->image('/full/path/to/image.jpg')
+$output = $client->check(['nudity', 'type', 'properties', 'wad', 'face'])->set_file('/full/path/to/image.jpg')
+```
+
+## Moderate a binary image:
+```php
+# Detect nudity in an image
+$output = $client->check(['nudity'])->set_bytes($binary_image)
+
+# Detect nudity, weapons, alcohol, drugs and faces in an image, along with image properties and type
+$output = $client->check(['nudity', 'type', 'properties', 'wad', 'face'])->set_bytes($binary_image)
 ```
 
 # Video and Stream Moderation

src/Check.php

@@ -7,6 +7,7 @@ class Check {
     private $endpoint = 'https://api.sightengine.com/';
     private $http;
     private $models;
+    private $url = '1.0/check.json';
 
     function __construct($api_user, $api_secret, $models) {
       $this->api_user = $api_user;
@@ -15,22 +16,23 @@ function __construct($api_user, $api_secret, $models) {
       $this->models = implode(",", $models);
     }
 
-    public function image($image) {
-        $url = '1.0/check.json';
+    public function set_file($image) {
+        $file = fopen($image, 'r');
+        $r = $this->http->request('POST', $this->url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'models' => $this->models],'multipart' => [['name' => 'media','contents' => $file]]]); 
 
-        if (filter_var($image, FILTER_VALIDATE_URL)) { 
-            $r = $this->http->request('GET', $url, ['query' => ['api_user' => $this->api_user, 
-                'api_secret' => $this->api_secret, 
-                'models' => $this->models,
-                'url' => $image]]);
+        return json_decode($r->getBody());
+    }
+
+    public function set_url($imageUrl) {
+        $r = $this->http->request('GET', $this->url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'models' => $this->models,'url' => $imageUrl]]);
+        
+        return json_decode($r->getBody());
+    }
 
-            return json_decode($r->getBody());
-        } else {
-            $file = fopen($image, 'r');
-            $r = $this->http->request('POST', $url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'models' => $this->models],'multipart' => [['name' => 'media','contents' => $file]]]); 
+    public function set_bytes($image) {
+        $r = $this->http->request('POST', $this->url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'models' => $this->models],'multipart' => [['name' => 'media','contents' => $image]]]); 
 
-            return json_decode($r->getBody());
-        }
+        return json_decode($r->getBody());
     }
 
     public function video($videoUrl, $callbackUrl) {

src/SightengineClient.php

@@ -23,7 +23,7 @@ public function feedback($model, $modelClass, $image) {
 		  } 
       else {
 			   $file = fopen($image, 'r');
-        $r = $this->http->request('POST', $url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'model' => $model,'class' => $modelClass],'multipart' => [['name' => 'media','contents' => $file]]]); 
+         $r = $this->http->request('POST', $url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'model' => $model,'class' => $modelClass],'multipart' => [['name' => 'media','contents' => $file]]]); 
 
         return json_decode($r->getBody());
 		  }

tests/StackTest.php

@@ -9,23 +9,31 @@ class StackTest extends TestCase
     public function test_nudityModel()
     {
         $client = new SightengineClient('1234', 'test');
+        $binaryFile = fopen(__DIR__ . '/assets/image.jpg', 'r'); // stream handles are returned by fopen()
 
-        $output = $client->check(['nudity'])->image('https://sightengine.com/assets/img/examples/example5.jpg');
+        $output = $client->check(['nudity'])->set_url('https://sightengine.com/assets/img/examples/example5.jpg');
         $this->assertEquals('success', $output->status);
 
-        $output2 = $client->check(['nudity'])->image(__DIR__ . '/assets/image.jpg');
+        $output2 = $client->check(['nudity'])->set_file(__DIR__ . '/assets/image.jpg');
         $this->assertEquals('success', $output2->status);
+
+        $output3 = $client->check(['nudity','wad','properties','type','face', 'celebrities'])->set_bytes($binaryFile);
+        $this->assertEquals('success', $output3->status);
     }
 
     public function test_allModel()
     {
         $client = new SightengineClient('1234', 'test');
+        $binaryFile = fopen(__DIR__ . '/assets/image.jpg', 'r');
 
-        $output = $client->check(['nudity','wad','properties','type','face', 'celebrities'])->image('https://sightengine.com/assets/img/examples/example5.jpg');
+        $output = $client->check(['nudity','wad','properties','type','face', 'celebrities'])->set_url('https://sightengine.com/assets/img/examples/example5.jpg');
         $this->assertEquals('success', $output->status);
 
-        $output2 = $client->check(['nudity','wad','properties','type','face', 'celebrities'])->image(__DIR__ . '/assets/image.jpg');
+        $output2 = $client->check(['nudity','wad','properties','type','face', 'celebrities'])->set_file(__DIR__ . '/assets/image.jpg');
         $this->assertEquals('success', $output2->status);
+
+        $output3 = $client->check(['nudity','wad','properties','type','face', 'celebrities'])->set_bytes($binaryFile);
+        $this->assertEquals('success', $output3->status);
     }
 
     public function test_feedback()