fml update (1.2 final)

This commit is contained in:
Steffen Schröder
2014-05-20 15:44:45 +02:00
parent 63981d8002
commit 0fc03e1d08
77 changed files with 166 additions and 152 deletions

View File

@ -30,14 +30,7 @@ class ScriptInclude {
*/
public function __construct($file = null, $namespace = null) {
$this->setFile($file);
if ($namespace) {
$this->setNamespace($namespace);
} else {
$fileParts = explode('.', $file);
if (count($fileParts) === 1) {
$this->setNamespace($file);
}
}
$this->setNamespace($namespace);
}
/**
@ -47,7 +40,7 @@ class ScriptInclude {
* @return \FML\Script\ScriptInclude
*/
public function setFile($file) {
$this->file = $file;
$this->file = (string)$file;
return $this;
}
@ -58,7 +51,7 @@ class ScriptInclude {
* @return \FML\Script\ScriptInclude
*/
public function setNamespace($namespace) {
$this->namespace = $namespace;
$this->namespace = (string)$namespace;
return $this;
}