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

Update composer Libs #6902

Merged
merged 6 commits into from
Apr 6, 2024
Merged

Update composer Libs #6902

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d14c68e
Update composer.json
DawoudIO Mar 8, 2024
500a4bd
Merge branch 'master' into php-composer-update
DawoudIO Mar 8, 2024
1929cd8
Update composer.json
DawoudIO Mar 8, 2024
ee94e04
Merge branch 'php-composer-update' of /~https://github.com/ChurchCRM/CR…
DawoudIO Apr 6, 2024
232c3bf
Merge branch 'master' into php-composer-update
DawoudIO Apr 6, 2024
494629a
updated
DawoudIO Apr 6, 2024
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
30 changes: 15 additions & 15 deletions src/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,28 @@
"ext-session": "*",
"ext-zip": "*",
"ext-zlib": "*",
"azuyalabs/yasumi": "^2.4.0",
"defuse/php-encryption": "^2.3.1",
"azuyalabs/yasumi": "^2.7.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updating composer.json is not enough to update dependencies. Is there an associated composer.lock update?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, it looks like many of these are already updated in /~https://github.com/ChurchCRM/CRM/blob/master/src/composer.lock - this change shouldn't be necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct as we use ^ to get the latest, this is to just keep it updated

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, but this change doesn't actually have any composer lib updates since composer.lock isn't updated

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes in the composer.json doesn't line up with the composer.lock

"defuse/php-encryption": "^v2.4.0",
"drewm/mailchimp-api": "^2.5.4",
"endroid/qr-code": "^5.0.4",
"geocoder-php/bing-maps-provider": "^4.2.0",
"geocoder-php/google-maps-provider": "^4.6.0",
"ifsnop/mysqldump-php": "^v2.9",
"endroid/qr-code": "^5.0.6",
"geocoder-php/bing-maps-provider": "^4.3.0",
"geocoder-php/google-maps-provider": "^4.7.1",
"ifsnop/mysqldump-php": "^v2.12",
"knplabs/github-api": "^3.12.0",
"monolog/monolog": "^2.3.0",
"mustache/mustache": "^v2.13.0",
"monolog/monolog": "^2.9.2",
"mustache/mustache": "^v2.14.2",
"php-http/guzzle7-adapter": "^1.0.0",
"php-http/message": "^1.11.1",
"phpmailer/phpmailer": "^6.5.1",
"pragmarx/google2fa": "^8.0.0",
"phpmailer/phpmailer": "^6.9.1",
"pragmarx/google2fa": "^8.0.1",
"propel/propel": "2.0.0-alpha12",
"setasign/fpdf": "^1.8.3",
"setasign/fpdf": "^1.8.6",
"slim/http-cache": "^1.1.0",
"slim/php-view": "^3.2.0",
"slim/slim": "^4.12.0",
"symfony/dependency-injection": "^6.0",
"symfony/translation": "^5.4.31",
"verot/class.upload.php": "^2.1.0",
"slim/slim": "^4.13.0",
"symfony/dependency-injection": "^v6.0.20",
"symfony/translation": "^5.4.35",
"verot/class.upload.php": "^2.1.6",
"vonage/client": "^2.4.0"
},
"autoload": {
Expand Down
Loading