Skip to content

Commit

Permalink
Update to be compatible with laravel 5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
William Wallace committed Oct 6, 2017
1 parent 3a89b8c commit 15301d1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ WAAVI is a web development studio based in Madrid, Spain. You can learn more abo
:---------|:----------
5.1.x | 1.0.x
5.2.x | 1.0.1 and higher
5.5.x | 1.0.7 and higher

## Installation and Setup

Expand Down
22 changes: 10 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,19 @@
"url shortener"
],
"license": "MIT",
"authors": [
{
"name": "Waavi",
"email": "[email protected]",
"homepage": "http://waavi.com"
}
],
"authors": [{
"name": "Waavi",
"email": "[email protected]",
"homepage": "http://waavi.com"
}],
"require": {
"illuminate/support": "5.1.x|5.2.x|5.3.*|5.4.*",
"illuminate/config": "5.1.x|5.2.x|5.3.*|5.4.*",
"illuminate/support": "5.1.x|5.2.x|5.3.*|5.4.*|5.5.*",
"illuminate/config": "5.1.x|5.2.x|5.3.*|5.4.*|5.5.*",
"mremi/url-shortener": "^2.0"
},
"require-dev": {
"phpunit/phpunit" : "^5",
"orchestra/testbench": "3.1.x|3.2.x|3.3.x|3.4.x",
"phpunit/phpunit": "^6",
"orchestra/testbench": "3.1.x|3.2.x|3.3.x|3.4.x|3.5.x",
"mockery/mockery": "^0.9.4"
},
"autoload": {
Expand All @@ -41,4 +39,4 @@
"scripts": {
"test": "vendor/bin/phpunit"
}
}
}
2 changes: 1 addition & 1 deletion tests/FactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function it_creates_bitly_driver()
*/
public function it_throws_exception_on_invalid_name()
{
$this->setExpectedException('InvalidArgumentException');
$this->expectException('InvalidArgumentException');
$factory = $this->app['urlshortener.factory'];
$driver = $factory->make('random');
}
Expand Down

0 comments on commit 15301d1

Please sign in to comment.