Skip to content

Commit 0704dac

Browse files
committed
Fixed dependecy for file manager
Removed old classes that are now separate modules
1 parent 4f93c5c commit 0704dac

File tree

8 files changed

+9
-513
lines changed

8 files changed

+9
-513
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
}
1717
],
1818
"require": {
19+
"samsonframework/localfilemanager": "1.*",
1920
"samsonos/php_core": "1.*",
2021
"samsonphp/event": "1.*"
2122
},

src/CSS.php

Lines changed: 0 additions & 92 deletions
This file was deleted.

src/FileManager.php

Lines changed: 0 additions & 163 deletions
This file was deleted.

src/FileManagerInterface.php

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/Router.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
namespace samsonphp\resource;
33

44
use samson\core\ExternalModule;
5+
use samsonframework\filemanager\FileManagerInterface;
56
use samsonphp\event\Event;
67

78
/**
@@ -24,6 +25,9 @@ class Router extends ExternalModule
2425
/** Event when recourse management is finished */
2526
const E_FINISHED = 'resourcer.finished';
2627

28+
/** @var FileManagerInterface File system manager */
29+
public $fileManager;
30+
2731
/** @deprecated Identifier */
2832
protected $id = STATIC_RESOURCE_HANDLER;
2933

@@ -47,13 +51,13 @@ class Router extends ExternalModule
4751
*/
4852
public function init(array $params = array())
4953
{
50-
// Subscribe for CSS handling
51-
Event::subscribe(self::E_RESOURCE_COMPILE, [new CSS(), 'compile']);
52-
5354
// Subscribe to core template rendering event
5455
Event::subscribe('core.rendered', [$this, 'renderTemplate']);
5556

56-
$resourceManager = new ResourceManager(new FileManager());
57+
// Set default dependency as local file manager
58+
$this->fileManager = $this->fileManager ?: new LocalFileManager();
59+
60+
$resourceManager = new ResourceManager($this->fileManager);
5761
$resourceManager::$cacheRoot = $this->cache_path;
5862
$resourceManager::$webRoot = getcwd();
5963
$resourceManager::$projectRoot = dirname($resourceManager::$webRoot) . '/';

0 commit comments

Comments
 (0)