1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
Date: Mon, 11 Mar 2019 21:29:32 -1000
Subject: phpcbf run
Forwarded: no
---
phpseclib/Net/SFTP.php | 1 -
tests/Functional/Net/SCPSSH2UserStoryTest.php | 6 +++---
tests/Functional/Net/SFTPUserStoryTest.php | 11 ++++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php
index c636c3d..1c7156d 100644
--- a/phpseclib/Net/SFTP.php
+++ b/phpseclib/Net/SFTP.php
@@ -2397,7 +2397,6 @@ class SFTP extends SSH2
fseek($fp, $offset);
$size-= $offset;
}
-
} elseif ($dataCallback) {
$size = 0;
} else {
diff --git a/tests/Functional/Net/SCPSSH2UserStoryTest.php b/tests/Functional/Net/SCPSSH2UserStoryTest.php
index 41e86e9..8040724 100644
--- a/tests/Functional/Net/SCPSSH2UserStoryTest.php
+++ b/tests/Functional/Net/SCPSSH2UserStoryTest.php
@@ -11,9 +11,9 @@ use phpseclib\Net\SSH2;
class Functional_Net_SCPSSH2UserStoryTest extends PhpseclibFunctionalTestCase
{
- static protected $remoteFile;
- static protected $exampleData;
- static protected $exampleDataLength;
+ protected static $remoteFile;
+ protected static $exampleData;
+ protected static $exampleDataLength;
public static function setUpBeforeClass()
{
diff --git a/tests/Functional/Net/SFTPUserStoryTest.php b/tests/Functional/Net/SFTPUserStoryTest.php
index e141fe0..4157dcd 100644
--- a/tests/Functional/Net/SFTPUserStoryTest.php
+++ b/tests/Functional/Net/SFTPUserStoryTest.php
@@ -10,10 +10,10 @@ use phpseclib\Net\SFTP;
class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
{
- static protected $scratchDir;
- static protected $exampleData;
- static protected $exampleDataLength;
- static protected $buffer;
+ protected static $scratchDir;
+ protected static $exampleData;
+ protected static $exampleDataLength;
+ protected static $buffer;
public static function setUpBeforeClass()
{
@@ -790,7 +790,8 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
public function testCallableGetWithLength($sftp)
{
$sftp->put('test.txt', 'zzzzz');
- $sftp->get('test.txt', function($data) {}, 0, 1);
+ $sftp->get('test.txt', function ($data) {
+ }, 0, 1);
$this->assertTrue(true);
}
}
|
