@ -82,7 +82,7 @@ class ReleaseController extends Controller
throw new Exception('Sorry, but releases should be run interactively to ensure you actually verify what you are doing ;)'); throw new Exception('Sorry, but releases should be run interactively to ensure you actually verify what you are doing ;)');
} }
if ($this->basePath === null) { if ($this->basePath === null) {
$this->basePath = dirname(dirname(__DIR__)); $this->basePath = \ dirname(\ dirname(__DIR__));
} }
$this->basePath = rtrim($this->basePath, '\\/'); $this->basePath = rtrim($this->basePath, '\\/');
return parent::beforeAction($action); return parent::beforeAction($action);
@ -183,7 +183,7 @@ class ReleaseController extends Controller
*/ */
public function actionRelease(array $what) public function actionRelease(array $what)
{ {
if (count($what) > 1) { if (\ count($what) > 1) {
$this->stdout("Currently only one simultaneous release is supported.\n"); $this->stdout("Currently only one simultaneous release is supported.\n");
return 1; return 1;
} }
@ -315,7 +315,7 @@ class ReleaseController extends Controller
*/ */
public function actionSortChangelog(array $what) public function actionSortChangelog(array $what)
{ {
if (count($what) > 1) { if (\ count($what) > 1) {
$this->stdout("Currently only one simultaneous release is supported.\n"); $this->stdout("Currently only one simultaneous release is supported.\n");
return 1; return 1;
} }
@ -376,7 +376,7 @@ class ReleaseController extends Controller
{ {
foreach ($what as $w) { foreach ($what as $w) {
if (strncmp('app-', $w, 4) === 0) { if (strncmp('app-', $w, 4) === 0) {
if (!empty($limit) & & !in_array('app', $limit)) { if (!empty($limit) & & !\ in_array('app', $limit)) {
throw new Exception('Only the following types are allowed: ' . implode(', ', $limit) . "\n"); throw new Exception('Only the following types are allowed: ' . implode(', ', $limit) . "\n");
} }
if (!is_dir($appPath = "{$this->basePath}/apps/" . substr($w, 4))) { if (!is_dir($appPath = "{$this->basePath}/apps/" . substr($w, 4))) {
@ -386,7 +386,7 @@ class ReleaseController extends Controller
$this->ensureGitClean($appPath); $this->ensureGitClean($appPath);
} }
} elseif ($w === 'framework') { } elseif ($w === 'framework') {
if (!empty($limit) & & !in_array('framework', $limit)) { if (!empty($limit) & & !\ in_array('framework', $limit)) {
throw new Exception('Only the following types are allowed: ' . implode(', ', $limit) . "\n"); throw new Exception('Only the following types are allowed: ' . implode(', ', $limit) . "\n");
} }
if (!is_dir($fwPath = "{$this->basePath}/framework")) { if (!is_dir($fwPath = "{$this->basePath}/framework")) {
@ -396,7 +396,7 @@ class ReleaseController extends Controller
$this->ensureGitClean($fwPath); $this->ensureGitClean($fwPath);
} }
} else { } else {
if (!empty($limit) & & !in_array('ext', $limit)) { if (!empty($limit) & & !\ in_array('ext', $limit)) {
throw new Exception('Only the following types are allowed: ' . implode(', ', $limit) . "\n"); throw new Exception('Only the following types are allowed: ' . implode(', ', $limit) . "\n");
} }
if (!is_dir($extPath = "{$this->basePath}/extensions/$w")) { if (!is_dir($extPath = "{$this->basePath}/extensions/$w")) {
@ -414,7 +414,7 @@ class ReleaseController extends Controller
{ {
$this->stdout("\n"); $this->stdout("\n");
$this->stdout($h = "Preparing framework release version $version", Console::BOLD); $this->stdout($h = "Preparing framework release version $version", Console::BOLD);
$this->stdout("\n" . str_repeat('-', strlen($h)) . "\n\n", Console::BOLD); $this->stdout("\n" . str_repeat('-', \ strlen($h)) . "\n\n", Console::BOLD);
if (!$this->confirm('Make sure you are on the right branch for this release and that it tracks the correct remote branch! Continue?')) { if (!$this->confirm('Make sure you are on the right branch for this release and that it tracks the correct remote branch! Continue?')) {
exit(1); exit(1);
@ -552,7 +552,7 @@ class ReleaseController extends Controller
{ {
$this->stdout("\n"); $this->stdout("\n");
$this->stdout($h = "Preparing release for application $name version $version", Console::BOLD); $this->stdout($h = "Preparing release for application $name version $version", Console::BOLD);
$this->stdout("\n" . str_repeat('-', strlen($h)) . "\n\n", Console::BOLD); $this->stdout("\n" . str_repeat('-', \ strlen($h)) . "\n\n", Console::BOLD);
if (!$this->confirm('Make sure you are on the right branch for this release and that it tracks the correct remote branch! Continue?')) { if (!$this->confirm('Make sure you are on the right branch for this release and that it tracks the correct remote branch! Continue?')) {
exit(1); exit(1);
@ -670,7 +670,7 @@ class ReleaseController extends Controller
{ {
$this->stdout("\n"); $this->stdout("\n");
$this->stdout($h = "Preparing release for extension $name version $version", Console::BOLD); $this->stdout($h = "Preparing release for extension $name version $version", Console::BOLD);
$this->stdout("\n" . str_repeat('-', strlen($h)) . "\n\n", Console::BOLD); $this->stdout("\n" . str_repeat('-', \ strlen($h)) . "\n\n", Console::BOLD);
if (!$this->confirm('Make sure you are on the right branch for this release and that it tracks the correct remote branch! Continue?')) { if (!$this->confirm('Make sure you are on the right branch for this release and that it tracks the correct remote branch! Continue?')) {
exit(1); exit(1);
@ -817,7 +817,7 @@ class ReleaseController extends Controller
$headline = $version . ' ' . date('F d, Y'); $headline = $version . ' ' . date('F d, Y');
$this->sed( $this->sed(
'/' . $v . ' under development\n(-+?)\n/', '/' . $v . ' under development\n(-+?)\n/',
$headline . "\n" . str_repeat('-', strlen($headline)) . "\n", $headline . "\n" . str_repeat('-', \ strlen($headline)) . "\n",
$this->getChangelogs($what) $this->getChangelogs($what)
); );
} }
@ -825,7 +825,7 @@ class ReleaseController extends Controller
protected function openChangelogs($what, $version) protected function openChangelogs($what, $version)
{ {
$headline = "\n$version under development\n"; $headline = "\n$version under development\n";
$headline .= str_repeat('-', strlen($headline) - 2) . "\n\n- no changes in this release.\n"; $headline .= str_repeat('-', \ strlen($headline) - 2) . "\n\n- no changes in this release.\n";
foreach ($this->getChangelogs($what) as $file) { foreach ($this->getChangelogs($what) as $file) {
$lines = explode("\n", file_get_contents($file)); $lines = explode("\n", file_get_contents($file));
$hl = [ $hl = [
@ -919,7 +919,7 @@ class ReleaseController extends Controller
protected function getChangelogs($what) protected function getChangelogs($what)
{ {
$changelogs = []; $changelogs = [];
if (in_array('framework', $what)) { if (\ in_array('framework', $what)) {
$changelogs[] = $this->getFrameworkChangelog(); $changelogs[] = $this->getFrameworkChangelog();
} }
@ -947,13 +947,13 @@ class ReleaseController extends Controller
protected function composerSetStability($what, $version) protected function composerSetStability($what, $version)
{ {
$apps = []; $apps = [];
if (in_array('app-advanced', $what)) { if (\ in_array('app-advanced', $what)) {
$apps[] = $this->basePath . '/apps/advanced/composer.json'; $apps[] = $this->basePath . '/apps/advanced/composer.json';
} }
if (in_array('app-basic', $what)) { if (\ in_array('app-basic', $what)) {
$apps[] = $this->basePath . '/apps/basic/composer.json'; $apps[] = $this->basePath . '/apps/basic/composer.json';
} }
if (in_array('app-benchmark', $what)) { if (\ in_array('app-benchmark', $what)) {
$apps[] = $this->basePath . '/apps/benchmark/composer.json'; $apps[] = $this->basePath . '/apps/benchmark/composer.json';
} }
if (empty($apps)) { if (empty($apps)) {
Vladimir Reznichenko
7 years ago
committed by
Alexander Makarov