Skip to content

Commit 5113dfa

Browse files
DerekCrannafordadam-buckleyDerek Crannaford
authored
fix: Stop core default as MASTER when no PHPversion (#70)
* Feature: work to codeception5 (#66) (#68) * First cut working, some kludges * First cut regressions for use * DB config for local * Incremental regressions into CodeSpaces * Correct testrunner config * No subsystem * Abandon auto chmod * As running in space * Check remote can push * GitIgnore UnitTest cache * Check can push from remote * Check can push from remote * Try to fix xdebug * Tentative XDebug OK * Retested Xdebug setup * Try DBug without restart * Still tweaking XDB * Still nudging XDB * Still A/B testing XDB settings * Update CI SeleniumRefs & Lint Docker Compose * Radically simplify XDebug ini * smtp config in template * Additional test env config on mail * Refactor per 8.1 ambitions * Skip questionable linter compatibility * Try alternative linter * Try 8.1 version overtrue * Use checkout v3 --------- Co-authored-by: Derek Crannaford <[email protected]> Co-authored-by: Adam Buckley <[email protected]> * Stop core default as MASTER when no PHPversion --------- Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Derek Crannaford <[email protected]>
1 parent cfaac3d commit 5113dfa

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

cmfive.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,12 +331,19 @@ function sketchComposerForCore($reference, $phpVersion)
331331
if (PHP_MAJOR_VERSION === 7 && PHP_MINOR_VERSION === 0) {
332332
$reference = "legacy/PHP7.0";
333333
$phpVersion = "7.0";
334-
} else {
335-
$reference = "master";
334+
}
335+
if (PHP_MAJOR_VERSION === 7 && PHP_MINOR_VERSION === 4) {
336+
$reference = "legacy/PHP7.4";
337+
$phpVersion = "7.4";
338+
}
339+
if (is_null($reference) || is_null($phpVersion)) {
340+
$reference = is_null($reference) ? "master" : $reference;
336341
$phpVersion = is_null($phpVersion) ? (PHP_MAJOR_VERSION .".". PHP_MINOR_VERSION) : $phpVersion;
337342
}
338343
}
339344

345+
echo ("Composer has ref's as " . $reference . " & " . $phpVersion . ".\n");
346+
340347
$composer_string = <<<COMPOSER
341348
{
342349
"name": "2pisoftware/cmfive-boilerplate",

0 commit comments

Comments
 (0)