Skip to content

Commit

Permalink
Laravel 6 Support
Browse files Browse the repository at this point in the history
  • Loading branch information
tzsk committed Sep 25, 2019
1 parent ee30036 commit 523eced
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 17 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: php
php:
- '5.6'
- '7.1'
- '7.2'
- '7.3'
before_script: composer install
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Updates should follow the [Keep a CHANGELOG](http:https://keepachangelog.com/) princip

### Added

- Laravel 6 Support
- AutoDiscovery Support for Laravel 5.5 and above
- PHP Unit tests
- Travis CI Support
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![Build Status](https://scrutinizer-ci.com/g/tzsk/collage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/tzsk/collage/build-status/master)
[![Total Downloads][ico-downloads]][link-downloads]

Create Image Collage with ease now with PHP. This also supports Laravel 5.1 or higher. This package uses [`intervention/image`](https://github.com/Intervention/image) package to leverage image manipulation.
Create Image Collage with ease now with PHP. This package uses [`intervention/image`](https://github.com/Intervention/image) package to leverage image manipulation.

Using this package is very easy and creating Beautiful Collages are not tough anymore.

Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
}
],
"require": {
"illuminate/support": "~5.1",
"intervention/image": "~2.4",
"php" : "~5.6|~7.0"
"illuminate/support": "~5.7|~5.8|^6.0",
"intervention/image": "~2.5",
"php" : "~7.2"
},
"require-dev": {
"phpunit/phpunit": ">=5.4.3",
"squizlabs/php_codesniffer": "^2.3",
"orchestra/testbench": "~3.1"
"phpunit/phpunit": "^8.0",
"squizlabs/php_codesniffer": "^3.0",
"orchestra/testbench": "~3.7|~3.8|^4.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/Contracts/CollageGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CollageGeneratorTest extends PhpTestCase
{
protected $generator;

public function setUp()
public function setUp() : void
{
$this->generator = $generator = new FakeCollageGenerator(new File, new Config);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Generators/FourImageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class FourImageTest extends PhpTestCase
'tests/images/image.jpg',
];

public function setUp()
public function setUp() : void
{
$this->generator = new FourImage($this->getFile(), new Config);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Generators/OneImageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class OneImageTest extends PhpTestCase
'tests/images/image.jpg',
];

public function setUp()
public function setUp() : void
{
$this->generator = new OneImage($this->getFile(), new Config);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Generators/ThreeImageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ThreeImageTest extends PhpTestCase
'tests/images/image.jpg',
];

public function setUp()
public function setUp() : void
{
$this->generator = new ThreeImage($this->getFile(), new Config);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Generators/TwoImageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TwoImageTest extends PhpTestCase
'tests/images/image.jpg',
];

public function setUp()
public function setUp() : void
{
$this->generator = new TwoImage($this->getFile(), new Config);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Helpers/ConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class ConfigTest extends PhpTestCase
*/
protected $config;

public function setUp()
public function setUp() : void
{
$this->config = new Config();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Helpers/FileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class FileTest extends PhpTestCase
*/
protected $file;

public function setUp()
public function setUp() : void
{
$this->file = new File;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/MakeCollageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MakeCollageTest extends PhpTestCase
*/
protected $collage;

public function setUp()
public function setUp() : void
{
$this->collage = new FakeMakeCollage;
}
Expand Down

0 comments on commit 523eced

Please sign in to comment.