Merge pull request #25 from wmde/#nofilter

Remove support for Vue 2 filters

Author: lucaswerkmeister

README.md

@@ -1,25 +1,19 @@
 # VueJS templating implementation in PHP
 
-Simple PHP implementation of the [Vue Template](https://vuejs.org/v2/guide/syntax.html) renderer.
+Simple PHP implementation of the [Vue Template](https://vuejs.org/guide/essentials/template-syntax.html) renderer.
 
 The library has been created to be used for rendering templates
 in the [Wikibase Lexeme extension](https://www.mediawiki.org/wiki/Extension:WikibaseLexeme).
 It intentionally covers only a subset of Vue Template syntax that is used by the Wikibase
 Lexeme extension. It is not going to cover all elements of Vue Template language.
 
-## Migration notes
-
-For the purpose of migrating to Vue 3, very basic support for the method syntax was added as an alternative to filters.
-In order to keep the interface stable, method callbacks should also be provided as the third parameter when calling
-`Templating::render()`.
-
 ## Installation
 
 The recommended way of installing the library is using [Composer](https://getcomposer.org),
 e.g. by adding the following line to the `require` section of the `composer.json` file:
 
 ```
-	"wmde/php-vuejs-templating": "^1.1.0"
+	"wmde/php-vuejs-templating": "^2.0.0"
 ```
 
 ## Tests

package.json

@@ -1,10 +1,8 @@
 {
 	"name": "php-vuejs-templating",
-	"dependencies": {},
 	"devDependencies": {
-		"vue": "^2.3.4",
-		"vue-server-renderer": "^2.3.4",
-		"cheerio": "^0.22.0"
+		"cheerio": "^0.22.0",
+		"vue": "^3.2.41"
 	},
 	"scripts": {
 		"populate-fixtures": "node tests/integration/populate_fixtures_with_expected_results.js"

src/Component.php

@@ -12,39 +12,29 @@
 use Exception;
 use LibXMLError;
 
-use WMDE\VueJsTemplating\FilterExpressionParsing\FilterParser;
 use WMDE\VueJsTemplating\JsParsing\BasicJsExpressionParser;
 use WMDE\VueJsTemplating\JsParsing\CachingExpressionParser;
 use WMDE\VueJsTemplating\JsParsing\JsExpressionParser;
 
 class Component {
 
-	private $filterParser;
-
 	/**
 	 * @var string HTML
 	 */
 	private $template;
 
-	/**
-	 * @var callable[]
-	 */
-	private $filters = [];
-
 	/**
 	 * @var JsExpressionParser
 	 */
 	private $expressionParser;
 
 	/**
 	 * @param string $template HTML
-	 * @param callable[] $filters
+	 * @param callable[] $methods
 	 */
-	public function __construct( $template, array $filters ) {
+	public function __construct( $template, array $methods ) {
 		$this->template = $template;
-		$this->filters = $filters;
-		$this->expressionParser = new CachingExpressionParser( new BasicJsExpressionParser() );
-		$this->filterParser = new FilterParser();
+		$this->expressionParser = new CachingExpressionParser( new BasicJsExpressionParser( $methods ) );
 	}
 
 	/**
@@ -161,8 +151,7 @@ private function replaceMustacheVariables( DOMNode $node, array $data ) {
 			preg_match_all( $regex, $text, $matches );
 
 			foreach ( $matches['expression'] as $index => $expression ) {
-				$value = $this->filterParser->parse( $expression )
-					->toExpression( $this->expressionParser, $this->filters )
+				$value = $this->expressionParser->parse( $expression )
 					->evaluate( $data );
 
 				$text = str_replace( $matches[0][$index], $value, $text );
@@ -182,8 +171,7 @@ private function handleAttributeBinding( DOMElement $node, array $data ) {
 				continue;
 			}
 
-			$value = $this->filterParser->parse( $attribute->value )
-				->toExpression( $this->expressionParser, $this->filters )
+			$value = $this->expressionParser->parse( $attribute->value )
 				->evaluate( $data );
 
 			$name = substr( $attribute->name, 1 );