diff --git a/lib/classes/recordutils.class.php b/lib/classes/recordutils.class.php index fee4d4f12c..b2f70cd46d 100644 --- a/lib/classes/recordutils.class.php +++ b/lib/classes/recordutils.class.php @@ -9,6 +9,8 @@ * file that was distributed with this source code. */ +use Alchemy\Phrasea\Application as SilexApp; + class recordutils { @@ -22,12 +24,12 @@ class recordutils } - public static function watermark($bas, $rec) + public static function watermark(SilexApp $app, \media_subdef $subdef) { } - public static function stamp($bas, $rec) + public static function stamp(SilexApp $app, \media_subdef $subdef) { } diff --git a/tests/Alchemy/Phrasea/Controller/Prod/DownloadTest.php b/tests/Alchemy/Phrasea/Controller/Prod/DownloadTest.php index 48f15e23a1..8551c9eed7 100644 --- a/tests/Alchemy/Phrasea/Controller/Prod/DownloadTest.php +++ b/tests/Alchemy/Phrasea/Controller/Prod/DownloadTest.php @@ -2,7 +2,7 @@ require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc'; -class ExportTest extends \PhraseanetWebTestCaseAuthenticatedAbstract +class DownloadTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { protected $client; @@ -33,6 +33,7 @@ class ExportTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); $this->assertRegExp('#download/[a-zA-Z0-9]*/$#', $response->headers->get('location')); + unset($response, $eventManagerStub); } /**