Skip to content

Commit 2faaa44

Browse files
inhereinhere
authored
Merge pull request #62 from ulue/dev2
update v2.0.9
2 parents 7ec4708 + cc8018b commit 2faaa44

File tree

20 files changed

+17
-50
lines changed

20 files changed

+17
-50
lines changed

‎src/amqp/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/amqp",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/apollo/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/apollo",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/breaker/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/breaker",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/consul/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/consul",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/crontab/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/crontab",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/devtool/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/devtool",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/devtool/src/Model/Dao/MigrateDao.php

-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<?php declare(strict_types=1);
22

3-
43
namespace Swoft\Devtool\Model\Dao;
54

6-
use ReflectionException;
75
use Swoft\Bean\Annotation\Mapping\Bean;
8-
use Swoft\Bean\Exception\ContainerException;
96
use Swoft\Db\DB;
107
use Swoft\Db\Exception\DbException;
118
use Swoft\Db\Query\Builder;
@@ -59,9 +56,7 @@ public function listMigrate(int $limit, string $pool, string $db): array
5956
* @param string $db
6057
*
6158
* @return bool
62-
* @throws ContainerException
6359
* @throws DbException
64-
* @throws ReflectionException
6560
*/
6661
public function save(string $name, int $time, string $pool, string $db): bool
6762
{
@@ -117,9 +112,7 @@ public function lastMigrationNames(string $pool, string $db, int $step = 1): arr
117112
* @param string $db
118113
*
119114
* @return bool
120-
* @throws ContainerException
121115
* @throws DbException
122-
* @throws ReflectionException
123116
*/
124117
public function rollback($names, string $pool, string $db): bool
125118
{

‎src/devtool/src/Model/Data/MigrateData.php

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?php declare(strict_types=1);
22

3-
43
namespace Swoft\Devtool\Model\Data;
54

6-
use ReflectionException;
75
use Swoft\Bean\Annotation\Mapping\Bean;
86
use Swoft\Bean\Annotation\Mapping\Inject;
9-
use Swoft\Bean\Exception\ContainerException;
107
use Swoft\Db\Exception\DbException;
118
use Swoft\Devtool\Model\Dao\MigrateDao;
129

@@ -95,9 +92,7 @@ public function getRollbackMigrates(array $migrateNames, string $pool, string $d
9592
*/
9693
public function lastMigrationNames(string $pool, string $db, int $step = 1): array
9794
{
98-
$last = $this->migrateDao->lastMigrationNames($pool, $db, $step);
99-
100-
return $last;
95+
return $this->migrateDao->lastMigrationNames($pool, $db, $step);
10196
}
10297

10398
/**
@@ -109,9 +104,7 @@ public function lastMigrationNames(string $pool, string $db, int $step = 1): arr
109104
* @param string $db
110105
*
111106
* @return bool
112-
* @throws ContainerException
113107
* @throws DbException
114-
* @throws ReflectionException
115108
*/
116109
public function saveMigrateLog(string $migrateName, int $time, string $pool, string $db): bool
117110
{
@@ -124,9 +117,7 @@ public function saveMigrateLog(string $migrateName, int $time, string $pool, str
124117
* @param string $db
125118
*
126119
* @return bool
127-
* @throws ContainerException
128120
* @throws DbException
129-
* @throws ReflectionException
130121
*/
131122
public function rollback($migrates, string $pool, string $db): bool
132123
{

‎src/devtool/src/Model/Logic/MigrateLogic.php

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<?php declare(strict_types=1);
22

3-
43
namespace Swoft\Devtool\Model\Logic;
54

65
use InvalidArgumentException;
76
use Leuffen\TextTemplate\TemplateParsingException;
8-
use ReflectionException;
97
use Swoft;
108
use Swoft\Bean\Annotation\Mapping\Bean;
119
use Swoft\Bean\Annotation\Mapping\Inject;
1210
use Swoft\Bean\BeanFactory;
13-
use Swoft\Bean\Exception\ContainerException;
1411
use Swoft\Db\DB;
1512
use Swoft\Db\Exception\DbException;
1613
use Swoft\Db\Schema;
@@ -205,9 +202,7 @@ public function history(array $dbs, string $prefix, int $start, int $end, int $l
205202
* @param string $db
206203
* @param string $defaultPool
207204
*
208-
* @throws ContainerException
209205
* @throws DbException
210-
* @throws ReflectionException
211206
*/
212207
private function showHistory(int $limit, string $dbPrefix, string $db, string $defaultPool): void
213208
{
@@ -268,9 +263,7 @@ private function handler(callable $callback, array $dbs, int $start = 0, int $en
268263
* @param string $dbPrefix
269264
* @param string $db
270265
*
271-
* @throws ContainerException
272266
* @throws DbException
273-
* @throws ReflectionException
274267
* @throws Throwable
275268
*/
276269
private function executeUp(array $mathMigrateNames, bool $isConfirm, string $dbPrefix, string $db = ''): void
@@ -333,9 +326,7 @@ private function executeUp(array $mathMigrateNames, bool $isConfirm, string $dbP
333326
* @param string $defaultPool
334327
* @param int $step
335328
*
336-
* @throws ContainerException
337329
* @throws DbException
338-
* @throws ReflectionException
339330
* @throws Throwable
340331
*/
341332
private function executeDown(
@@ -394,9 +385,7 @@ private function getRollbackMigrations(string $dbPrefix, string $db, string $def
394385
* @param string $dbPrefix
395386
* @param string $db
396387
*
397-
* @throws ContainerException
398388
* @throws DbException
399-
* @throws ReflectionException
400389
* @throws Throwable
401390
*/
402391
private function batchRollback(string $pool, array $migrates, bool $isConfirm, string $dbPrefix, string $db): void
@@ -611,9 +600,7 @@ private function matchNames(array $names, bool $strict = false): array
611600
/**
612601
* @param Builder $schema
613602
*
614-
* @throws ContainerException
615603
* @throws DbException
616-
* @throws ReflectionException
617604
*/
618605
private function createMigrationIfNotExists(Builder $schema): void
619606
{

‎src/elasticsearch/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/elasticsearch",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/grpc/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/grpc",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/kafka/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/kafka",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/limiter/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/limiter",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/session/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/session",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/swagger/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/swagger",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/swoole-tracker/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/swoole-tracker",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/view/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/view",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

‎src/whoops/README.md

-4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ Change the `App\Exception\Handler\HttpExceptionHandler` class:
4040

4141
namespace App\Exception\Handler;
4242

43-
use ReflectionException;
44-
use Swoft\Bean\Exception\ContainerException;
4543
use Swoft\Error\Annotation\Mapping\ExceptionHandler;
4644
use Swoft\Http\Message\ContentType;
4745
use Swoft\Http\Message\Response;
@@ -65,8 +63,6 @@ class HttpExceptionHandler extends AbstractHttpErrorHandler
6563
* @param Response $response
6664
*
6765
* @return Response
68-
* @throws ReflectionException
69-
* @throws ContainerException
7066
*/
7167
public function handle(Throwable $e, Response $response): Response
7268
{

‎src/whoops/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "swoft/whoops",
33
"description": "Whoops Component for Swoft",
44
"type": "library",
5-
"version": "v2.0.8",
5+
"version": "v2.0.9",
66
"homepage": "https://github.com/swoft-cloud/swoft",
77
"keywords": [
88
"php",

‎src/zipkin/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "swoft/zipkin",
33
"type": "library",
4-
"version": "v2.0.8",
4+
"version": "v2.0.9",
55
"keywords": [
66
"php",
77
"swoole",

0 commit comments

Comments
 (0)