Fix build errors and add LoggerInterface to Compiler

Author: Macavity

.gitignore

@@ -1,4 +1,6 @@
 
+/var
+
 # Managed by Composer
 /bin/*
 !bin/console
@@ -7,3 +9,4 @@
 # PHPUnit
 /phpunit.xml
 .phpcs-cache
+

README.md

@@ -17,6 +17,8 @@ Compile vue files to twig templates with PHP
 |v-for|:white_check_mark:|
 |v-on|:white_check_mark:|
 |v-bind||
+|v-bind:style||
+|v-bind:class||
 |v-model||
 |v-pre||
 |v-cloak||

composer.json

@@ -32,7 +32,8 @@
     },
     "require-dev": {
         "ext-simplexml": "*",
-        "phpunit/phpunit": "^7"
+        "phpunit/phpunit": "^7",
+        "monolog/monolog": "^1.24"
     },
     "scripts": {
         "cs:fix": "phpcbf --standard=phpcs.xml",

composer.lock

@@ -9,7 +9,7 @@
 use DOMNode;
 use DOMText;
 use Exception;
-use LibXMLError;
+use Psr\Log\LoggerInterface;
 
 class Compiler
 {
@@ -22,10 +22,13 @@ class Compiler
     /** @var DOMText */
     protected $lastCloseIf;
 
-    public function __construct(DOMDocument $document)
+    /** @var LoggerInterface */
+    protected $logger;
+
+    public function __construct(DOMDocument $document, LoggerInterface $logger)
     {
+        $this->logger = $logger;
         $this->document = $document;
-
         $this->lastCloseIf = null;
     }
 
@@ -48,22 +51,18 @@ public function convert(): string
 
     public function convertNode(DOMNode $node): DOMNode
     {
-        if ($this->isTextNode($node)) {
+        if ($node->nodeType === XML_TEXT_NODE) {
             return $node;
         }
 
         if ($node->nodeType === XML_ELEMENT_NODE) {
-            echo "\nElement node found";
+            //echo "\nElement node found";
             /** @var DOMElement $node */
             $this->replaceShowWithIf($node);
             $this->handleIf($node);
+        } elseif ($node->nodeType === XML_HTML_DOCUMENT_NODE) {
+            $this->logger->warning("Document node found.");
         }
-        elseif($node->nodeType === XML_HTML_DOCUMENT_NODE) {
-            echo "\nDocument node found.";
-        }
-//        else {
-//            var_dump($node->nodeType);
-//        }
 
         $this->stripEventHandlers($node);
         $this->handleFor($node);
@@ -80,12 +79,10 @@ public function convertNode(DOMNode $node): DOMNode
 
     public function replaceShowWithIf(DOMElement $node): void
     {
-
         if ($node->hasAttribute('v-show')) {
             $node->setAttribute('v-if', $node->getAttribute('v-show'));
             $node->removeAttribute('v-show');
         }
-
     }
 
     private function handleAttributeBinding(DOMElement $node)
@@ -94,16 +91,33 @@ private function handleAttributeBinding(DOMElement $node)
         foreach (iterator_to_array($node->attributes) as $attribute) {
 
             if (strpos($attribute->name, 'v-bind:') !== 0 && strpos($attribute->name, ':') !== 0) {
-                var_dump("- skip: ". $attribute->name);
+                $this->logger->debug("- skip: " . $attribute->name);
                 continue;
             }
 
             $name = substr($attribute->name, 1);
             $value = $attribute->value;
-            var_dump('- handle: '.$name.' = '.$value);
+            $this->logger->debug('- handle: ' . $name . ' = ' . $value);
+
+
+            switch ($name) {
+                case 'key':
+                    // Not necessary in twig
+                    break;
+                case 'style':
+                    break;
+                case 'class':
+                    break;
+                default:
+                    if ($value === 'true') {
+                        $node->setAttribute($name, $name);
+                    }
+                    $node->setAttribute($name, $value);
+            }
 
             if (is_bool($value)) {
                 if ($value) {
+                    $this->logger->debug('=> setAttribute');
                     $node->setAttribute($name, $name);
                 }
             } elseif (is_array($value)) {
@@ -125,9 +139,9 @@ private function handleAttributeBinding(DOMElement $node)
                     }
                     $node->setAttribute($name, implode(' ', $classes));
                 }
-            } else {
-                $node->setAttribute($name, $value);
             }
+
+            $this->logger->debug('=> remove ' . $attribute->name);
             $node->removeAttribute($attribute->name);
         }
     }
@@ -154,23 +168,19 @@ private function handleIf(DOMElement $node): void
             $this->lastCloseIf = $closeIf;
 
             $node->removeAttribute('v-if');
-        }
-        elseif ($node->hasAttribute('v-else-if')) {
+        } elseif ($node->hasAttribute('v-else-if')) {
             $condition = $node->getAttribute('v-else-if');
 
             // Replace old endif with else
-            $this->lastCloseIf->textContent = '{% elseif '.$condition.' %}';
+            $this->lastCloseIf->textContent = '{% elseif ' . $condition . ' %}';
 
             // Close with new endif
             $closeIf = $this->document->createTextNode('{% endif %}');
             $node->parentNode->insertBefore($closeIf, $node->nextSibling);
             $this->lastCloseIf = $closeIf;
 
             $node->removeAttribute('v-else-if');
-        }
-        elseif ($node->hasAttribute('v-else')) {
-            echo "\nFound a v-else";
-
+        } elseif ($node->hasAttribute('v-else')) {
             // Replace old endif with else
             $this->lastCloseIf->textContent = '{% else %}';
 

src/Compiler.php

@@ -4,9 +4,29 @@
 
 use DirectoryIterator;
 use DOMDocument;
+use Macavity\VueToTwig\Compiler;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
 
 abstract class AbstractTestCase extends \PHPUnit\Framework\TestCase
 {
+    protected function createCompiler(string $template): Compiler
+    {
+        $document = $this->createDocumentWithHtml($template);
+        $compiler = new Compiler($document, $this->createLogger());
+
+        return $compiler;
+    }
+
+    protected function createLogger(): Logger
+    {
+        $logger = new Logger('test');
+        $logger->pushHandler(new StreamHandler(__DIR__ . '/../var/dev/test.log'));
+
+        return $logger;
+    }
+
+
     protected function assertEqualHtml($expectedResult, $result): void
     {
         $expectedResult = $this->normalizeHtml($expectedResult);

tests/AbstractTestCase.php

@@ -2,17 +2,14 @@
 
 namespace Macavity\VueToTwig\Tests;
 
-use Macavity\VueToTwig\Compiler;
-
 class CompilerTest extends AbstractTestCase
 {
     /** @test */
     public function leavesMustacheVariablesIntact()
     {
         $html = '<template><div>{{ someVariable }}</div></template>';
         $expected = '<div>{{ someVariable }}</div>';
-        $document = $this->createDocumentWithHtml($html);
-        $compiler = new Compiler($document);
+        $compiler = $this->createCompiler($html);
 
         $actual = $compiler->convert();
 

tests/CompilerTest.php

@@ -2,8 +2,6 @@
 
 namespace Macavity\VueToTwig\Tests;
 
-use Macavity\VueToTwig\Compiler;
-
 class VueForTest extends AbstractTestCase
 {
     /**
@@ -12,8 +10,7 @@ class VueForTest extends AbstractTestCase
      */
     public function testFor($html, $expected)
     {
-        $document = $this->createDocumentWithHtml($html);
-        $compiler = new Compiler($document);
+        $compiler = $this->createCompiler($html);
 
         $actual = $compiler->convert();