Changed function callbacks syntax to support PHP7.3 (#13)

Author: andrey18106

lib/Service/CleanupService.php

@@ -23,7 +23,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *!
+ *
  */
 
 namespace OCA\MediaDC\Service;
@@ -50,15 +50,24 @@ public function __construct(IDBConnection $db, ISchemaWrapper $schema)
 	}
 
 	public function dropAppTables() {
-		$tables = array_filter($this->schema->getTableNames(),
-			fn($tableName): bool => strpos($tableName, Application::APP_ID) !== false
-		);
+		$tables = array_filter($this->schema->getTableNames(), '\OCA\MediaDC\Service\CleanupService::tablesCallback');
 		foreach ($tables as $table) {
 			$this->db->dropTable($table);
 		}
 		$this->removeAppMigrations();
 	}
 
+	/**
+	 * Callback for tables filter
+	 * 
+	 * @param string $tableName
+	 * 
+	 * @return bool
+	 */
+	static function tablesCallback($tableName) {
+		return strpos($tableName, Application::APP_ID) !== false;
+	}
+
 	private function removeAppMigrations() {
 		/** @var IQueryBuilder */
 		$qb = $this->db->getQueryBuilder();

lib/Service/CollectorService.php

@@ -174,7 +174,7 @@ public function restart($params = []) {
 		/** @var Setting */
 		$pyLimitSetting = $this->settingsMapper->findByName('python_limit');
 		$processesRunning = $this->tasksMapper->findAllRunning();
-		$taskIdsRunning = array_map(fn($task) => $task->getId(), $processesRunning);
+		$taskIdsRunning = array_map('\OCA\MediaDC\Service\CollectorService::taskIdCallback', $processesRunning);
 		/** @var CollectorTask */
 		$collectorTask = $this->tasksMapper->find($taskId);
 		$taskData = $this->getTargetDirectoriesData($params['targetDirectoryIds'], intval($params['collectorSettings']['target_mtype']), $excludeList);
@@ -213,6 +213,17 @@ public function restart($params = []) {
 		return ['success' => $collectorTask !== null, 'queued' => $queuedTask !== null];
 	}
 
+	/**
+	 * Callback to extract ColectorTask id
+	 * 
+	 * @param CollectorTask $task
+	 * 
+	 * @return int
+	 */
+	static function taskIdCallback($task) {
+		return $task->getId();
+	}
+
 	/**
 	 * Terminate CollectorTask background Python process
 	 * 

lib/Service/PythonService.php

@@ -74,14 +74,13 @@ public function __construct(SettingMapper $settingMapper, IConfig $config)
 	 */
 	public function run($scriptName, $scriptParams, $nonBlocking = false, $env = []) {
 		if (count($scriptParams) > 0) {
-			$callback = fn(string $k, string $v): string => $v !== '' ? "$k $v " : "$k";
-			$params = array_map($callback, array_keys($scriptParams), array_values($scriptParams));
+			$params = array_map('\OCA\MediaDC\Service\PythonService::scriptParamsCallback', array_keys($scriptParams), array_values($scriptParams));
 			$cmd = $this->pythonCommand . ' ' . $this->cwd . $scriptName . ' ' . join(' ', $params);
 		} else {
 			$cmd = $this->pythonCommand . ' ' .  $this->cwd . $scriptName;
 		}
 		if (count($env) > 0) {
-			$envVariables = join(' ', array_map(fn(string $k, string $v): string => "$k=\"$v\" ", array_keys($env), array_values($env)));
+			$envVariables = join(' ', array_map('\OCA\MediaDC\Service\PythonService::scriptEnvsCallback', array_keys($env), array_values($env)));
 		} else {
 			$envVariables = '';
 		}
@@ -96,6 +95,30 @@ public function run($scriptName, $scriptParams, $nonBlocking = false, $env = [])
 		}
 	}
 
+	/**
+	 * Callback for concatinating Python script params
+	 * 
+	 * @param string $key
+	 * @param string $value
+	 * 
+	 * @return string
+	 */
+	static function scriptParamsCallback($key, $value) {
+		return $value !== '' ? "$key $value " : "$key";
+	}
+
+	/**
+	 * Callback for concatinating Python environment variables
+	 * 
+	 * @param string $key
+	 * @param string $value
+	 * 
+	 * @return string
+	 */
+	static function scriptEnvsCallback($key, $value) {
+		return "$key=\"$value\" ";
+	}
+
 	/**
 	 * @param string @listName
 	 *