Skip to content

Re-instate 'Fix aws library conflicts in Totara' #64

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

Open
sarahjcotton wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Re-instate 'Fix aws library conflicts in Totara' #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions sdk/aws-autoloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2826,8 +2826,13 @@
}
}, true);

require __DIR__ . '/Aws/functions.php';
require __DIR__ . '/GuzzleHttp/functions_include.php';
if ((!isset($CFG->libraries) && !file_exists($CFG->libraries . '/optional/aws/aws-sdk-php/src/functions.php'))
Copy link
Contributor

@mark-webster-catalyst mark-webster-catalyst Aug 2, 2023

Choose a reason for hiding this comment

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

Suggested change
if ((!isset($CFG->libraries) && !file_exists($CFG->libraries . '/optional/aws/aws-sdk-php/src/functions.php'))
if ((!isset($CFG->libraries) || !file_exists($CFG->libraries . '/optional/aws/aws-sdk-php/src/functions.php'))

The AND should probably be an OR, otherwise the two statements are mutually inclusive.

Copy link
Contributor Author

@sarahjcotton sarahjcotton Aug 2, 2023

Choose a reason for hiding this comment

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

Been trying to do this in-between other work but I won't be able to review this week as I'm doing upgrade prep for the rest of the week then on leave next week, so could someone else pick it up perhaps? Happy to give access to my repo for any volunteers.

&& !function_exists('Aws\constantly')) {
require_once __DIR__ . '/Aws/functions.php';
}
if (!function_exists('GuzzleHttp\describe_type')) {
require_once __DIR__ . '/GuzzleHttp/functions_include.php';
}
require __DIR__ . '/GuzzleHttp/Psr7/functions_include.php';
require __DIR__ . '/GuzzleHttp/Promise/functions_include.php';
require __DIR__ . '/JmesPath/JmesPath.php';
Expand Down