get dev

6 files changed, 9 insertions, 10 deletions

diff --git a/vendor/sabre/vobject/bin/bench_freebusygenerator.php b/vendor/sabre/vobject/bin/bench_freebusygenerator.php
index 1299c14fb..963623d18 100644
--- a/vendor/sabre/vobject/bin/bench_freebusygenerator.php
+++ b/vendor/sabre/vobject/bin/bench_freebusygenerator.php
@@ -11,7 +11,7 @@ if ($argc < 2) {
     echo "The process will be repeated 100 times to get accurate stats\n";
     echo "\n";
     echo 'Usage: '.$argv[0]." inputfile.ics\n";
-    die();
+    exit();
 }
 
 list(, $inputFile) = $argv;
diff --git a/vendor/sabre/vobject/bin/bench_manipulatevcard.php b/vendor/sabre/vobject/bin/bench_manipulatevcard.php
index f229091db..df6d9f23d 100644
--- a/vendor/sabre/vobject/bin/bench_manipulatevcard.php
+++ b/vendor/sabre/vobject/bin/bench_manipulatevcard.php
@@ -10,7 +10,7 @@ if ($argc < 2) {
     echo 'system.';
     echo "\n";
     echo 'Usage: '.$argv[0]." inputfile.vcf\n";
-    die();
+    exit();
 }
 
 list(, $inputFile) = $argv;
diff --git a/vendor/sabre/vobject/bin/fetch_windows_zones.php b/vendor/sabre/vobject/bin/fetch_windows_zones.php
index 9c4e51abd..2361dc309 100755
--- a/vendor/sabre/vobject/bin/fetch_windows_zones.php
+++ b/vendor/sabre/vobject/bin/fetch_windows_zones.php
@@ -1,13 +1,12 @@
 #!/usr/bin/env php
 <?php
 
-$windowsZonesUrl = 'http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml';
+$windowsZonesUrl = 'https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml';
 $outputFile = __DIR__.'/../lib/timezonedata/windowszones.php';
 
 echo 'Fetching timezone map from: '.$windowsZonesUrl, "\n";
 
 $data = file_get_contents($windowsZonesUrl);
-
 $xml = simplexml_load_string($data);
 
 $map = [];
@@ -44,6 +43,6 @@ fclose($f);
 
 echo "Formatting\n";
 
-exec(__DIR__.'/sabre-cs-fixer fix '.escapeshellarg($outputFile));
+exec(__DIR__.'/../vendor/bin/php-cs-fixer fix '.escapeshellarg($outputFile));
 
 echo "Done\n";
diff --git a/vendor/sabre/vobject/bin/generateicalendardata.php b/vendor/sabre/vobject/bin/generateicalendardata.php
index 62b6107c5..019ed9745 100755
--- a/vendor/sabre/vobject/bin/generateicalendardata.php
+++ b/vendor/sabre/vobject/bin/generateicalendardata.php
@@ -18,7 +18,7 @@ The iCalendar output goes to stdout. Other messages to stderr.
 
 HI
     );
-    die();
+    exit();
 }
 
 $events = 100;
@@ -77,7 +77,7 @@ $result = $calendar->validate();
 if ($result) {
     fwrite(STDERR, "Errors!\n");
     fwrite(STDERR, print_r($result, true));
-    die(-1);
+    exit(-1);
 }
 
 fwrite(STDERR, "Serializing this beast\n");
diff --git a/vendor/sabre/vobject/bin/mergeduplicates.php b/vendor/sabre/vobject/bin/mergeduplicates.php
index e6cde73dd..31b2c14ab 100755
--- a/vendor/sabre/vobject/bin/mergeduplicates.php
+++ b/vendor/sabre/vobject/bin/mergeduplicates.php
@@ -19,7 +19,7 @@ foreach ($paths as $path) {
 
 if (!class_exists('Sabre\\VObject\\Version')) {
     fwrite(STDERR, "Composer autoloader could not be loaded.\n");
-    die(1);
+    exit(1);
 }
 
 echo 'sabre/vobject ', Version::VERSION, " duplicate contact merge tool\n";
@@ -27,7 +27,7 @@ echo 'sabre/vobject ', Version::VERSION, " duplicate contact merge tool\n";
 if ($argc < 3) {
     echo "\n";
     echo 'Usage: ', $argv[0], " input.vcf output.vcf [debug.log]\n";
-    die(1);
+    exit(1);
 }
 
 $input = fopen($argv[1], 'r');
diff --git a/vendor/sabre/vobject/bin/rrulebench.php b/vendor/sabre/vobject/bin/rrulebench.php
index 583da574c..69008002e 100644
--- a/vendor/sabre/vobject/bin/rrulebench.php
+++ b/vendor/sabre/vobject/bin/rrulebench.php
@@ -9,7 +9,7 @@ if ($argc < 4) {
     echo 'system.';
     echo "\n";
     echo 'Usage: '.$argv[0]." inputfile.ics startdate enddate\n";
-    die();
+    exit();
 }
 
 list(, $inputFile, $startDate, $endDate) = $argv;