Fixes a couple of issues with PHP 7.1. Makes "composer update" automatically rebuild git-deploy.

pocketarc · pocketarc · commit 89ff1cd56e77 · 2016-08-24T14:15:45.000+01:00
diff --git a/composer.json b/composer.json
@@ -70,5 +70,10 @@
     },
     "config": {
         "vendor-dir": "tools/vendor"
+    },
+    "scripts": {
+        "post-autoload-dump": [
+            "php tools/build.php"
+        ]
     }
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/git-deploy b/git-deploy
diff --git a/tools/build.php b/tools/build.php
@@ -35,8 +35,9 @@ public function accept() {
     $d = $phar->buildFromIterator(new RecursiveIteratorIterator($iterator), dirname(__FILE__));
     $phar->setStub(file_get_contents(dirname(__FILE__) . "/index.php"));
     unset($phar);
-    @unlink('../git-deploy');
-    rename('git-deploy.phar', '../git-deploy');
-    chmod('../git-deploy', 0755);
+    $path_to_git_deploy = dirname(__FILE__) . "/../git-deploy";
+    @unlink($path_to_git_deploy);
+    rename('git-deploy.phar', $path_to_git_deploy);
+    chmod($path_to_git_deploy, 0755);
     echo "Built git-deploy successfully!" . PHP_EOL;
 }
diff --git a/tools/index.php b/tools/index.php
@@ -2,11 +2,12 @@
 <?php
 
 ini_set('memory_limit', '-1');
+error_reporting(E_ALL ^ E_DEPRECATED);
 Phar::mapPhar("git-deploy");
 
 /**
  * PSR-4 autoloader.
- *      
+ *
  * @param string $class The fully-qualified class name.
  * @return void
  */
diff --git a/tools/src/Sftp.php b/tools/src/Sftp.php
@@ -9,8 +9,6 @@ class Sftp extends Server {
     public function connect($test = false) {
         if (!$this->connection or $test) {
             $server = $this->server;
-            require_once('Crypt/RSA.php');
-            require_once('Net/SFTP.php');
 
             $this->connection = new \phpseclib\Net\SFTP($server['host'], $server['port'], 10);
             $logged_in = false;
