@@ -14,9 +14,7 @@ |
||
14 | 14 | |
15 | 15 | namespace IPub\Flysystem\Factories\Cache; |
16 | 16 | |
17 | -use Nette; |
|
18 | 17 | use Nette\Utils; |
19 | - |
|
20 | 18 | use League\Flysystem; |
21 | 19 | use League\Flysystem\Cached; |
22 | 20 |
@@ -14,10 +14,7 @@ |
||
14 | 14 | |
15 | 15 | namespace IPub\Flysystem\Factories\Cache; |
16 | 16 | |
17 | -use Nette; |
|
18 | -use Nette\DI; |
|
19 | 17 | use Nette\Utils; |
20 | - |
|
21 | 18 | use League\Flysystem; |
22 | 19 | use League\Flysystem\Cached; |
23 | 20 |
@@ -33,7 +33,7 @@ |
||
33 | 33 | class NeonFileLoader extends Nette\Object |
34 | 34 | { |
35 | 35 | /** |
36 | - * @param $resource |
|
36 | + * @param string $resource |
|
37 | 37 | * |
38 | 38 | * @return array |
39 | 39 | */ |
@@ -17,7 +17,6 @@ |
||
17 | 17 | use Nette; |
18 | 18 | use Nette\Neon; |
19 | 19 | use Nette\Utils; |
20 | - |
|
21 | 20 | use IPub; |
22 | 21 | use IPub\Flysystem; |
23 | 22 | use IPub\Flysystem\Exceptions; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | // Check if filesystem is with cache |
68 | 68 | if (array_key_exists('cache', $filesystem)) { |
69 | 69 | // Create adapter name |
70 | - $adapterName = 'cached_' . $filesystem['adapter'] .'_'. $filesystem['cache'] .'_'. uniqid(); |
|
70 | + $adapterName = 'cached_'.$filesystem['adapter'].'_'.$filesystem['cache'].'_'.uniqid(); |
|
71 | 71 | |
72 | 72 | // Create cached adapter |
73 | 73 | $this->registerService( |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | Flysystem\Cached\CachedAdapter::class, |
77 | 77 | 'IPub\Flysystem\Factories\Adapters\CachedFactory::create', |
78 | 78 | [ |
79 | - 'adapterServiceName' => $this->prefix('adapters.' . $filesystem['adapter']), |
|
80 | - 'cacheServiceName' => $this->prefix('cache.' . $filesystem['cache']), |
|
79 | + 'adapterServiceName' => $this->prefix('adapters.'.$filesystem['adapter']), |
|
80 | + 'cacheServiceName' => $this->prefix('cache.'.$filesystem['cache']), |
|
81 | 81 | ] |
82 | 82 | ); |
83 | 83 | |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | $adapterName = $filesystem['adapter']; |
86 | 86 | } |
87 | 87 | |
88 | - $builder->addDefinition($this->prefix('filesystem.' . $name)) |
|
88 | + $builder->addDefinition($this->prefix('filesystem.'.$name)) |
|
89 | 89 | ->setClass(Flysystem\Filesystem::class) |
90 | - ->setArguments(['adapter' => '@' . $this->prefix('adapters.' . $adapterName)]) |
|
90 | + ->setArguments(['adapter' => '@'.$this->prefix('adapters.'.$adapterName)]) |
|
91 | 91 | ->addTag('ipub.flysystem.filesystem'); |
92 | 92 | |
93 | - $mountManager->addSetup('?->mountFilesystem(?, ?)', [$mountManager, $name, '@' . $this->prefix('filesystem.' . $name)]); |
|
93 | + $mountManager->addSetup('?->mountFilesystem(?, ?)', [$mountManager, $name, '@'.$this->prefix('filesystem.'.$name)]); |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $neonAdapter = new Loaders\NeonFileLoader; |
105 | 105 | |
106 | 106 | // Load adapters factories list |
107 | - $definitions = $neonAdapter->load(__DIR__ . DIRECTORY_SEPARATOR . $type . '.neon'); |
|
107 | + $definitions = $neonAdapter->load(__DIR__.DIRECTORY_SEPARATOR.$type.'.neon'); |
|
108 | 108 | |
109 | 109 | foreach ($services as $serviceName => $configuration) { |
110 | 110 | if (isset($configuration['type']) && array_key_exists($configuration['type'], $definitions)) { |
@@ -138,11 +138,11 @@ discard block |
||
138 | 138 | // Get container builder |
139 | 139 | $builder = $this->getContainerBuilder(); |
140 | 140 | |
141 | - $builder->addDefinition($this->prefix($type . '.' . $name)) |
|
141 | + $builder->addDefinition($this->prefix($type.'.'.$name)) |
|
142 | 142 | ->setClass($class) |
143 | 143 | ->setFactory($factory) |
144 | 144 | ->setArguments($arguments) |
145 | - ->addTag('ipub.flysystem.' . $type); |
|
145 | + ->addTag('ipub.flysystem.'.$type); |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | /** |
@@ -40,7 +40,7 @@ |
||
40 | 40 | public static function create(Utils\ArrayHash $parameters, DI\Container $container) |
41 | 41 | { |
42 | 42 | /** @var Flysystem\AdapterInterface $adapter */ |
43 | - $adapter = $container->getService($parameters->extensionPrefix . '.adapters.' . $parameters->adapter); |
|
43 | + $adapter = $container->getService($parameters->extensionPrefix.'.adapters.'.$parameters->adapter); |
|
44 | 44 | |
45 | 45 | return new Cached\Storage\Adapter($adapter, $parameters->file, $parameters->expires); |
46 | 46 | } |
@@ -14,9 +14,7 @@ |
||
14 | 14 | |
15 | 15 | namespace IPub\Flysystem\Factories\Cache; |
16 | 16 | |
17 | -use Nette; |
|
18 | 17 | use Nette\Utils; |
19 | - |
|
20 | 18 | use League\Flysystem; |
21 | 19 | use League\Flysystem\Cached; |
22 | 20 |
@@ -14,9 +14,7 @@ |
||
14 | 14 | |
15 | 15 | namespace IPub\Flysystem\Factories\Cache; |
16 | 16 | |
17 | -use Nette; |
|
18 | 17 | use Nette\Utils; |
19 | - |
|
20 | 18 | use League\Flysystem; |
21 | 19 | use League\Flysystem\Cached; |
22 | 20 |