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

php unit test changes to address issues that php7.4 will report #36586

Merged
merged 9 commits into from
Apr 7, 2020
Merged

php unit test changes to address issues that php7.4 will report #36586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
58b2286
Fix 'Function ReflectionType::__toString() is deprecated'
phil-davis Dec 13, 2019
b52bdb6
Fix 'stripos(): Non-string needles will be interpreted as strings in …
phil-davis Dec 13, 2019
34c17e3
Fix 'Trying to access array offset on value of type bool'
phil-davis Dec 13, 2019
b64502b
Pass real core.key core.crt in SignAppTest to fix 'Trying to access a…
phil-davis Dec 13, 2019
0cde06b
In ControllerMethodReflector type is a \ReflectionNamedType
phil-davis Dec 19, 2019
cdb2c5e
Pass real core.key core.crt in SignCoreTest to fix 'Trying to access …
phil-davis Jan 8, 2020
fda4d10
Fix 'Trying to access array offset on value of type bool' in CacheTest
phil-davis Jan 8, 2020
f4db855
Fix 'Trying to access array offset on value of type bool' in HomeCach…
phil-davis Jan 8, 2020
0434cca
Fix 'Trying to access array offset on value of type bool' in CacheJai…
phil-davis Jan 8, 2020
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
3 changes: 2 additions & 1 deletion lib/private/AppFramework/Utility/ControllerMethodReflector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ public function reflect($object, $method) {
// over phpdoc annotations
if (\method_exists($param, 'getType')) {
$type = $param->getType();
'@phan-var \ReflectionNamedType $type';
if ($type !== null) {
$this->types[$param->getName()] = (string) $type;
$this->types[$param->getName()] = $type->getName();
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Cache/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function getNumericStorageId() {
* get the stored metadata of a file or folder
*
* @param string | int $file either the path of a file or folder or the file id for a file or folder
* @return ICacheEntry|false the cache entry as array of false if the file is not found in the cache
* @return ICacheEntry|false the cache entry as array or false if the file is not found in the cache
*/
public function get($file) {
if (\is_string($file) or $file == '') {
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/Cache/FileCacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ protected function setUp(): void {
}

protected function tearDown(): void {
if ($this->instance) {
$this->instance->remove('hack', 'hack');
if ($this->instance->get('hack') !== null) {
$this->instance->remove('hack');
}

parent::tearDown();
Expand Down
12 changes: 6 additions & 6 deletions tests/lib/Command/Integrity/SignAppTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,23 +221,23 @@ public function testExecute() {
->expects($this->at(1))
->method('getOption')
->with('privateKey')
->will($this->returnValue('privateKey'));
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key'));
$inputInterface
->expects($this->at(2))
->method('getOption')
->with('certificate')
->will($this->returnValue('certificate'));
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt'));

$this->fileAccessHelper
->expects($this->at(0))
->method('file_get_contents')
->with('privateKey')
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key'));
->with(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')
->will($this->returnValue(\file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')));
$this->fileAccessHelper
->expects($this->at(1))
->method('file_get_contents')
->with('certificate')
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt'));
->with(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')
->will($this->returnValue(\file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')));

$this->checker
->expects($this->once())
Expand Down
12 changes: 6 additions & 6 deletions tests/lib/Command/Integrity/SignCoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ public function testExecute() {
->expects($this->at(0))
->method('getOption')
->with('privateKey')
->will($this->returnValue('privateKey'));
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key'));
$inputInterface
->expects($this->at(1))
->method('getOption')
->with('certificate')
->will($this->returnValue('certificate'));
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt'));
$inputInterface
->expects($this->at(2))
->method('getOption')
Expand All @@ -187,13 +187,13 @@ public function testExecute() {
$this->fileAccessHelper
->expects($this->at(0))
->method('file_get_contents')
->with('privateKey')
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key'));
->with(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')
->will($this->returnValue(\file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.key')));
$this->fileAccessHelper
->expects($this->at(1))
->method('file_get_contents')
->with('certificate')
->will($this->returnValue(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt'));
->with(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')
->will($this->returnValue(\file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/core.crt')));

$this->checker
->expects($this->once())
Expand Down
8 changes: 6 additions & 2 deletions tests/lib/Files/Cache/CacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,12 @@ public function testRootFolderSizeForNonHomeStorage() {

// clean up
$this->cache->remove('');
$this->cache->remove($dir1);
$this->cache->remove($dir2);
if ($this->cache->get($dir1)) {
$this->cache->remove($dir1);
}
if ($this->cache->get($dir2)) {
$this->cache->remove($dir2);
}

$this->assertFalse($this->cache->inCache($dir1));
$this->assertFalse($this->cache->inCache($dir2));
Expand Down
16 changes: 12 additions & 4 deletions tests/lib/Files/Cache/HomeCacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,15 @@ public function testRootFolderSizeIgnoresUnknownUpdate() {

// clean up
$this->cache->remove('');
$this->cache->remove('files');
$this->cache->remove($dir1);
$this->cache->remove($dir2);
if ($this->cache->get('files')) {
$this->cache->remove('files');
}
if ($this->cache->get($dir1)) {
$this->cache->remove($dir1);
}
if ($this->cache->get($dir2)) {
$this->cache->remove($dir2);
}

$this->assertFalse($this->cache->inCache('files'));
$this->assertFalse($this->cache->inCache($dir1));
Expand Down Expand Up @@ -132,7 +138,9 @@ public function testRootFolderSizeIsFilesSize() {

// clean up
$this->cache->remove('');
$this->cache->remove($dir1);
if ($this->cache->get($dir1)) {
$this->cache->remove($dir1);
}

$this->assertFalse($this->cache->inCache($dir1));
}
Expand Down
6 changes: 6 additions & 0 deletions tests/lib/Files/Cache/Wrapper/CacheJailTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ public function setUp(): void {
$this->cache = new \OC\Files\Cache\Wrapper\CacheJail($this->sourceCache, 'foo');
}

protected function tearDown(): void {
if ($this->sourceCache) {
$this->sourceCache->clear();
}
}

public function testSearchOutsideJail() {
$file1 = 'foo/foobar';
$file2 = 'folder/foobar';
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Util/User/MemoryAccountMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function search($fieldName, $pattern, $limit, $offset) {
return self::$accounts;
}
$match = \array_filter(self::$accounts, function (Account $a) use ($pattern) {
return \stripos($a->getUserId(), $pattern);
return \stripos($a->getUserId(), (string) $pattern);
});

return $match;
Expand Down