Skip to content

Commit

Permalink
minor #774 Test against stable versions of leafo/scssphp (stof)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.4-dev branch.

Discussion
----------

Test against stable versions of leafo/scssphp

This removes leafo/scssphp-compass from the dev requirements as this package seems unmaintained (not updated since 2012), has no stable releases, and does not allow using stable versions of leafo/scssphp (which is necessary on PHP 5.3 as the dev version requires 5.4+).

It also avoids using unbound constraints for other dev dependencies

Commits
-------

0cc2245 Test against stable versions of leafo/scssphp
  • Loading branch information
stof committed Nov 12, 2015
2 parents c733a3c + 0cc2245 commit c3bb677
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@
"symfony/phpunit-bridge": "~2.7|~3.0",
"twig/twig": "~1.8|~2.0",
"leafo/lessphp": "^0.3.7",
"leafo/scssphp": "*@dev",
"ptachoire/cssembed": "*",
"leafo/scssphp-compass": "*@dev",
"leafo/scssphp": "~0.1",
"ptachoire/cssembed": "~1.0",

"cssmin/cssmin": "*",
"mrclay/minify": "*",
"kamicane/packager": "*",
"joliclic/javascript-packer": "*",
"cssmin/cssmin": "3.0.1",
"mrclay/minify": "~2.2",
"kamicane/packager": "1.0",
"joliclic/javascript-packer": "1.1",
"patchwork/jsqueeze": "~1.0|~2.0",
"psr/log": "~1.0"
},
Expand Down
8 changes: 6 additions & 2 deletions tests/Assetic/Test/Filter/ScssphpFilterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class ScssphpFilterTest extends \PHPUnit_Framework_TestCase
{
protected function setUp()
{
if (!class_exists('scssc')) {
$this->markTestSkipped('scssphp is not installed');
if (!class_exists('Leafo\ScssPhp\Compiler')) {
$this->markTestSkipped('leafo/scssphp is not installed');
}
}

Expand Down Expand Up @@ -65,6 +65,10 @@ public function testImport()

public function testCompassExtensionCanBeEnabled()
{
if (!class_exists('scss_compass')) {
$this->markTestSkipped('leafo/scssphp-compass is not installed');
}

$expected = <<<EOF
.shadow {
-webkit-box-shadow: 10px 10px 8px red;
Expand Down

0 comments on commit c3bb677

Please sign in to comment.