From ec4d7e5f89bc8a24ee32d604732de3ea22c3f8f3 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Sun, 3 Jul 2022 19:04:01 +0000 Subject: [PATCH] Format code with php-cs-fixer This commit fixes the style issues introduced in 9f014e6 according to the output from php-cs-fixer. Details: https://deepsource.io/gh/thundersquared/apiscp-webapp-bedrock/transform/627f796e-2070-4c52-a974-4d841dd57db8/ --- src/lib/module.php | 115 ++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 70 deletions(-) diff --git a/src/lib/module.php b/src/lib/module.php index c9bf230..38ab510 100644 --- a/src/lib/module.php +++ b/src/lib/module.php @@ -25,8 +25,7 @@ class Bedrock_Module extends \Wordpress_Module protected function getAppRoot(string $hostname, string $path = ''): ?string { - if (file_exists($tmp = $this->getDocumentRoot($hostname, $path) . '/wp-config.php')) - { + if (file_exists($tmp = $this->getDocumentRoot($hostname, $path) . '/wp-config.php')) { return $tmp; } @@ -35,19 +34,14 @@ protected function getAppRoot(string $hostname, string $path = ''): ?string protected function getAppRootPath(string $hostname, string $path = ''): ?string { - if ($hostname[0] === '/') - { - if (!($path = realpath($this->domain_fs_path($hostname)))) - { + if ($hostname[0] === '/') { + if (!($path = realpath($this->domain_fs_path($hostname)))) { return null; } $approot = \dirname($path); - } - else - { + } else { $approot = $this->getAppRoot($hostname, $path); - if (!$approot) - { + if (!$approot) { return null; } $approot = $this->domain_fs_path($approot); @@ -65,8 +59,7 @@ protected function getAppRootPath(string $hostname, string $path = ''): ?string */ protected function parseLock(string $lockType, string $version): string { - switch ($lockType) - { + switch ($lockType) { case 'major': return '~' . Versioning::asMinor($version); case 'minor': @@ -97,11 +90,9 @@ protected function generateNewConfiguration(string $domain, string $docroot, Dat 'set DB_PASSWORD' => ["dotenv set DB_PASSWORD '%(password)s'", ['password' => $dbcredentials->password]], ]; - foreach ($steps as $name => $actions) - { + foreach ($steps as $name => $actions) { $ret = $this->execCommand($docroot, $actions[0], $actions[1]); - if (!$ret['success']) - { + if (!$ret['success']) { return error('failed to %s, error: %s', $name, coalesce($ret['stderr'], $ret['stdout'])); } } @@ -119,31 +110,28 @@ protected function generateNewConfiguration(string $domain, string $docroot, Dat */ public function install(string $hostname, string $path = '', array $opts = array()): bool { - if (!$this->mysql_enabled()) - { - return error('%(what)s must be enabled to install %(app)s', - ['what' => 'MySQL', 'app' => static::APP_NAME]); + if (!$this->mysql_enabled()) { + return error( + '%(what)s must be enabled to install %(app)s', + ['what' => 'MySQL', 'app' => static::APP_NAME] + ); } - if (!$this->php_composer_exists()) - { + if (!$this->php_composer_exists()) { return error('composer missing! contact sysadmin'); } // Same situation as with Ghost. We can't install under a path for fear of // leaking information - if ($path) - { + if ($path) { return error('Composer projects may only be installed directly on a subdomain or domain without a child path, e.g. https://domain.com but not https://domain.com/laravel'); } - if (!($docroot = $this->getDocumentRoot($hostname, $path))) - { + if (!($docroot = $this->getDocumentRoot($hostname, $path))) { return error("failed to normalize path for `%s'", $hostname); } - if (!$this->parseInstallOptions($opts, $hostname, $path)) - { + if (!$this->parseInstallOptions($opts, $hostname, $path)) { return false; } @@ -151,14 +139,14 @@ public function install(string $hostname, string $path = '', array $opts = array $ret = $this->execCommand($docroot, 'package install %(dotenvcmd)s ', [ 'dotenvcmd' => static::DOTENV_COMMAND, ]); - if (!$ret['success']) - { + if (!$ret['success']) { return error('failed to install dotenv command, error: %s', coalesce($ret['stderr'], $ret['stdout'])); } // Create Bedrock project with specified version $lock = $this->parseLock($opts['verlock'], $opts['version']); - $ret = $this->execComposer($docroot, + $ret = $this->execComposer( + $docroot, 'create-project --prefer-dist %(package)s %(docroot)s \'%(version)s\'', [ 'package' => static::PACKAGIST_NAME, @@ -168,50 +156,47 @@ public function install(string $hostname, string $path = '', array $opts = array ); // Rollback on failure - if (!$ret['success']) - { + if (!$ret['success']) { $this->file_delete($docroot, true); - return error('failed to download roots/bedrock package: %s %s', - $ret['stderr'], $ret['stdout'] + return error( + 'failed to download roots/bedrock package: %s %s', + $ret['stderr'], + $ret['stdout'] ); } // Remap public to web dir instead of app dir - if (null === ($docroot = $this->remapPublic($hostname, $path, 'web/'))) - { + if (null === ($docroot = $this->remapPublic($hostname, $path, 'web/'))) { $this->file_delete($docroot, true); - return error("Failed to remap Bedrock to web/, manually remap from `%s' - Bedrock setup is incomplete!", - $docroot); + return error( + "Failed to remap Bedrock to web/, manually remap from `%s' - Bedrock setup is incomplete!", + $docroot + ); } // Create new database $dbCred = DatabaseGenerator::mysql($this->getAuthContext(), $hostname); - if (!$dbCred->create()) - { + if (!$dbCred->create()) { return false; } // Fill in .env file - if (!$this->generateNewConfiguration($hostname, $docroot, $dbCred)) - { + if (!$this->generateNewConfiguration($hostname, $docroot, $dbCred)) { info('removing temporary files'); - if (!array_get($opts, 'hold')) - { + if (!array_get($opts, 'hold')) { $this->file_delete($docroot, true); $dbCred->rollback(); } return false; } - if (!isset($opts['title'])) - { + if (!isset($opts['title'])) { $opts['title'] = 'A Random Blog for a Random Reason'; } - if (!isset($opts['password'])) - { + if (!isset($opts['password'])) { $opts['password'] = Password::generate(); info("autogenerated password `%s'", $opts['password']); } @@ -233,10 +218,8 @@ public function install(string $hostname, string $path = '', array $opts = array $ret = $this->execCommand($docroot, 'core %(mode)s --admin_email=%(email)s --skip-email ' . '--url=%(proto)s%(url)s --title=%(title)s --admin_user=%(user)s --exec=%(mysqli81)s ' . '--admin_password=%(password)s', $args); - if (!$ret['success']) - { - if (!array_get($opts, 'hold')) - { + if (!$ret['success']) { + if (!array_get($opts, 'hold')) { $dbCred->rollback(); } return error('failed to create database structure: %s', coalesce($ret['stderr'], $ret['stdout'])); @@ -246,8 +229,7 @@ public function install(string $hostname, string $path = '', array $opts = array $wpcli->setConfiguration(['apache_modules' => ['mod_rewrite']]); $ret = $this->execCommand($docroot, "rewrite structure --hard '/%%postname%%/'"); - if (!$ret['success']) - { + if (!$ret['success']) { return error('failed to set rewrite structure, error: %s', coalesce($ret['stderr'], $ret['stdout'])); } @@ -267,8 +249,7 @@ public function get_versions(): array // Attempt to retrieve cached versions $cache = \Cache_Super_Global::spawn(); - if (false !== ($ver = $cache->get($key))) - { + if (false !== ($ver = $cache->get($key))) { return $ver; } @@ -276,8 +257,7 @@ public function get_versions(): array $url = self::VERSION_CHECK_URL; $context = stream_context_create(['http' => ['timeout' => 5]]); $contents = file_get_contents($url, false, $context); - if (!$contents) - { + if (!$contents) { return array(); } $versions = json_decode($contents, true); @@ -309,16 +289,14 @@ public function valid(string $hostname, string $path = ''): bool public function get_version(string $hostname, string $path = ''): ?string { - if (!$this->valid($hostname, $path)) - { + if (!$this->valid($hostname, $path)) { return null; } $approot = $this->getAppRootPath($hostname, $path); // is composer.json file missing? - if (!file_exists($approot . '/composer.json')) - { + if (!file_exists($approot . '/composer.json')) { return null; } @@ -333,8 +311,7 @@ public function get_environment(string $hostname, string $path = ''): ?string // Read .env value $ret = $this->execCommand($approot, "dotenv get WP_ENV"); - if (!$ret['success']) - { + if (!$ret['success']) { return error('failed to read env: %s', coalesce($ret['stderr'], $ret['stdout'])); } @@ -351,8 +328,7 @@ public function set_environment(string $hostname, string $path = '', string $env 'environment' => $environment, ]); - if (!$ret['success']) - { + if (!$ret['success']) { return error('failed to update env: %s', coalesce($ret['stderr'], $ret['stdout'])); } @@ -367,8 +343,7 @@ public function get_environments(string $hostname, string $path = ''): ?array $approotpath = $this->getAppRootPath($hostname, $path); // is config/environments/ dir missing? - if (!is_dir($approotpath . '/config/environments/')) - { + if (!is_dir($approotpath . '/config/environments/')) { return null; }