Commite0aaaa6

committed

Add type casting for mismatches which break in PHP 8.1

These may happen if horde runs from a copy of conf.php.dist

1 parent2c24014 commite0aaaa6Copy full SHA for e0aaaa6

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function __construct($params = array())`
`78`	`78`	`'vfs_quotalimit' => -1,`
`79`	`79`	`'vfs_quotaroot' =>''`
`80`	`80`	`));`
`81`		`-$this->setParams($params);`
	`81`	`+$this->setParams((array)$params);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`
`@@ -122,7 +122,7 @@ protected function _connect()`
`122`	`122`	`*/`
`123`	`123`	`publicfunctionsetParams($params =array())`
`124`	`124`	`{`
`125`		`-$this->_params =array_merge($this->_params,$params);`
	`125`	`+$this->_params =array_merge($this->_params,(array)$params);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/**`
`@@ -613,7 +613,8 @@ protected function _filterMatch($filter, $filename)`
`613`	`613`	`$filter =implode('\|',$filter);`
`614`	`614`	`}`
`615`	`615`
`616`		`-if (!strlen($filter)) {`
	`616`	`+// TODO: PHP 8.1 Disallow other inputs than strings and arrays`
	`617`	`+if (!is_string($filter) \|\| !strlen($filter)) {`
`617`	`618`	`returnfalse;`
`618`	`619`	`}`
`619`	`620`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,7 @@ public function changePermissions($path, $name, $permission)`
`430`	`430`	`protectedfunction_listFolder($path,$filter =null,$dotfiles =true,`
`431`	`431`	`$dironly =false)`
`432`	`432`	`{`
	`433`	`+$path =$path ??'';`
`433`	`434`	`$files =array();`
`434`	`435`	`$dir =$this->_getNativePath(strlen($path) ?$path :'');`
`435`	`436`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,7 @@ public function deleteFolder($path, $name, $recursive = false)`
`517`	`517`	`protectedfunction_listFolder($path,$filter =null,$dotfiles =true,`
`518`	`518`	`$dironly =false)`
`519`	`519`	`{`
	`520`	`+$path =$path ??'';`
`520`	`521`	`if (!$this->isFolder(dirname($path),basename($path))) {`
`521`	`522`	`thrownewHorde_Vfs_Exception(sprintf('"%s" is not a folder.',$path));`
`522`	`523`	`}`
`@@ -803,7 +804,7 @@ protected function _updateBlob($table, $field, $data, $where, $alsoupdate)`
`803`	`804`	`*/`
`804`	`805`	`protectedfunction_convertPath($path)`
`805`	`806`	`{`
`806`		`-returntrim($path,'/');`
	`807`	`+returntrim($path ??'','/');`
`807`	`808`	`}`
`808`	`809`
`809`	`810`	`/**`

Comments

(0)