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

Fix for the isDir function in the FTP Adapter #607

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Fix for the isDir function in the FTP Adapter #607

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f21ef3a
Fixed a bug in the FTP Adapter in the way we check if a path is a dir…
Romain Apr 30, 2019
0fc519f
Improved the way we build the URL to optionnaly add the port
Romain Apr 30, 2019
57df9f4
Improved the way we build the URL to take into consideration SSL situ…
Romain Apr 30, 2019
d11a658
Keep chdir as the main method, and fallback on is_dir if there's an e…
Romain Jun 14, 2019
8d7a5b0
Missing semi-colon
Romain Jun 14, 2019
32f770a
Applied nicolasmure comments
Romain Jun 18, 2019
cb83931
Throw an exception if we try to use is_dir when passive mode is not a…
Romain Jun 20, 2019
de3eb22
Some improvements for readability and simplification of the code
Romain Jun 21, 2019
6f31fc2
Removed unused return and unused variable declaration.
Romain Jul 26, 2019
6cc9d88
Removed .idea folder from tracking
Romain Mar 8, 2022
3712db9
Fixed a typo in the FTP protocol name
Romain Mar 8, 2022
81283ac
Resolved conflicts in the .gitignore
Romain Mar 8, 2022
c85ef2f
Merge branch 'master' into master
Romain Mar 8, 2022
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
7 changes: 6 additions & 1 deletion src/Gaufrette/Adapter/Ftp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,12 @@ private function isDir($directory)
return true;
}

if (!@ftp_chdir($this->getConnection(), $directory)) {
nicolasmure marked this conversation as resolved.
Show resolved Hide resolved
// Build the FTP URL that will be used to check if the path is a directory or not
$url = $this->ssl ? 'sftp://' : 'ftp://';
$url .= $this->username . ':' . $this->password . '@' . $this->host;
$url .= $this->port ? ':' . $this->port : '';

if (!@is_dir($url . $directory)) {
return false;
}

Expand Down