Updated test and html encoding-decoding code (didn't really work as expected)

Author: fpapadopou

Symfony/src/Codebender/CompilerBundle/Handler/CompilerHandler.php

@@ -71,7 +71,7 @@ function main($request, $compiler_config)
          * Decode any HTML entities found in project/libraries files
          */
         $request['files'] = $this->utility->htmlDecodeFiles($request['files']);
-        $request['libraries'] = $this->utility->htmlDecodeLibraries($request['libraries']);
+        $libraries = $this->utility->htmlDecodeLibraries($libraries);
 
 		// Step 1(part 1): Extract the project files included in the request.
 		$files = array();

Symfony/src/Codebender/CompilerBundle/Handler/UtilityHandler.php

@@ -157,14 +157,9 @@ function htmlDecodeFiles($files)
             return array();
         }
 
-        $htmlDecodedFiles = array();
-        foreach ($files as $file) {
-            $htmlDecodedFiles[] = array(
-                'filename' => $file['filename'],
-                'content' => htmlspecialchars_decode($file['content'])
-            );
-        }
-        return $htmlDecodedFiles;
+        array_walk($files, function(&$item){$item['content'] = htmlspecialchars_decode($item['content']);});
+
+        return $files;
     }
 
     /**

Symfony/src/Codebender/CompilerBundle/Tests/Controller/DefaultControllerFunctionalTest.php

@@ -254,7 +254,7 @@ public function testEthernetCompileErrorRemovedLibraryPaths()
         $files = array(array("filename" => "Blink.ino", "content" => "#include <Ethernet.h>\nvoid setup() {\n}\nvoid loop() {\n}\n"));
         $format = "binary";
         $version = "105";
-        $libraries = array('PseudoEthernet' => array('files' => array('filename' => 'Ethernet.h', 'content' => "#include \"SPI.h\"\n")));
+        $libraries = array('PseudoEthernet' => array(0 => array('filename' => 'Ethernet.h', 'content' => "#include \"SPI.h\"\n")));
         $build = array("mcu" => "atmega328p", "f_cpu" => "16000000", "core" => "arduino", "variant" => "standard");
 
         $data = json_encode(array("files" => $files, "format" => $format, "version" => $version, "libraries" => $libraries, "build" => $build));
@@ -277,7 +277,7 @@ public function testEthernetCompileErrorRemovedPersonalLibraryPaths()
         $files = array(array("filename" => "Blink.ino", "content" => "#include <Ethernet.h>\nvoid setup() {\n}\nvoid loop() {\n}\n"));
         $format = "binary";
         $version = "105";
-        $libraries = array('4096_cb_personal_lib_PseudoEthernet' => array('files' => array('filename' => 'Ethernet.h', 'content' => "#include \"SPI.h\"\n")));
+        $libraries = array('4096_cb_personal_lib_PseudoEthernet' => array(0 => array('filename' => 'Ethernet.h', 'content' => "#include \"SPI.h\"\n")));
         $build = array("mcu" => "atmega328p", "f_cpu" => "16000000", "core" => "arduino", "variant" => "standard");
 
         $data = json_encode(array("files" => $files, "format" => $format, "version" => $version, "libraries" => $libraries, "build" => $build));
@@ -300,7 +300,7 @@ public function testHtmlEncodedInput()
         $files = array(array("filename" => "Blink.ino", "content" => htmlspecialchars("#include <Ethernet.h>\nint * pointer;\nvoid setup() {\nint ** var = &pointer;\n}\nvoid loop() {\n}\n")));
         $format = "binary";
         $version = "105";
-        $libraries = array('Ethernet' => array('files' => array('filename' => 'Ethernet.h', 'content' => htmlspecialchars("\n"))));
+        $libraries = array('Ethernet' => array(0 => array('filename' => 'Ethernet.h', 'content' => htmlspecialchars('#include "Arduino.h"'))));
         $build = array("mcu" => "atmega328p", "f_cpu" => "16000000", "core" => "arduino", "variant" => "standard");
 
         $data = json_encode(array("files" => $files, "format" => $format, "version" => $version, "libraries" => $libraries, "build" => $build));