Merge remote branch 'kriswallsmith/assetic-renames'
* kriswallsmith/assetic-renames: [AsseticBundle] renamed some classes
This commit is contained in:
commit
c63e1ace81
@ -18,7 +18,7 @@ use Assetic\Factory\LazyAssetManager;
|
||||
*
|
||||
* @author Kris Wallsmith <kris.wallsmith@symfony-project.com>
|
||||
*/
|
||||
class CachedAssetManager extends LazyAssetManager
|
||||
class AssetManager extends LazyAssetManager
|
||||
{
|
||||
protected $cacheFiles = array();
|
||||
protected $fresh = true;
|
@ -11,7 +11,7 @@
|
||||
|
||||
namespace Symfony\Bundle\AsseticBundle;
|
||||
|
||||
use Assetic\FilterManager;
|
||||
use Assetic\FilterManager as BaseFilterManager;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
*
|
||||
* @author Kris Wallsmith <kris.wallsmith@symfony-project.com>
|
||||
*/
|
||||
class LazyFilterManager extends FilterManager
|
||||
class FilterManager extends BaseFilterManager
|
||||
{
|
||||
protected $container;
|
||||
protected $mappings;
|
@ -6,8 +6,8 @@
|
||||
|
||||
<parameters>
|
||||
<parameter key="assetic.asset_factory.class">Symfony\Bundle\AsseticBundle\Factory\AssetFactory</parameter>
|
||||
<parameter key="assetic.asset_manager.class">Symfony\Bundle\AsseticBundle\Factory\CachedAssetManager</parameter>
|
||||
<parameter key="assetic.filter_manager.class">Symfony\Bundle\AsseticBundle\LazyFilterManager</parameter>
|
||||
<parameter key="assetic.asset_manager.class">Symfony\Bundle\AsseticBundle\Factory\AssetManager</parameter>
|
||||
<parameter key="assetic.filter_manager.class">Symfony\Bundle\AsseticBundle\FilterManager</parameter>
|
||||
|
||||
<parameter key="assetic.filter.coffee.class">Assetic\Filter\CoffeeScriptFilter</parameter>
|
||||
<parameter key="assetic.filter.cssrewrite.class">Assetic\Filter\CssRewriteFilter</parameter>
|
||||
|
@ -11,9 +11,9 @@
|
||||
|
||||
namespace Symfony\Bundle\AsseticBundle\Tests\Factory;
|
||||
|
||||
use Symfony\Bundle\AsseticBundle\Factory\CachedAssetManager;
|
||||
use Symfony\Bundle\AsseticBundle\Factory\AssetManager;
|
||||
|
||||
class CachedAssetManagerTest extends \PHPUnit_Framework_TestCase
|
||||
class AssetManagerTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
protected function setUp()
|
||||
{
|
||||
@ -31,7 +31,7 @@ class CachedAssetManagerTest extends \PHPUnit_Framework_TestCase
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$am = new CachedAssetManager($factory);
|
||||
$am = new AssetManager($factory);
|
||||
$am->addCacheFile($file);
|
||||
|
||||
$this->assertTrue($am->has('foo'), '->loadFormulae() loads formulae');
|
@ -11,9 +11,9 @@
|
||||
|
||||
namespace Symfony\Bundle\AsseticBundle\Tests;
|
||||
|
||||
use Symfony\Bundle\AsseticBundle\LazyFilterManager;
|
||||
use Symfony\Bundle\AsseticBundle\FilterManager;
|
||||
|
||||
class LazyFilterManagerTest extends \PHPUnit_Framework_TestCase
|
||||
class FilterManagerTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
protected function setUp()
|
||||
{
|
||||
@ -32,7 +32,7 @@ class LazyFilterManagerTest extends \PHPUnit_Framework_TestCase
|
||||
->with('assetic.filter.bar')
|
||||
->will($this->returnValue($filter));
|
||||
|
||||
$fm = new LazyFilterManager($container, array('foo' => 'assetic.filter.bar'));
|
||||
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
|
||||
|
||||
$this->assertSame($filter, $fm->get('foo'), '->get() loads the filter from the container');
|
||||
$this->assertSame($filter, $fm->get('foo'), '->get() loads the filter from the container');
|
||||
@ -42,7 +42,7 @@ class LazyFilterManagerTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
$container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
|
||||
|
||||
$fm = new LazyFilterManager($container, array('foo' => 'assetic.filter.bar'));
|
||||
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
|
||||
$this->assertTrue($fm->has('foo'), '->has() returns true for lazily mapped filters');
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ class LazyFilterManagerTest extends \PHPUnit_Framework_TestCase
|
||||
->with('assetic.filter.bar')
|
||||
->will($this->returnValue($filter));
|
||||
|
||||
$fm = new LazyFilterManager($container, array('foo' => 'assetic.filter.bar'));
|
||||
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
|
||||
$fm->set('bar', $filter);
|
||||
$all = $fm->all();
|
||||
$this->assertEquals(2, count($all), '->all() returns all lazy and normal filters');
|
Reference in New Issue
Block a user