adds method to use Flysystem to check for source image existence for #38

src/BetterThumbsExtension.php

@@ -12,6 +12,9 @@
 use Bolt\Extension\cdowdy\betterthumbs\Providers\BetterThumbsProvider;
 use Bolt\Extension\SimpleExtension;
 use Bolt\Menu\MenuEntry;
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\Filesystem;
+
 use Pimple as Container;
 
 
@@ -44,7 +47,7 @@ public function getServiceProviders()
 	}
 
 	/**
-	 * @param        $file
+	 * @param        $sourceImage
 	 * @param string $name
 	 * @param array  $options
 	 *
@@ -63,7 +66,7 @@ public function image( $sourceImage, $name = 'betterthumbs', array $options = []
 
 		// if the image isn't found return bolt's 404 image
 		// set the width the the first width in the presets array
-		$sourceExists = $app['betterthumbs']->sourceFileExists( $file );
+		$sourceExists = $this->doesSourceImgExist( $file );
 		$notFoundImg  = $this->notFoundImage();
 		$notFoundSize = $this->imageNotFoundParams();
 
@@ -205,6 +208,16 @@ protected function getNamedConfig( $name )
 		return $configName;
 	}
 
+	protected function doesSourceImgExist( $sourceImage )
+	{
+		$app = $this->getContainer();
+
+		$adapter    = new Local( $app['resources']->getPath( 'filespath' ) );
+		$Filesystem = new Filesystem( $adapter );
+
+		return $Filesystem->has( $sourceImage );
+	}
+
 	/**
 	 * @return string
 	 */
@@ -234,6 +247,11 @@ protected function imageNotFoundParams()
 		return $presets[0];
 	}
 
+	/**
+	 * @param $sourceImage
+	 *
+	 * @return bool
+	 */
 	protected function filterEmptyImageArray( $sourceImage )
 	{
 		if ( is_array( $sourceImage ) ) {
@@ -636,7 +654,7 @@ protected function mergeAndSort( $firstArray, $secondArray, $sortType = SORT_NUM
 	}
 
 	/**
-	 * @param        $file
+	 * @param        $sourceImage
 	 * @param string $name
 	 * @param array  $options
 	 *
@@ -654,7 +672,7 @@ public function single( $sourceImage, $name = 'betterthumbs', array $options = [
 		$file = $this->filterEmptyImageArray( $sourceImage );
 		// if the image isn't found return bolt's 404 image
 		// set the width the the first width in the presets array
-		$sourceExists = $app['betterthumbs']->sourceFileExists( $file );
+		$sourceExists = $this->doesSourceImgExist( $file );
 		$notFoundImg  = $this->notFoundImage();
 		$notFoundSize = $this->imageNotFoundParams();
 
@@ -708,7 +726,7 @@ public function single( $sourceImage, $name = 'betterthumbs', array $options = [
 	}
 
 	/**
-	 * @param        $file
+	 * @param        $sourceImage
 	 * @param string $name
 	 * @param array  $options
 	 *
@@ -728,7 +746,7 @@ public function btSrcset( $sourceImage, $name = 'betterthumbs', array $options =
 		$file = $this->filterEmptyImageArray( $sourceImage );
 		// if the image isn't found return bolt's 404 image
 		// set the width the the first width in the presets array
-		$sourceExists = $app['betterthumbs']->sourceFileExists( $file );
+		$sourceExists = $this->doesSourceImgExist( $file );
 		$notFoundImg  = $this->notFoundImage();
 		$notFoundSize = $this->imageNotFoundParams();
 
@@ -767,7 +785,7 @@ public function btSrcset( $sourceImage, $name = 'betterthumbs', array $options =
 	}
 
 	/**
-	 * @param        $file
+	 * @param        $sourceImage
 	 * @param string $name
 	 * @param array  $options
 	 *
@@ -787,7 +805,7 @@ public function btSrc( $sourceImage, $name = 'betterthumbs', array $options = []
 		$file = $this->filterEmptyImageArray( $sourceImage );
 		// if the image isn't found return bolt's 404 image
 		// set the width the the first width in the presets array
-		$sourceExists = $app['betterthumbs']->sourceFileExists( $file );
+		$sourceExists = $this->doesSourceImgExist( $file );
 		$notFoundImg  = $this->notFoundImage();
 		$notFoundSize = $this->imageNotFoundParams();