Skip to content

Commit

Permalink
Merge pull request #11 from Kaishiyoku/master
Browse files Browse the repository at this point in the history
Added Guzzle 7 support
  • Loading branch information
Jeroen-G committed Sep 16, 2020
2 parents 862742b + 55b56af commit 224ff8a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
}
],
"require": {
"guzzlehttp/guzzle" : "~6.0"
"guzzlehttp/guzzle" : "^6.0|^7.0"
},
"require-dev": {
"phpunit/phpunit" : "~6.0"
"phpunit/phpunit" : "^7.0"
},
"suggest": {
"illuminate/support": "This package provides a Laravel Service Provider"
Expand Down
15 changes: 15 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
>
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<php>
<!-- <env name="FLICKR_KEY" value=""/>-->
</php>
</phpunit>
4 changes: 4 additions & 0 deletions tests/ApiTest.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<?php

use PHPUnit\Framework\TestCase;

class ApiTest extends TestCase
{
public $flickr;

public function __construct()
{
parent::__construct();

$api = new JeroenG\Flickr\Api($_ENV['FLICKR_KEY'], 'php_serial');
$this->flickr = new JeroenG\Flickr\Flickr($api);
}
Expand Down

0 comments on commit 224ff8a

Please sign in to comment.