Merge pull request #202 from TypiCMS/master

Laravel 9 / Flysystem 3 version of Croppa with passing tests.

.travis.yml

@@ -1,15 +1,13 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
+    - 8.0
+    - 8.1
 
 before_script:
-  - composer install --dev
-  - yarn add mocha
+    - composer install --dev
+    - yarn add mocha
 
 script:
-  - phpunit
-  - yarn mocha public/js/test
+    - phpunit
+    - yarn mocha public/js/test

composer.json

@@ -1,48 +1,48 @@
 {
-	"name": "bkwld/croppa",
-	"description": "Image thumbnail creation through specially formatted URLs for Laravel",
-	"authors": [
-		{
-			"name": "Robert Reinhard"
-		}
-	],
-	"license": "MIT",
-	"require": {
-		"php": "^7.2.5|^8.0",
-		"illuminate/console": "4 - 8",
-		"illuminate/support": "4 - 8",
-		"illuminate/routing": "4 - 8",
-		"league/flysystem": "~1.0",
-		"symfony/http-foundation": "2 - 5",
-		"symfony/http-kernel": "2 - 5",
-		"weotch/phpthumb": "^1.0.5",
-		"ext-gd": "*"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "4 - 5",
-		"mockery/mockery": "~0.9"
-	},
-	"suggest": {
-		"ext-exif": "Required if you want to have Croppa auto-rotate images from devices like mobile phones based on exif meta data."
-	},
-	"conflict": {
-		"league/flysystem-cached-adapter": "<1.0.2"
-	},
-	"autoload": {
-		"psr-0": {
-			"Bkwld\\Croppa": "src/"
-		}
-	},
-	"minimum-stability": "dev",
-	"prefer-stable": true,
-	"extra": {
-		"laravel": {
-			"providers": [
-				"Bkwld\\Croppa\\ServiceProvider"
-			],
-			"aliases": {
-				"Croppa": "Bkwld\\Croppa\\Facade"
-			}
-		}
-	}
+    "name": "bkwld/croppa",
+    "description": "Image thumbnail creation through specially formatted URLs for Laravel",
+    "authors": [
+        {
+            "name": "Robert Reinhard"
+        }
+    ],
+    "license": "MIT",
+    "require": {
+        "php": "^8.0.2",
+        "illuminate/console": "^9.0",
+        "illuminate/support": "^9.0",
+        "illuminate/routing": "^9.0",
+        "league/flysystem": "^3.0",
+        "symfony/http-foundation": "^6.0",
+        "symfony/http-kernel": "^6.0",
+        "weotch/phpthumb": "^1.0.5",
+        "ext-gd": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5.10",
+        "mockery/mockery": "^1.4.4"
+    },
+    "suggest": {
+        "ext-exif": "Required if you want to have Croppa auto-rotate images from devices like mobile phones based on exif meta data."
+    },
+    "conflict": {
+        "league/flysystem-cached-adapter": "<1.0.2"
+    },
+    "autoload": {
+        "psr-0": {
+            "Bkwld\\Croppa": "src/"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Bkwld\\Croppa\\ServiceProvider"
+            ],
+            "aliases": {
+                "Croppa": "Bkwld\\Croppa\\Facade"
+            }
+        }
+    }
 }

package.json

@@ -1,6 +1,6 @@
 {
-  "dependencies": {},
-  "devDependencies": {
-    "mocha": "^3.5.3"
-  }
+    "dependencies": {},
+    "devDependencies": {
+        "mocha": "^3.5.3"
+    }
 }

phpunit.xml

@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/Bkwld/Croppa/Commands/Purge.php

@@ -1,15 +1,17 @@
-<?php namespace Bkwld\Croppa\Commands;
+<?php
+
+namespace Bkwld\Croppa\Commands;
 
 // Deps
 use Bkwld\Croppa\Storage;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 
 /**
- * Delete ALL crops from the crops_dir
+ * Delete ALL crops from the crops_dir.
  */
-class Purge extends Command {
-
+class Purge extends Command
+{
     /**
      * The console command name.
      *
@@ -30,46 +32,43 @@ class Purge extends Command {
     protected $storage;
 
     /**
-     * Dependency inject
-     *
-     * @param Storage $storage
+     * Dependency inject.
      */
-    public function __construct(Storage $storage) {
+    public function __construct(Storage $storage)
+    {
         parent::__construct();
         $this->storage = $storage;
     }
 
     /**
-     * Execute the console command
-     *
-     * @return void
+     * Execute the console command.
      */
-    public function handle() {
+    public function handle()
+    {
         $dry = $this->input->getOption('dry-run');
-        foreach($this->storage->deleteAllCrops($this->input->getOption('filter'), $dry) as $path) {
-            $this->info(sprintf('%s %s', $path, $dry ? 'not deleted' : 'deleted' ));
+        foreach ($this->storage->deleteAllCrops($this->input->getOption('filter'), $dry) as $path) {
+            $this->info(sprintf('%s %s', $path, $dry ? 'not deleted' : 'deleted'));
         }
     }
 
     /**
-     * Backwards compatability with Laravel 4
-     *
-     * @return void
+     * Backwards compatability with Laravel 4.
      */
-    public function fire() {
+    public function fire()
+    {
         $this->handle();
     }
 
     /**
-     * Get the console command options
+     * Get the console command options.
      *
      * @return array;
      */
-    protected function getOptions() {
+    protected function getOptions()
+    {
         return [
             ['filter', null, InputOption::VALUE_REQUIRED, 'A regex pattern that whitelists matching crop paths', null],
             ['dry-run', null, InputOption::VALUE_NONE, 'Only return the crops that would be deleted'],
         ];
     }
-
 }

src/Bkwld/Croppa/Exception.php

@@ -1,3 +1,7 @@
-<?php namespace Bkwld\Croppa;
+<?php
 
-class Exception extends \Exception { }
+namespace Bkwld\Croppa;
+
+class Exception extends \Exception
+{
+}

src/Bkwld/Croppa/Facade.php

@@ -1,8 +1,10 @@
-<?php namespace Bkwld\Croppa;
+<?php
+
+namespace Bkwld\Croppa;
 
 class Facade extends \Illuminate\Support\Facades\Facade
 {
-	protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor()
     {
         return 'Bkwld\Croppa\Helpers';
     }

src/Bkwld/Croppa/Filters/BlackWhite.php

@@ -6,17 +6,13 @@
 
 class BlackWhite implements FilterInterface
 {
-
     /**
      * Applies filter to given thumbnail object.
      *
-     * @param \GdThumb $thumb
-     *
      * @return \Intervention\Image\Image
      */
     public function applyFilter(GdThumb $thumb)
     {
         return $thumb->imageFilter(IMG_FILTER_GRAYSCALE);
     }
-
 }

src/Bkwld/Croppa/Filters/Blur.php

@@ -6,17 +6,13 @@
 
 class Blur implements FilterInterface
 {
-
     /**
      * Applies filter to given thumbnail object.
      *
-     * @param \GdThumb $thumb
-     *
      * @return \Intervention\Image\Image
      */
     public function applyFilter(GdThumb $thumb)
     {
         return $thumb->imageFilter(IMG_FILTER_GAUSSIAN_BLUR);
     }
-
 }

src/Bkwld/Croppa/Filters/Darkgray.php

@@ -6,19 +6,16 @@
 
 class Darkgray implements FilterInterface
 {
-
     /**
      * Applies filter to given thumbnail object.
      *
-     * @param \GdThumb $thumb
-     *
      * @return \Intervention\Image\Image
      */
     public function applyFilter(GdThumb $thumb)
     {
         $thumb->imageFilter(IMG_FILTER_GRAYSCALE);
         $thumb->imageFilter(IMG_FILTER_COLORIZE, -80, -80, -80);
+
         return $thumb;
     }
-
 }

src/Bkwld/Croppa/Filters/FilterInterface.php

@@ -7,8 +7,6 @@
 interface FilterInterface
 {
     /**
-     * @param \GdThumb $thumb
-     *
      * @return \GdThumb $thumb
      */
     public function applyFilter(GdThumb $thumb);

src/Bkwld/Croppa/Filters/Negative.php

@@ -9,8 +9,6 @@ class Negative implements FilterInterface
     /**
      * Applies filter to given thumbnail object.
      *
-     * @param \GdThumb $thumb
-     *
      * @return \Intervention\Image\Image
      */
     public function applyFilter(GdThumb $thumb)
@@ -20,5 +18,4 @@ public function applyFilter(GdThumb $thumb)
 
         return $thumb;
     }
-
 }

src/Bkwld/Croppa/Filters/OrangeWarhol.php

@@ -9,8 +9,6 @@ class OrangeWarhol implements FilterInterface
     /**
      * Applies filter to given thumbnail object.
      *
-     * @param \GdThumb $thumb
-     *
      * @return \Intervention\Image\Image
      */
     public function applyFilter(GdThumb $thumb)
@@ -21,6 +19,4 @@ public function applyFilter(GdThumb $thumb)
 
         return $thumb;
     }
-
-
 }

src/Bkwld/Croppa/Filters/TurquoiseWarhol.php

@@ -9,8 +9,6 @@ class TurquoiseWarhol implements FilterInterface
     /**
      * Applies filter to given thumbnail object.
      *
-     * @param \GdThumb $thumb
-     *
      * @return \Intervention\Image\Image
      */
     public function applyFilter(GdThumb $thumb)
@@ -21,5 +19,4 @@ public function applyFilter(GdThumb $thumb)
 
         return $thumb;
     }
-
 }