quality of life improvements

.gitignore

@@ -1,5 +1,4 @@
 /vendor
-/composer.lock
 /tmp
 /*.iml
 /.idea

bin/config.php

@@ -55,7 +55,7 @@
             'testEndpoint' => 'http://hapi.fhir.org/baseDstu3',
         ],
         'R4'    => [
-            'url'          => 'http://www.hl7.org/fhir/fhir-all-xsd.zip',
+            'url'          => 'http://www.hl7.org/fhir/R4/fhir-all-xsd.zip',
             'namespace'    => '\\HL7\\FHIR\\R4',
             'testEndpoint' => 'http://hapi.fhir.org/baseR4',
         ],

bin/generate.php

@@ -391,9 +391,28 @@ function is_dir_empty($dir)
 
     if ($download) {
         echo 'Downloading ' . $version . ' from ' . $url . PHP_EOL;
-        // Download/extract ZIP file
-        if (!copy($url, $zip_file_name)) {
-            echo "Unable to download.\n";
+        $fh = fopen($zip_file_name, 'w');
+        $ch = curl_init($url);
+        curl_setopt_array(
+            $ch,
+            [
+                CURLOPT_USERAGENT => 'Mozilla/5.0 (Android 4.4; Mobile; rv:41.0) Gecko/41.0 Firefox/41.0',
+                CURLOPT_FOLLOWLOCATION => true,
+                CURLOPT_HEADER => 0,
+                CURLOPT_FILE => $fh,
+            ]
+        );
+        $resp = curl_exec($ch);
+        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $err = curl_error($ch);
+        curl_close($ch);
+        fclose($fh);
+        if ('' !== $err) {
+            echo sprintf('Error downloading from %s: %s%s', $version, $err, PHP_EOL);
+            exit(1);
+        }
+        if ($code !== 200) {
+            echo sprintf('Error downlodaing from %s: %d (%s)%s', $version, $code, $resp, PHP_EOL);
             exit(1);
         }
     }

composer.json

@@ -27,6 +27,7 @@
   },
   "require-dev": {
     "ext-curl": "*",
+    "ext-zip": "*",
     "phpunit/phpunit": "@stable"
   },
   "replace": {