Skip to content

Commit

Permalink
Upgraded dependencies (#129)
Browse files Browse the repository at this point in the history
  • Loading branch information
vokomarov authored Sep 17, 2023
2 parents da27b96 + 7b847fa commit 84a3578
Show file tree
Hide file tree
Showing 10 changed files with 457 additions and 450 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
INFRA_REPO_REF: main
CLUSTER: k8s-cash-track
NAMESPACE: cash-track
KUBECTL_BIN: https://storage.googleapis.com/kubernetes-release/release/v1.24.4/bin/linux/amd64/kubectl
KUBECTL_BIN: https://storage.googleapis.com/kubernetes-release/release/v1.27.4/bin/linux/amd64/kubectl

jobs:
deploy:
Expand Down
2 changes: 1 addition & 1 deletion .rr.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2.7'
version: "3"

rpc:
listen: tcp://127.0.0.1:6001
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN --mount=type=bind,from=mlocati/php-extension-installer:1.5,source=/usr/bin/
install-php-extensions opcache zip xsl dom exif intl pcntl bcmath sockets mbstring pdo_mysql mysqli redis && \
apk del --no-cache ${PHPIZE_DEPS} ${BUILD_DEPENDS}

COPY --from=ghcr.io/roadrunner-server/roadrunner:2.12.3 /usr/bin/rr /usr/bin/rr
COPY --from=ghcr.io/roadrunner-server/roadrunner:2023.2.2 /usr/bin/rr /usr/bin/rr

COPY --from=composer /usr/bin/composer /usr/bin/composer

Expand Down
9 changes: 6 additions & 3 deletions app/src/Config/AppConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,20 @@ public function getWebAppUrl(): string

public function getEmailConfirmationLink(string $token): string
{
return str_replace('{token}', $token, $this->config['email_confirmation_link']);
/** @psalm-suppress PossiblyInvalidCast */
return (string) str_replace('{token}', $token, $this->config['email_confirmation_link']);
}

public function getPasswordResetLink(string $code): string
{
return str_replace('{code}', $code, $this->config['password_reset_link']);
/** @psalm-suppress PossiblyInvalidCast */
return (string) str_replace('{code}', $code, $this->config['password_reset_link']);
}

public function getWalletLink(int $walletId): string
{
return str_replace('{wallet}', (string) $walletId, $this->config['wallet_link']);
/** @psalm-suppress PossiblyInvalidCast */
return (string) str_replace('{wallet}', (string) $walletId, $this->config['wallet_link']);
}

public function getDbEncrypterKey(): string
Expand Down
4 changes: 4 additions & 0 deletions app/src/Service/Cors/CorsService.php
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,10 @@ protected function isOriginAllowed(ServerRequestInterface $request): bool
return false;
}

/**
* @param string $pattern
* @return non-empty-string
*/
protected function convertPatternToRegex(string $pattern): string
{
$pattern = str_replace(['/', '.', '*'], ['\/', '\.', '.*'], $pattern);
Expand Down
2 changes: 1 addition & 1 deletion app/src/Service/WalletService.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function unArchive(Wallet $wallet): Wallet
*/
public function share(Wallet $wallet, User $user, User $sharer): Wallet
{
/** @psalm-suppress InvalidArgument */
/** @psalm-suppress DocblockTypeContradiction */
if ($wallet->users->contains($user) === true) {
return $wallet;
}
Expand Down
26 changes: 13 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,38 @@
"ext-pdo": "*",
"ext-redis": "*",
"ext-sockets": "*",
"aws/aws-sdk-php": "^3.190",
"cycle/entity-behavior": "^1.1",
"aws/aws-sdk-php": "^3.281",
"cycle/entity-behavior": "^1.2",
"cycle/entity-behavior-uuid": "^1.0",
"doctrine/collections": "^1.8",
"firebase/php-jwt": "^6.0",
"google/apiclient": "^2.12.1",
"illuminate/collections": "^9.52",
"doctrine/collections": "^2.1",
"firebase/php-jwt": "^6.8",
"google/apiclient": "^2.15",
"illuminate/collections": "^10.23",
"kreait/firebase-php": "^7.0",
"laminas/laminas-diactoros": "^2.25",
"lcobucci/jwt": "^4.3",
"ramsey/uuid": "^4.7",
"spiral-packages/league-event": "^1.0",
"spiral-packages/scheduler": "^2.1",
"spiral/cycle-bridge": "^2.4",
"spiral/cycle-bridge": "^2.5",
"spiral/filters-bridge": "^1.0",
"spiral/framework": "^3.7",
"spiral/framework": "^3.8",
"spiral/nyholm-bridge": "^1.3",
"spiral/roadrunner-bridge": "^2.6",
"spiral/roadrunner-cli": "^2.5",
"spiral/stempler-bridge": "^3.2",
"spiral/translator": "^3.6",
"spiral/translator": "^3.8",
"spiral/validator": "^1.3",
"symfony/mailer": "^6.2",
"symfony/mailer": "^6.3",
"voku/portable-utf8": "^6.0"
},
"require-dev": {
"phpunit/phpunit": "^9.6",
"qossmic/deptrac-shim": "^1.0",
"squizlabs/php_codesniffer": "3.*",
"spiral/testing": "^2.3",
"symfony/var-dumper": "^6.2",
"vimeo/psalm": "^5.9.0"
"spiral/testing": "^2.4",
"symfony/var-dumper": "^6.3",
"vimeo/psalm": "^5.15"
},
"scripts": {
"post-create-project-cmd": [
Expand Down
Loading

0 comments on commit 84a3578

Please sign in to comment.