庞浩然Paul 的投稿 | Laravel China 社区

代码内容不符

Old	New	Differences
67	67
68	68	```php
69	69	<?php
70		namespace Overtrue\Weather\Tests;
71
72		use GuzzleHttp\Client;
73		use GuzzleHttp\ClientInterface;
74		use GuzzleHttp\Psr7\Response;
75		use Mockery\Matcher\AnyArgs;
76		use Overtrue\Weather\Exceptions\HttpException;
77		use Overtrue\Weather\Exceptions\InvalidArgumentException;
78		use Overtrue\Weather\Weather;
79		use PHPUnit\Framework\TestCase;
80
81		class WeatherTest extends TestCase
	70	namespace Overtrue\Weather;
	71
	72	use GuzzleHttp\Client;
	73	use Overtrue\Weather\Exceptions\HttpException;
	74	use Overtrue\Weather\Exceptions\InvalidArgumentException;
	75
	76	class Weather
82	77	{
83	78	.
84	79	.
85	80	.
86		public function getWeather($city, ~~$type = 'base',~~ $format = 'json')
	81	public function getWeather($city, string $type = 'base', string $format = 'json')
87	82	{
88	83	$url = 'https://restapi.amap.com/v3/weather/weatherInfo';
89	84
90	85	// 1. 对 `$format` 与 `$extensions` 参数进行检查，不在范围内的抛出异常。
91		if (!\in_array(~~$format~~, ['xml', 'json'])) {
	86	if (!\in_array(\strtolower($format), ['xml', 'json'])) {
92	87	throw new InvalidArgumentException('Invalid response format: '. $format);
93	88	}
94	89
95	90	if (!\in_array(\strtolower($type), ['base', 'all'])) {
96		throw new InvalidArgumentException('Invalid type value(base/all): '.$type);
	91	throw new InvalidArgumentException('Invalid type value(base/all): '. $type);
97	92	}
98	93
99	94	// 2. 封装 query 参数，并对空值进行过滤。

Old

New

Differences

```php

<?php

namespace Overtrue\Weather\Tests;

use GuzzleHttp\Client;

use GuzzleHttp\ClientInterface;

use GuzzleHttp\Psr7\Response;

use Mockery\Matcher\AnyArgs;

use Overtrue\Weather\Exceptions\HttpException;

use Overtrue\Weather\Exceptions\InvalidArgumentException;

use Overtrue\Weather\Weather;

use PHPUnit\Framework\TestCase;

class WeatherTest extends TestCase

namespace Overtrue\Weather;

use GuzzleHttp\Client;

use Overtrue\Weather\Exceptions\HttpException;

use Overtrue\Weather\Exceptions\InvalidArgumentException;

class Weather

{

public function getWeather($city, ~~$type = 'base',~~ $format = 'json')

public function getWeather($city, string $type = 'base', string $format = 'json')

{

$url = 'https://restapi.amap.com/v3/weather/weatherInfo';

// 1. 对 `$format` 与 `$extensions` 参数进行检查，不在范围内的抛出异常。

if (!\in_array(~~$format~~, ['xml', 'json'])) {

if (!\in_array(\strtolower($format), ['xml', 'json'])) {

throw new InvalidArgumentException('Invalid response format: '. $format);

}

if (!\in_array(\strtolower($type), ['base', 'all'])) {

throw new InvalidArgumentException('Invalid type value(base/all): '.$type);

throw new InvalidArgumentException('Invalid type value(base/all): '. $type);

}

// 2. 封装 query 参数，并对空值进行过滤。

修改理由：

相关信息：

内容修改：

社区赞助商

关于 LearnKu

资源推荐

服务提供商

其他信息