diff options
author | Joas Schilling <coding@schilljs.com> | 2020-05-12 16:04:42 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2020-05-12 16:04:42 +0300 |
commit | 84d42604e60aa1c31ecf698dcc069f36c494148a (patch) | |
tree | 0c881194abad7aa1d6c103f1bad2b201b1c7acd4 /lib/Command | |
parent | 851f76ecd2be9302cf7938e287929f9296b398d0 (diff) |
Run cs:fix
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/Command')
-rw-r--r-- | lib/Command/Command/Add.php | 3 | ||||
-rw-r--r-- | lib/Command/Command/AddSamples.php | 4 | ||||
-rw-r--r-- | lib/Command/Command/Delete.php | 1 | ||||
-rw-r--r-- | lib/Command/Command/ListCommand.php | 2 | ||||
-rw-r--r-- | lib/Command/Command/TRenderCommand.php | 5 | ||||
-rw-r--r-- | lib/Command/Command/Update.php | 2 | ||||
-rw-r--r-- | lib/Command/Room/Add.php | 1 | ||||
-rw-r--r-- | lib/Command/Room/Create.php | 1 | ||||
-rw-r--r-- | lib/Command/Room/Delete.php | 1 | ||||
-rw-r--r-- | lib/Command/Room/Demote.php | 1 | ||||
-rw-r--r-- | lib/Command/Room/Promote.php | 1 | ||||
-rw-r--r-- | lib/Command/Room/Remove.php | 1 | ||||
-rw-r--r-- | lib/Command/Room/TRoomCommand.php | 4 | ||||
-rw-r--r-- | lib/Command/Room/Update.php | 1 | ||||
-rw-r--r-- | lib/Command/Signaling/Add.php | 1 | ||||
-rw-r--r-- | lib/Command/Signaling/Delete.php | 3 | ||||
-rw-r--r-- | lib/Command/Signaling/ListCommand.php | 2 | ||||
-rw-r--r-- | lib/Command/Stun/Add.php | 1 | ||||
-rw-r--r-- | lib/Command/Stun/Delete.php | 3 | ||||
-rw-r--r-- | lib/Command/Stun/ListCommand.php | 2 | ||||
-rw-r--r-- | lib/Command/Turn/Add.php | 1 | ||||
-rw-r--r-- | lib/Command/Turn/Delete.php | 3 | ||||
-rw-r--r-- | lib/Command/Turn/ListCommand.php | 2 |
23 files changed, 29 insertions, 17 deletions
diff --git a/lib/Command/Command/Add.php b/lib/Command/Command/Add.php index cd2d24642..e7060106e 100644 --- a/lib/Command/Command/Add.php +++ b/lib/Command/Command/Add.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> @@ -29,7 +30,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class Add extends Base { - use TRenderCommand; /** @var CommandService */ @@ -115,6 +115,5 @@ class Add extends Base { $output->writeln(''); $output->writeln("<comment>If you think your command makes sense for other users as well, feel free to share it in the following github issue:\n https://github.com/nextcloud/spreed/issues/1566</comment>"); - } } diff --git a/lib/Command/Command/AddSamples.php b/lib/Command/Command/AddSamples.php index 6e601ac37..bbbd06b7e 100644 --- a/lib/Command/Command/AddSamples.php +++ b/lib/Command/Command/AddSamples.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> @@ -32,7 +33,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class AddSamples extends Base { - use TRenderCommand; /** @var CommandService */ @@ -73,7 +73,7 @@ class AddSamples extends Base { $chmod = fileperms($appPath . '/sample-commands/calc.sh'); if (!($chmod & 0x0040 || $chmod & 0x0008 || $chmod & 0x0001)) { $output->writeln('<error>sample-commands/calc.sh is not executable</error>'); - } else if (!shell_exec('which bc')) { + } elseif (!shell_exec('which bc')) { $output->writeln('<error>Can not add calculator command, because Basic calculator package (bc - https://www.gnu.org/software/bc/) is missing</error>'); } else { $this->installCommand( diff --git a/lib/Command/Command/Delete.php b/lib/Command/Command/Delete.php index ecf549d65..d1ec44730 100644 --- a/lib/Command/Command/Delete.php +++ b/lib/Command/Command/Delete.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> diff --git a/lib/Command/Command/ListCommand.php b/lib/Command/Command/ListCommand.php index af45de3ac..4fe019538 100644 --- a/lib/Command/Command/ListCommand.php +++ b/lib/Command/Command/ListCommand.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> @@ -29,7 +30,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class ListCommand extends Base { - use TRenderCommand; /** @var CommandService */ diff --git a/lib/Command/Command/TRenderCommand.php b/lib/Command/Command/TRenderCommand.php index b70c34ec3..99fa57be5 100644 --- a/lib/Command/Command/TRenderCommand.php +++ b/lib/Command/Command/TRenderCommand.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> @@ -25,13 +26,11 @@ namespace OCA\Talk\Command\Command; use OCA\Talk\Model\Command; use OC\Core\Command\Base; use Symfony\Component\Console\Helper\Table; -use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; trait TRenderCommand { - protected function renderCommands(string $outputFormat, OutputInterface $output, array $commands, bool $showHelp = false): void { - $result = array_map(function(Command $command) { + $result = array_map(function (Command $command) { return $command->asArray(); }, $commands); diff --git a/lib/Command/Command/Update.php b/lib/Command/Command/Update.php index f0f807319..6dc12aaf4 100644 --- a/lib/Command/Command/Update.php +++ b/lib/Command/Command/Update.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com> @@ -30,7 +31,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class Update extends Base { - use TRenderCommand; /** @var CommandService */ diff --git a/lib/Command/Room/Add.php b/lib/Command/Room/Add.php index d213beb1e..c48755aa4 100644 --- a/lib/Command/Room/Add.php +++ b/lib/Command/Room/Add.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> diff --git a/lib/Command/Room/Create.php b/lib/Command/Room/Create.php index f2003e45d..bc708d838 100644 --- a/lib/Command/Room/Create.php +++ b/lib/Command/Room/Create.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> diff --git a/lib/Command/Room/Delete.php b/lib/Command/Room/Delete.php index d065cc469..986ca67a4 100644 --- a/lib/Command/Room/Delete.php +++ b/lib/Command/Room/Delete.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> diff --git a/lib/Command/Room/Demote.php b/lib/Command/Room/Demote.php index 008030811..9bdb607db 100644 --- a/lib/Command/Room/Demote.php +++ b/lib/Command/Room/Demote.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> diff --git a/lib/Command/Room/Promote.php b/lib/Command/Room/Promote.php index c55315343..44b378c74 100644 --- a/lib/Command/Room/Promote.php +++ b/lib/Command/Room/Promote.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> diff --git a/lib/Command/Room/Remove.php b/lib/Command/Room/Remove.php index 0c0f77012..aeb7313a6 100644 --- a/lib/Command/Room/Remove.php +++ b/lib/Command/Room/Remove.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> diff --git a/lib/Command/Room/TRoomCommand.php b/lib/Command/Room/TRoomCommand.php index 1b65d8d0d..1baf70793 100644 --- a/lib/Command/Room/TRoomCommand.php +++ b/lib/Command/Room/TRoomCommand.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> @@ -32,8 +33,7 @@ use OCA\Talk\Participant; use OCA\Talk\Room; use OCP\IUser; -trait TRoomCommand -{ +trait TRoomCommand { /** * @param Room $room * @param string $name diff --git a/lib/Command/Room/Update.php b/lib/Command/Room/Update.php index 500e898a8..a75dd6a7f 100644 --- a/lib/Command/Room/Update.php +++ b/lib/Command/Room/Update.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2020 Daniel Rudolf <nextcloud.com@daniel-rudolf.de> diff --git a/lib/Command/Signaling/Add.php b/lib/Command/Signaling/Add.php index 2b421d030..735d45f13 100644 --- a/lib/Command/Signaling/Add.php +++ b/lib/Command/Signaling/Add.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> diff --git a/lib/Command/Signaling/Delete.php b/lib/Command/Signaling/Delete.php index 4404c5df9..4dc6aaa87 100644 --- a/lib/Command/Signaling/Delete.php +++ b/lib/Command/Signaling/Delete.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> @@ -64,7 +65,7 @@ class Delete extends Base { } $count = count($signaling['servers']); // remove all occurrences of $server - $servers = array_filter($signaling['servers'], function($s) use ($server) { + $servers = array_filter($signaling['servers'], function ($s) use ($server) { return $s['server'] !== $server; }); $signaling['servers'] = array_values($servers); // reindex diff --git a/lib/Command/Signaling/ListCommand.php b/lib/Command/Signaling/ListCommand.php index 4ea7bd599..d0f3382f8 100644 --- a/lib/Command/Signaling/ListCommand.php +++ b/lib/Command/Signaling/ListCommand.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> @@ -27,7 +28,6 @@ namespace OCA\Talk\Command\Signaling; use OCP\IConfig; use OC\Core\Command\Base; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class ListCommand extends Base { diff --git a/lib/Command/Stun/Add.php b/lib/Command/Stun/Add.php index c12439fff..be6d9993a 100644 --- a/lib/Command/Stun/Add.php +++ b/lib/Command/Stun/Add.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> diff --git a/lib/Command/Stun/Delete.php b/lib/Command/Stun/Delete.php index 46f7aaf0a..2128dffba 100644 --- a/lib/Command/Stun/Delete.php +++ b/lib/Command/Stun/Delete.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> @@ -61,7 +62,7 @@ class Delete extends Base { } $count = count($servers); // remove all occurrences of $server - $servers = array_filter($servers, function($s) use ($server) { + $servers = array_filter($servers, function ($s) use ($server) { return $s !== $server; }); $servers = array_values($servers); // reindex diff --git a/lib/Command/Stun/ListCommand.php b/lib/Command/Stun/ListCommand.php index ecd4e5b81..f5a8a2438 100644 --- a/lib/Command/Stun/ListCommand.php +++ b/lib/Command/Stun/ListCommand.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> @@ -27,7 +28,6 @@ namespace OCA\Talk\Command\Stun; use OCP\IConfig; use OC\Core\Command\Base; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class ListCommand extends Base { diff --git a/lib/Command/Turn/Add.php b/lib/Command/Turn/Add.php index fb993f900..83326fc0b 100644 --- a/lib/Command/Turn/Add.php +++ b/lib/Command/Turn/Add.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> diff --git a/lib/Command/Turn/Delete.php b/lib/Command/Turn/Delete.php index cb6d5bec4..2f09a2940 100644 --- a/lib/Command/Turn/Delete.php +++ b/lib/Command/Turn/Delete.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> @@ -68,7 +69,7 @@ class Delete extends Base { $count = count($servers); // remove all occurrences which math $server and $protocols - $servers = array_filter($servers, function($s) use ($server, $protocols) { + $servers = array_filter($servers, function ($s) use ($server, $protocols) { return $s['server'] !== $server || $s['protocols'] !== $protocols; }); $servers = array_values($servers); // reindex diff --git a/lib/Command/Turn/ListCommand.php b/lib/Command/Turn/ListCommand.php index fd26595d5..a9bf3633c 100644 --- a/lib/Command/Turn/ListCommand.php +++ b/lib/Command/Turn/ListCommand.php @@ -1,4 +1,5 @@ <?php + declare(strict_types=1); /** * @copyright Copyright (c) 2018 Denis Mosolov <denismosolov@gmail.com> @@ -27,7 +28,6 @@ namespace OCA\Talk\Command\Turn; use OCP\IConfig; use OC\Core\Command\Base; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class ListCommand extends Base { |