Browse Source

CS fixes

microsub
J. King 6 years ago
parent
commit
39cad91b78
  1. 2
      lib/Db/AbstractDriver.php
  2. 2
      lib/Db/PDODriver.php
  3. 4
      lib/Db/PDOError.php
  4. 2
      lib/Db/SQLite3/Driver.php
  5. 2
      lib/Db/SQLite3/PDODriver.php
  6. 1
      tests/cases/Db/SQLite3PDO/TestStatement.php
  7. 1
      tests/cases/Lang/TestBasic.php
  8. 1
      tests/cases/User/TestAuthorization.php
  9. 2
      tests/lib/Database/Setup.php

2
lib/Db/AbstractDriver.php

@ -13,7 +13,7 @@ abstract class AbstractDriver implements Driver {
protected $transDepth = 0;
protected $transStatus = [];
protected abstract function getError(): string;
abstract protected function getError(): string;
/** @codeCoverageIgnore */
public function schemaVersion(): int {

2
lib/Db/PDODriver.php

@ -44,4 +44,4 @@ trait PDODriver {
}
return new PDOStatement($this->db, $s, $paramTypes);
}
}
}

4
lib/Db/PDOError.php

@ -28,9 +28,11 @@ trait PDOError {
default:
return [Exception::class, "engineErrorGeneral", $err[1]." - ".$err[2]];
}
// no break
default:
return [Exception::class, "engineErrorGeneral", $err[2]]; // @codeCoverageIgnore
}
// no break
default:
return [Exception::class, "engineErrorGeneral", $err[0].": ".$err[2]]; // @codeCoverageIgnore
}
@ -39,4 +41,4 @@ trait PDOError {
public function getError(): string {
return (string) $this->db->errorInfo()[2];
}
}
}

2
lib/Db/SQLite3/Driver.php

@ -82,7 +82,7 @@ class Driver extends \JKingWeb\Arsse\Db\AbstractDriver {
} elseif (PDODriver::requirementsMet()) {
return new PDODriver;
} else {
throw new Exception("extMissing", self::driverName());
throw new Exception("extMissing", self::driverName());
}
}

2
lib/Db/SQLite3/PDODriver.php

@ -35,7 +35,7 @@ class PDODriver extends Driver {
} elseif (Driver::requirementsMet()) {
return new Driver;
} else {
throw new Exception("extMissing", self::driverName());
throw new Exception("extMissing", self::driverName());
}
}

1
tests/cases/Db/SQLite3PDO/TestStatement.php

@ -14,7 +14,6 @@ use JKingWeb\Arsse\Db\SQLite3\PDODriver;
* @covers \JKingWeb\Arsse\Db\PDOStatement<extended>
* @covers \JKingWeb\Arsse\Db\PDOError */
class TestStatement extends \JKingWeb\Arsse\Test\AbstractTest {
protected $c;
protected static $imp = \JKingWeb\Arsse\Db\PDOStatement::class;

1
tests/cases/Lang/TestBasic.php

@ -9,7 +9,6 @@ namespace JKingWeb\Arsse\TestCase\Lang;
use JKingWeb\Arsse\Lang as TestClass;
use org\bovigo\vfs\vfsStream;
/** @covers \JKingWeb\Arsse\Lang */
class TestBasic extends \JKingWeb\Arsse\Test\AbstractTest {
use \JKingWeb\Arsse\Test\Lang\Setup;

1
tests/cases/User/TestAuthorization.php

@ -6,7 +6,6 @@
declare(strict_types=1);
namespace JKingWeb\Arsse\TestCase\User;
use JKingWeb\Arsse\Arsse;
use JKingWeb\Arsse\Conf;
use JKingWeb\Arsse\User;

2
tests/lib/Database/Setup.php

@ -103,7 +103,7 @@ trait Setup {
break;
case "bool":
$test[$col] = (int) ValueInfo::normalize($value, ValueInfo::T_BOOL | ValueInfo::M_DROP | valueInfo::M_NULL);
break;
break;
}
}
if ($row===$test) {

Loading…
Cancel
Save