Skip to content

Commit dc749c3

Browse files
committed
Add Laravel 5.5 compatibility with Auto-Discovery
- Require php 7.0+ - Upgrade to phpunit 6.5.x - Add php 7.2 to travis-ci
1 parent 8663bb1 commit dc749c3

File tree

8 files changed

+29
-22
lines changed

8 files changed

+29
-22
lines changed

.travis.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
language: php
22

33
php:
4-
- 5.6
54
- 7.0
5+
- 7.1
6+
- 7.2
67

78
matrix:
8-
allow_failures:
9-
- php: 7.0
109
include:
11-
- php: 5.6
12-
env: dependencies=lowest
1310
- php: 7
1411
env: dependencies=lowest
15-
- php: 5.6
16-
env: dependencies=highest
1712
- php: 7
1813
env: dependencies=highest
1914

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# Changelog
22

3-
All Notable changes for the Laravel 5 Genderize.io API Client will be documented in this file
3+
All notable changes for the Laravel 5 Genderize.io API Client will be documented in this file
44

5+
## 2.0.0
6+
- Laravel 5.5 compatibility with Auto-Discovery
7+
- Require php 7.0+
8+
- Upgrade to phpunit 6.5.x
9+
- Add php 7.2 to travis-ci
10+
511
## 1.1.0
612
- Laravel 5.4 compatibility
713

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ It provides a fluent interface for easy request building.
2020
composer require pixelpeter/laravel5-genderize-api-client
2121
```
2222

23-
### Step 2: Add the Service Provider
23+
### Step 2: Add the Service Provider (not needed with v2.x because of auto discovery)
2424
Add the service provider in `app/config/app.php`
2525
```php
2626
'provider' => [

composer.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=5.5.9",
21+
"php" : "^7.0",
2222
"mashape/unirest-php": "^3.0"
2323
},
2424
"autoload": {
@@ -35,9 +35,19 @@
3535
]
3636
},
3737
"require-dev": {
38-
"phpunit/phpunit": "^5.1",
39-
"mockery/mockery": "^0.9.4",
38+
"phpunit/phpunit": "^6.5",
39+
"mockery/mockery": "^1.0.0",
4040
"satooshi/php-coveralls": "^1.0",
41-
"laravel/laravel": "5.4.*"
41+
"laravel/laravel": "5.5.*"
42+
},
43+
"extra": {
44+
"laravel": {
45+
"providers": [
46+
"Pixelpeter\\Genderize\\GenderizeServiceProvider"
47+
],
48+
"aliases": {
49+
"Woocommerce": "Pixelpeter\\Genderize\\Facades\\Genderize"
50+
}
51+
}
4252
}
4353
}

tests/Facades/GenderizeTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php namespace Pixelpeter\Genderize\Test;
22

3-
use PHPUnit_Framework_TestCase;
43
use Pixelpeter\Genderize\Facades\Genderize;
54
use Pixelpeter\Genderize\TestCase;
65

@@ -13,6 +12,6 @@ class GenderizeTest extends TestCase
1312
*/
1413
public function check_the_facade_could_be_called()
1514
{
16-
Genderize::name('John');
15+
$this->assertInstanceOf(\Pixelpeter\Genderize\GenderizeClient::class, Genderize::name('John'));
1716
}
1817
}

tests/Models/GenderizeResponseTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php namespace Pixelpeter\Genderize\Test;
22

3-
use PHPUnit_Framework_TestCase;
43
use Pixelpeter\Genderize\Models\GenderizeResponse;
54
use Unirest\Response;
65

7-
class GenderizeResponseTest extends PHPUnit_Framework_TestCase
6+
class GenderizeResponseTest extends \PHPUnit\Framework\TestCase
87
{
98
/**
109
* It correctly parses a response with a single result

tests/Models/MetaTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php namespace Pixelpeter\Genderize\Test;
22

3-
use PHPUnit_Framework_TestCase;
4-
use Pixelpeter\Genderize\Models\Meta;
53
use Carbon\Carbon;
4+
use Pixelpeter\Genderize\Models\Meta;
65

7-
class MetaTest extends PHPUnit_Framework_TestCase
6+
class MetaTest extends \PHPUnit\Framework\TestCase
87
{
98
/**
109
* @var \Pixelpeter\Genderize\Models\Meta

tests/Models/NameTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?php namespace Pixelpeter\Genderize\Test;
22

3-
use PHPUnit_Framework_TestCase;
43
use Pixelpeter\Genderize\Models\Name;
54

6-
class NameTest extends PHPUnit_Framework_TestCase
5+
class NameTest extends \PHPUnit\Framework\TestCase
76
{
87
/**
98
* @var \Pixelpeter\Genderize\Models\Name

0 commit comments

Comments
 (0)