Merge pull request #147 from davidyell/develop

Merge for release

.coveralls.yml

@@ -1,2 +1,2 @@
 src_dir: src
-coverage_clover: build/logs/clover.xml
+coverage_clover: build/logs/clover.xml

.travis.yml

@@ -16,10 +16,10 @@ matrix:
   fast_finish: true
 
   include:
-  - php: 5.5
+    php: 5.5
     env: PHPCS=1 DEFAULT=0
 
-  - php: 5.5
+    php: 5.5
     env: COVERALLS=1 DEFAULT=0
 
 install:
@@ -41,4 +41,4 @@ script:
   - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
 
 notifications:
-  email: false
+  email: false

README.md

@@ -16,12 +16,11 @@ in a similar vein to how [@josegonzalez](https://github.com/josegonzalez) had wr
 * [File Info is enabled](http://php.net/manual/en/book.fileinfo.php) for mimetype validation
 
 ##Status
-This is currently in beta, the api is stable and the plugin is functionally complete.
-
 [![Build Status](https://travis-ci.org/davidyell/CakePHP3-Proffer.svg?branch=master)](https://travis-ci.org/davidyell/CakePHP3-Proffer)
 [![Coverage Status](https://coveralls.io/repos/davidyell/CakePHP3-Proffer/badge.png)](https://coveralls.io/r/davidyell/CakePHP3-Proffer)
 [![Dependency Status](https://www.versioneye.com/user/projects/54eee43931e55e12f9000018/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54eee43931e55e12f9000018)
 [![Latest Stable Version](https://poser.pugx.org/davidyell/proffer/v/stable.svg)](https://packagist.org/packages/davidyell/proffer) [![Total Downloads](https://poser.pugx.org/davidyell/proffer/downloads.svg)](https://packagist.org/packages/davidyell/proffer) [![Latest Unstable Version](https://poser.pugx.org/davidyell/proffer/v/unstable.svg)](https://packagist.org/packages/davidyell/proffer) [![License](https://poser.pugx.org/davidyell/proffer/license.svg)](https://packagist.org/packages/davidyell/proffer)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/65daa950-3128-44ef-b388-d4370efd853c/mini.png)](https://insight.sensiolabs.com/projects/65daa950-3128-44ef-b388-d4370efd853c)
 
 ##Documentation
 All the documentation can be found in the [docs](docs) folder.

src/Lib/ImageTransform.php

@@ -8,7 +8,6 @@
 
 namespace Proffer\Lib;
 
-use Cake\Event\Event;
 use Cake\ORM\Table;
 use Imagine\Filter\Transformation;
 use Imagine\Gd\Imagine as Gd;

src/Lib/ImageTransformInterface.php

@@ -11,8 +11,6 @@
 
 namespace Proffer\Lib;
 
-use Cake\ORM\Table;
-
 interface ImageTransformInterface
 {
     /**

src/Lib/ProfferPathInterface.php

@@ -11,9 +11,6 @@
 
 namespace Proffer\Lib;
 
-use Cake\ORM\Entity;
-use Cake\ORM\Table;
-
 interface ProfferPathInterface
 {
 

src/Shell/ProfferShell.php

@@ -148,7 +148,7 @@ public function cleanup($table)
             $okayToDestroy = $this->in(__('Are you sure? This will irreversibly delete files'), ['y', 'n'], 'n');
             if ($okayToDestroy === 'N') {
                 $this->out(__('Aborted, no files deleted.'));
-                exit;
+                $this->_stop();
             }
         } else {
             $this->out(__('<info>Performing dry run cleanup.</info>'));
@@ -257,12 +257,12 @@ protected function checkTable($table)
             $this->Table = $this->loadModel($table);
         } catch (Exception $e) {
             $this->out(__('<error>' . $e->getMessage() . '</error>'));
-            exit;
+            $this->_stop();
         }
 
         if (get_class($this->Table) === 'AppModel') {
             $this->out(__('<error>The table could not be found, instance of AppModel loaded.</error>'));
-            exit;
+            $this->_stop();
         }
 
         if (!$this->Table->hasBehavior('Proffer')) {
@@ -271,7 +271,7 @@ protected function checkTable($table)
                 "' does not have the Proffer behavior attached.</error>"
             );
             $this->out($out);
-            exit;
+            $this->_stop();
         }
 
         $config = $this->Table->behaviors()->Proffer->config();
@@ -282,15 +282,15 @@ protected function checkTable($table)
                     "' does not have the configured upload field in it's schema.</error>"
                 );
                 $this->out($out);
-                exit;
+                $this->_stop();
             }
             if (!$this->Table->hasField($settings['dir'])) {
                 $out = __(
                     "<error>The table '" . $this->Table->alias() .
                     "' does not have the configured dir field in it's schema.</error>"
                 );
                 $this->out($out);
-                exit;
+                $this->_stop();
             }
 
         }