[D] Fix generating xml files | Update dependencies

kimden · Apr 16, 2019 · 3b4009c · 3b4009c
1 parent a363381
commit 3b4009c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -17,6 +17,7 @@
         "ext-gettext": "*",
         "ext-mbstring": "*",
         "ext-simplexml": "*",
+        "ext-json": "*",
         "ext-xml": "*",
         "myclabs/php-enum": "^1.5",
         "webmozart/assert": "^1.2",

diff --git a/composer.lock b/composer.lock
diff --git a/include/xmlWrite.php b/include/xmlWrite.php
@@ -486,28 +486,31 @@ function generateAssetXML($download_location)
 
 function writeNewsXML()
 {
-    $news_xml = generateNewsXML(OLD_ASSETS_XML_LOCATION, OLD_NEWS_XML_LOCATION);
+    // Base is old
+    $news_xml = generateNewsXML(OLD_ASSETS_XML_LOCATION, OLD_NEWS_XML_PATH);
 
-    // Write  new xml file
+    // Write new xml file
     FileSystem::filePutContents(
         NEWS_XML_PATH,
         str_replace(OLD_DOWNLOAD_LOCATION, DOWNLOAD_LOCATION, $news_xml)
     );
 
-
+    // Write old
     return FileSystem::filePutContents(OLD_NEWS_XML_PATH, $news_xml);
 }
 
 function writeAssetXML()
 {
+    // Base is old
     $asset_xml = generateAssetXML(OLD_DOWNLOAD_LOCATION);
 
-    // Write  new xml file
+    // Write new xml file
     FileSystem::filePutContents(
         ASSETS_XML_PATH,
         str_replace(OLD_DOWNLOAD_LOCATION, DOWNLOAD_LOCATION, $asset_xml)
     );
 
+    // Write old
     return FileSystem::filePutContents(OLD_ASSETS_XML_PATH, $asset_xml);
 }