Merge pull request #349 from facebook/fix/transformation-settings

Fix #346 - Transformer's transform method does not account for settings
facebookarchive · Mar 21, 2019 · acefb2a · acefb2a
2 parents 8f152d1 + bd2c556
commit acefb2a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/Facebook/InstantArticles/Elements/InstantArticle.php b/src/Facebook/InstantArticles/Elements/InstantArticle.php
@@ -478,6 +478,14 @@ public function addMetaProperty($property_name, $property_content)
         return $this;
     }
 
+    public function getMetaProperty($property_name)
+    {
+        if (array_key_exists($property_name, $this->metaProperties)) {
+            return $this->metaProperties[$property_name];
+        }
+        return null;
+    }
+
     public function render($doctype = '<!doctype html>', $format = false, $validate = true)
     {
         $doctype = is_null($doctype) ? '<!doctype html>' : $doctype;

diff --git a/src/Facebook/InstantArticles/Transformer/Transformer.php b/src/Facebook/InstantArticles/Transformer/Transformer.php
@@ -263,9 +263,6 @@ public function transformString($context, $content, $encoding = "utf-8")
         libxml_clear_errors();
         libxml_use_internal_errors($libxml_previous_state);
         $result = $this->transform($context, $document);
-        if (Type::is($result, InstantArticle::getClassName())) {
-            $result = $this->handleTransformationSettings($result);
-        }
         $totalTime = round(microtime(true) - $start, 3)*1000;
         $totalWarnings = count($this->getWarnings());
         $this->addLog(
@@ -278,15 +275,16 @@ public function transformString($context, $content, $encoding = "utf-8")
     /**
      * @param InstantArticle $context
      * @param \DOMNode $node
-     * @deprecated Use @see Transformer::transformString instead.
      *
      * @return mixed
      */
     public function transform($context, $node)
     {
-        if (Type::is($context, InstantArticle::getClassName())) {
+        $is_first_run = false;
+        if (Type::is($context, InstantArticle::getClassName()) && $context->getMetaProperty('op:generator:transformer') === null) {
             $context->addMetaProperty('op:generator:transformer', 'facebook-instant-articles-sdk-php');
             $context->addMetaProperty('op:generator:transformer:version', InstantArticle::CURRENT_VERSION);
+            $is_first_run = true;
             $this->instantArticle = $context;
         }
 
@@ -375,6 +373,10 @@ public function transform($context, $node)
             }
         }
 
+        if ($is_first_run) {
+            $context = $this->handleTransformationSettings($context);
+        }
+
         return $context;
     }
 

diff --git a/tests/Facebook/InstantArticles/Transformer/Example/SimpleTransformerTest.php b/tests/Facebook/InstantArticles/Transformer/Example/SimpleTransformerTest.php
@@ -24,7 +24,12 @@ public function testSelfTransformerContent()
 
         $html_file = file_get_contents(__DIR__ . '/simple.html');
 
-        $transformer->transformString($instant_article, $html_file);
+        libxml_use_internal_errors(true);
+        $document = new \DOMDocument();
+        $document->loadHTML($html_file);
+        libxml_use_internal_errors(false);
+
+        $transformer->transform($instant_article, $document);
         $instant_article->addMetaProperty('op:generator:version', '1.0.0');
         $instant_article->addMetaProperty('op:generator:transformer:version', '1.0.0');
         $result = $instant_article->render('', true)."\n";