iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgraded external components

This commit is contained in:
Igor Scheller 2019-05-31 17:09:50 +02:00 committed by msquare
parent 25bf0d8f87
commit 236197faf8
6 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -62,7 +62,7 @@ test:
- cp -R tests/ phpunit.xml "${DOCROOT}" - cp -R tests/ phpunit.xml "${DOCROOT}"
- HOMEDIR=$(pwd) - HOMEDIR=$(pwd)
- cd "${DOCROOT}" - cd "${DOCROOT}"
- composer --no-ansi install --dev - composer --no-ansi install
- ./bin/migrate - ./bin/migrate
script: script:
- vendor/bin/phpunit -v --colors=never --coverage-text --coverage-html "${HOMEDIR}/coverage/" --log-junit "${HOMEDIR}/unittests.xml" - vendor/bin/phpunit -v --colors=never --coverage-text --coverage-html "${HOMEDIR}/coverage/" --log-junit "${HOMEDIR}/unittests.xml"

25
composer.json
View File

@ -22,27 +22,28 @@
"ext-PDO": "*", "ext-PDO": "*",
"ext-SimpleXML": "*", "ext-SimpleXML": "*",
"ext-xml": "*", "ext-xml": "*",
"doctrine/dbal": "^2.8", "doctrine/dbal": "^2.9",
"erusev/parsedown": "^1.6", "erusev/parsedown": "^1.7",
"illuminate/container": "5.5.*", "illuminate/container": "5.8.*",
"illuminate/database": "5.5.*", "illuminate/database": "5.8.*",
"illuminate/support": "5.5.*", "illuminate/support": "5.8.*",
"nikic/fast-route": "^1.3", "nikic/fast-route": "^1.3",
"nyholm/psr7": "^1.1", "nyholm/psr7": "^1.1",
"psr/container": "^1.0", "psr/container": "^1.0",
"psr/http-server-middleware": "^1.0", "psr/http-server-middleware": "^1.0",
"psr/log": "^1.0", "psr/log": "^1.1",
"swiftmailer/swiftmailer": "^6.1", "swiftmailer/swiftmailer": "^6.2",
"symfony/http-foundation": "^3.3", "symfony/http-foundation": "^4.3",
"symfony/psr-http-message-bridge": "^1.0", "symfony/psr-http-message-bridge": "^1.2",
"twig/extensions": "^1.5", "twig/extensions": "^1.5",
"twig/twig": "~2.6.0" "twig/twig": "~2.6.0",
"vlucas/phpdotenv": "^3.3"
}, },
"require-dev": { "require-dev": {
"dms/phpunit-arraysubset-asserts": "^0.1.0", "dms/phpunit-arraysubset-asserts": "^0.1.0",
"filp/whoops": "^2.1", "filp/whoops": "^2.3",
"phpunit/phpunit": "^8.1", "phpunit/phpunit": "^8.1",
"symfony/var-dumper": "^3.3" "symfony/var-dumper": "^4.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
src/Http/MessageTrait.php
View File

@ -18,7 +18,7 @@ trait MessageTrait
* *
* @return string HTTP protocol version. * @return string HTTP protocol version.
*/ */
public function getProtocolVersion() public function getProtocolVersion(): string
{ {
return parent::getProtocolVersion(); return parent::getProtocolVersion();
} }

1
src/Http/Request.php
View File

@ -370,7 +370,6 @@ class Request extends SymfonyRequest implements ServerRequestInterface
$filename, $filename,
$file->getClientFilename(), $file->getClientFilename(),
$file->getClientMediaType(), $file->getClientMediaType(),
$file->getSize(),
$file->getError() $file->getError()
); );
} }

18
tests/Unit/HelpersTest.php
View File

@ -55,7 +55,7 @@ class HelpersTest extends TestCase
} }
/** /**
* @covers \base_path() * @covers \base_path
*/ */
public function testBasePath() public function testBasePath()
{ {
@ -99,7 +99,7 @@ class HelpersTest extends TestCase
} }
/** /**
* @covers \config_path() * @covers \config_path
*/ */
public function testConfigPath() public function testConfigPath()
{ {
@ -117,20 +117,6 @@ class HelpersTest extends TestCase
$this->assertEquals('/foo/conf/bar.php', config_path('bar.php')); $this->assertEquals('/foo/conf/bar.php', config_path('bar.php'));
} }
/**
* @covers \env
*/
public function testEnv()
{
putenv('envTestVar=someContent');
$env = env('envTestVar');
$this->assertEquals('someContent', $env);
$env = env('someRandomEnvVarThatShouldNeverExist', 'someDefaultValue');
$this->assertEquals('someDefaultValue', $env);
}
/** /**
* @covers \request * @covers \request
*/ */

3
tests/Unit/Http/RequestTest.php
View File

@ -286,7 +286,7 @@ class RequestTest extends TestCase
{ {
$filename = tempnam(sys_get_temp_dir(), 'test'); $filename = tempnam(sys_get_temp_dir(), 'test');
file_put_contents($filename, 'LoremIpsum!'); file_put_contents($filename, 'LoremIpsum!');
$files = [new SymfonyFile($filename, 'foo.txt', 'text/plain', 11)]; $files = [new SymfonyFile($filename, 'foo.txt', 'text/plain', UPLOAD_ERR_PARTIAL)];
$request = new Request([], [], [], [], $files); $request = new Request([], [], [], [], $files);
$uploadedFiles = $request->getUploadedFiles(); $uploadedFiles = $request->getUploadedFiles();
@ -298,6 +298,7 @@ class RequestTest extends TestCase
$this->assertEquals('foo.txt', $file->getClientFilename()); $this->assertEquals('foo.txt', $file->getClientFilename());
$this->assertEquals('text/plain', $file->getClientMediaType()); $this->assertEquals('text/plain', $file->getClientMediaType());
$this->assertEquals(11, $file->getSize()); $this->assertEquals(11, $file->getSize());
$this->assertEquals(UPLOAD_ERR_PARTIAL, $file->getError());
} }
/** /**