Merge branch 'dev' into 'dev'

Dev sync

See merge request kostikov/core!1

7 files changed, 9 insertions, 12 deletions

diff --git a/vendor/sabre/dav/bin/build.php b/vendor/sabre/dav/bin/build.php
index 54174a777..4dd25d9c9 100644..100755
--- a/vendor/sabre/dav/bin/build.php
+++ b/vendor/sabre/dav/bin/build.php
@@ -32,7 +32,7 @@ if ($argc > 2) {
 
 if (!isset($tasks[$currentTask])) {
     echo 'Task not found: ',  $currentTask, "\n";
-    die(1);
+    exit(1);
 }
 
 // Creating the dependency graph
@@ -43,7 +43,7 @@ while (count($oldTaskList) > 0) {
     foreach ($oldTaskList as $task => $foo) {
         if (!isset($tasks[$task])) {
             echo 'Dependency not found: '.$task, "\n";
-            die(1);
+            exit(1);
         }
         $dependencies = $tasks[$task];
 
@@ -107,7 +107,7 @@ function test()
     system(__DIR__.'/phpunit --configuration '.$baseDir.'/tests/phpunit.xml.dist --stop-on-failure', $code);
     if (0 != $code) {
         echo "PHPUnit reported error code $code\n";
-        die(1);
+        exit(1);
     }
 }
 
@@ -139,7 +139,7 @@ function buildzip()
     system('cd build/SabreDAV; composer install -n', $code);
     if (0 !== $code) {
         echo "Composer reported error code $code\n";
-        die(1);
+        exit(1);
     }
 
     echo "  Removing pointless files\n";
diff --git a/vendor/sabre/dav/bin/googlecode_upload.py b/vendor/sabre/dav/bin/googlecode_upload.py
index caafd5ded..caafd5ded 100644..100755
--- a/vendor/sabre/dav/bin/googlecode_upload.py
+++ b/vendor/sabre/dav/bin/googlecode_upload.py
diff --git a/vendor/sabre/dav/bin/migrateto20.php b/vendor/sabre/dav/bin/migrateto20.php
index c7a8d9e35..fb24fe599 100644..100755
--- a/vendor/sabre/dav/bin/migrateto20.php
+++ b/vendor/sabre/dav/bin/migrateto20.php
@@ -72,7 +72,7 @@ switch ($driver) {
         break;
     default:
         echo 'Error: unsupported driver: '.$driver."\n";
-        die(-1);
+        exit(-1);
 }
 
 foreach (['calendar', 'addressbook'] as $itemType) {
@@ -130,7 +130,6 @@ foreach (['calendar', 'addressbook'] as $itemType) {
                 break;
 
             case 'sqlite':
-
                 $pdo->exec("ALTER TABLE $tableName RENAME TO $tableNameOld");
 
                 switch ($itemType) {
@@ -370,7 +369,6 @@ CREATE TABLE cards (
             break;
 
         case 'sqlite':
-
             $pdo->exec('
 CREATE TABLE cards (
     id integer primary key asc,
@@ -395,7 +393,6 @@ CREATE TABLE cards (
             break;
 
         case 'sqlite':
-
             $pdo->exec('
                 ALTER TABLE cards ADD etag text;
                 ALTER TABLE cards ADD size integer;
diff --git a/vendor/sabre/dav/bin/migrateto21.php b/vendor/sabre/dav/bin/migrateto21.php
index 909643583..2c15b0a21 100644..100755
--- a/vendor/sabre/dav/bin/migrateto21.php
+++ b/vendor/sabre/dav/bin/migrateto21.php
@@ -73,7 +73,7 @@ switch ($driver) {
         break;
     default:
         echo 'Error: unsupported driver: '.$driver."\n";
-        die(-1);
+        exit(-1);
 }
 
 echo "Upgrading 'calendarobjects'\n";
diff --git a/vendor/sabre/dav/bin/migrateto30.php b/vendor/sabre/dav/bin/migrateto30.php
index 25e544c2a..9798cadd2 100644..100755
--- a/vendor/sabre/dav/bin/migrateto30.php
+++ b/vendor/sabre/dav/bin/migrateto30.php
@@ -72,7 +72,7 @@ switch ($driver) {
         break;
     default:
         echo 'Error: unsupported driver: '.$driver."\n";
-        die(-1);
+        exit(-1);
 }
 
 echo "Upgrading 'propertystorage'\n";
diff --git a/vendor/sabre/dav/bin/migrateto32.php b/vendor/sabre/dav/bin/migrateto32.php
index 57fd35507..09ac55d13 100644..100755
--- a/vendor/sabre/dav/bin/migrateto32.php
+++ b/vendor/sabre/dav/bin/migrateto32.php
@@ -75,7 +75,7 @@ switch ($driver) {
         break;
     default:
         echo 'Error: unsupported driver: '.$driver."\n";
-        die(-1);
+        exit(-1);
 }
 
 echo "Creating 'calendarinstances'\n";
diff --git a/vendor/sabre/dav/bin/sabredav.php b/vendor/sabre/dav/bin/sabredav.php
index 28341b587..71047b8f8 100644..100755
--- a/vendor/sabre/dav/bin/sabredav.php
+++ b/vendor/sabre/dav/bin/sabredav.php
@@ -20,7 +20,7 @@ class CliLog
 $log = new CliLog();
 
 if ('cli-server' !== php_sapi_name()) {
-    die('This script is intended to run on the built-in php webserver');
+    exit('This script is intended to run on the built-in php webserver');
 }
 
 // Finding composer