Skip to content

Commit 707a958

Browse files
committed
Merge pull request #15 from skymeyer/prep1.0.3
Prepare 1.0.3
2 parents 693db69 + d25bf9b commit 707a958

File tree

6 files changed

+11
-19
lines changed

6 files changed

+11
-19
lines changed

.coveralls.yml

-4
This file was deleted.

.travis.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ php:
1010
- 5.5
1111
- 5.6
1212
- hhvm
13+
- 7
1314

1415
matrix:
1516
fast_finish: true
1617
allow_failures:
1718
- php: hhvm
19+
- php: 7
1820

1921
before_script:
2022
- composer self-update
@@ -24,12 +26,9 @@ script:
2426
- mkdir -p build/logs
2527
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
2628

27-
after_script:
28-
- vendor/bin/coveralls -v
29+
after_success:
2930
- wget https://scrutinizer-ci.com/ocular.phar
3031
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
3132

3233
notifications:
3334
email: false
34-
hipchat:
35-
- secure: "er7thyIWhqVBJjCH4A/giLAf9EGoVJKgsFs+LAxqBK2wlxQmynnum/5mJhCU\n/jBNPqtgIyKjshAUBPsKThKGt/Q1GnGa1Db5gmqLmZb+tBEUcvRH4aQ9M3dX\nxJt9xslRBXiJ2By4ZnxHq5V7VLb5FNm3SeZfHQ2e3hopq6UqiLw="

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Vatsimphp [![Latest Stable Version](https://poser.pugx.org/skymeyer/vatsimphp/v/stable.png)](https://packagist.org/packages/skymeyer/vatsimphp) [![Build Status](https://travis-ci.org/skymeyer/Vatsimphp.png)](https://travis-ci.org/skymeyer/Vatsimphp) [![Coverage Status](https://coveralls.io/repos/skymeyer/Vatsimphp/badge.png?branch=master)](https://coveralls.io/r/skymeyer/Vatsimphp?branch=master) [![Dependency Status](https://www.versioneye.com/user/projects/51adb7faaffe34000200d0cd/badge.png)](https://www.versioneye.com/user/projects/51adb7faaffe34000200d0cd)
1+
Vatsimphp [![Latest Stable Version](https://poser.pugx.org/skymeyer/vatsimphp/v/stable.png)](https://packagist.org/packages/skymeyer/vatsimphp) [![Build Status](https://travis-ci.org/skymeyer/Vatsimphp.png)](https://travis-ci.org/skymeyer/Vatsimphp) [![Dependency Status](https://www.versioneye.com/php/skymeyer:vatsimphp/dev-master/badge.svg)](https://www.versioneye.com/php/skymeyer:vatsimphp/dev-master) [![Code Coverage](https://scrutinizer-ci.com/g/skymeyer/Vatsimphp/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/skymeyer/Vatsimphp/?branch=master) [![Code Quality](https://scrutinizer-ci.com/g/skymeyer/Vatsimphp/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/skymeyer/Vatsimphp/?branch=master) [![Join the chat at https://gitter.im/skymeyer/Vatsimphp](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/skymeyer/Vatsimphp)
22
=================
33

44
Vatsimphp collects and parses the publically available statistics

composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"monolog/monolog": "~1.11"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "~4.5",
21-
"satooshi/php-coveralls": "dev-master"
20+
"phpunit/phpunit": "~4.5"
2221
},
2322
"autoload": {
2423
"psr-4": {

src/Vatsimphp/Sync/AbstractSync.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ public function __construct()
141141
*
142142
* Set parser
143143
* @param string $parserName
144-
* @param array $params
145144
*/
146145
public function setParser($parserName)
147146
{
@@ -184,7 +183,7 @@ public function getUrls()
184183
*
185184
* Return parsed data
186185
* @throws SyncException
187-
* @return \Iterator
186+
* @return \Vatsimphp\Result\ResultContainer
188187
*/
189188
public function loadData()
190189
{
@@ -450,7 +449,6 @@ protected function getDataFromCurl()
450449
*
451450
* Load data from file and pass it to the parser
452451
* Fails if content is expired
453-
* @param string $file
454452
* @return boolean
455453
*/
456454
protected function loadFromCache()

src/Vatsimphp/VatsimData.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function searchCallsign($callsign)
202202
/**
203203
*
204204
* Search for given vatsim ID
205-
* @param string $id
205+
* @param string $cid
206206
* @return \Vatsimphp\Filter\Iterator
207207
*/
208208
public function searchVatsimId($cid)
@@ -378,7 +378,7 @@ public function getConfig($key = null)
378378
/**
379379
*
380380
* Prepare StatusSync object for reusage
381-
* @return Vatsimphp\Sync\StatusSync
381+
* @return StatusSync
382382
*/
383383
protected function prepareSync()
384384
{
@@ -400,7 +400,7 @@ protected function prepareSync()
400400
/**
401401
*
402402
* Prepare MetarSync object for reusage
403-
* @return Vatsimphp\Sync\MetarSync
403+
* @return MetarSync
404404
*/
405405
protected function prepareMetarSync()
406406
{
@@ -428,15 +428,15 @@ protected function getStatusSync()
428428
}
429429

430430
/**
431-
* @return Vatsimphp\Sync\DataSync
431+
* @return DataSync
432432
*/
433433
protected function getDataSync()
434434
{
435435
return new DataSync();
436436
}
437437

438438
/**
439-
* @return Vatsimphp\Sync\MetarSync
439+
* @return MetarSync
440440
*/
441441
protected function getMetarSync()
442442
{

0 commit comments

Comments
 (0)