Added PhpCss\As\Vistor\Xpath::OPTION_USE_CONTEXT_SELF, limit the context to the current node

Author: ThomasWeinert

.travis.yml

@@ -1,11 +1,15 @@
 language: php
 
+sudo: required
+dist: trusty
+group: edge
+
 php:
-  - 5.6
   - 7.0
-  - 7.0snapshot
   - 7.1
   - 7.1snapshot
+  - 7.2
+  - 7.2snapshot
   - nightly
 
 matrix:
@@ -15,12 +19,11 @@ matrix:
 before_install:
   - composer self-update
   - composer clear-cache
-  - if [ $(phpenv version-name) = "5.6" ]; then wget https://phar.phpunit.de/phpunit-5.7.phar -O phpunit.phar; fi
-  - if [ $(phpenv version-name) != "5.6" ]; then wget https://phar.phpunit.de/phpunit.phar; fi
+  - wget -O phpunit.phar https://phar.phpunit.de/phpunit-6.phar
 
 install: composer install
 
-script: php phpunit.phar --configuration phpunit.xml.dist
+script: php phpunit.phar tests
 
 notifications:
   webhooks:

README.md

@@ -7,7 +7,7 @@
 [![Latest Unstable Version](https://poser.pugx.org/carica/phpcss/v/unstable.svg)](https://packagist.org/packages/carica/phpcss)
 
 * License: The MIT License
-* Copyright: 2010-2014 PhpCss Team
+* Copyright: 2010-2018 PhpCss Team
 * Author: [Thomas Weinert](http://thomas.weinert.info) <thomas@weinert.info>
 
 Thanks to Benjamin Eberlei, Bastian Feder and Jakob Westhoff for ideas and concepts.

composer.json

@@ -11,11 +11,11 @@
   ],
   "config": {
     "platform": {
-      "php": "5.6"
+      "php": "7.0"
     }
   },
   "require" : {
-    "PHP" : ">=5.5"
+    "PHP" : ">=7.0"
   },
   "autoload": {
     "psr-4": {"PhpCss\\": "src/PhpCss"},

composer.lock

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="phpunit" version="6" installed="6.5.7" location="./tools/phpunit"/>
+</phive>

phive.xml

@@ -43,6 +43,11 @@ class Xpath extends Overload {
      * start expressions in descendant-or-self context
      */
     const OPTION_USE_CONTEXT_SELF = 32;
+    /**
+     * limit expressions to self context
+     */
+    const OPTION_USE_CONTEXT_SELF_LIMIT = 64;
+
     /**
      * lowercase the element names (not the namespace prefixes)
      */
@@ -288,6 +293,8 @@ public function visitEnterSelectorSequence(Ast\Selector\Sequence $sequence) {
         }
         if ($this->hasOption(self::OPTION_USE_CONTEXT_DOCUMENT)) {
           $this->add('//');
+        } elseif ($this->hasOption(self::OPTION_USE_CONTEXT_SELF_LIMIT)) {
+          $this->add('self::');
         } elseif ($this->hasOption(self::OPTION_USE_CONTEXT_SELF)) {
           $this->add('descendant-or-self::');
         } else {

src/PhpCss/Ast/Visitor/Xpath.php

@@ -133,6 +133,17 @@ public static function provideExamples() {
           ),
           Ast\Visitor\Xpath::OPTION_USE_CONTEXT_SELF
         ),
+        'element, self context limit' => array(
+          'self::*[local-name() = "element"]',
+          new Ast\Selector\Group(
+            array(
+              new Ast\Selector\Sequence(
+                array(new Ast\Selector\Simple\Type('element'))
+              )
+            )
+          ),
+          Ast\Visitor\Xpath::OPTION_USE_CONTEXT_SELF_LIMIT
+        ),
         'element, #id' => array(
           './/*[local-name() = "element"]|.//*[@id = "id"]',
           new Ast\Selector\Group(