Skip to content

bugfixes and tests #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2011
Merged

bugfixes and tests #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 26 additions & 31 deletions lib/CSSRuleSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,22 +419,22 @@ public function createBackgroundShorthand()
'background-position', 'background-attachment'
);
$aRules = $this->getRules();
$oNewRule = new CSSRule('background');
foreach($aProperties as $sProperty)
{
$aNewValues = array();
foreach($aProperties as $sProperty) {
if(!isset($aRules[$sProperty])) continue;
$oRule = $aRules[$sProperty];
if(!$oRule->getIsImportant())
{
foreach($aRules[$sProperty]->getValues() as $aValues)
{
$oNewRule->addValue($aValues);
if(!$oRule->getIsImportant()) {
foreach($aRules[$sProperty]->getValues() as $aValues) {
$aNewValues[] = $aValues;
}
$this->removeRule($sProperty);
}
}
if(count($oNewRule->getValues()) > 0)
{
if(count($aNewValues)) {
$oNewRule = new CSSRule('background');
foreach ($aNewValues as $mValue) {
$oNewRule->addValue($mValue);
}
$this->addRule($oNewRule);
}
}
Expand All @@ -445,42 +445,37 @@ public function createBackgroundShorthand()
*
* TODO: this is extremely similar to createBackgroundShorthand and should be combined
**/
public function createBorderShorthand()
{
public function createBorderShorthand() {
$aBorderRules = array(
'border-width', 'border-style', 'border-color'
);
$oNewRule = new CSSRule('border');
$aRules = $this->getRules();
foreach ($aBorderRules as $sBorderRule)
{
$aNewValues = array();
foreach ($aBorderRules as $sBorderRule) {
if(!isset($aRules[$sBorderRule])) continue;

$oRule = $aRules[$sBorderRule];
if(!$oRule->getIsImportant())
{
if(!$oRule->getIsImportant()) {
// Can't merge if multiple values !
if(count($oRule->getValues()) > 1) continue;
foreach($oRule->getValues() as $aValues)
{
foreach($oRule->getValues() as $aValues) {
$mValue = $aValues[0];
if($mValue instanceof CSSValue)
{
if($mValue instanceof CSSValue) {
$mNewValue = clone $mValue;
$oNewRule->addValue(array($mNewValue));
$aNewValues[] = $mNewValue;
}
else
{
$oNewRule->addValue(array($mValue));
else {
$aNewValues[] = $mValue;
}
}
}
}
if(count($oNewRule->getValues()))
{
}
if(count($aNewValues)) {
$oNewRule = new CSSRule('border');
foreach($aNewValues as $mNewValue) {
$oNewRule->addValue(array($mNewValue));
}
$this->addRule($oNewRule);
foreach ($aBorderRules as $sRuleName)
{
foreach($aBorderRules as $sRuleName) {
$this->removeRule($sRuleName);
}
}
Expand Down
223 changes: 223 additions & 0 deletions tests/CSSDeclarationBlockTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
<?php
require_once __DIR__.'/../CSSParser.php';
/**
*
*/
class CSSDeclarationBlockTest extends PHPUnit_Framework_TestCase
{
/**
* @dataProvider expandBorderShorthandProvider
**/
public function testExpandBorderShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->expandBorderShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function expandBorderShorthandProvider()
{
return array(
array('body{ border: 2px solid rgb(0,0,0) }', 'body {border-width: 2px;border-style: solid;border-color: rgb(0,0,0);}'),
array('body{ border: none }', 'body {border-style: none;}'),
array('body{ border: 2px }', 'body {border-width: 2px;}'),
array('body{ border: rgb(255,0,0) }', 'body {border-color: rgb(255,0,0);}'),
array('body{ border: 1em solid }', 'body {border-width: 1em;border-style: solid;}'),
array('body{ margin: 1em; }', 'body {margin: 1em;}')
);
}

/**
* @dataProvider expandFontShorthandProvider
**/
public function testExpandFontShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->expandFontShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function expandFontShorthandProvider()
{
return array(
array(
'body{ margin: 1em; }',
'body {margin: 1em;}'
),
array(
'body {font: 12px serif;}',
'body {font-style: normal;font-variant: normal;font-weight: normal;font-size: 12px;line-height: normal;font-family: serif;}'
),
array(
'body {font: italic 12px serif;}',
'body {font-style: italic;font-variant: normal;font-weight: normal;font-size: 12px;line-height: normal;font-family: serif;}'
),
array(
'body {font: italic bold 12px serif;}',
'body {font-style: italic;font-variant: normal;font-weight: bold;font-size: 12px;line-height: normal;font-family: serif;}'
),
array(
'body {font: italic bold 12px/1.6 serif;}',
'body {font-style: italic;font-variant: normal;font-weight: bold;font-size: 12px;line-height: 1.6;font-family: serif;}'
),
array(
'body {font: italic small-caps bold 12px/1.6 serif;}',
'body {font-style: italic;font-variant: small-caps;font-weight: bold;font-size: 12px;line-height: 1.6;font-family: serif;}'
),
);
}

/**
* @dataProvider expandBackgroundShorthandProvider
**/
public function testExpandBackgroundShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->expandBackgroundShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function expandBackgroundShorthandProvider()
{
return array(
array('body {border: 1px;}', 'body {border: 1px;}'),
array('body {background: rgb(255,0,0);}','body {background-color: rgb(255,0,0);background-image: none;background-repeat: repeat;background-attachment: scroll;background-position: 0% 0%;}'),
array('body {background: rgb(255,0,0) url("foobar.png");}','body {background-color: rgb(255,0,0);background-image: url("foobar.png");background-repeat: repeat;background-attachment: scroll;background-position: 0% 0%;}'),
array('body {background: rgb(255,0,0) url("foobar.png") no-repeat;}','body {background-color: rgb(255,0,0);background-image: url("foobar.png");background-repeat: no-repeat;background-attachment: scroll;background-position: 0% 0%;}'),
array('body {background: rgb(255,0,0) url("foobar.png") no-repeat center;}','body {background-color: rgb(255,0,0);background-image: url("foobar.png");background-repeat: no-repeat;background-attachment: scroll;background-position: center center;}'),
array('body {background: rgb(255,0,0) url("foobar.png") no-repeat top left;}','body {background-color: rgb(255,0,0);background-image: url("foobar.png");background-repeat: no-repeat;background-attachment: scroll;background-position: top left;}'),
);
}

/**
* @dataProvider expandDimensionsShorthandProvider
**/
public function testExpandDimensionsShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->expandDimensionsShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function expandDimensionsShorthandProvider()
{
return array(
array('body {border: 1px;}', 'body {border: 1px;}'),
array('body {margin-top: 1px;}', 'body {margin-top: 1px;}'),
array('body {margin: 1em;}','body {margin-top: 1em;margin-right: 1em;margin-bottom: 1em;margin-left: 1em;}'),
array('body {margin: 1em 2em;}','body {margin-top: 1em;margin-right: 2em;margin-bottom: 1em;margin-left: 2em;}'),
array('body {margin: 1em 2em 3em;}','body {margin-top: 1em;margin-right: 2em;margin-bottom: 3em;margin-left: 2em;}'),
);
}

/**
* @dataProvider createBorderShorthandProvider
**/
public function testCreateBorderShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->createBorderShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function createBorderShorthandProvider()
{
return array(
array('body {border-width: 2px;border-style: solid;border-color: rgb(0,0,0);}', 'body {border: 2px solid rgb(0,0,0);}'),
array('body {border-style: none;}', 'body {border: none;}'),
array('body {border-width: 1em;border-style: solid;}', 'body {border: 1em solid;}'),
array('body {margin: 1em;}', 'body {margin: 1em;}')
);
}

/**
* @dataProvider createFontShorthandProvider
**/
public function testCreateFontShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->createFontShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function createFontShorthandProvider()
{
return array(
array('body {font-size: 12px; font-family: serif}', 'body {font: 12px serif;}'),
array('body {font-size: 12px; font-family: serif; font-style: italic;}', 'body {font: italic 12px serif;}'),
array('body {font-size: 12px; font-family: serif; font-style: italic; font-weight: bold;}', 'body {font: italic bold 12px serif;}'),
array('body {font-size: 12px; font-family: serif; font-style: italic; font-weight: bold; line-height: 1.6;}', 'body {font: italic bold 12px/1.6 serif;}'),
array('body {font-size: 12px; font-family: serif; font-style: italic; font-weight: bold; line-height: 1.6; font-variant: small-caps;}', 'body {font: italic small-caps bold 12px/1.6 serif;}'),
array('body {margin: 1em;}', 'body {margin: 1em;}')
);
}

/**
* @dataProvider createDimensionsShorthandProvider
**/
public function testCreateDimensionsShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->createDimensionsShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function createDimensionsShorthandProvider()
{
return array(
array('body {border: 1px;}', 'body {border: 1px;}'),
array('body {margin-top: 1px;}', 'body {margin-top: 1px;}'),
array('body {margin-top: 1em; margin-right: 1em; margin-bottom: 1em; margin-left: 1em;}','body {margin: 1em;}'),
array('body {margin-top: 1em; margin-right: 2em; margin-bottom: 1em; margin-left: 2em;}','body {margin: 1em 2em;}'),
array('body {margin-top: 1em; margin-right: 2em; margin-bottom: 3em; margin-left: 2em;}','body {margin: 1em 2em 3em;}'),
);
}

/**
* @dataProvider createBackgroundShorthandProvider
**/
public function testCreateBackgroundShorthand($sCss, $sExpected)
{
$oParser = new CSSParser($sCss);
$oDoc = $oParser->parse();
foreach($oDoc->getAllDeclarationBlocks() as $oDeclaration)
{
$oDeclaration->createBackgroundShorthand();
}
$this->assertEquals((string)$oDoc, $sExpected);
}
public function createBackgroundShorthandProvider()
{
return array(
array('body {border: 1px;}', 'body {border: 1px;}'),
array('body {background-color: rgb(255,0,0);}', 'body {background: rgb(255,0,0);}'),
array('body {background-color: rgb(255,0,0);background-image: url(foobar.png);}', 'body {background: rgb(255,0,0) url("foobar.png");}'),
array('body {background-color: rgb(255,0,0);background-image: url(foobar.png);background-repeat: no-repeat;}', 'body {background: rgb(255,0,0) url("foobar.png") no-repeat;}'),
array('body {background-color: rgb(255,0,0);background-image: url(foobar.png);background-repeat: no-repeat;}', 'body {background: rgb(255,0,0) url("foobar.png") no-repeat;}'),
array('body {background-color: rgb(255,0,0);background-image: url(foobar.png);background-repeat: no-repeat;background-position: center;}', 'body {background: rgb(255,0,0) url("foobar.png") no-repeat center;}'),
array('body {background-color: rgb(255,0,0);background-image: url(foobar.png);background-repeat: no-repeat;background-position: top left;}', 'body {background: rgb(255,0,0) url("foobar.png") no-repeat top left;}'),
);
}

}