Merge branch 'dev'

Author: agrandiere

.gitignore

@@ -3,4 +3,7 @@ composer.phar
 
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-composer.lock
+composer.lock
+*.iml
+
+*.xml

README.md

@@ -62,7 +62,7 @@ $output = $client->check(['nudity', 'type', 'properties', 'wad', 'face'])->set_b
 The first step to detect nudity in a video stream is to submit the video stream to the API.
 
 ```php
-$client->check(['nudity'])->video('http://www.quirksmode.org/html5/videos/big_buck_bunny.webm', 'https://example.com/yourcallback')
+$client->check(['nudity', 'wad'])->video('http://www.quirksmode.org/html5/videos/big_buck_bunny.webm', 'https://example.com/yourcallback')
 ```
 
 # Feedback

src/Check.php

@@ -36,8 +36,8 @@ public function set_bytes($image) {
     }
 
     public function video($videoUrl, $callbackUrl) {
-        $url = '1.0/video/moderation.json';
-        $r = $this->http->request('GET', $url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'stream_url' => $videoUrl,'callback_url' => $callbackUrl]]);
+        $url = '1.0/video/check.json';
+        $r = $this->http->request('GET', $url, ['query' => ['api_user' => $this->api_user, 'api_secret' => $this->api_secret, 'stream_url' => $videoUrl,'callback_url' => $callbackUrl, 'models' => $this->models]]);
 
         return json_decode($r->getBody());
     }

tests/StackTest.php

@@ -17,7 +17,7 @@ public function test_nudityModel()
         $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);
+        $output3 = $client->check(['nudity','wad','properties','type','faces', 'celebrities'])->set_bytes($binaryFile);
         $this->assertEquals('success', $output3->status);
     }
 
@@ -26,13 +26,13 @@ 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'])->set_url('https://sightengine.com/assets/img/examples/example5.jpg');
+        $output = $client->check(['nudity','wad','properties','type','faces', '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'])->set_file(__DIR__ . '/assets/image.jpg');
+        $output2 = $client->check(['nudity','wad','properties','type','faces', 'celebrities'])->set_file(__DIR__ . '/assets/image.jpg');
         $this->assertEquals('success', $output2->status);
 
-        $output3 = $client->check(['nudity','wad','properties','type','face', 'celebrities'])->set_bytes($binaryFile);
+        $output3 = $client->check(['nudity','wad','properties','type','faces', 'celebrities'])->set_bytes($binaryFile);
         $this->assertEquals('success', $output3->status);
     }
 
@@ -56,5 +56,13 @@ public function test_feedback()
         $feedback4 = $client->feedback('nudity','raw', __DIR__ . '/assets/image.jpg');
         $this->assertEquals('success', $feedback4->status);
     }
+
+    public function test_video()
+    {
+        $client = new SightengineClient('1234', 'test');
+        $output = $client->check(['nudity','wad','properties','type','faces', 'celebrities'])->video('https://sightengine.com/assets/stream/examples/funfair.mp4','http://requestb.in/1nm1vw11');
+
+        $this->assertEquals('success', $output->status);
+    }
 }
 ?>