Skip to content

Commit 5ab2795

Browse files
asika32764asika32764
committed
Travis and test php8
1 parent f92768c commit 5ab2795

File tree

4 files changed

+54
-37
lines changed

4 files changed

+54
-37
lines changed

‎composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
"minimum-stability": "beta",
1818
"require": {
1919
"php": ">=5.3",
20-
"windwalker/dom": "~2.0|~3.0"
20+
"windwalker/dom": "~2.0||~3.0"
2121
},
2222
"require-dev": {
23-
"windwalker/test": "~2.0|~3.0",
24-
"windwalker/utilities": "~2.0|~3.0",
25-
"phpunit/phpunit": "^4.0"
23+
"windwalker/test": "~2.0||~3.0",
24+
"windwalker/utilities": "~2.0||~3.0",
25+
"phpunit/phpunit": "^7.0||^8.0||^9.0"
2626
},
2727
"autoload": {
2828
"psr-4": {
@@ -31,7 +31,7 @@
3131
},
3232
"config": {
3333
"platform": {
34-
"php": "5.3.10"
34+
"php": "7.1.5"
3535
}
3636
},
3737
"license": "MIT"

‎phpunit.dist.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
syntaxCheck="true"
88
>
99
<php>
10-
<ini name="error_reporting" value="32767" />
10+
<ini name="error_reporting" value="-1" />
1111
</php>
1212
<testsuites>
1313
<testsuite name="Unit">

‎phpunit.travis.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit bootstrap="vendor/autoload.php" colors="false"
3+
convertErrorsToExceptions="true"
4+
convertNoticesToExceptions="true"
5+
convertWarningsToExceptions="true"
6+
strict="true"
7+
syntaxCheck="true"
8+
>
9+
<php>
10+
<ini name="error_reporting" value="-1" />
11+
</php>
12+
<testsuites>
13+
<testsuite name="Unit">
14+
<directory>test</directory>
15+
</testsuite>
16+
</testsuites>
17+
</phpunit>

‎test/AutolinkTest.php

+31-31
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function testConvert()
9999
100100
HTML;
101101

102-
$this->assertStringSafeEquals($html, $this->instance->convert($text));
102+
self::assertStringSafeEquals($html, $this->instance->convert($text));
103103
}
104104

105105
/**
@@ -111,21 +111,21 @@ public function testLink()
111111
{
112112
$url = 'http://www.google.com';
113113

114-
$this->assertEquals(
114+
self::assertEquals(
115115
'<a foo="bar" href="http://www.google.com">http://www.google.com</a>',
116116
$this->instance->link($url, array('foo' => 'bar'))
117117
);
118118

119119
$this->instance->stripScheme(true);
120120

121-
$this->assertEquals(
121+
self::assertEquals(
122122
'<a foo="bar" href="http://www.google.com">www.google.com</a>',
123123
$this->instance->link($url, array('foo' => 'bar'))
124124
);
125125

126126
$this->instance->autoTitle(true);
127127

128-
$this->assertEquals(
128+
self::assertEquals(
129129
'<a foo="bar" href="http://www.google.com" title="http://www.google.com">www.google.com</a>',
130130
$this->instance->link($url, array('foo' => 'bar'))
131131
);
@@ -142,7 +142,7 @@ public function testTextLimit()
142142

143143
$this->instance->textLimit(50);
144144

145-
$this->assertEquals(
145+
self::assertEquals(
146146
'<a href="http://campus.asukademy.com/learning/job/84-find-internship-opportunity-through-platform.html">http://campus.asukademy.com/learning/job/84-fin...</a>',
147147
$this->instance->link($url)
148148
);
@@ -151,7 +151,7 @@ public function testTextLimit()
151151
return \Asika\Autolink\LinkHelper::shorten($url);
152152
});
153153

154-
$this->assertEquals(
154+
self::assertEquals(
155155
'<a href="http://campus.asukademy.com/learning/job/84-find-internship-opportunity-through-platform.html">http://campus.asukademy.com/....../84-find-interns......</a>',
156156
$this->instance->link($url)
157157
);
@@ -168,7 +168,7 @@ public function testAutoTitle()
168168

169169
$this->instance->autoTitle(true);
170170

171-
$this->assertEquals(
171+
self::assertEquals(
172172
'<a foo="bar" href="http://example.com/path?foo[&quot;1&quot;]=a&amp;foo[\'2\']=b" title="http://example.com/path?foo[&quot;1&quot;]=a&amp;foo[\'2\']=b">http://example.com/path?foo[&quot;1&quot;]=a&amp;foo[\'2\']=b</a>',
173173
$this->instance->link($url, array('foo' => 'bar'))
174174
);
@@ -185,7 +185,7 @@ public function testStripScheme()
185185

186186
$url = 'http://campus.asukademy.com/learning/job/84-find-internship-opportunity-through-platform.html';
187187

188-
$this->assertEquals(
188+
self::assertEquals(
189189
'<a href="http://campus.asukademy.com/learning/job/84-find-internship-opportunity-through-platform.html">campus.asukademy.com/learning/job/84-find-internship-opportunity-through-platform.html</a>',
190190
$this->instance->link($url)
191191
);
@@ -195,23 +195,23 @@ public function testAddScheme()
195195
{
196196
$url = 'ftp://example.com';
197197

198-
$this->assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
198+
self::assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
199199

200200
$url = 'ftps://example.com';
201201

202-
$this->assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
202+
self::assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
203203

204204
$url = 'https://example.com';
205205

206-
$this->assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
206+
self::assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
207207

208208
$url = 'skype://example.com';
209209

210-
$this->assertEquals($url, $this->instance->convert($url));
210+
self::assertEquals($url, $this->instance->convert($url));
211211

212212
$this->instance->addScheme('skype');
213213

214-
$this->assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
214+
self::assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
215215
}
216216

217217
public function testLinkNoScheme()
@@ -220,23 +220,23 @@ public function testLinkNoScheme()
220220

221221
$url = 'ftp://example.com';
222222

223-
$this->assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
223+
self::assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
224224

225225
$url = 'example.com';
226226

227-
$this->assertEquals('<a href="http://' . $url . '">' . $url . '</a>', $this->instance->convert($url));
227+
self::assertEquals('<a href="http://' . $url . '">' . $url . '</a>', $this->instance->convert($url));
228228

229229
$url = 'https://example.com';
230230

231-
$this->assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
231+
self::assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
232232

233233
$url = 'skype://example.com';
234234

235-
$this->assertEquals($url, $this->instance->convert($url));
235+
self::assertEquals($url, $this->instance->convert($url));
236236

237237
$this->instance->addScheme('skype');
238238

239-
$this->assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
239+
self::assertEquals('<a href="' . $url . '">' . $url . '</a>', $this->instance->convert($url));
240240
}
241241

242242
/**
@@ -248,24 +248,24 @@ public function testGetAndSetScheme()
248248
{
249249
$autolink = new Autolink(array(), array('a', 'b', 'http'));
250250

251-
$this->assertEquals(array('http', 'https', 'ftp', 'ftps', 'a', 'b'), $autolink->getSchemes());
252-
$this->assertEquals('http|https|ftp|ftps|a|b', $autolink->getSchemes(true));
251+
self::assertEquals(array('http', 'https', 'ftp', 'ftps', 'a', 'b'), $autolink->getSchemes());
252+
self::assertEquals('http|https|ftp|ftps|a|b', $autolink->getSchemes(true));
253253

254254
$autolink->setSchemes('skype');
255255

256-
$this->assertEquals(array('skype'), $autolink->getSchemes());
256+
self::assertEquals(array('skype'), $autolink->getSchemes());
257257

258258
$autolink->setSchemes(array('mailto'));
259259

260-
$this->assertEquals(array('mailto'), $autolink->getSchemes());
260+
self::assertEquals(array('mailto'), $autolink->getSchemes());
261261

262262
$autolink->setSchemes(array('mailto', 'mailto'));
263263

264-
$this->assertEquals(array('mailto'), $autolink->getSchemes());
264+
self::assertEquals(array('mailto'), $autolink->getSchemes());
265265

266266
$autolink->removeScheme('mailto');
267267

268-
$this->assertEquals(array(), $autolink->getSchemes());
268+
self::assertEquals(array(), $autolink->getSchemes());
269269
}
270270

271271
public function testAutoEscape()
@@ -274,21 +274,21 @@ public function testAutoEscape()
274274

275275
$url = 'https://example.com/?foo=bar&yoo=baz';
276276

277-
$this->assertEquals('<a href="' . htmlspecialchars($url) . '">' . htmlspecialchars($url) . '</a>', $autolink->convert($url));
277+
self::assertEquals('<a href="' . htmlspecialchars($url) . '">' . htmlspecialchars($url) . '</a>', $autolink->convert($url));
278278

279279
$autolink->autoEscape(false);
280280

281-
$this->assertEquals('<a href="' . $url . '">' . htmlspecialchars($url) . '</a>', $autolink->convert($url));
281+
self::assertEquals('<a href="' . $url . '">' . htmlspecialchars($url) . '</a>', $autolink->convert($url));
282282

283283
$url = 'hello+admin&test@example.org';
284284

285285
$autolink->autoEscape(true);
286286

287-
$this->assertEquals('<a href="mailto:' . htmlspecialchars($url) . '">' . htmlspecialchars($url) . '</a>', $autolink->convertEmail($url));
287+
self::assertEquals('<a href="mailto:' . htmlspecialchars($url) . '">' . htmlspecialchars($url) . '</a>', $autolink->convertEmail($url));
288288

289289
$autolink->autoEscape(false);
290290

291-
$this->assertEquals('<a href="mailto:' . $url . '">' . htmlspecialchars($url) . '</a>', $autolink->convertEmail($url));
291+
self::assertEquals('<a href="mailto:' . $url . '">' . htmlspecialchars($url) . '</a>', $autolink->convertEmail($url));
292292
}
293293

294294
public function testConvertEmail()
@@ -327,7 +327,7 @@ public function testConvertEmail()
327327
and emails are coming in between(<a href="mailto:sakura@flower.com">sakura@flower.com</a>).
328328
HTML;
329329

330-
$this->assertStringSafeEquals($html, $this->instance->convertEmail($text));
330+
self::assertStringSafeEquals($html, $this->instance->convertEmail($text));
331331
}
332332

333333
/**
@@ -341,8 +341,8 @@ public function testGetAndSetLinkBuilder()
341341
return $url . json_encode($attribs);
342342
});
343343

344-
$this->assertEquals('http://google.com{"foo":"bar","href":"http:\/\/google.com"}', $this->instance->link('http://google.com', array('foo' => 'bar')));
344+
self::assertEquals('http://google.com{"foo":"bar","href":"http:\/\/google.com"}', $this->instance->link('http://google.com', array('foo' => 'bar')));
345345

346-
$this->assertInstanceOf('Closure', $this->instance->getLinkBuilder());
346+
self::assertInstanceOf('Closure', $this->instance->getLinkBuilder());
347347
}
348348
}

0 commit comments

Comments
 (0)