Skip to content

Commit 0ae1b6d

Browse files
authored
Add support for L5.5 and L5.6, remove support for L5.4 (#2)
1 parent 9d55c1c commit 0ae1b6d

File tree

4 files changed

+28
-24
lines changed

4 files changed

+28
-24
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ language: php
22

33
php:
44
- 7.0
5+
- 7.1
56

6-
# env:
7-
# matrix:
8-
# - COMPOSER_FLAGS="--prefer-lowest"
9-
# - COMPOSER_FLAGS=""
7+
env:
8+
matrix:
9+
- COMPOSER_FLAGS="--prefer-lowest"
10+
- COMPOSER_FLAGS=""
1011

1112
before_script:
1213
- travis_retry composer self-update

composer.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"type": "project",
77
"require": {
88
"php": ">=7.0",
9-
"illuminate/auth": "5.4.*",
10-
"illuminate/console": "5.4.*",
11-
"illuminate/contracts": "5.4.*",
12-
"illuminate/database": "5.4.*",
13-
"illuminate/events": "5.4.*",
14-
"illuminate/support": "5.4.*",
15-
"illuminate/view": "5.4.*"
9+
"illuminate/auth": "~5.5.0|~5.6.0",
10+
"illuminate/console": "~5.5.0|~5.6.0",
11+
"illuminate/contracts": "~5.5.0|~5.6.0",
12+
"illuminate/database": "~5.5.0|~5.6.0",
13+
"illuminate/events": "~5.5.0|~5.6.0",
14+
"illuminate/support": "~5.5.0|~5.6.0",
15+
"illuminate/view": "~5.5.0|~5.6.0"
1616
},
1717
"require-dev": {
1818
"fzaninotto/faker": "~1.4",
19-
"mockery/mockery": "0.9.*",
20-
"phpunit/phpunit": "~6.0",
21-
"orchestra/testbench": "~3.4"
19+
"mockery/mockery": "^1.0",
20+
"phpunit/phpunit": "^6.2|^7.0",
21+
"orchestra/testbench": "~3.5|~3.6"
2222
},
2323
"autoload": {
2424
"classmap": [
@@ -42,7 +42,7 @@
4242
},
4343
"extra": {
4444
"brach-alias": {
45-
"dev-master": "0.3.x-dev"
45+
"dev-master": "0.4.x-dev"
4646
},
4747
"laravel": {
4848
"providers": [

readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ This package contains a PHP component for controlling the Tus upload server and
2020

2121
To get started, install Laravel Tus Upload via the [Composer](http://getcomposer.org/) package manager.
2222

23+
> If you require Laravel 5.4 support, use version `0.3` of the package
24+
2325
```bash
2426
composer require oneofftech/laravel-tus-upload
2527
```

src/Console/SupportsTusd.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use RuntimeException;
66
use Symfony\Component\Process\Process;
7-
use Symfony\Component\Process\ProcessBuilder;
87
use OneOffTech\TusUpload\Events\TusUploaderStarted;
98
use OneOffTech\TusUpload\Events\TusUploaderStopped;
109

@@ -80,16 +79,18 @@ protected static function buildTusProcess()
8079
throw new RuntimeException("Invalid path to tusd [{$driver}, {$path}].");
8180
}
8281

83-
$builder = (new ProcessBuilder())
84-
->setPrefix(realpath($driver));
82+
// $builder = (new ProcessBuilder())
83+
// ->setPrefix();
8584

86-
$arguments = static::tusdArguments();
87-
88-
foreach ($arguments as $argument) {
89-
$builder->add($argument);
90-
}
85+
86+
$tus_arguments = static::tusdArguments();
87+
88+
// foreach ($arguments as $argument) {
89+
// $builder->add($argument);
90+
// }
91+
$arguments = array_merge([realpath($driver)], $tus_arguments);
9192

92-
return $builder->getProcess();
93+
return new Process($arguments);
9394
}
9495

9596
/**

0 commit comments

Comments
 (0)