as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-04-25 11:27:13 +08:00
parent 77a6445eea
commit be8faa5cb0
6 changed files with 374 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/ActiveRecord.php
+360 -358
View File
@@ -13,6 +13,7 @@ namespace Database;
use Database\Base\BaseActiveRecord; use Database\Base\BaseActiveRecord;
use Database\Traits\HasBase; use Database\Traits\HasBase;
use Exception; use Exception;
use JetBrains\PhpStorm\Pure;
use ReflectionException; use ReflectionException;
use Snowflake\Channel; use Snowflake\Channel;
use Snowflake\Exception\NotFindClassException; use Snowflake\Exception\NotFindClassException;
@@ -32,415 +33,416 @@ defined('FIND_OR_CREATE_MESSAGE') or define('FIND_OR_CREATE_MESSAGE', 'Create a
class ActiveRecord extends BaseActiveRecord class ActiveRecord extends BaseActiveRecord
{ {
const DECR = 'decr'; const DECR = 'decr';
const INCR = 'incr'; const INCR = 'incr';
/** /**
* @return array * @return array
*/ */
public function rules(): array public function rules(): array
{ {
return []; return [];
} }
/** /**
* @param string $column * @param string $column
* @param int $value * @param int $value
* @return ActiveRecord|false * @return ActiveRecord|false
* @throws Exception * @throws Exception
*/ */
public function increment(string $column, int $value): bool|ActiveRecord public function increment(string $column, int $value): bool|ActiveRecord
{ {
if (!$this->mathematics([$column => $value], '+')) { if (!$this->mathematics([$column => $value], '+')) {
return false; return false;
} }
$this->{$column} += $value; $this->{$column} += $value;
return $this->refresh(); return $this->refresh();
} }
/** /**
* @param string $column * @param string $column
* @param int $value * @param int $value
* @return ActiveRecord|false * @return ActiveRecord|false
* @throws Exception * @throws Exception
*/ */
public function decrement(string $column, int $value): bool|ActiveRecord public function decrement(string $column, int $value): bool|ActiveRecord
{ {
if (!$this->mathematics([$column => $value], '-')) { if (!$this->mathematics([$column => $value], '-')) {
return false; return false;
} }
$this->{$column} -= $value; $this->{$column} -= $value;
return $this->refresh(); return $this->refresh();
} }
/** /**
* @param array $columns * @param array $columns
* @return ActiveRecord|false * @return ActiveRecord|false
* @throws Exception * @throws Exception
*/ */
public function increments(array $columns): bool|static public function increments(array $columns): bool|static
{ {
if (!$this->mathematics($columns, '+')) { if (!$this->mathematics($columns, '+')) {
return false; return false;
} }
foreach ($columns as $key => $attribute) { foreach ($columns as $key => $attribute) {
$this->$key += $attribute; $this->$key += $attribute;
} }
return $this; return $this;
} }
/** /**
* @param array $columns * @param array $columns
* @return ActiveRecord|false * @return ActiveRecord|false
* @throws Exception * @throws Exception
*/ */
public function decrements(array $columns): bool|static public function decrements(array $columns): bool|static
{ {
if (!$this->mathematics($columns, '-')) { if (!$this->mathematics($columns, '-')) {
return false; return false;
} }
foreach ($columns as $key => $attribute) { foreach ($columns as $key => $attribute) {
$this->$key -= $attribute; $this->$key -= $attribute;
} }
return $this; return $this;
} }
/** /**
* @param array $condition * @param array $condition
* @param array $attributes * @param array $attributes
* @return bool|ActiveRecord * @return bool|ActiveRecord
* @throws ReflectionException * @throws ReflectionException
* @throws NotFindClassException * @throws NotFindClassException
* @throws Exception * @throws Exception
*/ */
public static function findOrCreate(array $condition, array $attributes = []): bool|static public static function findOrCreate(array $condition, array $attributes = []): bool|static
{ {
$logger = Snowflake::app()->getLogger(); $logger = Snowflake::app()->getLogger();
/** @var static $select */ /** @var static $select */
$select = static::find()->where($condition)->first(); $select = static::find()->where($condition)->first();
if (!empty($select)) { if (!empty($select)) {
return $select; return $select;
} }
if (empty($attributes)) { if (empty($attributes)) {
return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql'); return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
} }
$select = self::getModelClass(); $select = self::getModelClass();
$select->attributes = $attributes; $select->attributes = $attributes;
if (!$select->save()) { if (!$select->save()) {
return $logger->addError($select->getLastError(), 'mysql'); return $logger->addError($select->getLastError(), 'mysql');
} }
return $select; return $select;
} }
/** /**
* @param array $condition * @param array $condition
* @param array $attributes * @param array $attributes
* @return bool|static * @return bool|static
* @throws Exception * @throws Exception
*/ */
public static function createOrUpdate(array $condition, array $attributes = []): bool|static public static function createOrUpdate(array $condition, array $attributes = []): bool|static
{ {
$logger = Snowflake::app()->getLogger(); $logger = Snowflake::app()->getLogger();
if (empty($attributes)) { if (empty($attributes)) {
return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql'); return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
} }
/** @var static $select */ /** @var static $select */
$select = static::find()->where($condition)->first(); $select = static::find()->where($condition)->first();
if (empty($select)) { if (empty($select)) {
$select = self::getModelClass(); $select = self::getModelClass();
} }
$select->attributes = $attributes; $select->attributes = $attributes;
if (!$select->save()) { if (!$select->save()) {
return $logger->addError($select->getLastError(), 'mysql'); return $logger->addError($select->getLastError(), 'mysql');
} }
return $select; return $select;
} }
/** /**
* @return static * @return static
* @throws Exception * @throws Exception
*/ */
private static function getModelClass(): static #[Pure] private static function getModelClass(): static
{ {
$className = get_called_class(); return new static();
/** @var Channel $channel */ $className = get_called_class();
$channel = Snowflake::app()->get('channel'); /** @var Channel $channel */
return $channel->pop($className, function () use ($className) { $channel = Snowflake::app()->get('channel');
return new $className(); return $channel->pop($className, function () use ($className) {
}); return new $className();
} });
}
/** /**
* @param $action * @param $action
* @param $columns * @param $columns
* @param array $condition * @param array $condition
* @return array|bool|int|string|null * @return array|bool|int|string|null
* @throws Exception * @throws Exception
*/ */
private function mathematics($columns, $action, $condition = []): int|bool|array|string|null private function mathematics($columns, $action, $condition = []): int|bool|array|string|null
{ {
if (empty($condition)) { if (empty($condition)) {
$condition = [$this->getPrimary() => $this->getPrimaryValue()]; $condition = [$this->getPrimary() => $this->getPrimaryValue()];
} }
$activeQuery = static::find()->where($condition); $activeQuery = static::find()->where($condition);
$create = SqlBuilder::builder($activeQuery)->mathematics($columns, $action); $create = SqlBuilder::builder($activeQuery)->mathematics($columns, $action);
if (is_bool($create)) { if (is_bool($create)) {
return false; return false;
} }
return static::getDb()->createCommand($create[0], $create[1])->exec(); return static::getDb()->createCommand($create[0], $create[1])->exec();
} }
/** /**
* @param array $fields * @param array $fields
* @return ActiveRecord|bool * @return ActiveRecord|bool
* @throws Exception * @throws Exception
*/ */
public function update(array $fields): static|bool public function update(array $fields): static|bool
{ {
return $this->save($fields); return $this->save($fields);
} }
/** /**
* @param array $data * @param array $data
* @return bool * @return bool
* @throws Exception * @throws Exception
*/ */
public static function inserts(array $data): bool public static function inserts(array $data): bool
{ {
/** @var static $class */ /** @var static $class */
$class = Snowflake::createObject(['class' => static::class]); $class = Snowflake::createObject(['class' => static::class]);
if (empty($data)) { if (empty($data)) {
return $class->addError('Insert data empty.', 'mysql'); return $class->addError('Insert data empty.', 'mysql');
} }
return $class::find()->batchInsert($data); return $class::find()->batchInsert($data);
} }
/** /**
* @return bool * @return bool
* @throws Exception * @throws Exception
*/ */
public function delete(): bool public function delete(): bool
{ {
$conditions = $this->_oldAttributes; $conditions = $this->_oldAttributes;
if (empty($conditions)) { if (empty($conditions)) {
return $this->addError("Delete condition do not empty.", 'mysql'); return $this->addError("Delete condition do not empty.", 'mysql');
} }
$primary = $this->getPrimary(); $primary = $this->getPrimary();
if (!empty($primary)) { if (!empty($primary)) {
$conditions = [$primary => $this->getAttribute($primary)]; $conditions = [$primary => $this->getAttribute($primary)];
} }
return static::deleteByCondition($conditions); return static::deleteByCondition($conditions);
} }
/** /**
* @param $condition * @param $condition
* @param array $attributes * @param array $attributes
* *
* @return bool * @return bool
* @throws Exception * @throws Exception
*/ */
public static function updateAll(mixed $condition, $attributes = []): bool public static function updateAll(mixed $condition, $attributes = []): bool
{ {
$condition = static::find()->where($condition); $condition = static::find()->where($condition);
return $condition->batchUpdate($attributes); return $condition->batchUpdate($attributes);
} }
/** /**
* @param $condition * @param $condition
* @param array $attributes * @param array $attributes
* *
* @return array|Collection * @return array|Collection
* @throws Exception * @throws Exception
*/ */
public static function findAll($condition, $attributes = []): array|Collection public static function findAll($condition, $attributes = []): array|Collection
{ {
$query = static::find()->where($condition); $query = static::find()->where($condition);
if (!empty($attributes)) { if (!empty($attributes)) {
$query->bindParams($attributes); $query->bindParams($attributes);
} }
return $query->all(); return $query->all();
} }
/** /**
* @param $method * @param $method
* @return mixed * @return mixed
* @throws Exception * @throws Exception
*/ */
private function resolveObject($method): mixed private function resolveObject($method): mixed
{ {
$resolve = $this->{$this->getRelate($method)}(); $resolve = $this->{$this->getRelate($method)}();
if ($resolve instanceof HasBase) { if ($resolve instanceof HasBase) {
$resolve = $resolve->get(); $resolve = $resolve->get();
} }
if ($resolve instanceof Collection) { if ($resolve instanceof Collection) {
return $resolve->toArray(); return $resolve->toArray();
} else if ($resolve instanceof ActiveRecord) { } else if ($resolve instanceof ActiveRecord) {
return $resolve->toArray(); return $resolve->toArray();
} else if (is_object($resolve)) { } else if (is_object($resolve)) {
return get_object_vars($resolve); return get_object_vars($resolve);
} else { } else {
return $resolve; return $resolve;
} }
} }
/** /**
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
public function toArray(): array public function toArray(): array
{ {
$data = $this->_attributes; $data = $this->_attributes;
$lists = Snowflake::getAnnotation()->getModelMethods(get_called_class()); $lists = Snowflake::getAnnotation()->getModelMethods(static::class);
foreach ($lists as $key => $item) { foreach ($lists as $key => $item) {
$data[$key] = $this->{$item}($data[$key] ?? null); $data[$key] = $this->{$item}($data[$key] ?? null);
} }
$data = array_merge($data, $this->runRelate()); $data = array_merge($data, $this->runRelate());
return $data; return $data;
} }
/** /**
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
private function runRelate(): array private function runRelate(): array
{ {
$relates = []; $relates = [];
if (empty($with = $this->getWith())) { if (empty($with = $this->getWith())) {
return $relates; return $relates;
} }
foreach ($with as $val) { foreach ($with as $val) {
$relates[$val] = $this->resolveObject($val); $relates[$val] = $this->resolveObject($val);
} }
return $relates; return $relates;
} }
/** /**
* @param string $modelName * @param string $modelName
* @param $foreignKey * @param $foreignKey
* @param $localKey * @param $localKey
* @return ActiveQuery * @return HasOne|ActiveQuery
* @throws Exception * @throws Exception
*/ */
public function hasOne(string $modelName, $foreignKey, $localKey): mixed public function hasOne(string $modelName, $foreignKey, $localKey): HasOne|ActiveQuery
{ {
if (!$this->has($localKey)) { if (!$this->has($localKey)) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey); $value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasOne($modelName, $foreignKey, $value, $relation); return new HasOne($modelName, $foreignKey, $value, $relation);
} }
/** /**
* @param $modelName * @param $modelName
* @param $foreignKey * @param $foreignKey
* @param $localKey * @param $localKey
* @return ActiveQuery * @return ActiveQuery
* @throws Exception * @throws Exception
*/ */
public function hasCount($modelName, $foreignKey, $localKey): mixed public function hasCount($modelName, $foreignKey, $localKey): mixed
{ {
if (!$this->has($localKey)) { if (!$this->has($localKey)) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey); $value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasCount($modelName, $foreignKey, $value, $relation); return new HasCount($modelName, $foreignKey, $value, $relation);
} }
/** /**
* @param $modelName * @param $modelName
* @param $foreignKey * @param $foreignKey
* @param $localKey * @param $localKey
* @return ActiveQuery * @return ActiveQuery
* @throws Exception * @throws Exception
*/ */
public function hasMany($modelName, $foreignKey, $localKey): mixed public function hasMany($modelName, $foreignKey, $localKey): mixed
{ {
if (!$this->has($localKey)) { if (!$this->has($localKey)) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey); $value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasMany($modelName, $foreignKey, $value, $relation); return new HasMany($modelName, $foreignKey, $value, $relation);
} }
/** /**
* @param $modelName * @param $modelName
* @param $foreignKey * @param $foreignKey
* @param $localKey * @param $localKey
* @return ActiveQuery * @return ActiveQuery
* @throws Exception * @throws Exception
*/ */
public function hasIn($modelName, $foreignKey, $localKey): mixed public function hasIn($modelName, $foreignKey, $localKey): mixed
{ {
if (!$this->has($localKey)) { if (!$this->has($localKey)) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey); $value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasMany($modelName, $foreignKey, $value, $relation); return new HasMany($modelName, $foreignKey, $value, $relation);
} }
/** /**
* @return bool * @return bool
* @throws Exception * @throws Exception
*/ */
public function afterDelete(): bool public function afterDelete(): bool
{ {
if (!$this->hasPrimary()) { if (!$this->hasPrimary()) {
return TRUE; return TRUE;
} }
$value = $this->getPrimaryValue(); $value = $this->getPrimaryValue();
if (empty($value)) { if (empty($value)) {
return TRUE; return TRUE;
} }
return TRUE; return TRUE;
} }
/** /**
* @return bool * @return bool
* @throws Exception * @throws Exception
*/ */
public function beforeDelete(): bool public function beforeDelete(): bool
{ {
if (!$this->hasPrimary()) { if (!$this->hasPrimary()) {
return TRUE; return TRUE;
} }
$value = $this->getPrimaryValue(); $value = $this->getPrimaryValue();
if (empty($value)) { if (empty($value)) {
return TRUE; return TRUE;
} }
return TRUE; return TRUE;
} }
} }
Database/Base/BaseActiveRecord.php
+9 -8
View File
@@ -350,7 +350,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
*/ */
public static function find(): ActiveQuery public static function find(): ActiveQuery
{ {
return Snowflake::createObject(ActiveQuery::class, [get_called_class()]); return Snowflake::createObject(ActiveQuery::class, [static::class]);
} }
/** /**
@@ -725,14 +725,15 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
} }
/** /**
* @param $name * @param $name
* @return mixed * @return mixed
*/ * @throws Exception
*/
public function getRelate($name): mixed public function getRelate($name): mixed
{ {
if (empty($this->_relate[$name])) { if (empty($this->_relate[$name])) {
$this->_relate = Snowflake::getAnnotation()->getRelateMethods(get_called_class()); $this->_relate = Snowflake::getAnnotation()->getRelateMethods(static::class);
} }
return $this->_relate[$name] ?? null; return $this->_relate[$name] ?? null;
} }
@@ -827,7 +828,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
parent::__set($name, $value); parent::__set($name, $value);
return; return;
} }
$method = annotation()->getSetMethodName(get_called_class(), $name); $method = annotation()->getSetMethodName(static::class, $name);
if (!empty($method)) { if (!empty($method)) {
$value = $this->{$method}($value); $value = $this->{$method}($value);
} }
@@ -845,7 +846,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
$value = $this->_attributes[$name] ?? null; $value = $this->_attributes[$name] ?? null;
$loader = Snowflake::app()->getAnnotation(); $loader = Snowflake::app()->getAnnotation();
if (!empty($method = $loader->getGetMethodName(get_called_class(), $name))) { if (!empty($method = $loader->getGetMethodName(static::class, $name))) {
return $this->{$method}(...[$value]); return $this->{$method}(...[$value]);
} }
if (array_key_exists($name, $this->_attributes)) { if (array_key_exists($name, $this->_attributes)) {
HttpServer/Abstracts/HttpService.php
+1 -1
View File
@@ -46,7 +46,7 @@ abstract class HttpService extends Component
if (property_exists($this, $name)) { if (property_exists($this, $name)) {
return $this->$name; return $this->$name;
} }
$message = sprintf('method %s::%s not exists.', get_called_class(), $name); $message = sprintf('method %s::%s not exists.', static::class, $name);
throw new Exception($message); throw new Exception($message);
} }
System/Abstracts/BaseObject.php
+2 -2
View File
@@ -65,7 +65,7 @@ class BaseObject implements Configure
*/ */
#[Pure] public static function className(): string #[Pure] public static function className(): string
{ {
return get_called_class(); return static::class;
} }
/** /**
@@ -80,7 +80,7 @@ class BaseObject implements Configure
if (method_exists($this, $method)) { if (method_exists($this, $method)) {
$this->{$method}($value); $this->{$method}($value);
} else { } else {
$this->error('set ' . $name . ' not exists ' . get_called_class()); $this->error('set ' . $name . ' not exists ' . static::class);
throw new Exception('The set name ' . $name . ' not find in class ' . static::class); throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
} }
} }
System/Process/Process.php
+1 -1
View File
@@ -60,7 +60,7 @@ abstract class Process extends \Swoole\Process implements SProcess
*/ */
#[Pure] private function getPrefix(): string #[Pure] private function getPrefix(): string
{ {
return get_called_class(); return static::class;
} }
Validator/BaseValidator.php
+1 -1
View File
@@ -128,7 +128,7 @@ abstract class BaseValidator
} else if (property_exists($this, $name)) { } else if (property_exists($this, $name)) {
$this->$name = $value; $this->$name = $value;
} else { } else {
throw new Exception('unknown property ' . $name . ' in class ' . get_called_class()); throw new Exception('unknown property ' . $name . ' in class ' . static::class);
} }
} }
} }