Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 7.1.0 - Upgrade php version and dependencies #393

Merged
merged 6 commits into from
Jan 29, 2025
Merged

Release 7.1.0 - Upgrade php version and dependencies #393

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1751d8a
upgrade php to 8.3
jason-jackson Nov 20, 2024
e891d93
update dependencies
jason-jackson Jan 13, 2025
233fb5e
psr2 compliance
jason-jackson Jan 13, 2025
67c4663
fix issue with str_to_time not handling -- as expected
jason-jackson Jan 14, 2025
91cd2bc
fix a test causing a "+-" parsing issue with strtotime
jason-jackson Jan 14, 2025
9d93e29
Merge branch 'main' into feature/upgrade-php
jason-jackson Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM silintl/php8:8.1
FROM silintl/php8:8.3

ARG GITHUB_REF_NAME
ENV GITHUB_REF_NAME=$GITHUB_REF_NAME
Expand Down
1 change: 1 addition & 0 deletions application/common/helpers/MySqlDateTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public static function formatDateTime(int $timestamp): string
*/
public static function relative(string $difference = '+30 days'): string
{
$difference = str_replace('--', '+', $difference);
briskt marked this conversation as resolved.
Show resolved Hide resolved
return self::formatDate(strtotime($difference));
}

Expand Down
956 changes: 488 additions & 468 deletions application/composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions application/dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
{
"name": "doctrine/deprecations",
"version": "1.1.3"
"version": "1.1.4"
},
{
"name": "doctrine/lexer",
Expand All @@ -33,23 +33,23 @@
},
{
"name": "ezyang/htmlpurifier",
"version": "v4.17.0"
"version": "v4.18.0"
},
{
"name": "fillup/fake-bower-assets",
"version": "2.0.9"
},
{
"name": "firebase/php-jwt",
"version": "v6.10.1"
"version": "v6.10.2"
},
{
"name": "google/apiclient",
"version": "v2.14.0"
},
{
"name": "google/apiclient-services",
"version": "v0.379.0"
"version": "v0.390.0"
},
{
"name": "google/auth",
Expand Down Expand Up @@ -81,15 +81,15 @@
},
{
"name": "jean85/pretty-package-versions",
"version": "2.0.6"
"version": "2.1.0"
},
{
"name": "mlocati/ip-lib",
"version": "1.18.0"
"version": "1.18.1"
},
{
"name": "monolog/monolog",
"version": "2.9.3"
"version": "2.10.0"
},
{
"name": "notamedia/yii2-sentry",
Expand Down Expand Up @@ -129,7 +129,7 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.42"
"version": "3.0.43"
},
{
"name": "phpspec/php-diff",
Expand Down Expand Up @@ -169,7 +169,7 @@
},
{
"name": "roave/security-advisories",
"version": "dev-master 622ede4"
"version": "dev-master a717959"
},
{
"name": "sentry/sdk",
Expand All @@ -181,15 +181,15 @@
},
{
"name": "silinternational/email-service-php-client",
"version": "2.4.2"
"version": "2.4.3"
},
{
"name": "silinternational/php-array-dot-notation",
"version": "0.1.0"
},
{
"name": "silinternational/php-env",
"version": "3.2.0"
"version": "3.3.0"
},
{
"name": "silinternational/psr3-adapters",
Expand All @@ -209,19 +209,19 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.5.0"
"version": "v3.5.1"
},
{
"name": "symfony/http-client",
"version": "v6.4.13"
"version": "v7.2.2"
},
{
"name": "symfony/http-client-contracts",
"version": "v3.5.0"
"version": "v3.5.2"
},
{
"name": "symfony/options-resolver",
"version": "v6.4.13"
"version": "v7.2.0"
},
{
"name": "symfony/polyfill-ctype",
Expand Down Expand Up @@ -249,7 +249,7 @@
},
{
"name": "symfony/service-contracts",
"version": "v3.5.0"
"version": "v3.5.1"
},
{
"name": "theiconic/php-ga-measurement-protocol",
Expand Down
2 changes: 1 addition & 1 deletion application/features/bootstrap/EmailContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ public function thatUserHasAPasswordThatExpiresInDays($n)

$currentPassword = $this->tempUser->currentPassword;
$currentPassword->password = base64_encode(random_bytes(33)); // Needed to pass validation
$currentPassword->expires_on = MySqlDateTime::relative('+' . $n . ' days');
$currentPassword->expires_on = MySqlDateTime::relative($n . ' days');
jason-jackson marked this conversation as resolved.
Show resolved Hide resolved
Assert::true(
$currentPassword->save(),
'Failed to save updated password expiration date. '
Expand Down
1 change: 1 addition & 0 deletions application/requirements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* Application requirement checker script.
*
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ services:
MYSQL_PASSWORD: appfortests

cli:
image: silintl/php8:8.1
image: silintl/php8:8.3
platform: linux/amd64
volumes:
- composer-cache:/composer
Expand All @@ -78,7 +78,7 @@ services:
COMPOSER_CACHE_DIR: /composer
env_file:
- ./local.env
command: [ "true" ]
command: ["true"]

dynamo:
image: amazon/dynamodb-local
Expand Down Expand Up @@ -143,7 +143,7 @@ services:
command: bash -c "pwd && ls -al && php restart.php"

test:
image: silintl/php8:8.1
image: silintl/php8:8.3
platform: linux/amd64
volumes:
- ./application:/data
Expand Down
Loading