fix: Remove all references to OC_Image

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/lib/private/Image.php b/lib/private/Image.php
index 42a3710b99e24ae4d62e9a5de7b1c9071934cf44..7e2147e9777fb8fc85477c9ad23ea0b2fefa9550 100644 (file)
--- a/lib/private/Image.php
+++ b/lib/private/Image.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
 
 namespace OC;
 
+use finfo;
 use OCP\IImage;
 
 /**
@@ -51,7 +52,11 @@ class Image implements IImage {
         * @param \OCP\IConfig $config
         * @throws \InvalidArgumentException in case the $imageRef parameter is not null
         */
-       public function __construct($imageRef = null, ?\OCP\ILogger $logger = null, ?\OCP\IConfig $config = null) {
+       public function __construct(
+               $imageRef = null,
+               ?\OCP\ILogger $logger = null,
+               ?\OCP\IConfig $config = null
+       ) {
                $this->logger = $logger;
                if ($logger === null) {
                        $this->logger = \OC::$server->getLogger();
@@ -124,7 +129,7 @@ class Image implements IImage {
         */
        public function widthTopLeft(): int {
                $o = $this->getOrientation();
-               $this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, ['app' => 'core']);
+               $this->logger->debug('Image->widthTopLeft() Orientation: ' . $o, ['app' => 'core']);
                switch ($o) {
                        case -1:
                        case 1:
@@ -148,7 +153,7 @@ class Image implements IImage {
         */
        public function heightTopLeft(): int {
                $o = $this->getOrientation();
-               $this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, ['app' => 'core']);
+               $this->logger->debug('Image->heightTopLeft() Orientation: ' . $o, ['app' => 'core']);
                switch ($o) {
                        case -1:
                        case 1:
@@ -251,7 +256,7 @@ class Image implements IImage {
                                        $imageType = IMAGETYPE_WEBP;
                                        break;
                                default:
-                                       throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
+                                       throw new \Exception('Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
                        }
                }
 
@@ -270,7 +275,7 @@ class Image implements IImage {
                                if (function_exists('imagexbm')) {
                                        $retVal = imagexbm($this->resource, $filePath);
                                } else {
-                                       throw new Exception('\OC_Image::_output(): imagexbm() is not supported.');
+                                       throw new \Exception('Image::_output(): imagexbm() is not supported.');
                                }
 
                                break;
@@ -354,11 +359,11 @@ class Image implements IImage {
                                break;
                        default:
                                $res = imagepng($this->resource);
-                               $this->logger->info('OC_Image->data. Could not guess mime-type, defaulting to png', ['app' => 'core']);
+                               $this->logger->info('Image->data. Could not guess mime-type, defaulting to png', ['app' => 'core']);
                                break;
                }
                if (!$res) {
-                       $this->logger->error('OC_Image->data. Error getting image data.', ['app' => 'core']);
+                       $this->logger->error('Image->data. Error getting image data.', ['app' => 'core']);
                }
                return ob_get_clean();
        }
@@ -418,19 +423,19 @@ class Image implements IImage {
                }
 
                if ($this->imageType !== IMAGETYPE_JPEG) {
-                       $this->logger->debug('OC_Image->fixOrientation() Image is not a JPEG.', ['app' => 'core']);
+                       $this->logger->debug('Image->fixOrientation() Image is not a JPEG.', ['app' => 'core']);
                        return -1;
                }
                if (!is_callable('exif_read_data')) {
-                       $this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', ['app' => 'core']);
+                       $this->logger->debug('Image->fixOrientation() Exif module not enabled.', ['app' => 'core']);
                        return -1;
                }
                if (!$this->valid()) {
-                       $this->logger->debug('OC_Image->fixOrientation() No image loaded.', ['app' => 'core']);
+                       $this->logger->debug('Image->fixOrientation() No image loaded.', ['app' => 'core']);
                        return -1;
                }
                if (is_null($this->filePath) || !is_readable($this->filePath)) {
-                       $this->logger->debug('OC_Image->fixOrientation() No readable file path set.', ['app' => 'core']);
+                       $this->logger->debug('Image->fixOrientation() No readable file path set.', ['app' => 'core']);
                        return -1;
                }
                $exif = @exif_read_data($this->filePath, 'IFD0');
@@ -443,11 +448,11 @@ class Image implements IImage {
 
        public function readExif($data): void {
                if (!is_callable('exif_read_data')) {
-                       $this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', ['app' => 'core']);
+                       $this->logger->debug('Image->fixOrientation() Exif module not enabled.', ['app' => 'core']);
                        return;
                }
                if (!$this->valid()) {
-                       $this->logger->debug('OC_Image->fixOrientation() No image loaded.', ['app' => 'core']);
+                       $this->logger->debug('Image->fixOrientation() No image loaded.', ['app' => 'core']);
                        return;
                }
 
@@ -470,7 +475,7 @@ class Image implements IImage {
                        return false;
                }
                $o = $this->getOrientation();
-               $this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, ['app' => 'core']);
+               $this->logger->debug('Image->fixOrientation() Orientation: ' . $o, ['app' => 'core']);
                $rotate = 0;
                $flip = false;
                switch ($o) {
@@ -517,15 +522,15 @@ class Image implements IImage {
                                                $this->resource = $res;
                                                return true;
                                        } else {
-                                               $this->logger->debug('OC_Image->fixOrientation() Error during alpha-saving', ['app' => 'core']);
+                                               $this->logger->debug('Image->fixOrientation() Error during alpha-saving', ['app' => 'core']);
                                                return false;
                                        }
                                } else {
-                                       $this->logger->debug('OC_Image->fixOrientation() Error during alpha-blending', ['app' => 'core']);
+                                       $this->logger->debug('Image->fixOrientation() Error during alpha-blending', ['app' => 'core']);
                                        return false;
                                }
                        } else {
-                               $this->logger->debug('OC_Image->fixOrientation() Error during orientation fixing', ['app' => 'core']);
+                               $this->logger->debug('Image->fixOrientation() Error during orientation fixing', ['app' => 'core']);
                                return false;
                        }
                }
@@ -636,10 +641,10 @@ class Image implements IImage {
                                                imagealphablending($this->resource, true);
                                                imagesavealpha($this->resource, true);
                                        } else {
-                                               $this->logger->debug('OC_Image->loadFromFile, GIF image not valid: ' . $imagePath, ['app' => 'core']);
+                                               $this->logger->debug('Image->loadFromFile, GIF image not valid: ' . $imagePath, ['app' => 'core']);
                                        }
                                } else {
-                                       $this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, ['app' => 'core']);
+                                       $this->logger->debug('Image->loadFromFile, GIF images not supported: ' . $imagePath, ['app' => 'core']);
                                }
                                break;
                        case IMAGETYPE_JPEG:
@@ -650,10 +655,10 @@ class Image implements IImage {
                                        if (@getimagesize($imagePath) !== false) {
                                                $this->resource = @imagecreatefromjpeg($imagePath);
                                        } else {
-                                               $this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, ['app' => 'core']);
+                                               $this->logger->debug('Image->loadFromFile, JPG image not valid: ' . $imagePath, ['app' => 'core']);
                                        }
                                } else {
-                                       $this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, ['app' => 'core']);
+                                       $this->logger->debug('Image->loadFromFile, JPG images not supported: ' . $imagePath, ['app' => 'core']);
                                }
                                break;
                        case IMAGETYPE_PNG:
@@ -667,10 +672,10 @@ class Image implements IImage {
                                                imagealphablending($this->resource, true);
                                                imagesavealpha($this->resource, true);
                                        } else {
-                                               $this->logger->debug('OC_Image->loadFromFile, PNG image not valid: ' . $imagePath, ['app' => 'core']);
+                                               $this->logger->debug('Image->loadFromFile, PNG image not valid: ' . $imagePath, ['app' => 'core']);
                                        }
                                } else {
-                                       $this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, ['app' => 'core']);
+                                       $this->logger->debug('Image->loadFromFile, PNG images not supported: ' . $imagePath, ['app' => 'core']);
                                }
                                break;
                        case IMAGETYPE_XBM:
@@ -680,7 +685,7 @@ class Image implements IImage {
                                        }
                                        $this->resource = @imagecreatefromxbm($imagePath);
                                } else {
-                                       $this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, ['app' => 'core']);
+                                       $this->logger->debug('Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, ['app' => 'core']);
                                }
                                break;
                        case IMAGETYPE_WBMP:
@@ -690,7 +695,7 @@ class Image implements IImage {
                                        }
                                        $this->resource = @imagecreatefromwbmp($imagePath);
                                } else {
-                                       $this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, ['app' => 'core']);
+                                       $this->logger->debug('Image->loadFromFile, WBMP images not supported: ' . $imagePath, ['app' => 'core']);
                                }
                                break;
                        case IMAGETYPE_BMP:
@@ -744,13 +749,13 @@ class Image implements IImage {
                                        // Check for animation indicators
                                        if (strpos(strtoupper($header['Chunk']), 'ANIM') !== false || strpos(strtoupper($header['Chunk']), 'ANMF') !== false) {
                                                // Animated so don't let it reach libgd
-                                               $this->logger->debug('OC_Image->loadFromFile, animated WEBP images not supported: ' . $imagePath, ['app' => 'core']);
+                                               $this->logger->debug('Image->loadFromFile, animated WEBP images not supported: ' . $imagePath, ['app' => 'core']);
                                        } else {
                                                // We're safe so give it to libgd
                                                $this->resource = @imagecreatefromwebp($imagePath);
                                        }
                                } else {
-                                       $this->logger->debug('OC_Image->loadFromFile, WEBP images not supported: ' . $imagePath, ['app' => 'core']);
+                                       $this->logger->debug('Image->loadFromFile, WEBP images not supported: ' . $imagePath, ['app' => 'core']);
                                }
                                break;
                                /*
@@ -786,7 +791,7 @@ class Image implements IImage {
                                }
                                $this->resource = @imagecreatefromstring($data);
                                $iType = IMAGETYPE_PNG;
-                               $this->logger->debug('OC_Image->loadFromFile, Default', ['app' => 'core']);
+                               $this->logger->debug('Image->loadFromFile, Default', ['app' => 'core']);
                                break;
                }
                if ($this->valid()) {
@@ -817,7 +822,7 @@ class Image implements IImage {
                }
 
                if (!$this->resource) {
-                       $this->logger->debug('OC_Image->loadFromFile, could not load', ['app' => 'core']);
+                       $this->logger->debug('Image->loadFromFile, could not load', ['app' => 'core']);
                        return false;
                }
                return $this->resource;
@@ -840,7 +845,7 @@ class Image implements IImage {
                                $this->mimeType = $this->fileInfo->buffer($data);
                        }
                        if (!$this->resource) {
-                               $this->logger->debug('OC_Image->loadFromBase64, could not load', ['app' => 'core']);
+                               $this->logger->debug('Image->loadFromBase64, could not load', ['app' => 'core']);
                                return false;
                        }
                        return $this->resource;
@@ -952,7 +957,7 @@ class Image implements IImage {
         */
        public function centerCrop(int $size = 0): bool {
                if (!$this->valid()) {
-                       $this->logger->debug('OC_Image->centerCrop, No image loaded', ['app' => 'core']);
+                       $this->logger->debug('Image->centerCrop, No image loaded', ['app' => 'core']);
                        return false;
                }
                $widthOrig = imagesx($this->resource);
@@ -979,7 +984,7 @@ class Image implements IImage {
                }
                $process = imagecreatetruecolor($targetWidth, $targetHeight);
                if ($process === false) {
-                       $this->logger->debug('OC_Image->centerCrop, Error creating true color image', ['app' => 'core']);
+                       $this->logger->debug('Image->centerCrop, Error creating true color image', ['app' => 'core']);
                        return false;
                }
 
@@ -992,7 +997,7 @@ class Image implements IImage {
 
                $result = imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
                if ($result === false) {
-                       $this->logger->debug('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, ['app' => 'core']);
+                       $this->logger->debug('Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, ['app' => 'core']);
                        return false;
                }
                imagedestroy($this->resource);

diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php
index 2687972b8f6b59111340a4e0957aac41f1711e6c..fde2ccef5c3c5e68b399472921bba3b1b0ec2554 100644 (file)
--- a/tests/lib/Avatar/UserAvatarTest.php
+++ b/tests/lib/Avatar/UserAvatarTest.php
@@ -14,6 +14,7 @@ use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\Image;
 use Psr\Log\LoggerInterface;
 
 class UserAvatarTest extends \Test\TestCase {
@@ -92,7 +93,7 @@ class UserAvatarTest extends \Test\TestCase {
                                ['generated', false],
                        ]);
 
-               $expected = new \OC_Image();
+               $expected = new Image();
                $expected->loadFromFile(\OC::$SERVERROOT . '/tests/data/testavatar.png');
 
                $file = $this->createMock(ISimpleFile::class);
@@ -109,7 +110,7 @@ class UserAvatarTest extends \Test\TestCase {
                                ['generated', false],
                        ]);
 
-               $expected = new \OC_Image();
+               $expected = new Image();
                $expected->loadFromFile(\OC::$SERVERROOT . '/tests/data/testavatar.png');
 
                $file = $this->createMock(ISimpleFile::class);
@@ -128,9 +129,9 @@ class UserAvatarTest extends \Test\TestCase {
                                ['generated', false],
                        ]);
 
-               $expected = new \OC_Image();
+               $expected = new Image();
                $expected->loadFromFile(\OC::$SERVERROOT . '/tests/data/testavatar.png');
-               $expected2 = new \OC_Image();
+               $expected2 = new Image();
                $expected2->loadFromFile(\OC::$SERVERROOT . '/tests/data/testavatar.png');
                $expected2->resize(32);
 
@@ -215,7 +216,7 @@ class UserAvatarTest extends \Test\TestCase {
                        ->with('avatar.png')
                        ->willReturn($newFile);
 
-               $image = new \OC_Image();
+               $image = new Image();
                $image->loadFromFile(\OC::$SERVERROOT . '/tests/data/testavatar.png');
                $newFile->expects($this->once())
                        ->method('putContent')

diff --git a/tests/lib/ImageTest.php b/tests/lib/ImageTest.php
index 2e93a7fb6fd50dc1ced8e2f35476957df58ce7d7..1c46a59cd65e2cdaf1994258bdab2f9c80a42f7c 100644 (file)
--- a/tests/lib/ImageTest.php
+++ b/tests/lib/ImageTest.php
@@ -8,6 +8,7 @@
 namespace Test;
 
 use OC;
+use OC\Image;
 use OCP\IConfig;
 
 class ImageTest extends \Test\TestCase {
@@ -19,105 +20,105 @@ class ImageTest extends \Test\TestCase {
        }
 
        public function testConstructDestruct() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
-               $this->assertInstanceOf('\OC_Image', $img);
+               $this->assertInstanceOf('\OC\Image', $img);
                $this->assertInstanceOf('\OCP\IImage', $img);
                unset($img);
 
                $imgcreate = imagecreatefromjpeg(OC::$SERVERROOT.'/tests/data/testimage.jpg');
-               $img = new \OC_Image();
+               $img = new Image();
                $img->setResource($imgcreate);
-               $this->assertInstanceOf('\OC_Image', $img);
+               $this->assertInstanceOf('\OC\Image', $img);
                $this->assertInstanceOf('\OCP\IImage', $img);
                unset($img);
 
                $base64 = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'));
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64($base64);
-               $this->assertInstanceOf('\OC_Image', $img);
+               $this->assertInstanceOf('\OC\Image', $img);
                $this->assertInstanceOf('\OCP\IImage', $img);
                unset($img);
 
-               $img = new \OC_Image();
-               $this->assertInstanceOf('\OC_Image', $img);
+               $img = new Image();
+               $this->assertInstanceOf('\OC\Image', $img);
                $this->assertInstanceOf('\OCP\IImage', $img);
                unset($img);
        }
 
        public function testValid() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertTrue($img->valid());
 
                $text = base64_encode('Lorem ipsum dolor sir amet …');
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64($text);
                $this->assertFalse($img->valid());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $this->assertFalse($img->valid());
        }
 
        public function testMimeType() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertEquals('image/png', $img->mimeType());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $this->assertEquals('', $img->mimeType());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $this->assertEquals('image/jpeg', $img->mimeType());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $this->assertEquals('image/gif', $img->mimeType());
        }
 
        public function testWidth() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertEquals(128, $img->width());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $this->assertEquals(1680, $img->width());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $this->assertEquals(64, $img->width());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $this->assertEquals(-1, $img->width());
        }
 
        public function testHeight() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertEquals(128, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $this->assertEquals(1050, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $this->assertEquals(64, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $this->assertEquals(-1, $img->height());
        }
 
        public function testSave() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $img->resize(16);
                $img->save(OC::$SERVERROOT.'/tests/data/testimage2.png');
                $this->assertEquals(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage2.png'), $img->data());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.jpg');
                $img->resize(128);
                $img->save(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
@@ -125,7 +126,7 @@ class ImageTest extends \Test\TestCase {
        }
 
        public function testData() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png'));
                // Preserve transparency
@@ -145,7 +146,7 @@ class ImageTest extends \Test\TestCase {
                        ->method('getSystemValueInt')
                        ->with('preview_max_memory', 256)
                        ->willReturn(256);
-               $img = new \OC_Image(null, null, $config);
+               $img = new Image(null, null, $config);
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.jpg');
                $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                imageinterlace($raw, true);
@@ -154,7 +155,7 @@ class ImageTest extends \Test\TestCase {
                $expected = ob_get_clean();
                $this->assertEquals($expected, $img->data());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.gif');
                $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'));
                ob_start();
@@ -164,7 +165,7 @@ class ImageTest extends \Test\TestCase {
        }
 
        public function testDataNoResource() {
-               $img = new \OC_Image();
+               $img = new Image();
                $this->assertNull($img->data());
        }
 
@@ -172,36 +173,36 @@ class ImageTest extends \Test\TestCase {
         * @depends testData
         */
        public function testToString() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $expected = base64_encode($img->data());
                $this->assertEquals($expected, (string)$img);
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $expected = base64_encode($img->data());
                $this->assertEquals($expected, (string)$img);
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.gif');
                $expected = base64_encode($img->data());
                $this->assertEquals($expected, (string)$img);
        }
 
        public function testResize() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertTrue($img->resize(32));
                $this->assertEquals(32, $img->width());
                $this->assertEquals(32, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $this->assertTrue($img->resize(840));
                $this->assertEquals(840, $img->width());
                $this->assertEquals(525, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $this->assertTrue($img->resize(100));
                $this->assertEquals(100, $img->width());
@@ -209,19 +210,19 @@ class ImageTest extends \Test\TestCase {
        }
 
        public function testPreciseResize() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertTrue($img->preciseResize(128, 512));
                $this->assertEquals(128, $img->width());
                $this->assertEquals(512, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $this->assertTrue($img->preciseResize(64, 840));
                $this->assertEquals(64, $img->width());
                $this->assertEquals(840, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $this->assertTrue($img->preciseResize(1000, 1337));
                $this->assertEquals(1000, $img->width());
@@ -229,19 +230,19 @@ class ImageTest extends \Test\TestCase {
        }
 
        public function testCenterCrop() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $img->centerCrop();
                $this->assertEquals(128, $img->width());
                $this->assertEquals(128, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $img->centerCrop();
                $this->assertEquals(1050, $img->width());
                $this->assertEquals(1050, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $img->centerCrop(512);
                $this->assertEquals(512, $img->width());
@@ -249,19 +250,19 @@ class ImageTest extends \Test\TestCase {
        }
 
        public function testCrop() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $this->assertTrue($img->crop(0, 0, 50, 20));
                $this->assertEquals(50, $img->width());
                $this->assertEquals(20, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
                $this->assertTrue($img->crop(500, 700, 550, 300));
                $this->assertEquals(550, $img->width());
                $this->assertEquals(300, $img->height());
 
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromBase64(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
                $this->assertTrue($img->crop(10, 10, 15, 15));
                $this->assertEquals(15, $img->width());
@@ -284,7 +285,7 @@ class ImageTest extends \Test\TestCase {
         * @param int[] $expected
         */
        public function testFitIn($filename, $asked, $expected) {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT . '/tests/data/' . $filename);
                $this->assertTrue($img->fitIn($asked[0], $asked[1]));
                $this->assertEquals($expected[0], $img->width());
@@ -307,7 +308,7 @@ class ImageTest extends \Test\TestCase {
         * @param string $filename
         */
        public function testScaleDownToFitWhenSmallerAlready($filename) {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/' . $filename);
                $currentWidth = $img->width();
                $currentHeight = $img->height();
@@ -340,7 +341,7 @@ class ImageTest extends \Test\TestCase {
         * @param int[] $expected
         */
        public function testScaleDownWhenBigger($filename, $asked, $expected) {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/' . $filename);
                //$this->assertTrue($img->scaleDownToFit($asked[0], $asked[1]));
                $img->scaleDownToFit($asked[0], $asked[1]);
@@ -360,7 +361,7 @@ class ImageTest extends \Test\TestCase {
         * @dataProvider convertDataProvider
         */
        public function testConvert($mimeType) {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.png');
                $tempFile = tempnam(sys_get_temp_dir(), 'img-test');
 
@@ -369,14 +370,14 @@ class ImageTest extends \Test\TestCase {
        }
 
        public function testMemoryLimitFromFile() {
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage-badheader.jpg');
                $this->assertFalse($img->valid());
        }
 
        public function testMemoryLimitFromData() {
                $data = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage-badheader.jpg');
-               $img = new \OC_Image();
+               $img = new Image();
                $img->loadFromData($data);
                $this->assertFalse($img->valid());
        }

diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php
index 9116fee7e2f7bbd21f248a1edeb4e5f8c56c4405..caac15c353227507a4385bc9e84bd805d96f7318 100644 (file)
--- a/tests/lib/Preview/GeneratorTest.php
+++ b/tests/lib/Preview/GeneratorTest.php
@@ -15,6 +15,7 @@ use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\IConfig;
+use OCP\IImage;
 use OCP\IPreview;
 use OCP\Preview\BeforePreviewFetchedEvent;
 use OCP\Preview\IProviderV2;
@@ -161,7 +162,7 @@ class GeneratorTest extends \Test\TestCase {
                                $this->fail('Unexpected provider requested');
                        });
 
-               $image = $this->createMock(\OC_Image::class);
+               $image = $this->createMock(IImage::class);
                $image->method('width')->willReturn(2048);
                $image->method('height')->willReturn(2048);
                $image->method('valid')->willReturn(true);
@@ -329,7 +330,7 @@ class GeneratorTest extends \Test\TestCase {
        }
 
        private function getMockImage($width, $height, $data = null) {
-               $image = $this->createMock(\OC_Image::class);
+               $image = $this->createMock(IImage::class);
                $image->method('height')->willReturn($width);
                $image->method('width')->willReturn($height);
                $image->method('valid')->willReturn(true);