Skip to content

Commit 396fcf1

Browse files
committed
Merge remote branch 'kriswallsmith/assetic/rm-phpcs'
* kriswallsmith/assetic/rm-phpcs: [AsseticBundle] removed PHP_CodeSniffer dependency
2 parents 691c9f5 + 3fb935d commit 396fcf1

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<!-- filters -->
5454
<service id="assetic.filter.cssrewrite" class="%assetic.filter.cssrewrite.class%">
5555
<tag name="assetic.filter" alias="cssrewrite" />
56-
<argument type="service" id="assetic.css_tokenizer" />
5756
</service>
5857
<service id="assetic.filter.less" class="%assetic.filter.less.class%">
5958
<tag name="assetic.filter" alias="less" />
@@ -90,9 +89,6 @@
9089
</service>
9190

9291
<!-- other -->
93-
<service id="assetic.css_tokenizer" class="PHP_CodeSniffer_Tokenizers_CSS" public="false">
94-
<file>PHP/CodeSniffer.php</file>
95-
</service>
9692
<service id="assetic.config_cache" class="%assetic.config_cache.class%" public="false">
9793
<argument>%assetic.cache_dir%/config</argument>
9894
</service>

src/Symfony/Bundle/AsseticBundle/Tests/DependencyInjection/AsseticExtensionTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ protected function setUp()
4343
$this->markTestSkipped('Assetic is not available.');
4444
}
4545

46-
if (false === @include_once 'PHP/CodeSniffer.php') {
47-
$this->markTestSkipped('PHP_CodeSniffer is not installed.');
48-
}
49-
5046
$this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')
5147
->disableOriginalConstructor()
5248
->getMock();

0 commit comments

Comments
 (0)