Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix code style

Browse Source
This commit is contained in:
Amine Ben hammou
2019-06-17 20:11:04 +01:00
committed by M. Shull
parent 9588ce4515
commit 05a4ebad04
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
RoboFile.php
View File

@ -36,8 +36,8 @@ class RoboFile extends \Robo\Tasks {
function watch() { function watch() {
$this->say('Warning: this lints and compiles all files, not just the changed one. Use separate tasks watch:js and watch:css for faster and more efficient watching.'); $this->say('Warning: this lints and compiles all files, not just the changed one. Use separate tasks watch:js and watch:css for faster and more efficient watching.');
$css_files = $this->rsearch('assets/css/src/', array('scss')); $css_files = $this->rsearch('assets/css/src/', ['scss']);
$js_files = $this->rsearch('assets/js/src/', array('js', 'jsx')); $js_files = $this->rsearch('assets/js/src/', ['js', 'jsx']);
$this->taskWatch() $this->taskWatch()
->monitor($js_files, function() { ->monitor($js_files, function() {
@ -50,7 +50,7 @@ class RoboFile extends \Robo\Tasks {
} }
function watchCss() { function watchCss() {
$css_files = $this->rsearch('assets/css/src/', array('scss')); $css_files = $this->rsearch('assets/css/src/', ['scss']);
$this->taskWatch() $this->taskWatch()
->monitor($css_files, function($changedFile) { ->monitor($css_files, function($changedFile) {
$file = $changedFile->getResource()->getResource(); $file = $changedFile->getResource()->getResource();
@ -71,10 +71,10 @@ class RoboFile extends \Robo\Tasks {
function compileAll($opts = ['env' => null]) { function compileAll($opts = ['env' => null]) {
$collection = $this->collectionBuilder(); $collection = $this->collectionBuilder();
$collection->addCode(function() use ($opts) { $collection->addCode(function() use ($opts) {
return call_user_func(array($this, 'compileJs'), $opts); return call_user_func([$this, 'compileJs'], $opts);
}); });
$collection->addCode(function() use ($opts) { $collection->addCode(function() use ($opts) {
return call_user_func(array($this, 'compileCss'), $opts); return call_user_func([$this, 'compileCss'], $opts);
}); });
return $collection->run(); return $collection->run();
} }
@ -126,9 +126,9 @@ class RoboFile extends \Robo\Tasks {
} }
function translationsBuild() { function translationsBuild() {
return $this->_exec('./node_modules/.bin/grunt makepot'. return $this->_exec('./node_modules/.bin/grunt makepot' .
' --gruntfile='.__DIR__.'/tasks/makepot/makepot.js'. ' --gruntfile=' . __DIR__ . '/tasks/makepot/makepot.js' .
' --base_path='.__DIR__ ' --base_path=' . __DIR__
); );
} }
@ -191,12 +191,12 @@ class RoboFile extends \Robo\Tasks {
} }
function testCoverage($opts=['file' => null, 'xml' => false]) { function testCoverage($opts=['file' => null, 'xml' => false]) {
$command = join(' ', array( $command = join(' ', [
'vendor/bin/codecept run -s acceptance', 'vendor/bin/codecept run -s acceptance',
(($opts['file']) ? $opts['file'] : ''), (($opts['file']) ? $opts['file'] : ''),
'--coverage', '--coverage',
($opts['xml']) ? '--coverage-xml' : '--coverage-html' ($opts['xml']) ? '--coverage-xml' : '--coverage-html',
)); ]);
if ($opts['xml']) { if ($opts['xml']) {
$command .= ' --xml'; $command .= ' --xml';
@ -208,11 +208,11 @@ class RoboFile extends \Robo\Tasks {
function testJavascript($xml_output_file = null) { function testJavascript($xml_output_file = null) {
$this->compileJs(); $this->compileJs();
$command = join(' ', array( $command = join(' ', [
'./node_modules/.bin/mocha', './node_modules/.bin/mocha',
'-r tests/javascript/mochaTestHelper.js', '-r tests/javascript/mochaTestHelper.js',
'tests/javascript/testBundles/**/*.js' 'tests/javascript/testBundles/**/*.js',
)); ]);
if (!empty($xml_output_file)) { if (!empty($xml_output_file)) {
$command .= sprintf( $command .= sprintf(
@ -284,7 +284,7 @@ class RoboFile extends \Robo\Tasks {
} }
$configurator = new \MailPoet\DI\ContainerConfigurator(); $configurator = new \MailPoet\DI\ContainerConfigurator();
$dump_file = __DIR__ . '/generated/' . $configurator->getDumpClassname() . '.php'; $dump_file = __DIR__ . '/generated/' . $configurator->getDumpClassname() . '.php';
$this->say('Deleting DI Container'); $this->say('Deleting DI Container');
$this->_exec("rm -f $dump_file"); $this->_exec("rm -f $dump_file");
$this->say('Generating DI container cache'); $this->say('Generating DI container cache');
@ -296,19 +296,19 @@ class RoboFile extends \Robo\Tasks {
$dump_file, $dump_file,
$dumper->dump([ $dumper->dump([
'class' => $configurator->getDumpClassname(), 'class' => $configurator->getDumpClassname(),
'namespace' => $configurator->getDumpNamespace() 'namespace' => $configurator->getDumpNamespace(),
]) ])
); );
} }
function qa() { function qa() {
$collection = $this->collectionBuilder(); $collection = $this->collectionBuilder();
$collection->addCode(array($this, 'qaLint')); $collection->addCode([$this, 'qaLint']);
$collection->addCode(function() { $collection->addCode(function() {
return $this->qaCodeSniffer('all'); return $this->qaCodeSniffer('all');
}); });
$collection->addCode(array($this, 'qaLintJavascript')); $collection->addCode([$this, 'qaLintJavascript']);
$collection->addCode(array($this, 'qaLintCss')); $collection->addCode([$this, 'qaLintCss']);
return $collection->run(); return $collection->run();
} }
@ -332,20 +332,20 @@ class RoboFile extends \Robo\Tasks {
} }
return $this->collectionBuilder() return $this->collectionBuilder()
->taskExec( ->taskExec(
'./tasks/code_sniffer/vendor/bin/phpcs '. './tasks/code_sniffer/vendor/bin/phpcs ' .
'--standard=./tasks/code_sniffer/MailPoet '. '--standard=./tasks/code_sniffer/MailPoet ' .
'--runtime-set testVersion 5.6-7.3 '. '--runtime-set testVersion 5.6-7.3 ' .
'--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,'. '--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,' .
'./lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* '. './lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* ' .
'lib/ '. 'lib/ ' .
$severityFlag $severityFlag
) )
->taskExec( ->taskExec(
'./tasks/code_sniffer/vendor/bin/phpcs '. './tasks/code_sniffer/vendor/bin/phpcs ' .
'--standard=./tasks/code_sniffer/MailPoet '. '--standard=./tasks/code_sniffer/MailPoet ' .
'--runtime-set testVersion 5.6-7.3 '. '--runtime-set testVersion 5.6-7.3 ' .
'--ignore=./tests/unit/_bootstrap.php,./tests/unit/_fixtures.php,./tests/integration/_bootstrap.php,./tests/integration/_fixtures.php '. '--ignore=./tests/unit/_bootstrap.php,./tests/unit/_fixtures.php,./tests/integration/_bootstrap.php,./tests/integration/_fixtures.php ' .
'tests/unit tests/integration tests/acceptance tests/DataFactories '. 'tests/unit tests/integration tests/acceptance tests/DataFactories ' .
$severityFlag $severityFlag
) )
->run(); ->run();
@ -360,11 +360,11 @@ class RoboFile extends \Robo\Tasks {
->taskExec('rm -rf ' . __DIR__ . '/vendor/nikic') ->taskExec('rm -rf ' . __DIR__ . '/vendor/nikic')
->taskExec('cd ' . __DIR__ . ' && ./composer.phar dump-autoload') ->taskExec('cd ' . __DIR__ . ' && ./composer.phar dump-autoload')
->taskExec( ->taskExec(
'WP_ROOT="'.getenv('WP_ROOT').'" '. 'WP_ROOT="' . getenv('WP_ROOT') . '" ' .
'php -d memory_limit=2G '. 'php -d memory_limit=2G ' .
"$dir/phpstan.phar analyse ". "$dir/phpstan.phar analyse " .
"--configuration $dir/tasks/phpstan/phpstan.neon ". "--configuration $dir/tasks/phpstan/phpstan.neon " .
'--level 5 '. '--level 5 ' .
"$dir/lib" "$dir/lib"
) )
->dir(__DIR__ . '/tasks/phpstan') ->dir(__DIR__ . '/tasks/phpstan')
@ -439,7 +439,7 @@ class RoboFile extends \Robo\Tasks {
if (file_exists("$svn_dir/trunk_new") || file_exists("$svn_dir/trunk_old")) { if (file_exists("$svn_dir/trunk_new") || file_exists("$svn_dir/trunk_old")) {
$collection->taskFileSystemStack() $collection->taskFileSystemStack()
->stopOnFail() ->stopOnFail()
->remove(array("$svn_dir/trunk_new", "$svn_dir/trunk_old")); ->remove(["$svn_dir/trunk_new", "$svn_dir/trunk_old"]);
} }
// Extract the distributable zip to tmp trunk dir // Extract the distributable zip to tmp trunk dir
@ -713,7 +713,7 @@ class RoboFile extends \Robo\Tasks {
$circleci_controller = $this->createCircleCiController(); $circleci_controller = $this->createCircleCiController();
$path = $circleci_controller->downloadLatestBuild(self::ZIP_BUILD_PATH); $path = $circleci_controller->downloadLatestBuild(self::ZIP_BUILD_PATH);
$this->say('Release ZIP downloaded to: ' . $path); $this->say('Release ZIP downloaded to: ' . $path);
$this->say(sprintf('Release ZIP file size: %.2F MB', filesize($path)/pow(1024, 2))); $this->say(sprintf('Release ZIP file size: %.2F MB', filesize($path) / pow(1024, 2)));
} }
public function releasePublishGithub($version = null) { public function releasePublishGithub($version = null) {
@ -743,11 +743,11 @@ class RoboFile extends \Robo\Tasks {
$this->say("Release '$version[name]' info was published on Slack."); $this->say("Release '$version[name]' info was published on Slack.");
} }
protected function rsearch($folder, $extensions = array()) { protected function rsearch($folder, $extensions = []) {
$dir = new RecursiveDirectoryIterator($folder); $dir = new RecursiveDirectoryIterator($folder);
$iterator = new RecursiveIteratorIterator($dir); $iterator = new RecursiveIteratorIterator($dir);
$pattern = '/^.+\.('.join($extensions, '|').')$/i'; $pattern = '/^.+\.(' . join($extensions, '|') . ')$/i';
$files = new RegexIterator( $files = new RegexIterator(
$iterator, $iterator,
@ -755,7 +755,7 @@ class RoboFile extends \Robo\Tasks {
RecursiveRegexIterator::GET_MATCH RecursiveRegexIterator::GET_MATCH
); );
$list = array(); $list = [];
foreach ($files as $file) { foreach ($files as $file) {
$list[] = $file[0]; $list[] = $file[0];
} }