Skip to content

Commit

Permalink
Merge bbe4403 into fd4a66c
Browse files Browse the repository at this point in the history
  • Loading branch information
doyouhaobaby committed Jul 19, 2020
2 parents fd4a66c + bbe4403 commit 5fa078e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/Leevel/Kernel/ExceptionRuntime.php
Expand Up @@ -28,8 +28,8 @@
use Leevel\Kernel\Exception\NotFoundHttpException;
use Leevel\Log\ILog;
use Leevel\Router\RouterNotFoundException;
use Leevel\Support\Arr\convert_json;
use function Leevel\Support\Arr\convert_json;
use Leevel\Support\Arr\convert_json;
use Leevel\Support\Arr\should_json;
use function Leevel\Support\Arr\should_json;
use NunoMaduro\Collision\Provider as CollisionProvider;
Expand Down
32 changes: 16 additions & 16 deletions tests/Database/SelectTest.php
Expand Up @@ -950,15 +950,15 @@ public function testPage(): void
$this->assertSame(
$data,
$this->varJson(
$page->toArray()['page']
)
$page->toArray()['page']
)
);

$this->assertSame(
$data,
$this->varJson(
$page->jsonSerialize()['page']
)
$page->jsonSerialize()['page']
)
);

$data = <<<'eot'
Expand Down Expand Up @@ -1058,15 +1058,15 @@ public function testPageWithCondition(): void
$this->assertSame(
$data,
$this->varJson(
$page->toArray()['page']
)
$page->toArray()['page']
)
);

$this->assertSame(
$data,
$this->varJson(
$page->jsonSerialize()['page']
)
$page->jsonSerialize()['page']
)
);

$data = <<<'eot'
Expand Down Expand Up @@ -1160,15 +1160,15 @@ public function testPageMacro(): void
$this->assertSame(
$data,
$this->varJson(
$page->toArray()['page']
)
$page->toArray()['page']
)
);

$this->assertSame(
$data,
$this->varJson(
$page->jsonSerialize()['page']
)
$page->jsonSerialize()['page']
)
);

$data = <<<'eot'
Expand Down Expand Up @@ -1262,15 +1262,15 @@ public function testPagePrevNext(): void
$this->assertSame(
$data,
$this->varJson(
$page->toArray()['page']
)
$page->toArray()['page']
)
);

$this->assertSame(
$data,
$this->varJson(
$page->jsonSerialize()['page']
)
$page->jsonSerialize()['page']
)
);

$data = <<<'eot'
Expand Down

0 comments on commit 5fa078e

Please sign in to comment.