Skip to content

Commit 92d745d

Browse files
committed
Replace dup vars with constant
1 parent 9644f24 commit 92d745d

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

src/PublicSuffixListManager.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
class PublicSuffixListManager
2626
{
27+
const PUBLIC_SUFFIX_LIST_URL = 'https://publicsuffix.org/list/public_suffix_list.dat';
28+
2729
const ALL_DOMAINS = 'ALL';
2830
const PDP_PSL_TEXT_FILE = 'public-suffix-list.txt';
2931
const PDP_PSL_PHP_FILE = 'public-suffix-list.php';
@@ -35,19 +37,14 @@ class PublicSuffixListManager
3537
const PRIVATE_PSL_PHP_FILE = 'private-public-suffix-list.php';
3638

3739
/**
38-
* @var Public Suffix List Type
40+
* @var array Public Suffix List Type
3941
*/
4042
private static $domainList = [
4143
self::ALL_DOMAINS => self::PDP_PSL_PHP_FILE,
4244
self::ICANN_DOMAINS => self::ICANN_PSL_PHP_FILE,
4345
self::PRIVATE_DOMAINS => self::PRIVATE_PSL_PHP_FILE,
4446
];
4547

46-
/**
47-
* @var string Public Suffix List URL
48-
*/
49-
private $publicSuffixListUrl = 'https://publicsuffix.org/list/public_suffix_list.dat';
50-
5148
/**
5249
* @var string Directory where text and php versions of list will be cached
5350
*/
@@ -114,7 +111,7 @@ public function getList($list = self::ALL_DOMAINS): PublicSuffixList
114111
*/
115112
public function refreshPublicSuffixList()
116113
{
117-
$publicSuffixList = $this->getHttpAdapter()->getContent($this->publicSuffixListUrl);
114+
$publicSuffixList = $this->getHttpAdapter()->getContent(self::PUBLIC_SUFFIX_LIST_URL);
118115
$this->cache(self::PDP_PSL_TEXT_FILE, $publicSuffixList);
119116

120117
$publicSuffixListArray = $this->convertListToArray();

tests/PublicSuffixListManagerTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ class PublicSuffixListManagerTest extends TestCase
4545
*/
4646
protected $dataDir;
4747

48-
/**
49-
* @var string url
50-
*/
51-
protected $publicSuffixListUrl = 'https://publicsuffix.org/list/public_suffix_list.dat';
52-
5348
/**
5449
* @var HttpAdapterInterface|\PHPUnit_Framework_MockObject_MockObject Http adapter
5550
*/
@@ -89,7 +84,7 @@ public function testRefreshPublicSuffixList()
8984

9085
$this->httpAdapter->expects($this->once())
9186
->method('getContent')
92-
->with($this->publicSuffixListUrl)
87+
->with(PublicSuffixListManager::PUBLIC_SUFFIX_LIST_URL)
9388
->will($this->returnValue($content));
9489

9590
$this->assertFileNotExists(

0 commit comments

Comments
 (0)