Skip to content

use asserts #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 23, 2023
Merged

use asserts #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d77d92
use asserts
shmax Sep 23, 2023
fecf389
lint
shmax Sep 23, 2023
6b3ee38
simplify switch
shmax Sep 23, 2023
a1fe4ed
simplify
shmax Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions lib/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ public static function get(string $key, \Closure $closure, int $expire = null):

public static function set(string $key, mixed $var, int $expire = null): void
{
if (!static::$adapter) {
return;
}
assert(isset(static::$adapter), 'Adapter required to set');

$key = static::get_namespace() . $key;

Expand All @@ -110,9 +108,7 @@ public static function set(string $key, mixed $var, int $expire = null): void

public static function delete(string $key): void
{
if (!static::$adapter) {
return;
}
assert(isset(static::$adapter), 'Adapter required to delete');

$key = static::get_namespace() . $key;
static::$adapter->delete($key);
Expand Down
10 changes: 1 addition & 9 deletions lib/Column.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ public static function castIntegerSafely($value): string|int
return $value;
}

// It's just a decimal number
elseif (is_float($value) && floor($value) != $value) {
return (int) $value;
}

// If adding 0 to a string causes a float conversion,
// we have a number over PHP_INT_MAX
elseif (is_string($value) && 1 === bccomp($value, (string) PHP_INT_MAX)) {
Expand Down Expand Up @@ -157,8 +152,7 @@ public function cast($value, $connection): mixed
case self::STRING: return (string) $value;
case self::INTEGER: return static::castIntegerSafely($value);
case self::DECIMAL: return (float) $value;
case self::DATETIME:
case self::DATE:
default: // DATETIME, DATE, TIME
if ('' === $value) {
return null;
}
Expand All @@ -179,8 +173,6 @@ public function cast($value, $connection): mixed

return $connection->string_to_datetime($value);
}

return $value;
}

/**
Expand Down
3 changes: 1 addition & 2 deletions lib/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ public static function instance(string $connection_string_or_connection_name = n
$config = Config::instance();

if (!str_contains($connection_string_or_connection_name ?? '', '://')) {
$connection_string = $connection_string_or_connection_name ?
$config->get_connection($connection_string_or_connection_name) :
$connection_string = $config->get_connection($connection_string_or_connection_name ?? '') ??
$config->get_default_connection_string();
} else {
$connection_string = $connection_string_or_connection_name;
Expand Down
2 changes: 1 addition & 1 deletion lib/ConnectionManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ConnectionManager extends Singleton
*
* @return Connection
*/
public static function get_connection($name=null)
public static function get_connection(string $name=null)
{
$config = Config::instance();
$name = $name ?? $config->get_default_connection();
Expand Down
1 change: 0 additions & 1 deletion test/helpers/AdapterTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public function testShouldSetAdapterVariables()

public function testNullConnectionStringUsesDefaultConnection()
{
$this->assertNotNull(ActiveRecord\Connection::instance(null));
$this->assertNotNull(ActiveRecord\Connection::instance(''));
$this->assertNotNull(ActiveRecord\Connection::instance());
}
Expand Down