From c12161f63a9ccaae938ceeef525bf06e34513fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20K=C3=BCndig?= Date: Tue, 8 Sep 2020 08:42:25 +0200 Subject: [PATCH] Adapter install command to new October branching model --- october | 2 +- src/Config/Yaml.php | 2 +- src/Downloader/OctoberCms.php | 8 ++++---- templates/lando.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/october b/october index b882f2d..4e93209 100755 --- a/october +++ b/october @@ -1,7 +1,7 @@ #!/usr/bin/env php 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); } } diff --git a/src/Downloader/OctoberCms.php b/src/Downloader/OctoberCms.php index 9637d7c..868bb30 100644 --- a/src/Downloader/OctoberCms.php +++ b/src/Downloader/OctoberCms.php @@ -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; @@ -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; @@ -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 ); @@ -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(); diff --git a/templates/lando.yml b/templates/lando.yml index 4081634..30151a2 100644 --- a/templates/lando.yml +++ b/templates/lando.yml @@ -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: