Make amphp/file optional

Added support for amphp/file 2.x.
amphp · Nov 10, 2020 · 8729495 · 8729495
1 parent b6e9c25
commit 8729495
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -15,14 +15,14 @@
     "require": {
         "php": ">=7.1",
         "amphp/amp": "^2",
-        "amphp/file": "^1 || ^0.3.5",
         "amphp/socket": "^1",
         "amphp/sql": "^1",
         "amphp/sql-common": "^1"
     },
     "require-dev": {
         "ext-openssl": "*",
         "amphp/process": "^1",
+        "amphp/file": "^2 || ^1 || ^0.3.5",
         "phpunit/phpunit": "^9 || ^8 || ^7",
         "amphp/phpunit-util": "^1.1.2",
         "amphp/php-cs-fixer-config": "dev-master",

diff --git a/src/Internal/Processor.php b/src/Internal/Processor.php
@@ -5,6 +5,7 @@
 use Amp\CancellationToken;
 use Amp\Coroutine;
 use Amp\Deferred;
+use Amp\File;
 use Amp\Loop;
 use Amp\Mysql\CommandResult;
 use Amp\Mysql\ConnectionConfig;
@@ -852,8 +853,17 @@ private function handleLocalInfileRequest(string $packet): void
         \Amp\asyncCall(function () use ($packet) {
             try {
                 $filePath = \substr($packet, 1);
-                /** @var \Amp\File\Handle $fileHandle */
-                $fileHandle = yield \Amp\File\open($filePath, 'r');
+                /** @var \Amp\File\File $fileHandle */
+                if (\function_exists("Amp\\File\\openFile")) {
+                    // amphp/file 2.x
+                    $fileHandle = yield File\openFile($filePath, 'r');
+                } elseif (\function_exists("Amp\\File\\open")) {
+                    // amphp/file 1.x or 0.3.x
+                    $fileHandle = yield File\open($filePath, 'r');
+                } else {
+                    throw new \Error("amphp/file must be installed for LOCAL INFILE queries");
+                }
+
                 while ("" != ($chunk = yield $fileHandle->read())) {
                     $this->sendPacket($chunk);
                 }