esoko/soko-web
esoko/soko-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

feature/update-to-php81 #29

Merged
bence merged 5 commits from feature/update-to-php81 into master 2023-09-27 22:11:05 +02:00
Conversation 0 Commits 5 Files Changed 5 +375 -577
5 changed files with 375 additions and 577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:7.4.7-cli-buster FROM php:8.1-cli-bookworm
RUN apt-get update && apt-get install -y unzip RUN apt-get update && apt-get install -y unzip
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

6
composer.json
View File

@ -5,12 +5,12 @@
"license": "GNU GPL 3.0", "license": "GNU GPL 3.0",
"require": { "require": {
"vlucas/phpdotenv": "^5.5", "vlucas/phpdotenv": "^5.5",
"symfony/console": "^5.4", "symfony/console": "^6.3",
"phpmailer/phpmailer": "^6.8", "phpmailer/phpmailer": "^6.8",
"cocur/slugify": "^4.3" "cocur/slugify": "^4.5"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.6", "phpunit/phpunit": "^10.3",
"phpstan/phpstan": "^1.10" "phpstan/phpstan": "^1.10"
}, },
"autoload": { "autoload": {

934
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
src/Session/DatabaseSessionHandler.php
View File

@ -86,12 +86,12 @@ class DatabaseSessionHandler implements ISessionHandler
return true; return true;
} }
public function gc($maxlifetime): bool public function gc($maxlifetime): int|false
{ {
// empty on purpose // empty on purpose
// old sessions are deleted by MaintainDatabaseCommand // old sessions are deleted by MaintainDatabaseCommand
return true; return 1;
} }
public function create_sid(): string public function create_sid(): string

6
tests/OAuth/GoogleOAuthTest.php
View File

@ -17,7 +17,7 @@ final class GoogleOAuthTest extends TestCase
$redirectUrl = 'http://example.com/oauth'; $redirectUrl = 'http://example.com/oauth';
$requestMock = $this->getMockBuilder(IRequest::class) $requestMock = $this->getMockBuilder(IRequest::class)
->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send']) ->onlyMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
->getMock(); ->getMock();
$googleOAuth = new GoogleOAuth($requestMock); $googleOAuth = new GoogleOAuth($requestMock);
@ -48,10 +48,10 @@ final class GoogleOAuthTest extends TestCase
$redirectUrl = 'http://example.com/oauth'; $redirectUrl = 'http://example.com/oauth';
$requestMock = $this->getMockBuilder(IRequest::class) $requestMock = $this->getMockBuilder(IRequest::class)
->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send']) ->onlyMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
->getMock(); ->getMock();
$responseMock = $this->getMockBuilder(IResponse::class) $responseMock = $this->getMockBuilder(IResponse::class)
->setMethods(['getBody', 'getHeaders']) ->onlyMethods(['getBody', 'getHeaders'])
->getMock(); ->getMock();
$googleOAuth = new GoogleOAuth($requestMock); $googleOAuth = new GoogleOAuth($requestMock);