style:代码格式化

This commit is contained in:
zyimm 2023-07-31 17:26:22 +08:00
parent b40a526ad7
commit 179f3b07ac
3 changed files with 93 additions and 73 deletions

View File

@ -27,12 +27,12 @@ class MongodbConnection extends Connection implements ConnectionInterface
/**
* @var Manager
*/
protected $connection;
protected Manager $connection;
/**
* @var array
*/
protected $config;
protected array $config;
/**
* @throws MongoDBException
@ -125,6 +125,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
/**
* @param Throwable $e
*
* @return bool
* @throws MongoDBException
*/
@ -173,6 +174,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $options
*
* @return array
* @throws MongoDBException
*/
@ -185,7 +187,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
$query = new Query($filter, $options);
$cursor = $this->connection->executeQuery($this->config['db'].'.'.$namespace, $query);
foreach ($cursor as $document) {
$result = (array) $document;
$result = (array)$document;
break;
}
} catch (\Exception $e) {
@ -204,6 +206,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $options
*
* @return array
* @throws MongoDBException
*/
@ -215,7 +218,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
$query = new Query($filter, $options);
$cursor = $this->connection->executeQuery($this->config['db'].'.'.$namespace, $query);
foreach ($cursor as $document) {
$result[] = (array) $document;
$result[] = (array)$document;
}
} catch (\Exception $e) {
throw new MongoDBException($e->getFile().$e->getLine().$e->getMessage());
@ -235,6 +238,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param int $currentPage
* @param array $filter
* @param array $options
*
* @return array
* @throws MongoDBException
*/
@ -244,7 +248,8 @@ class MongodbConnection extends Connection implements ConnectionInterface
int $currentPage = 0,
array $filter = [],
array $options = []
): array {
): array
{
// 查询数据
$data = $result = [];
//每次最多返回10条记录
@ -256,6 +261,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
*
* @param string $namespace
* @param array $filter
*
* @return int
* @throws MongoDBException
*/
@ -265,7 +271,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
try {
$command = new Command([
'count' => $namespace,
'query' => empty($filter) ? (object) [] : $filter
'query' => empty($filter) ? (object)[] : $filter
]);
$cursor = $this->connection->executeCommand($this->config['db'], $command);
return $cursor->toArray()[0]->n;
@ -285,6 +291,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $options
*
* @return array
* @throws MongoDBException
*/
@ -300,8 +307,8 @@ class MongodbConnection extends Connection implements ConnectionInterface
$query = new Query($filter, $options);
$cursor = $this->connection->executeQuery($this->config['db'].'.'.$namespace, $query);
foreach ($cursor as $document) {
$document = (array) $document;
$document['_id'] = (string) $document['_id'];
$document = (array)$document;
$document['_id'] = (string)$document['_id'];
$result = $document;
break;
}
@ -321,6 +328,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $options
*
* @return array
* @throws MongoDBException
*/
@ -351,6 +359,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param int $currentPage
* @param array $filter
* @param array $options
*
* @return array
* @throws MongoDBException
*/
@ -360,7 +369,8 @@ class MongodbConnection extends Connection implements ConnectionInterface
int $currentPage = 0,
array $filter = [],
array $options = []
): array {
): array
{
if (!empty($filter['_id']) && !($filter['_id'] instanceof ObjectId)) {
$filter['_id'] = new ObjectId($filter['_id']);
}
@ -380,6 +390,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
*
* @param string $namespace
* @param array $data
*
* @return string
* @throws MongoDBException
*/
@ -387,7 +398,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
{
try {
$bulk = new BulkWrite();
$insertId = (string) $bulk->insert($data);
$insertId = (string)$bulk->insert($data);
$written = new WriteConcern(WriteConcern::MAJORITY, 1000);
$this->connection->executeBulkWrite($this->config['db'].'.'.$namespace, $bulk, $written);
} catch (\Exception $e) {
@ -410,6 +421,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
*
* @param string $namespace
* @param array $data
*
* @return array
* @throws MongoDBException
*/
@ -419,7 +431,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
try {
$bulk = new BulkWrite();
foreach ($data as $items) {
$insertId[] = (string) $bulk->insert($items);
$insertId[] = (string)$bulk->insert($items);
}
$written = new WriteConcern(WriteConcern::MAJORITY, 1000);
$this->connection->executeBulkWrite($this->config['db'].'.'.$namespace, $bulk, $written);
@ -448,6 +460,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $newObj
*
* @return bool
* @throws MongoDBException
*/
@ -485,6 +498,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $newObj
*
* @return bool
* @throws MongoDBException
*/
@ -522,6 +536,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $newObj
*
* @return bool
* @throws MongoDBException
*/
@ -563,6 +578,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
* @param string $namespace
* @param array $filter
* @param array $newObj
*
* @return bool
* @throws MongoDBException
*/
@ -596,6 +612,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
*
* @param string $namespace
* @param array $filter
*
* @return bool
* @throws MongoDBException
*/
@ -621,6 +638,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
*
* @param string $namespace
* @param array $filter
*
* @return bool
* @throws MongoDBException
*/
@ -646,6 +664,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
*
* @param string $namespace
* @param array $filter
*
* @return bool
* @throws MongoDBException
*/
@ -674,6 +693,7 @@ class MongodbConnection extends Connection implements ConnectionInterface
*
* @param string $namespace
* @param array $filter
*
* @return bool
* @throws Exception
* @throws MongoDBException

View File

@ -18,12 +18,12 @@ class MongoDBPool extends Pool
/**
* @var string
*/
protected $name;
protected string $name;
/**
* @var array
*/
protected $config;
protected mixed $config;
/**
* @param ContainerInterface $container

View File

@ -15,12 +15,12 @@ class PoolFactory
/**
* @var ContainerInterface
*/
protected $container;
protected ContainerInterface $container;
/**
* @var Channel[]
*/
protected $pools = [];
protected array $pools = [];
public function __construct(ContainerInterface $container)
{
@ -36,7 +36,7 @@ class PoolFactory
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function getPool(string $name)
public function getPool(string $name): mixed
{
if (isset($this->pools[$name])) {
return $this->pools[$name];