Merge pull request #17 from preprocess/contrib-master

Improve encoding in deferred execution
preprocess · Jan 20, 2019 · 1e03681 · 1e03681
2 parents 860c244 + 0697c8d
commit 1e03681
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/source/Parser.php b/source/Parser.php
@@ -131,10 +131,10 @@ public function parse($code)
     {
         $code = $this->getCodeWithMacros($code);
         $code = $this->getCodeWithCompilers($code);
-        $code = base64_encode($code);
+        $code = base64_encode(gzencode($code));
 
         return defer("
-            \$code = base64_decode('{$code}');
+            \$code = gzdecode(base64_decode('{$code}'));
             \$engine = new \Yay\Engine;
 
             gc_disable();
@@ -151,7 +151,7 @@ private function getCodeWithCompilers($code)
             $this->getCompilers(),
             $this->getDiscoveredCompilers()
         );
-        
+
         foreach ($compilers as $compiler) {
             if (is_callable($compiler)) {
                 $code = $compiler($code);
@@ -167,7 +167,7 @@ private function getCodeWithMacros($code)
             $this->getMacros(),
             $this->getDiscoveredMacros()
         );
-        
+
         foreach ($macros as $macro) {
             if (file_exists($macro)) {
                 $code = str_replace(

diff --git a/source/functions.php b/source/functions.php
@@ -48,14 +48,14 @@ function defer($code) {
                 {$code};
             };
 
-            print base64_encode(serialize(\$function()));
+            print base64_encode(gzencode(\$function()));
         ";
 
         $result = exec(
             "php -r 'eval(base64_decode(\"" . base64_encode($defer) . "\"));'"
         );
 
-        return unserialize(base64_decode($result));
+        return gzdecode(base64_decode($result));
     }
 }