diff --git a/.circleci/fake-sendmail.php b/.circleci/fake-sendmail.php index cbd42e19f8..5062d18655 100755 --- a/.circleci/fake-sendmail.php +++ b/.circleci/fake-sendmail.php @@ -7,6 +7,7 @@ if (!file_exists($path)) { $filename = $path . '/mailpoet-' . microtime(true) . '.txt'; $file_handle = fopen($filename, "w"); +// phpcs:ignore Squiz.PHP.DiscouragedFunctions $call_arguments = print_r($argv, true) . "\n"; fwrite($file_handle, $call_arguments); diff --git a/RoboFile.php b/RoboFile.php index d8bd4887b0..11d435280f 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -383,7 +383,24 @@ class RoboFile extends \Robo\Tasks { ->taskExec($task) ->rawArg('--runtime-set testVersion 5.6-7.3') ->rawArg('-l .') + + // PHP >= 7.2 for dev tools, etc. + ->taskExec($task) + ->rawArg('--runtime-set testVersion 7.2-7.3') + ->arg('--ignore=' . implode(',', [ + 'prefixer/build', + 'prefixer/vendor', + 'tasks/code_sniffer/vendor', + 'tasks/makepot', + 'tools/vendor', + ]) ) + ->args([ + '.circleci', + 'prefixer', + 'tasks', + 'tools', + ]) ->run(); } diff --git a/prefixer/fix-twig.php b/prefixer/fix-twig.php index 0f731ddc58..327d6076d4 100755 --- a/prefixer/fix-twig.php +++ b/prefixer/fix-twig.php @@ -44,7 +44,7 @@ $replacements = [ [ 'file' => '../vendor-prefixed/twig/twig/src/Node/Expression/Binary/NotInBinary.php', 'find' => [ - '\'!twig_in_filter(\'' + '\'!twig_in_filter(\'', ], 'replace' => [ '\'!\\\\MailPoetVendor\\\\twig_in_filter(\'', @@ -53,7 +53,7 @@ $replacements = [ [ 'file' => '../vendor-prefixed/twig/twig/src/Node/Expression/Binary/InBinary.php', 'find' => [ - '\'twig_in_filter(\'' + '\'twig_in_filter(\'', ], 'replace' => [ '\'\\\\MailPoetVendor\\\\twig_in_filter(\'', diff --git a/prefixer/scoper.inc.php b/prefixer/scoper.inc.php index 9b6388bbd7..5ee8074738 100644 --- a/prefixer/scoper.inc.php +++ b/prefixer/scoper.inc.php @@ -18,7 +18,7 @@ return [ 'vendor-bin', 'composer', ]) - ->in('vendor') + ->in('vendor'), ], // Whitelists a list of files. Unlike the other whitelist related features, this one is about completely leaving diff --git a/tasks/code_sniffer/MailPoet/Sniffs/ControlStructures/ControlSignatureSniff.php b/tasks/code_sniffer/MailPoet/Sniffs/ControlStructures/ControlSignatureSniff.php index 967c1e3d14..5ae8c9e3fb 100644 --- a/tasks/code_sniffer/MailPoet/Sniffs/ControlStructures/ControlSignatureSniff.php +++ b/tasks/code_sniffer/MailPoet/Sniffs/ControlStructures/ControlSignatureSniff.php @@ -1,4 +1,7 @@ self::RELEASE_SOURCE_BRANCH, 'base' => 'master', 'direction' => 'desc', - ] + ], ]); $response = json_decode($response->getBody()->getContents(), true); if (sizeof($response) === 0) { @@ -182,11 +182,10 @@ class GitHubController { return json_decode($response->getBody()->getContents(), true); } - private function uploadReleaseZip($upload_url, $release_zip_path) - { + private function uploadReleaseZip($upload_url, $release_zip_path) { $this->http_client->post($upload_url, [ 'headers' => [ - 'Content-Type' => 'application/zip' + 'Content-Type' => 'application/zip', ], 'query' => [ 'name' => $this->zip_filename, @@ -195,8 +194,7 @@ class GitHubController { ]); } - private function publishDraftAsRelease($release_id) - { + private function publishDraftAsRelease($release_id) { $this->http_client->patch('releases/' . urlencode($release_id), [ 'json' => [ 'draft' => false, diff --git a/tasks/release/JiraController.php b/tasks/release/JiraController.php index 6e92a89367..4d6aa1157d 100644 --- a/tasks/release/JiraController.php +++ b/tasks/release/JiraController.php @@ -66,7 +66,7 @@ class JiraController { 'query' => [ 'maxResults' => 1, 'orderBy' => '-sequence', - ] + ], ]); $version = json_decode($response->getBody()->getContents(), true); if (empty($version) || empty($version['values'])) { @@ -81,7 +81,7 @@ class JiraController { 'maxResults' => 1, 'orderBy' => '-sequence', 'status' => 'released', - ] + ], ]); $version = json_decode($response->getBody()->getContents(), true); if (empty($version) || empty($version['values'])) { diff --git a/tasks/release/ReleaseVersionController.php b/tasks/release/ReleaseVersionController.php index e0d4a4a532..1baf16464a 100644 --- a/tasks/release/ReleaseVersionController.php +++ b/tasks/release/ReleaseVersionController.php @@ -97,9 +97,9 @@ class ReleaseVersionController { $data = [ 'update' => [ 'fixVersions' => [ - ['set' => [['name' => $version]]] - ] - ] + ['set' => [['name' => $version]]], + ], + ], ]; return $this->jira->updateIssue($issue_key, $data); } diff --git a/tools/install.php b/tools/install.php index 72d742b947..f3065cee14 100644 --- a/tools/install.php +++ b/tools/install.php @@ -8,7 +8,7 @@ $tools = [ ]; // ensure installation in dev-mode only -$is_dev_mode = (bool) getenv('COMPOSER_DEV_MODE'); +$is_dev_mode = (bool)getenv('COMPOSER_DEV_MODE'); if (!$is_dev_mode) { fwrite(STDERR, "Skipping installing dev tools in non-dev mode.\n"); return;