Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-kuendig committed Sep 8, 2020
2 parents fadc19e + c12161f commit ad78fc7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion october
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
define('DS', DIRECTORY_SEPARATOR);
define('VERSION', '0.8.6');
define('VERSION', '0.9.0');

if (file_exists(__DIR__.'/../../autoload.php')) {
require __DIR__.'/../../autoload.php';
Expand Down
2 changes: 1 addition & 1 deletion src/Config/Yaml.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct($file, Parser $parser = null)
try {
$this->config = $parser->parse(file_get_contents($file));
} catch (ParseException $e) {
throw new \RuntimeException('Unable to parse the YAML string: %s', $e->getMessage());
throw new \RuntimeException(sprintf('Unable to parse the YAML string: %s', $e->getMessage()), 100);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/Downloader/OctoberCms.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function download($force = false)
*/
protected function fetchZip()
{
$response = (new Client)->get('https://github.com/octobercms/october/archive/master.zip');
$response = (new Client)->get('https://github.com/octobercms/october/archive/1.1.zip');
file_put_contents($this->zipFile, $response->getBody());

return $this;
Expand Down Expand Up @@ -84,7 +84,7 @@ protected function extract()
*/
protected function fetchHtaccess()
{
$contents = file_get_contents('https://raw.githubusercontent.com/octobercms/october/master/.htaccess');
$contents = file_get_contents('https://raw.githubusercontent.com/octobercms/october/1.1/.htaccess');
file_put_contents(getcwd() . DS . '.htaccess', $contents);

return $this;
Expand All @@ -106,7 +106,7 @@ protected function setMaster()
$contents = preg_replace_callback(
'/october\/(?:rain|system|backend|cms)":\s"([^"]+)"/m',
function ($treffer) {
return str_replace($treffer[1], 'dev-master', $treffer[0]);
return str_replace($treffer[1], '~1.1', $treffer[0]);
},
$contents
);
Expand All @@ -129,7 +129,7 @@ protected function cleanUp()
@unlink($this->zipFile);

$directory = getcwd();
$source = $directory . DS . 'october-master';
$source = $directory . DS . 'october-1.1';

(new Process(sprintf('mv %s %s', $source . '/*', $directory)))->run();
(new Process(sprintf('rm -rf %s', $source)))->run();
Expand Down
2 changes: 1 addition & 1 deletion templates/lando.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config:
services:
appserver:
composer:
offline/oc-bootstrapper: ^0.8.0
offline/oc-bootstrapper: ^0.9.0
overrides:
depends_on: [database]
build:
Expand Down

0 comments on commit ad78fc7

Please sign in to comment.