Browse Source

Style fixes

dbtest
J. King 2 years ago
parent
commit
afe26fb8e1
  1. 11
      RoboFile.php
  2. 2
      tests/lib/DatabaseDrivers/MySQLCommon.php
  3. 1
      tests/lib/DatabaseDrivers/PostgreSQL.php
  4. 3
      tests/lib/DatabaseDrivers/PostgreSQLCommon.php
  5. 1
      tests/lib/DatabaseDrivers/SQLite3.php
  6. 2
      tests/lib/DatabaseDrivers/SQLite3Common.php

11
RoboFile.php

@ -1,6 +1,5 @@
<?php <?php
use Robo\Collection\CollectionBuilder;
use Robo\Result; use Robo\Result;
const BASE = __DIR__.\DIRECTORY_SEPARATOR; const BASE = __DIR__.\DIRECTORY_SEPARATOR;
@ -166,7 +165,7 @@ class RoboFile extends \Robo\Tasks {
(IS_WIN && (!exec(escapeshellarg($bin)." --help $blackhole", $junk, $status) || $status)) (IS_WIN && (!exec(escapeshellarg($bin)." --help $blackhole", $junk, $status) || $status))
|| (!IS_WIN && (!exec("which ".escapeshellarg($bin)." $blackhole", $junk, $status) || $status)) || (!IS_WIN && (!exec("which ".escapeshellarg($bin)." $blackhole", $junk, $status) || $status))
) { ) {
return false; return false;
} }
} }
return true; return true;
@ -283,7 +282,7 @@ class RoboFile extends \Robo\Tasks {
* The commit to package may be any Git tree-ish identifier: a tag, a branch, * The commit to package may be any Git tree-ish identifier: a tag, a branch,
* or any commit hash. If none is provided on the command line, Robo will prompt * or any commit hash. If none is provided on the command line, Robo will prompt
* for a commit to package; the default is "HEAD". * for a commit to package; the default is "HEAD".
* *
* The Arch base-devel group should be installed for this. * The Arch base-devel group should be installed for this.
*/ */
public function packageArch(string $commit = null): Result { public function packageArch(string $commit = null): Result {
@ -317,7 +316,7 @@ class RoboFile extends \Robo\Tasks {
* The commit to package may be any Git tree-ish identifier: a tag, a branch, * The commit to package may be any Git tree-ish identifier: a tag, a branch,
* or any commit hash. If none is provided on the command line, Robo will prompt * or any commit hash. If none is provided on the command line, Robo will prompt
* for a commit to package; the default is "HEAD". * for a commit to package; the default is "HEAD".
* *
* The pbuilder tool should be installed for this. * The pbuilder tool should be installed for this.
*/ */
public function packageDeb(string $commit = null): Result { public function packageDeb(string $commit = null): Result {
@ -404,7 +403,7 @@ class RoboFile extends \Robo\Tasks {
* The commit to package may be any Git tree-ish identifier: a tag, a branch, * The commit to package may be any Git tree-ish identifier: a tag, a branch,
* or any commit hash. If none is provided on the command line, Robo will prompt * or any commit hash. If none is provided on the command line, Robo will prompt
* for a commit to package; the default is "HEAD". * for a commit to package; the default is "HEAD".
* *
* Generic release tarballs will always be generated, but distribution-specific * Generic release tarballs will always be generated, but distribution-specific
* packages are skipped when the required tools are not available * packages are skipped when the required tools are not available
*/ */
@ -416,7 +415,7 @@ class RoboFile extends \Robo\Tasks {
// determine whether the distribution-specific packages can be built // determine whether the distribution-specific packages can be built
$dist = [ $dist = [
'Arch' => $this->toolExists("git", "makepkg", "updpkgsums"), 'Arch' => $this->toolExists("git", "makepkg", "updpkgsums"),
'Deb' => $this->toolExists("git", "sudo", "pbuilder"), 'Deb' => $this->toolExists("git", "sudo", "pbuilder"),
]; ];
// start a collection // start a collection
$t = $this->collectionBuilder(); $t = $this->collectionBuilder();

2
tests/lib/DatabaseDrivers/MySQLCommon.php

@ -57,4 +57,4 @@ trait MySQLCommon {
} }
$db->query("SET FOREIGN_KEY_CHECKS=1"); $db->query("SET FOREIGN_KEY_CHECKS=1");
} }
} }

1
tests/lib/DatabaseDrivers/PostgreSQL.php

@ -7,7 +7,6 @@ declare(strict_types=1);
namespace JKingWeb\Arsse\Test\DatabaseDrivers; namespace JKingWeb\Arsse\Test\DatabaseDrivers;
use JKingWeb\Arsse\Arsse; use JKingWeb\Arsse\Arsse;
use JKingWeb\Arsse\Db\Driver;
trait PostgreSQL { trait PostgreSQL {
use PostgreSQLCommon; use PostgreSQLCommon;

3
tests/lib/DatabaseDrivers/PostgreSQLCommon.php

@ -6,7 +6,6 @@
declare(strict_types=1); declare(strict_types=1);
namespace JKingWeb\Arsse\Test\DatabaseDrivers; namespace JKingWeb\Arsse\Test\DatabaseDrivers;
use JKingWeb\Arsse\Arsse;
use JKingWeb\Arsse\Db\Driver; use JKingWeb\Arsse\Db\Driver;
trait PostgreSQLCommon { trait PostgreSQLCommon {
@ -66,4 +65,4 @@ trait PostgreSQLCommon {
self::dbExec($db, $st); self::dbExec($db, $st);
} }
} }
} }

1
tests/lib/DatabaseDrivers/SQLite3.php

@ -7,7 +7,6 @@ declare(strict_types=1);
namespace JKingWeb\Arsse\Test\DatabaseDrivers; namespace JKingWeb\Arsse\Test\DatabaseDrivers;
use JKingWeb\Arsse\Arsse; use JKingWeb\Arsse\Arsse;
use JKingWeb\Arsse\Db\Driver;
trait SQLite3 { trait SQLite3 {
use SQLite3Common; use SQLite3Common;

2
tests/lib/DatabaseDrivers/SQLite3Common.php

@ -67,4 +67,4 @@ trait SQLite3Common {
$db->exec($st); $db->exec($st);
} }
} }
} }

Loading…
Cancel
Save