diff options
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | service/headers/service_test.go | 4 | ||||
| -rw-r--r-- | tests/client.php | 2 | ||||
| -rw-r--r-- | tests/http/client.php | 2 | ||||
| -rw-r--r-- | tests/http/slow-client.php | 2 | ||||
| -rw-r--r-- | tests/slow-client.php | 2 | ||||
| -rw-r--r-- | tests/slow-destroy.php | 2 |
10 files changed, 14 insertions, 10 deletions
diff --git a/.dockerignore b/.dockerignore index 9bfb38f4..b817b3c8 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,3 +7,4 @@ /tests /bin composer.json +vendor_php @@ -1,6 +1,7 @@ .idea composer.lock vendor +vendor_php builds/ tests/vendor/ .rr-sample.yaml @@ -9,7 +9,6 @@ install: all uninstall: rm -f /usr/local/bin/rr test: - go mod vendor composer update go test -v -race -cover go test -v -race -cover ./util diff --git a/composer.json b/composer.json index beed4175..aa461df3 100644 --- a/composer.json +++ b/composer.json @@ -22,11 +22,14 @@ "symfony/console": "^2.5.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "laminas/laminas-diactoros": "^1.3 || ^2.0" }, + "config": { + "vendor-dir": "vendor_php" + }, "require-dev": { - "phpstan/phpstan": "~0.12" + "phpstan/phpstan": "~0.12" }, "scripts": { - "analyze": "@php ./vendor/bin/phpstan analyze -c ./phpstan.neon.dist --no-progress --ansi" + "analyze": "@php ./vendor_php/bin/phpstan analyze -c ./phpstan.neon.dist --no-progress --ansi" }, "autoload": { "psr-4": { diff --git a/service/headers/service_test.go b/service/headers/service_test.go index 8d727c15..a67def02 100644 --- a/service/headers/service_test.go +++ b/service/headers/service_test.go @@ -200,7 +200,7 @@ func TestCORS_OPTIONS(t *testing.T) { }`, httpCfg: `{ "enable": true, - "address": ":6379", + "address": ":16379", "maxRequestSize": 1024, "workers":{ "command": "php ../../tests/http/client.php headers pipes", @@ -222,7 +222,7 @@ func TestCORS_OPTIONS(t *testing.T) { time.Sleep(time.Millisecond * 100) defer c.Stop() - req, err := http.NewRequest("OPTIONS", "http://localhost:6379", nil) + req, err := http.NewRequest("OPTIONS", "http://localhost:16379", nil) if err != nil { return err } diff --git a/tests/client.php b/tests/client.php index 31caa410..835b1c6c 100644 --- a/tests/client.php +++ b/tests/client.php @@ -3,7 +3,7 @@ use Spiral\Goridge; ini_set('display_errors', 'stderr'); -require dirname(__DIR__) . "/vendor/autoload.php"; +require dirname(__DIR__) . "/vendor_php/autoload.php"; if (count($argv) < 3) { die("need 2 arguments"); diff --git a/tests/http/client.php b/tests/http/client.php index 166acfb6..9f21b273 100644 --- a/tests/http/client.php +++ b/tests/http/client.php @@ -4,7 +4,7 @@ use Spiral\Goridge; use Spiral\RoadRunner; ini_set('display_errors', 'stderr'); -require dirname(__DIR__) . "/../vendor/autoload.php"; +require dirname(__DIR__) . "/../vendor_php/autoload.php"; if (count($argv) < 3) { die("need 2 arguments"); diff --git a/tests/http/slow-client.php b/tests/http/slow-client.php index 58250dfb..4d3963d7 100644 --- a/tests/http/slow-client.php +++ b/tests/http/slow-client.php @@ -4,7 +4,7 @@ use Spiral\Goridge; use Spiral\RoadRunner; ini_set('display_errors', 'stderr'); -require dirname(__DIR__) . "/../vendor/autoload.php"; +require dirname(__DIR__) . "/../vendor_php/autoload.php"; if (count($argv) < 3) { die("need 2 arguments"); diff --git a/tests/slow-client.php b/tests/slow-client.php index bc4b0561..ece0a439 100644 --- a/tests/slow-client.php +++ b/tests/slow-client.php @@ -3,7 +3,7 @@ use Spiral\Goridge; ini_set('display_errors', 'stderr'); -require dirname(__DIR__) . "/vendor/autoload.php"; +require dirname(__DIR__) . "/vendor_php/autoload.php"; if (count($argv) < 3) { die("need 2 arguments"); diff --git a/tests/slow-destroy.php b/tests/slow-destroy.php index 6af61050..e2a01af2 100644 --- a/tests/slow-destroy.php +++ b/tests/slow-destroy.php @@ -3,7 +3,7 @@ use Spiral\Goridge; ini_set('display_errors', 'stderr'); -require dirname(__DIR__) . "/vendor/autoload.php"; +require dirname(__DIR__) . "/vendor_php/autoload.php"; if (count($argv) < 3) { die("need 2 arguments"); |