Skip to content

Commit e181f0d

Browse files
committed
fixed carbon version bug fro dependency
1 parent 9ed9950 commit e181f0d

File tree

5 files changed

+27
-18
lines changed

5 files changed

+27
-18
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ build
22
composer.lock
33
docs
44
vendor
5+
.phpunit.result.cache
6+

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
All Notable changes to `Laravel AdWords Targeting Idea Service` will be documented in this file.
44

5+
## [1.4.1] - 2019-03-10
6+
- fix dependencies for carbon v2
7+
58
## [1.4.0] - 2019-02-27
69
- drop support for Laravel 5.7 and lower
710
- drop support for PHP 7.1 and lower

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"php": ">=7.1.0",
2323
"laravel/framework": "~5.8.0",
2424
"googleads/googleads-php-lib": "^40.0",
25-
"schulzefelix/laravel-data-transfer-object": "^1.0.0"
25+
"schulzefelix/laravel-data-transfer-object": "^1.1.0"
2626
},
2727
"require-dev": {
2828
"mockery/mockery": "^1.0",

phpunit.xml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,34 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php"
3-
backupGlobals="false"
2+
<phpunit backupGlobals="false"
43
backupStaticAttributes="false"
4+
bootstrap="vendor/autoload.php"
55
colors="true"
6-
verbose="true"
76
convertErrorsToExceptions="true"
87
convertNoticesToExceptions="true"
98
convertWarningsToExceptions="true"
109
processIsolation="false"
1110
stopOnFailure="false">
1211
<testsuites>
13-
<testsuite name="Test Suite">
14-
<directory>tests</directory>
12+
<testsuite name="Unit">
13+
<directory suffix="Test.php">./tests/Integration</directory>
14+
</testsuite>
15+
16+
<testsuite name="Feature">
17+
<directory suffix="Test.php">./tests/Feature</directory>
1518
</testsuite>
1619
</testsuites>
1720
<filter>
18-
<whitelist>
19-
<directory suffix=".php">src/</directory>
21+
<whitelist processUncoveredFilesFromWhitelist="true">
22+
<directory suffix=".php">./app</directory>
2023
</whitelist>
2124
</filter>
22-
<logging>
23-
<log type="tap" target="build/report.tap"/>
24-
<log type="junit" target="build/report.junit.xml"/>
25-
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
26-
<log type="coverage-text" target="build/coverage.txt"/>
27-
<log type="coverage-clover" target="build/logs/clover.xml"/>
28-
</logging>
25+
<php>
26+
<server name="APP_ENV" value="testing"/>
27+
<server name="BCRYPT_ROUNDS" value="4"/>
28+
<server name="CACHE_DRIVER" value="array"/>
29+
<server name="MAIL_DRIVER" value="array"/>
30+
<server name="QUEUE_CONNECTION" value="sync"/>
31+
<server name="SESSION_DRIVER" value="array"/>
32+
<server name="ADWORDS_DEVELOPER_TOKEN" value=""/>
33+
</php>
2934
</phpunit>

tests/Integration/AdWordsServiceProviderTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66

77
class AdWordsServiceProviderTest extends TestCase
88
{
9-
/** @test */
10-
public function it_will_throw_an_exception_if_no_developer_token_is_set()
9+
public function testItWillThrowAnExceptionIfNoDeveloperTokenIsSet()
1110
{
1211
$this->app['config']->set('adwords-targeting-idea-service.developer_token', '');
1312

1413
$this->expectException(InvalidConfiguration::class);
1514

16-
\AdWords::searchVolumes(['cheesecake']);
15+
dd(\AdWords::searchVolumes(['cheesecake']));
1716
}
1817
}

0 commit comments

Comments
 (0)