Compare commits

..

No commits in common. "master" and "unit-tests" have entirely different histories.

4 changed files with 5 additions and 6 deletions

View file

@ -6,11 +6,11 @@ php:
- 5.5 - 5.5
- 5.6 - 5.6
- hhvm - hhvm
- hhvm-nightly
matrix: matrix:
allow_failures: allow_failures:
- php: hhvm-nightly - php: 5.6
- php: hhvm
install: install:
- composer install - composer install

View file

@ -1 +0,0 @@
github: joshtronic

View file

@ -9,7 +9,7 @@
"authors": [{ "authors": [{
"name": "Josh Sherman", "name": "Josh Sherman",
"email": "josh@gravityblvd.com", "email": "josh@gravityblvd.com",
"homepage": "http://joshtronic.com" "homepage": "https://github.com/joshtronic/php-googleplaces"
}], }],
"require": { "require": {
"php": ">=5.3.0" "php": ">=5.3.0"

View file

@ -352,12 +352,12 @@ class GooglePlacesTest extends PHPUnit_Framework_TestCase
/** /**
* @expectedException Exception * @expectedException Exception
* @expectedExceptionMessage CURL Error: Protocol yatp not supported or disabled in libcurl * @expectedExceptionMessage CURL Error: Could not resolve host: bar
*/ */
public function testClientError() public function testClientError()
{ {
$client = new joshtronic\GooglePlacesClient(); $client = new joshtronic\GooglePlacesClient();
$client->get('yatp://foo@bar'); $client->get('http://foo@bar:google.com');
} }
} }