ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continued ioc refactoring.

Browse Source
This commit is contained in:
Taylor Otwell
2011-08-26 21:42:04 -05:00
parent fb3a0df0dd
commit 1e49001dfc
44 changed files with 1388 additions and 1046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
laravel/asset.php
View File

@@ -33,7 +33,7 @@ class Asset {
{
if ( ! isset(static::$containers[$container]))
{
static::$containers[$container] = new Asset_Container($container, new File);
static::$containers[$container] = new Asset_Container($container);
}
return static::$containers[$container];
@@ -78,13 +78,6 @@ class Asset_Container {
*/
public $assets = array();
/**
* The file manager instance.
*
* @var File
*/
private $file;
/**
* Create a new asset container instance.
*
@@ -92,10 +85,9 @@ class Asset_Container {
* @param File $file
* @return void
*/
public function __construct($name, File $file)
public function __construct($name)
{
$this->name = $name;
$this->file = $file;
}
/**
@@ -125,7 +117,7 @@ class Asset_Container {
*/
public function add($name, $source, $dependencies = array(), $attributes = array())
{
$type = ($this->file->extension($source) == 'css') ? 'style' : 'script';
$type = (pathinfo($source, PATHINFO_EXTENSION) == 'css') ? 'style' : 'script';
return call_user_func(array($this, $type), $name, $source, $dependencies, $attributes);
}