hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 07:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove static create calls in Symlinker module

Browse Source
This commit is contained in:
Benoît Burnichon
2016-01-14 10:46:18 +01:00
parent c7d0d63b1d
commit bba360c3a1
4 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Core/Provider/FileServeServiceProvider.php
View File

@@ -41,7 +41,7 @@ class FileServeServiceProvider implements ServiceProviderInterface
}); });
$app['phraseanet.static-file'] = $app->share(function (Application $app) { $app['phraseanet.static-file'] = $app->share(function (Application $app) {
return new StaticMode(SymLinker::create($app)); return new StaticMode($app['phraseanet.thumb-symlinker']);
}); });
$app['phraseanet.file-serve'] = $app->share(function (Application $app) { $app['phraseanet.file-serve'] = $app->share(function (Application $app) {

8
lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
View File

@@ -41,11 +41,15 @@ class PhraseanetServiceProvider implements ServiceProviderInterface
}); });
$app['phraseanet.thumb-symlinker'] = $app->share(function (SilexApplication $app) { $app['phraseanet.thumb-symlinker'] = $app->share(function (SilexApplication $app) {
return SymLinker::create($app); return new SymLinker(
$app['phraseanet.thumb-symlinker-encoder'],
$app['filesystem'],
$app['thumbnail.path']
);
}); });
$app['phraseanet.thumb-symlinker-encoder'] = $app->share(function (SilexApplication $app) { $app['phraseanet.thumb-symlinker-encoder'] = $app->share(function (SilexApplication $app) {
return SymLinkerEncoder::create($app); return new SymLinkerEncoder($app['phraseanet.configuration']['main']['key']);
}); });
$app['acl'] = $app->share(function (SilexApplication $app) { $app['acl'] = $app->share(function (SilexApplication $app) {

11
lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinker.php
View File

@@ -11,10 +11,8 @@
namespace Alchemy\Phrasea\Http\StaticFile\Symlink; namespace Alchemy\Phrasea\Http\StaticFile\Symlink;
use Alchemy\Phrasea\Exception\InvalidArgumentException;
use Silex\Application; use Silex\Application;
use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Filesystem\Filesystem;
use Guzzle\Http\Url;
/** /**
* Create & retrieve symlinks * Create & retrieve symlinks
@@ -25,15 +23,6 @@ class SymLinker
protected $fs; protected $fs;
protected $symlinkDir; protected $symlinkDir;
public static function create(Application $app)
{
return new SymLinker(
$app['phraseanet.thumb-symlinker-encoder'],
$app['filesystem'],
$app['thumbnail.path']
);
}
public function __construct(SymLinkerEncoder $encoder, Filesystem $fs, $symlinkDir) public function __construct(SymLinkerEncoder $encoder, Filesystem $fs, $symlinkDir)
{ {
$this->encoder = $encoder; $this->encoder = $encoder;

11
lib/Alchemy/Phrasea/Http/StaticFile/Symlink/SymLinkerEncoder.php
View File

@@ -11,21 +11,10 @@
namespace Alchemy\Phrasea\Http\StaticFile\Symlink; namespace Alchemy\Phrasea\Http\StaticFile\Symlink;
use Silex\Application;
use Symfony\Component\Filesystem\Filesystem;
use Guzzle\Http\Url;
class SymLinkerEncoder class SymLinkerEncoder
{ {
protected $key; protected $key;
public static function create(Application $app)
{
return new self(
$app['phraseanet.configuration']['main']['key']
);
}
public function __construct($key) public function __construct($key)
{ {
$this->key = $key; $this->key = $key;