Merge pull request #422 from rexxars/cleanup

Code cleanup
imbo · Dec 9, 2015 · 9a94505 · 9a94505
2 parents 1e778c6 + 68bd786
commit 9a94505
Show file tree

Hide file tree

Showing 51 changed files with 77 additions and 108 deletions.
diff --git a/library/Imbo/Application.php b/library/Imbo/Application.php
diff --git a/library/Imbo/Auth/AccessControl/Adapter/AbstractAdapter.php b/library/Imbo/Auth/AccessControl/Adapter/AbstractAdapter.php
@@ -72,4 +72,37 @@ public function hasAccess($publicKey, $resource, $user = null) {
 
         return false;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUsersForResource($publicKey, $resource) {
+        if (!$publicKey || !$resource) {
+            return [];
+        }
+
+        $accessList = $this->getAccessListForPublicKey($publicKey);
+
+        // Get all user lists
+        $userLists = array_filter(array_map(function($acl) {
+            return isset($acl['users']) ? $acl['users'] : false;
+        }, $accessList));
+
+        // Merge user lists
+        $users = call_user_func_array('array_merge', $userLists);
+
+        // Check if public key has access to user with same name
+        if ($this->hasAccess($publicKey, $resource, $publicKey)) {
+            $userList[] = $publicKey;
+        }
+
+        // Check for each user specified in acls
+        foreach ($users as $user) {
+            if ($this->hasAccess($publicKey, $resource, $user)) {
+                $userList[] = $user;
+            }
+        }
+
+        return $userList;
+    }
 }
diff --git a/library/Imbo/Auth/AccessControl/Adapter/ArrayAdapter.php b/library/Imbo/Auth/AccessControl/Adapter/ArrayAdapter.php
@@ -57,39 +57,6 @@ public function __construct(array $accessList = [], $groups = []) {
         $this->validateAccessList();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUsersForResource($publicKey, $resource) {
-        if (!$publicKey || !$resource) {
-            return [];
-        }
-
-        $accessList = $this->getAccessListForPublicKey($publicKey);
-
-        // Get all user lists
-        $userLists = array_filter(array_map(function($acl) {
-            return isset($acl['users']) ? $acl['users'] : false;
-        }, $accessList));
-
-        // Merge user lists
-        $users = call_user_func_array('array_merge', $userLists);
-
-        // Check if public key has access to user with same name
-        if ($this->hasAccess($publicKey, $resource, $publicKey)) {
-            $userList[] = $publicKey;
-        }
-
-        // Check for each user specified in acls
-        foreach ($users as $user) {
-            if ($this->hasAccess($publicKey, $resource, $user)) {
-                $userList[] = $user;
-            }
-        }
-
-        return $userList;
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/library/Imbo/Auth/AccessControl/Adapter/MongoDB.php b/library/Imbo/Auth/AccessControl/Adapter/MongoDB.php
@@ -11,8 +11,6 @@
 namespace Imbo\Auth\AccessControl\Adapter;
 
 use Imbo\Exception\DatabaseException,
-    Imbo\Exception\InvalidArgumentException,
-    Imbo\Exception\RuntimeException,
     Imbo\Auth\AccessControl\GroupQuery,
     Imbo\Model\Groups as GroupsModel,
     MongoClient,
@@ -106,39 +104,6 @@ public function __construct(array $params = null, MongoClient $client = null, Mo
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUsersForResource($publicKey, $resource) {
-        if (!$publicKey || !$resource) {
-            return [];
-        }
-
-        $accessList = $this->getAccessListForPublicKey($publicKey);
-
-        // Get all user lists
-        $userLists = array_filter(array_map(function($acl) {
-            return isset($acl['users']) ? $acl['users'] : false;
-        }, $accessList));
-
-        // Merge user lists
-        $users = call_user_func_array('array_merge', $userLists);
-
-        // Check if public key has access to user with same name
-        if ($this->hasAccess($publicKey, $resource, $publicKey)) {
-            $userList[] = $publicKey;
-        }
-
-        // Check for each user specified in acls
-        foreach ($users as $user) {
-            if ($this->hasAccess($publicKey, $resource, $user)) {
-                $userList[] = $user;
-            }
-        }
-
-        return $userList;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -388,8 +353,6 @@ public function getAccessListForPublicKey($publicKey) {
 
             return $info;
         }, $info['acl']);
-
-        return $info['acl'];
     }
 
     /**

diff --git a/library/Imbo/Auth/AccessControl/Adapter/SimpleArrayAdapter.php b/library/Imbo/Auth/AccessControl/Adapter/SimpleArrayAdapter.php
@@ -11,7 +11,6 @@
 namespace Imbo\Auth\AccessControl\Adapter;
 
 use Imbo\Exception\InvalidArgumentException,
-    Imbo\Auth\AccessControl\GroupQuery,
     Imbo\Resource;
 
 /**

diff --git a/library/Imbo/Database/Doctrine.php b/library/Imbo/Database/Doctrine.php
diff --git a/library/Imbo/EventListener/AccessControl.php b/library/Imbo/EventListener/AccessControl.php
@@ -11,9 +11,7 @@
 namespace Imbo\EventListener;
 
 use Imbo\EventManager\EventInterface,
-    Imbo\Http\Request\Request,
     Imbo\Exception\RuntimeException,
-    Imbo\Auth\AccessControl\AccessControlAdapter,
     Imbo\Auth\AccessControl\GroupQuery,
     Imbo\Model\Groups as GroupsModel,
     Imbo\Resource;

diff --git a/library/Imbo/EventListener/AccessToken.php b/library/Imbo/EventListener/AccessToken.php
@@ -144,7 +144,7 @@ public function checkAccessToken(EventInterface $event) {
         // See if we should modify the protocol for the incoming request
         $protocol = $config['authentication']['protocol'];
         if ($protocol === 'both') {
-            $uris = array_reduce($uris, function($dest, $uri) use ($protocol) {
+            $uris = array_reduce($uris, function($dest, $uri) {
                 $baseUrl = preg_replace('#^https?#', '', $uri);
                 $dest[] = 'http' . $baseUrl;
                 $dest[] = 'https' . $baseUrl;

diff --git a/library/Imbo/EventListener/DatabaseOperations.php b/library/Imbo/EventListener/DatabaseOperations.php
@@ -316,7 +316,6 @@ public function loadUser(EventInterface $event) {
     public function loadStats(EventInterface $event) {
         $response = $event->getResponse();
         $database = $event->getDatabase();
-        $accessControl = $event->getAccessControl();
 
         $statsModel = new Model\Stats();
         $statsModel->setNumUsers($database->getNumUsers());

diff --git a/library/Imbo/EventListener/ImageVariations/Database/Doctrine.php b/library/Imbo/EventListener/ImageVariations/Database/Doctrine.php
@@ -10,16 +10,10 @@
 
 namespace Imbo\EventListener\ImageVariations\Database;
 
-use Imbo\Model\Image,
-    Imbo\Model\Images,
-    Imbo\Resource\Images\Query,
-    Imbo\Exception\DatabaseException,
-    Doctrine\DBAL\Configuration,
+use Doctrine\DBAL\Configuration,
     Doctrine\DBAL\DriverManager,
     Doctrine\DBAL\Connection,
-    PDO,
-    DateTime,
-    DateTimeZone;
+    PDO;
 
 /**
  * Doctrine 2 database driver for the image variations

diff --git a/library/Imbo/EventListener/ImageVariations/Database/MongoDB.php b/library/Imbo/EventListener/ImageVariations/Database/MongoDB.php
@@ -10,10 +10,7 @@
 
 namespace Imbo\EventListener\ImageVariations\Database;
 
-use Imbo\Model\Image,
-    Imbo\Model\Images,
-    Imbo\Resource\Images\Query,
-    Imbo\Exception\DatabaseException,
+use Imbo\Exception\DatabaseException,
     MongoClient,
     MongoCollection,
     MongoException;

diff --git a/library/Imbo/EventListener/StatsAccess.php b/library/Imbo/EventListener/StatsAccess.php
diff --git a/library/Imbo/EventListener/StorageOperations.php b/library/Imbo/EventListener/StorageOperations.php
diff --git a/library/Imbo/EventManager/Event.php b/library/Imbo/EventManager/Event.php
diff --git a/library/Imbo/Http/Response/Response.php b/library/Imbo/Http/Response/Response.php
diff --git a/library/Imbo/Http/Response/ResponseFormatter.php b/library/Imbo/Http/Response/ResponseFormatter.php
diff --git a/library/Imbo/Image/Identifier/Generator/RandomString.php b/library/Imbo/Image/Identifier/Generator/RandomString.php
@@ -10,8 +10,7 @@
 
 namespace Imbo\Image\Identifier\Generator;
 
-use Imbo\Model\Image,
-    Ramsey\Uuid\Uuid as UuidFactory;
+use Imbo\Model\Image;
 
 /**
  * Random string image identifier generator

diff --git a/library/Imbo/Image/ImagePreparation.php b/library/Imbo/Image/ImagePreparation.php
@@ -12,6 +12,7 @@
 
 use Imbo\EventManager\EventInterface,
     Imbo\EventListener\ListenerInterface,
+    Imbo\Image\Identifier\Generator\GeneratorInterface,
     Imbo\Exception\ImageException,
     Imbo\Exception,
     Imbo\Model\Image,
@@ -109,7 +110,7 @@ private function generateImageIdentifier(EventInterface $event, Image $image) {
         $imageIdentifierGenerator = $config['imageIdentifierGenerator'];
 
         if (is_callable($imageIdentifierGenerator) &&
-            !($imageIdentifierGenerator instanceof ImageIdentifierGeneratorInterface)) {
+            !($imageIdentifierGenerator instanceof GeneratorInterface)) {
             $imageIdentifierGenerator = $imageIdentifierGenerator();
         }
 

diff --git a/library/Imbo/Image/Transformation/AutoRotate.php b/library/Imbo/Image/Transformation/AutoRotate.php
diff --git a/library/Imbo/Image/Transformation/Blur.php b/library/Imbo/Image/Transformation/Blur.php
@@ -10,8 +10,7 @@
 
 namespace Imbo\Image\Transformation;
 
-use Imbo\Model\Image,
-    Imbo\Exception\TransformationException,
+use Imbo\Exception\TransformationException,
     Imbo\EventListener\ListenerInterface,
     Imbo\EventManager\EventInterface,
     ImagickException;

diff --git a/library/Imbo/Image/Transformation/Border.php b/library/Imbo/Image/Transformation/Border.php
diff --git a/library/Imbo/Image/Transformation/Canvas.php b/library/Imbo/Image/Transformation/Canvas.php
diff --git a/library/Imbo/Image/Transformation/Compress.php b/library/Imbo/Image/Transformation/Compress.php
diff --git a/library/Imbo/Image/Transformation/Contrast.php b/library/Imbo/Image/Transformation/Contrast.php
@@ -10,8 +10,7 @@
 
 namespace Imbo\Image\Transformation;
 
-use Imbo\Model\Image,
-    Imbo\Exception\TransformationException,
+use Imbo\Exception\TransformationException,
     Imbo\EventListener\ListenerInterface,
     Imbo\EventManager\EventInterface,
     ImagickException;

diff --git a/library/Imbo/Image/Transformation/Crop.php b/library/Imbo/Image/Transformation/Crop.php
@@ -10,8 +10,7 @@
 
 namespace Imbo\Image\Transformation;
 
-use Imbo\Model\Image,
-    Imbo\Exception\TransformationException,
+use Imbo\Exception\TransformationException,
     Imbo\EventListener\ListenerInterface,
     Imbo\EventManager\EventInterface,
     ImagickException;

diff --git a/library/Imbo/Image/Transformation/Desaturate.php b/library/Imbo/Image/Transformation/Desaturate.php
diff --git a/library/Imbo/Image/Transformation/DrawPois.php b/library/Imbo/Image/Transformation/DrawPois.php
@@ -15,9 +15,7 @@
     Imbo\EventManager\EventInterface,
     Imbo\Model\Image,
     Imagick,
-    ImagickPixel,
     ImagickException,
-    ImagickPixelException,
     ImagickDraw;
 
 /**

diff --git a/library/Imbo/Image/Transformation/FlipVertically.php b/library/Imbo/Image/Transformation/FlipVertically.php
diff --git a/library/Imbo/Image/Transformation/Histogram.php b/library/Imbo/Image/Transformation/Histogram.php
@@ -120,7 +120,6 @@ public function transform(EventInterface $event) {
 
             // let's draw a histogram
             $origwidth = 256;
-            $origheight = floor($origwidth / $ratio);
             $width = $origwidth * $scale;
             $height = floor($width / $ratio);
 

diff --git a/library/Imbo/Image/Transformation/MaxSize.php b/library/Imbo/Image/Transformation/MaxSize.php
diff --git a/library/Imbo/Image/Transformation/Modulate.php b/library/Imbo/Image/Transformation/Modulate.php
diff --git a/library/Imbo/Image/Transformation/Resize.php b/library/Imbo/Image/Transformation/Resize.php
diff --git a/library/Imbo/Image/Transformation/Rotate.php b/library/Imbo/Image/Transformation/Rotate.php
diff --git a/library/Imbo/Image/Transformation/Sepia.php b/library/Imbo/Image/Transformation/Sepia.php
diff --git a/library/Imbo/Image/Transformation/Sharpen.php b/library/Imbo/Image/Transformation/Sharpen.php
@@ -10,8 +10,7 @@
 
 namespace Imbo\Image\Transformation;
 
-use Imbo\Model\Image,
-    Imbo\Exception\TransformationException,
+use Imbo\Exception\TransformationException,
     Imbo\EventListener\ListenerInterface,
     Imbo\EventManager\EventInterface,
     ImagickException;

diff --git a/library/Imbo/Image/Transformation/Thumbnail.php b/library/Imbo/Image/Transformation/Thumbnail.php
diff --git a/library/Imbo/Image/Transformation/Transpose.php b/library/Imbo/Image/Transformation/Transpose.php
diff --git a/library/Imbo/Image/Transformation/Transverse.php b/library/Imbo/Image/Transformation/Transverse.php
diff --git a/library/Imbo/Image/Transformation/Watermark.php b/library/Imbo/Image/Transformation/Watermark.php
diff --git a/library/Imbo/Resource/GlobalImages.php b/library/Imbo/Resource/GlobalImages.php
@@ -11,8 +11,7 @@
 namespace Imbo\Resource;
 
 use Imbo\EventManager\EventInterface,
-    Imbo\Exception\RuntimeException,
-    Imbo\Model;
+    Imbo\Exception\RuntimeException;
 
 /**
  * Global images resource

diff --git a/library/Imbo/Resource/Group.php b/library/Imbo/Resource/Group.php
@@ -11,7 +11,6 @@
 namespace Imbo\Resource;
 
 use Imbo\EventManager\EventInterface,
-    Imbo\Exception\InvalidArgumentException,
     Imbo\Exception\ResourceException,
     Imbo\Auth\AccessControl\Adapter\MutableAdapterInterface,
     Imbo\Model\Group as GroupModel;

diff --git a/library/Imbo/Resource/Image.php b/library/Imbo/Resource/Image.php
diff --git a/library/Imbo/Resource/ShortUrls.php b/library/Imbo/Resource/ShortUrls.php
diff --git a/library/Imbo/Resource/Stats.php b/library/Imbo/Resource/Stats.php
diff --git a/library/Imbo/Storage/Filesystem.php b/library/Imbo/Storage/Filesystem.php
diff --git a/library/Imbo/Storage/GridFS.php b/library/Imbo/Storage/GridFS.php
diff --git a/library/Imbo/Storage/S3.php b/library/Imbo/Storage/S3.php
diff --git a/library/Imbo/Storage/StorageInterface.php b/library/Imbo/Storage/StorageInterface.php
diff --git a/library/ImboCli/Command/AddPublicKey.php b/library/ImboCli/Command/AddPublicKey.php
@@ -10,8 +10,7 @@
 
 namespace ImboCli\Command;
 
-use Symfony\Component\Console\Command\Command as BaseCommand,
-    Symfony\Component\Console\Input\InputArgument,
+use Symfony\Component\Console\Input\InputArgument,
     Symfony\Component\Console\Input\InputInterface,
     Symfony\Component\Console\Question\Question,
     Symfony\Component\Console\Question\ChoiceQuestion,

diff --git a/setup/doctrine.sqlite.sql b/setup/doctrine.sqlite.sql
@@ -59,4 +59,4 @@ CREATE TABLE IF NOT EXISTS imagevariations (
     height INTEGER NOT NULL,
     added INTEGER NOT NULL,
     PRIMARY KEY (user,imageIdentifier,width)
-);
+);
diff --git a/tests/phpunit/ImboUnitTest/Image/ImagePreparationTest.php b/tests/phpunit/ImboUnitTest/Image/ImagePreparationTest.php
@@ -10,7 +10,9 @@
 
 namespace ImboUnitTest\Image;
 
-use Imbo\Image\ImagePreparation;
+use Imbo\Image\ImagePreparation,
+    Imbo\Model\Image,
+    Imbo\Image\Identifier\Generator\GeneratorInterface;
 
 /**
  * @covers Imbo\Image\ImagePreparation
@@ -173,4 +175,31 @@ public function testInstantiatesImageIdentifierGeneratorOnCallable() {
         $this->request->expects($this->once())->method('setImage')->with($this->isInstanceOf('Imbo\Model\Image'));
         $this->prepare->prepareImage($event);
     }
+
+    /**
+     * @covers Imbo\Image\ImagePreparation::prepareImage
+     * @covers Imbo\Image\ImagePreparation::generateImageIdentifier
+     */
+    public function testDoesNotInstantiateCallableGenerator() {
+        $imagePath = FIXTURES_DIR . '/image.png';
+        $imageData = file_get_contents($imagePath);
+
+        $config['imageIdentifierGenerator'] = new CallableImageIdentifierGenerator();
+
+        $event = $this->getMock('Imbo\EventManager\Event');
+        $event->expects($this->any())->method('getRequest')->will($this->returnValue($this->request));
+        $event->expects($this->any())->method('getResponse')->will($this->returnValue($this->response));
+        $event->expects($this->any())->method('getConfig')->will($this->returnValue($config));
+        $event->expects($this->any())->method('getDatabase')->will($this->returnValue($this->database));
+
+        $this->request->expects($this->once())->method('getContent')->will($this->returnValue($imageData));
+        $this->request->expects($this->once())->method('setImage')->with($this->isInstanceOf('Imbo\Model\Image'));
+        $this->prepare->prepareImage($event);
+    }
+}
+
+class CallableImageIdentifierGenerator implements GeneratorInterface {
+    public function generate(Image $image) {}
+    public function isDeterministic() {}
+    public function __invoke() {}
 }