Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into ValidatorMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
Matej Szendi committed Nov 4, 2013
134 parents 1ddadb6 + 2a36660 + b606864 + 41467b4 + b11a11a + de9f81e + 5737317 + c7cdc55 + a50e2ae + 80fc529 + ba58ad8 + a20b034 + f3031d6 + f095b61 + ee7be4f + 5cd5b6f + 560bbb2 + 211c08a + 164a230 + 1fa8900 + 2b3577e + 495bb6c + ab5c324 + 2e456c8 + 63bff97 + f7e139b + 3cb454e + 22f9181 + 93a693f + 2a458de + 1c142d8 + 7f95140 + be3c33f + 7ab0a73 + 8cb2a33 + 56ac953 + 4157e43 + 0ec8c93 + 4bea232 + 26b2403 + 11d87a1 + fb85298 + 6bda27e + b73658e + 1020b71 + 58956c7 + 4de672f + 79fe77b + 7624c04 + cfbc839 + 49e4d7c + ff81391 + 21cca29 + f0671be + 7c4ff71 + 98d530a + 8d88cc5 + 390535a + 00e3a5a + 1debe09 + 90714d6 + b60de46 + 239a3c3 + 623bc45 + caef534 + 2df5656 + 43268cd + a75eec7 + 2567e8f + ea9335d + 464392f + 7fd0ba3 + 1e64d87 + c8ba509 + ca73950 + c8dc1c3 + bb4f382 + c7e8658 + 7182b57 + 7681cd3 + 9e9880e + e68c740 + a5f5145 + e24bcf7 + 0cf2624 + 74f8e99 + 9dc42d7 + 6918467 + 75ec452 + 7032642 + 79c38ce + 995e0a7 + bb2d896 + 1b246ad + b74beb0 + d10206d + 242a79a + 8a250b9 + 537a949 + 9269d97 + 2698f19 + 4cf6c67 + 5866634 + 6ef9027 + af148c0 + e8a3d3b + 769eee2 + db12820 + 0b7828e + 1da1921 + 9643cb4 + c09dfeb + 831c808 + 346e46a + 09df463 + a6b3a5c + 81271a1 + a27453a + 64fe065 + 042e1cd + abd6687 + 0dcab85 + b47ae92 + 630648b + 3a97e95 + 1a3b527 + 53e423c + 854a12d + accad73 + 4a1dcdf + 52a7c3f + a6e83c4 + 702a810 + 27b5402 commit 2e72915
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 19 deletions.
14 changes: 8 additions & 6 deletions src/Css2Xpath.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected static function _tokenize($expression)

// arbitrary attribute strict equality
$expression = preg_replace_callback(
'|\[([a-z0-9_-]+)=[\'"]([^\'"]+)[\'"]\]|i',
'|\[@?([a-z0-9_-]+)=[\'"]([^\'"]+)[\'"]\]|i',
function ($matches) {
return '[@' . strtolower($matches[1]) . "='" . $matches[2] . "']";
},
Expand Down Expand Up @@ -113,11 +113,13 @@ function ($matches) {
);

// Classes
$expression = preg_replace(
'|\.([a-z][a-z0-9_-]*)|i',
"[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]",
$expression
);
if(false === strpos($expression, "[@")) {
$expression = preg_replace(
'|\.([a-z][a-z0-9_-]*)|i',
"[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]",
$expression
);
}

/** ZF-9764 -- remove double asterisk */
$expression = str_replace('**', '*', $expression);
Expand Down
16 changes: 12 additions & 4 deletions test/Css2XpathTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Dom
*/

namespace ZendTest\Dom;
Expand All @@ -15,9 +14,6 @@
/**
* Test class for Css2Xpath.
*
* @category Zend
* @package Zend_Dom
* @subpackage UnitTests
* @group Zend_Dom
*/
class Css2XpathTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -168,4 +164,16 @@ public function testIdSelectorWithLeadingAsterix()
$test = Css2Xpath::transform('*#id');
$this->assertEquals("//*[@id='id']", $test);
}

/**
* @group ZF-5310
*/
public function testCanTransformWithAttributeAndDot()
{
$test = Css2Xpath::transform('a[href="http://example.com"]');
$this->assertEquals("//a[@href='http://example.com']", $test);

$test = Css2Xpath::transform('a[@href="http://example.com"]');
$this->assertEquals("//a[@href='http://example.com']", $test);
}
}
4 changes: 0 additions & 4 deletions test/NodeListTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Dom
*/

namespace ZendTest\Dom;

use Zend\Dom\NodeList;

/**
* @category Zend
* @package Zend_Dom
* @subpackage UnitTests
* @group Zend_Dom
*/
class NodeListTest extends \PHPUnit_Framework_TestCase
Expand Down
17 changes: 13 additions & 4 deletions test/QueryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Dom
*/

namespace ZendTest\Dom;
Expand All @@ -17,9 +16,6 @@
/**
* Test class for Zend_Dom_Query.
*
* @category Zend
* @package Zend_Dom
* @subpackage UnitTests
* @group Zend_Dom
*/
class QueryTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -400,4 +396,17 @@ public function testOffsetUnset()

unset($results[2]);
}

/**
* @group ZF-5310
*/
public function testCssSelectorShouldFindNodesWhenMatchingAttributeValueWithDot()
{
$this->loadHtml();
$results = $this->query->execute('a[href="http://www.about.com"]');

$this->assertEquals(1, $results->count());
$this->assertEquals('About', $results[0]->nodeValue);

}
}
2 changes: 1 addition & 1 deletion test/_files/sample.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ul id="topnav">
<li class="current"><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="http://www.about.com">About</a></li>
<li><a href="#">Misc</a></li>
<li><a href="#">Wiki</a></li>
</ul>
Expand Down

0 comments on commit 2e72915

Please sign in to comment.