Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c63e1ac

Browse filesBrowse files
fabpotfabpot
committed
Merge remote branch 'kriswallsmith/assetic-renames'
* kriswallsmith/assetic-renames: [AsseticBundle] renamed some classes
2 parents cef86a3 + bd32e3e commit c63e1ac
Copy full SHA for c63e1ac

File tree

Expand file treeCollapse file tree

5 files changed

+13
-13
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+13
-13
lines changed

‎src/Symfony/Bundle/AsseticBundle/Factory/CachedAssetManager.php renamed to ‎src/Symfony/Bundle/AsseticBundle/Factory/AssetManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/AsseticBundle/Factory/AssetManager.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @author Kris Wallsmith <kris.wallsmith@symfony-project.com>
2020
*/
21-
class CachedAssetManager extends LazyAssetManager
21+
class AssetManager extends LazyAssetManager
2222
{
2323
protected $cacheFiles = array();
2424
protected $fresh = true;

‎src/Symfony/Bundle/AsseticBundle/LazyFilterManager.php renamed to ‎src/Symfony/Bundle/AsseticBundle/FilterManager.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/AsseticBundle/FilterManager.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
namespace Symfony\Bundle\AsseticBundle;
1313

14-
use Assetic\FilterManager;
14+
use Assetic\FilterManager as BaseFilterManager;
1515
use Symfony\Component\DependencyInjection\ContainerInterface;
1616

1717
/**
1818
* Lazy filter manager.
1919
*
2020
* @author Kris Wallsmith <kris.wallsmith@symfony-project.com>
2121
*/
22-
class LazyFilterManager extends FilterManager
22+
class FilterManager extends BaseFilterManager
2323
{
2424
protected $container;
2525
protected $mappings;

‎src/Symfony/Bundle/AsseticBundle/Resources/config/assetic.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/AsseticBundle/Resources/config/assetic.xml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<parameters>
88
<parameter key="assetic.asset_factory.class">Symfony\Bundle\AsseticBundle\Factory\AssetFactory</parameter>
9-
<parameter key="assetic.asset_manager.class">Symfony\Bundle\AsseticBundle\Factory\CachedAssetManager</parameter>
10-
<parameter key="assetic.filter_manager.class">Symfony\Bundle\AsseticBundle\LazyFilterManager</parameter>
9+
<parameter key="assetic.asset_manager.class">Symfony\Bundle\AsseticBundle\Factory\AssetManager</parameter>
10+
<parameter key="assetic.filter_manager.class">Symfony\Bundle\AsseticBundle\FilterManager</parameter>
1111

1212
<parameter key="assetic.filter.coffee.class">Assetic\Filter\CoffeeScriptFilter</parameter>
1313
<parameter key="assetic.filter.cssrewrite.class">Assetic\Filter\CssRewriteFilter</parameter>

‎src/Symfony/Bundle/AsseticBundle/Tests/Factory/CachedAssetManagerTest.php renamed to ‎src/Symfony/Bundle/AsseticBundle/Tests/Factory/AssetManagerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/AsseticBundle/Tests/Factory/AssetManagerTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Bundle\AsseticBundle\Tests\Factory;
1313

14-
use Symfony\Bundle\AsseticBundle\Factory\CachedAssetManager;
14+
use Symfony\Bundle\AsseticBundle\Factory\AssetManager;
1515

16-
class CachedAssetManagerTest extends \PHPUnit_Framework_TestCase
16+
class AssetManagerTest extends \PHPUnit_Framework_TestCase
1717
{
1818
protected function setUp()
1919
{
@@ -31,7 +31,7 @@ public function testLoadFormulae()
3131
->disableOriginalConstructor()
3232
->getMock();
3333

34-
$am = new CachedAssetManager($factory);
34+
$am = new AssetManager($factory);
3535
$am->addCacheFile($file);
3636

3737
$this->assertTrue($am->has('foo'), '->loadFormulae() loads formulae');

‎src/Symfony/Bundle/AsseticBundle/Tests/LazyFilterManagerTest.php renamed to ‎src/Symfony/Bundle/AsseticBundle/Tests/FilterManagerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/AsseticBundle/Tests/FilterManagerTest.php
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespace Symfony\Bundle\AsseticBundle\Tests;
1313

14-
use Symfony\Bundle\AsseticBundle\LazyFilterManager;
14+
use Symfony\Bundle\AsseticBundle\FilterManager;
1515

16-
class LazyFilterManagerTest extends \PHPUnit_Framework_TestCase
16+
class FilterManagerTest extends \PHPUnit_Framework_TestCase
1717
{
1818
protected function setUp()
1919
{
@@ -32,7 +32,7 @@ public function testGet()
3232
->with('assetic.filter.bar')
3333
->will($this->returnValue($filter));
3434

35-
$fm = new LazyFilterManager($container, array('foo' => 'assetic.filter.bar'));
35+
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
3636

3737
$this->assertSame($filter, $fm->get('foo'), '->get() loads the filter from the container');
3838
$this->assertSame($filter, $fm->get('foo'), '->get() loads the filter from the container');
@@ -42,7 +42,7 @@ public function testHas()
4242
{
4343
$container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
4444

45-
$fm = new LazyFilterManager($container, array('foo' => 'assetic.filter.bar'));
45+
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
4646
$this->assertTrue($fm->has('foo'), '->has() returns true for lazily mapped filters');
4747
}
4848

@@ -56,7 +56,7 @@ public function testAll()
5656
->with('assetic.filter.bar')
5757
->will($this->returnValue($filter));
5858

59-
$fm = new LazyFilterManager($container, array('foo' => 'assetic.filter.bar'));
59+
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
6060
$fm->set('bar', $filter);
6161
$all = $fm->all();
6262
$this->assertEquals(2, count($all), '->all() returns all lazy and normal filters');

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.