Upgrade to Symfony 5 process component

Author: rasmuscnielsen

.travis.yml

@@ -5,6 +5,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4
 
 services:
   - mysql

composer.json

@@ -2,14 +2,14 @@
     "name": "makeabledk/laravel-backup-sql-check",
     "license": "CC-BY-SA-4.0",
     "require": {
-        "php": ">=7.1.0"
+        "php": ">=7.1.0",
+        "symfony/process": "^5.0"
     },
     "require-dev": {
         "spatie/laravel-backup": "^6.0",
-        "friendsofphp/php-cs-fixer": "^2.3",
-        "laravel/laravel": "5.7",
-        "orchestra/testbench": "~3.5",
-        "mockery/mockery": "^1.2"
+        "laravel/laravel": "^7.0",
+        "orchestra/testbench": "^5.0",
+        "mockery/mockery": "^1.3"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -8,24 +8,17 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false">
-    <php>
-        <ini name='display_errors' value='1' />
-    </php>
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory>./tests/</directory>
+            <directory suffix="Test.php">./tests/</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist>
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-</phpunit>
+    <php>
+        <ini name="display_errors" value="1"/>
+    </php>
+</phpunit>

src/DbImporter/Databases/MySqlImporter.php

@@ -3,6 +3,7 @@
 namespace Makeable\SqlCheck\DbImporter\Databases;
 
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Makeable\SqlCheck\DbImporter\DbImporter;
 use Makeable\SqlCheck\DbImporter\Exceptions\DatabaseImportFailed;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
@@ -119,7 +120,7 @@ protected function checkIfImportWasSuccessful($databaseName, $credentials)
     {
         $rawTables = $this->runMysqlCommand(["USE `{$databaseName}`", 'SHOW TABLES'], $credentials)->getOutput();
 
-        if (! starts_with($rawTables, 'Tables_in') || ! count(explode(PHP_EOL, $rawTables)) > 1) {
+        if (! Str::startsWith($rawTables, 'Tables_in') || ! count(explode(PHP_EOL, $rawTables)) > 1) {
             throw DatabaseImportFailed::databaseWasEmpty($rawTables);
         }
     }
@@ -137,11 +138,11 @@ protected function runMysqlCommand($mysqlCommands, $credentialsFile, $timeout =
 
         $command = [
             "{$quote}{$this->dumpBinaryPath}mysql{$quote}",
-            "--defaults-extra-file=\"{$credentialsFile}\"",
+            "--defaults-extra-file='{$credentialsFile}'",
         ];
 
         if ($this->socket !== '') {
-            $command[] = "--socket={$this->socket}";
+            $command[] = "--socket='{$this->socket}'";
         }
 
         foreach ($this->extraOptions as $extraOption) {
@@ -150,10 +151,11 @@ protected function runMysqlCommand($mysqlCommands, $credentialsFile, $timeout =
 
         $command[] = "-e {$quote}".implode('; ', Arr::wrap($mysqlCommands))."{$quote}";
 
-        $process = new Process(implode(' ', $command));
-        $process->setTimeout($timeout);
+        $command = implode(' ', $command);
 
         try {
+            $process = Process::fromShellCommandline($command);
+            $process->setTimeout($timeout);
             $process->run();
         } catch (ProcessTimedOutException $exception) {
             throw DatabaseImportFailed::timeoutExceeded($timeout);

src/DbImporter/DbImporterFactory.php

@@ -26,7 +26,8 @@ public static function createFromConnection($dbConnectionName)
             ->setHost(Arr::first(Arr::wrap($dbConfig['host'] ?? '')))
             ->setDbName($dbConfig['database'])
             ->setUserName($dbConfig['username'] ?? '')
-            ->setPassword($dbConfig['password'] ?? '');
+            ->setPassword($dbConfig['password'] ?? '')
+            ->setSocket($dbConfig['unix_socket'] ?? '');
 
         if ($dbImporter instanceof MysqlImporter) {
             $dbImporter->setDbCharset(Arr::get($dbConfig, 'charset'));

tests/Feature/HealthySqlDumpTest.php

@@ -2,6 +2,7 @@
 
 namespace Makeable\SqlCheck\Tests\Feature;
 
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
 use Makeable\SqlCheck\DiskSpace;
@@ -45,9 +46,11 @@ public function it_fails_when_backup_is_corrupt()
 
         Event::fake();
 
-        $this->artisan('backup:monitor')->assertExitCode(0);
+        Artisan::call('backup:monitor');
 
         Event::assertDispatched(UnhealthyBackupWasFound::class);
+
+        $this->assertStringContainsString('unhealthy!', Artisan::output());
     }
 
     /** @test */
@@ -57,10 +60,12 @@ public function it_fails_when_sql_process_exceed_the_timeout_limit()
 
         Event::fake(UnhealthyBackupWasFound::class);
 
-        $this->artisan('backup:monitor')->assertExitCode(0);
+        Artisan::call('backup:monitor');
 
         Event::assertDispatched(UnhealthyBackupWasFound::class);
 
+        $this->assertStringContainsString('unhealthy!', Artisan::output());
+
         // Manually remove database, because error exited code before deleting it
         DB::select('DROP DATABASE `healthy-sql-dump--backup--mysite-2019-09-16-08-00-07`');
     }
@@ -79,8 +84,10 @@ public function available()
 
         Event::fake(UnhealthyBackupWasFound::class);
 
-        $this->artisan('backup:monitor')->assertExitCode(0);
+        Artisan::call('backup:monitor');
 
         Event::assertDispatched(UnhealthyBackupWasFound::class);
+
+        $this->assertStringContainsString('unhealthy!', Artisan::output());
     }
 }

tests/TestCase.php

@@ -30,6 +30,7 @@ protected function getEnvironmentSetUp($app)
         config()->set('database.connections.mysql.username', env('DB_USERNAME'));
         config()->set('database.connections.mysql.password', env('DB_PASSWORD'));
         config()->set('database.connections.mysql.database', env('DB_DATABASE'));
+        config()->set('database.connections.mysql.unix_socket', env('DB_SOCKET'));
         config()->set('filesystems.disks.backup', [
             'driver' => 'local',
             'root' => __DIR__.'/stubs',