add more tests

Author: peter279k

.editorconfig

@@ -0,0 +1,12 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false
+indent_style = space
+indent_size = 4

.travis.yml

@@ -1,7 +1,29 @@
 language: php
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
+matrix:
+  include:
+    - php: 5.3
+      dist: precise
+    - php: 5.4
+      dist: trusty
+    - php: 5.5
+      dist: trusty
+    - php: 5.6
+      dist: trusty
+    - php: 7.0
+      dist: trusty
+    - php: 7.1
+      dist: trusty
+    - php: 7.2
+      dist: trusty
+    - php: nightly
+      dist: trusty
+
+before_script:
+  - composer install
+
+script:
+  - mkdir -p build/logs
+  - ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+
+after_script:
+  - php vendor/bin/coveralls -v

composer.json

@@ -13,15 +13,26 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "ext-gd": "*"
+        "ext-gd": "*",
+        "ext-fileinfo": "*"
     },
     "suggest": {
         "ext-exif": "Auto-rotate jpeg files"
     },
     "autoload": {
-        "classmap": ["lib"]
+        "psr-4": {
+            "Gumlet\\": "lib/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Gumlet\\": "test/"
+        }
     },
     "require-dev": {
-        "apigen/apigen": "^4.1"
+        "phpunit/phpunit": "^4.8",
+        "php-coveralls/php-coveralls": "dev-master",
+        "ext-exif": "*",
+        "ext-gd": "*"
     }
 }

lib/ImageResize.php

@@ -14,6 +14,9 @@ class ImageResize
     const CROPLEFT = 4;
     const CROPRIGHT = 5;
     const CROPTOPCENTER = 6;
+    const IMG_FLIP_HORIZONTAL = 0;
+    const IMG_FLIP_VERTICAL = 1;
+    const IMG_FLIP_BOTH = 2;
 
     public $quality_jpg = 85;
     public $quality_webp = 85;
@@ -79,11 +82,12 @@ public function addFilter(callable $filter)
      * Apply filters.
      *
      * @param $image resource an image resource identifier
+     * @param $filterType filter type and default value is IMG_FILTER_NEGATE
      */
-    protected function applyFilter($image)
+    protected function applyFilter($image, $filterType = IMG_FILTER_NEGATE)
     {
         foreach ($this->filters as $function) {
-            $function($image);
+            $function($image, $filterType);
         }
     }
 
@@ -149,7 +153,6 @@ public function __construct($filename)
 
         default:
             throw new ImageResizeException('Unsupported image type');
-            break;
         }
 
         if (!$this->source_image) {
@@ -571,7 +574,7 @@ public function crop($width, $height, $allow_enlarge = false, $position = self::
      */
     public function freecrop($width, $height, $x = false, $y = false)
     {
-        if ($x === false or $y === false) {
+        if ($x === false || $y === false) {
             return $this->crop($width, $height);
         }
         $this->source_x = $x;
@@ -658,59 +661,51 @@ protected function getCropPosition($expectedSize, $position = self::CROPCENTER)
         }
         return $size;
     }
-}
-
-// imageflip definition for PHP < 5.5
-if (!function_exists('imageflip')) {
-    define('IMG_FLIP_HORIZONTAL', 0);
-    define('IMG_FLIP_VERTICAL', 1);
-    define('IMG_FLIP_BOTH', 2);
 
-    function imageflip($image, $mode)
+    /**
+     *  Flips an image using a given mode if PHP version is lower than 5.5
+     *
+     * @param  resource $image
+     * @param  integer  $mode
+     * @return integer|null
+     */
+    public function imageFlip($image, $mode)
     {
-        switch ($mode) {
-        case IMG_FLIP_HORIZONTAL: {
-            $max_x = imagesx($image) - 1;
-            $half_x = $max_x / 2;
-            $sy = imagesy($image);
-            $temp_image = imageistruecolor($image)? imagecreatetruecolor(1, $sy): imagecreate(1, $sy);
-            for ($x = 0; $x < $half_x; ++$x) {
-                imagecopy($temp_image, $image, 0, 0, $x, 0, 1, $sy);
-                imagecopy($image, $image, $x, 0, $max_x - $x, 0, 1, $sy);
-                imagecopy($image, $temp_image, $max_x - $x, 0, 0, 0, 1, $sy);
+        switch($mode) {
+            case self::IMG_FLIP_HORIZONTAL: {
+                $max_x = imagesx($image) - 1;
+                $half_x = $max_x / 2;
+                $sy = imagesy($image);
+                $temp_image = imageistruecolor($image)? imagecreatetruecolor(1, $sy): imagecreate(1, $sy);
+                for ($x = 0; $x < $half_x; ++$x) {
+                    imagecopy($temp_image, $image, 0, 0, $x, 0, 1, $sy);
+                    imagecopy($image, $image, $x, 0, $max_x - $x, 0, 1, $sy);
+                    imagecopy($image, $temp_image, $max_x - $x, 0, 0, 0, 1, $sy);
+                }
+                break;
             }
-            break;
-        }
-case IMG_FLIP_VERTICAL: {
-    $sx = imagesx($image);
-    $max_y = imagesy($image) - 1;
-    $half_y = $max_y / 2;
-    $temp_image = imageistruecolor($image)? imagecreatetruecolor($sx, 1): imagecreate($sx, 1);
-    for ($y = 0; $y < $half_y; ++$y) {
-        imagecopy($temp_image, $image, 0, 0, 0, $y, $sx, 1);
-        imagecopy($image, $image, 0, $y, 0, $max_y - $y, $sx, 1);
-        imagecopy($image, $temp_image, 0, $max_y - $y, 0, 0, $sx, 1);
-    }
-    break;
-}
-case IMG_FLIP_BOTH: {
-    $sx = imagesx($image);
-    $sy = imagesy($image);
-    $temp_image = imagerotate($image, 180, 0);
-    imagecopy($image, $temp_image, 0, 0, 0, 0, $sx, $sy);
-    break;
-}
-default: {
-    return;
-}
+            case self::IMG_FLIP_VERTICAL: {
+                $sx = imagesx($image);
+                $max_y = imagesy($image) - 1;
+                $half_y = $max_y / 2;
+                $temp_image = imageistruecolor($image)? imagecreatetruecolor($sx, 1): imagecreate($sx, 1);
+                for ($y = 0; $y < $half_y; ++$y) {
+                    imagecopy($temp_image, $image, 0, 0, 0, $y, $sx, 1);
+                    imagecopy($image, $image, 0, $y, 0, $max_y - $y, $sx, 1);
+                    imagecopy($image, $temp_image, 0, $max_y - $y, 0, 0, $sx, 1);
+                }
+                break;
+            }
+            case self::IMG_FLIP_BOTH: {
+                $sx = imagesx($image);
+                $sy = imagesy($image);
+                $temp_image = imagerotate($image, 180, 0);
+                imagecopy($image, $temp_image, 0, 0, 0, 0, $sx, $sy);
+                break;
+            }
+            default:
+                return null;
         }
         imagedestroy($temp_image);
     }
 }
-
-/**
- * PHP Exception used in the ImageResize class
- */
-class ImageResizeException extends \Exception
-{
-}

lib/ImageResizeException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Gumlet;
+
+/**
+ * PHP Exception used in the ImageResize class
+ */
+class ImageResizeException extends \Exception
+{
+}

phpunit.xml

@@ -1,15 +1,14 @@
-<phpunit colors="true">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php" colors="true" backupGlobals="false" 
+         backupStaticAttributes="false" syntaxCheck="false">
     <testsuites>
-        <testsuite name="php-image-resize tests">
-            <directory>test</directory>
+        <testsuite name="Tests">
+            <directory suffix="Test.php">test</directory>
         </testsuite>
     </testsuites>
     <filter>
-      <whitelist processUncoveredFilesFromWhitelist="true">
-        <directory suffix=".php">lib</directory>
-      </whitelist>
+        <whitelist processUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">lib</directory>
+        </whitelist>
     </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout"/>
-    </logging>
 </phpunit>

test/ImageResizeExceptionTest.php

@@ -0,0 +1,44 @@
+<?php
+
+use \Gumlet\ImageResize;
+use \Gumlet\ImageResizeException;
+use \PHPUnit\Framework\TestCase;
+
+class ImageResizeExceptionTest extends TestCase
+{
+    public function testExceptionEmpty()
+    {
+        $e = new ImageResizeException();
+
+        $this->assertEquals("", $e->getMessage());
+        $this->assertInstanceOf('\Gumlet\ImageResizeException', $e);
+    }
+
+    public function testExceptionMessage()
+    {
+        $e = new ImageResizeException("General error");
+
+        $this->assertEquals("General error", $e->getMessage());
+        $this->assertInstanceOf('\Gumlet\ImageResizeException', $e);
+    }
+
+    public function testExceptionExtending()
+    {
+        $e = new ImageResizeException("General error");
+
+        $this->assertInstanceOf('\Exception', $e);
+    }
+
+    public function testExceptionThrown()
+    {
+        try{
+            throw new ImageResizeException("General error");
+        } catch (\Exception $e) {
+            $this->assertEquals("General error", $e->getMessage());
+            $this->assertInstanceOf('\Gumlet\ImageResizeException', $e);
+            return;
+        }
+        $this->fail();
+    }
+}
+// It's pretty easy to get your attention these days, isn't it? :D