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.

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

Fix phpseclib class namespace in Varien_Io_Sftp #3008

Merged
merged 1 commit into from
Feb 4, 2023

Conversation

elidrissidev
Copy link
Member

@elidrissidev elidrissidev commented Feb 2, 2023

Description (*)

A small fix related to phpseclib/phpseclib composer dependency which uses a different namespace than the one that was installed in lib/. I also removed the unneeded require_once from the top of the file, and corrected an undefined variable usage.

Related Pull Requests

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)
  • Add yourself to contributors list

@github-actions github-actions bot added Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* labels Feb 2, 2023
@@ -117,7 +115,7 @@ public function rmdir($dir, $recursive = false)
$list = $this->_connection->nlist();
if (!count($list)) {
// Go back
$this->_connection->chdir($pwd);
$this->_connection->chdir($cwd);
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it better to change line 111 instead:

from $cwd = $this->_connection->pwd();
to $pwd = $this->_connection->pwd();

Copy link
Member Author

Choose a reason for hiding this comment

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

I think pwd means "print working directory", and cwd means "current working directory". So cwd is the value resulting from calling pwd().

@fballiano fballiano merged commit 559775e into OpenMage:1.9.4.x Feb 4, 2023
@fballiano
Copy link
Contributor

merged and ported to 20.0

@elidrissidev elidrissidev deleted the fix/phpseclib-usage branch February 4, 2023 19:15
elidrissidev added a commit to elidrissidev/magento-lts that referenced this pull request Feb 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/*
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants