Compare commits
No commits in common. "master" and "3.3.0" have entirely different histories.
8 changed files with 15 additions and 40 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -2,4 +2,3 @@
|
|||
/vendor
|
||||
composer.lock
|
||||
.phpunit.result.cache
|
||||
.env
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
ARG PHP_IMAGE_TAG
|
||||
FROM php:${PHP_IMAGE_TAG}-cli-alpine
|
||||
|
||||
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
||||
|
||||
WORKDIR /opt/test
|
16
Makefile
16
Makefile
|
@ -1,16 +0,0 @@
|
|||
ifneq (,$(shell (type docker-compose 2>&1 >/dev/null && echo 1) || true))
|
||||
PHP=docker-compose run --rm --no-deps php
|
||||
else
|
||||
PHP=php
|
||||
endif
|
||||
|
||||
PHP_CONSOLE_DEPS=vendor
|
||||
|
||||
vendor: composer.json
|
||||
@$(PHP) composer install -o -n --no-ansi
|
||||
@touch vendor || true
|
||||
|
||||
phpunit: $(PHP_CONSOLE_DEPS)
|
||||
@$(PHP) vendor/bin/phpunit --color=always
|
||||
|
||||
check: phpunit
|
|
@ -13,11 +13,11 @@
|
|||
"php": ">=7.2",
|
||||
"ext-curl": "*",
|
||||
"ext-json": "*",
|
||||
"guzzlehttp/guzzle": "~6.3|^7.0",
|
||||
"guzzlehttp/guzzle": "~6.3",
|
||||
"jms/serializer": "^0.12|^1.0|^2.0|^3.0",
|
||||
"symfony/validator": "~2.8|~3.0|~4.0|^5.0|^6.0",
|
||||
"symfony/validator": "~2.8|~3.0|~4.0|^5.0",
|
||||
"doctrine/cache": "~1.6",
|
||||
"psr/log": "~1.0|^2.0|^3.0"
|
||||
"psr/log": "~1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~8.0"
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
version: '3.4'
|
||||
|
||||
services:
|
||||
php:
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
PHP_IMAGE_TAG: ${PHP_IMAGE_TAG:-7.4}
|
||||
volumes:
|
||||
- "./:/opt/test"
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
convertErrorsToExceptions="true"
|
||||
convertNoticesToExceptions="true"
|
||||
convertWarningsToExceptions="true"
|
||||
convertDeprecationsToExceptions="true"
|
||||
processIsolation="false"
|
||||
stopOnFailure="false">
|
||||
|
||||
|
|
|
@ -143,7 +143,7 @@ class AtolOnlineApiTest extends TestCase
|
|||
*/
|
||||
public function testGetTokenBadResponse(): void
|
||||
{
|
||||
$api = $this->getApi([new BadResponseException('', new Request('GET', 'test'), new Response())]);
|
||||
$api = $this->getApi([new BadResponseException('', new Request('GET', 'test'))]);
|
||||
|
||||
$this->assertFalse($this->callMethod($api, 'getToken'));
|
||||
}
|
||||
|
|
|
@ -1,3 +1,13 @@
|
|||
<?php
|
||||
|
||||
return require __DIR__.'/../vendor/autoload.php';
|
||||
use Composer\Autoload\ClassLoader;
|
||||
use Doctrine\Common\Annotations\AnnotationRegistry;
|
||||
|
||||
/**
|
||||
* @var ClassLoader $loader
|
||||
*/
|
||||
$loader = require __DIR__.'/../vendor/autoload.php';
|
||||
|
||||
AnnotationRegistry::registerLoader('class_exists');
|
||||
|
||||
return $loader;
|
||||
|
|
Loading…
Add table
Reference in a new issue