Permalink
Browse files

WS tweaks

  • Loading branch information...
1 parent d19838b commit 53cd96a0dc67ebef906795c10f863b710e6e3f2d @lsmith77 lsmith77 committed Oct 21, 2011
Showing with 27 additions and 11 deletions.
  1. +7 −6 Controller/ImagineController.php
  2. +10 −5 Imagine/CachePathResolver.php
  3. +10 −0 Imagine/Filter/FilterManager.php
View
13 Controller/ImagineController.php
@@ -11,12 +11,12 @@
class ImagineController
{
/**
- * @var Liip\ImagineBundle\Imagine\DataLoader\LoaderInterface
+ * @var LoaderInterface
*/
private $dataLoader;
/**
- * @var Liip\ImagineBundle\Imagine\Filter\FilterManager
+ * @var FilterManager
*/
private $filterManager;
@@ -26,16 +26,17 @@ class ImagineController
private $webRoot;
/**
- * @var Liip\ImagineBundle\Imagine\CachePathResolver
+ * @var CachePathResolver
*/
private $cachePathResolver;
/**
* Constructor
*
- * @param Liip\ImagineBundle\Imagine\DataLoader\LoaderInterface $dataLoader
- * @param Liip\ImagineBundle\Imagine\Filter\FilterManager $filterManager
- * @param Liip\ImagineBundle\Imagine\CachePathResolver $cachePathResolver
+ * @param LoaderInterface $dataLoader
+ * @param FilterManager $filterManager
+ * @param string $webRoot
+ * @param CachePathResolver $cachePathResolver
*/
public function __construct(LoaderInterface $dataLoader, FilterManager $filterManager, $webRoot, CachePathResolver $cachePathResolver = null)
{
View
15 Imagine/CachePathResolver.php
@@ -12,12 +12,12 @@
class CachePathResolver
{
/**
- * @var Symfony\Component\Routing\RouterInterface
+ * @var RouterInterface
*/
private $router;
/**
- * @var Symfony\Component\HttpKernel\Util\Filesystem
+ * @var Filesystem
*/
private $filesystem;
@@ -29,10 +29,10 @@ class CachePathResolver
/**
* Constructs cache path resolver with a given web root and cache prefix
*
- * @param Request $request
- * @param RouterInterface $router
+ * @param Request $request
+ * @param RouterInterface $router
* @param Filesystem $filesystem
- * @param string $webRoot
+ * @param string $webRoot
*/
public function __construct(RouterInterface $router, Filesystem $filesystem, $webRoot)
{
@@ -47,6 +47,8 @@ public function __construct(RouterInterface $router, Filesystem $filesystem, $we
* @param string $path
* @param string $filter
* @param boolean $absolute
+ *
+ * @return string
*/
public function getBrowserPath($targetPath, $filter, $absolute = false)
{
@@ -71,6 +73,8 @@ public function getBrowserPath($targetPath, $filter, $absolute = false)
* @param Request $request
* @param string $path
* @param string $filter
+ *
+ * @return string
*/
public function resolve(Request $request, $targetPath, $filter)
{
@@ -102,6 +106,7 @@ public function resolve(Request $request, $targetPath, $filter)
* @throws \RuntimeException
* @param Response $response
* @param string $targetPath
+ *
* @return Response
*/
public function store(Response $response, $targetPath)
View
10 Imagine/Filter/FilterManager.php
@@ -9,7 +9,14 @@
class FilterManager
{
+ /**
+ * @var array
+ */
private $filters;
+
+ /**
+ * @var array
+ */
private $loaders;
/**
@@ -24,6 +31,7 @@ public function __construct(array $filters = array())
/**
* @param $name
* @param Loader\LoaderInterface $loader
+ *
* @return void
*/
public function addLoader($name, LoaderInterface $loader)
@@ -33,6 +41,7 @@ public function addLoader($name, LoaderInterface $loader)
/**
* @param $filter
+ *
* @return array
*/
public function getFilterConfig($filter)
@@ -49,6 +58,7 @@ public function getFilterConfig($filter)
* @param $filter
* @param $image
* @param string $localPath
+ *
* @return Response
*/
public function get(Request $request, $filter, $image, $localPath)

0 comments on commit 53cd96a

Please sign in to comment.