deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed hacks for Windows OS (Because it isn't work fine all the same)

Browse source
This commit is contained in:
Dmitry Khomutov 2017-02-01 22:27:47 +07:00
commit 8779880a8f
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
23 changed files with 36 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/PHPCensor/Plugin/CleanBuild.php
View file

@ -49,9 +49,7 @@ class CleanBuild extends Plugin
public function execute()
{
$cmd = 'rm -Rf "%s"';
if (IS_WIN) {
$cmd = 'rmdir /S /Q "%s"';
}
$this->builder->executeCommand($cmd, $this->builder->buildPath . 'composer.phar');
$this->builder->executeCommand($cmd, $this->builder->buildPath . 'composer.lock');

4
src/PHPCensor/Plugin/Codeception.php
View file

@ -129,10 +129,6 @@ class Codeception extends Plugin implements ZeroConfigPluginInterface
$cmd = 'cd "%s" && ' . $codeception . ' run -c "%s" --xml ' . $this->args;
if (IS_WIN) {
$cmd = 'cd /d "%s" && ' . $codeception . ' run -c "%s" --xml ' . $this->args;
}
$configPath = $this->builder->buildPath . $configPath;
$success = $this->builder->executeCommand($cmd, $this->builder->buildPath, $configPath);

9
src/PHPCensor/Plugin/Composer.php
View file

@ -104,14 +104,7 @@ class Composer extends Plugin implements ZeroConfigPluginInterface
public function execute()
{
$composerLocation = $this->builder->findBinary(['composer', 'composer.phar']);
$cmd = '';
if (IS_WIN) {
$cmd = 'php ';
}
$cmd .= $composerLocation . ' --no-ansi --no-interaction ';
$cmd = $composerLocation . ' --no-ansi --no-interaction ';
if ($this->preferDist) {
$this->builder->log('Using --prefer-dist flag');

6
src/PHPCensor/Plugin/CopyBuild.php
View file

@ -62,9 +62,6 @@ class CopyBuild extends Plugin
$this->wipeExistingDirectory();
$cmd = 'mkdir -p "%s" && cp -R "%s" "%s"';
if (IS_WIN) {
$cmd = 'mkdir -p "%s" && xcopy /E "%s" "%s"';
}
$success = $this->builder->executeCommand($cmd, $this->directory, $build, $this->directory);
@ -97,9 +94,6 @@ class CopyBuild extends Plugin
if ($this->ignore) {
foreach ($this->builder->ignore as $file) {
$cmd = 'rm -Rf "%s/%s"';
if (IS_WIN) {
$cmd = 'rmdir /S /Q "%s\%s"';
}
$this->builder->executeCommand($cmd, $this->directory, $file);
}
}

6
src/PHPCensor/Plugin/Grunt.php
View file

@ -74,18 +74,12 @@ class Grunt extends Plugin
{
// if npm does not work, we cannot use grunt, so we return false
$cmd = 'cd %s && npm install';
if (IS_WIN) {
$cmd = 'cd /d %s && npm install';
}
if (!$this->builder->executeCommand($cmd, $this->directory)) {
return false;
}
// build the grunt command
$cmd = 'cd %s && ' . $this->grunt;
if (IS_WIN) {
$cmd = 'cd /d %s && ' . $this->grunt;
}
$cmd .= ' --no-color';
$cmd .= ' --gruntfile %s';
$cmd .= ' %s'; // the task that will be executed

6
src/PHPCensor/Plugin/Gulp.php
View file

@ -74,18 +74,12 @@ class Gulp extends Plugin
{
// if npm does not work, we cannot use gulp, so we return false
$cmd = 'cd %s && npm install';
if (IS_WIN) {
$cmd = 'cd /d %s && npm install';
}
if (!$this->builder->executeCommand($cmd, $this->directory)) {
return false;
}
// build the gulp command
$cmd = 'cd %s && ' . $this->gulp;
if (IS_WIN) {
$cmd = 'cd /d %s && ' . $this->gulp;
}
$cmd .= ' --no-color';
$cmd .= ' --gulpfile %s';
$cmd .= ' %s'; // the task that will be executed

5
src/PHPCensor/Plugin/Wipe.php
View file

@ -55,11 +55,10 @@ class Wipe extends Plugin
}
if (is_dir($this->directory)) {
$cmd = 'rm -Rf "%s"';
if (IS_WIN) {
$cmd = 'rmdir /S /Q "%s"';
}
return $this->builder->executeCommand($cmd, $this->directory);
}
return true;
}
}