Skip to content

Commit

Permalink
2.0.0 (#1)
Browse files Browse the repository at this point in the history
* 2.0

* Update version

* Fix workflow

* Update version
  • Loading branch information
aaronbushnell authored Sep 17, 2024
1 parent c7a9d45 commit 7bbe60d
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 31 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ jobs:
with:
ref: ${{ github.head_ref }}

- uses: shivammathur/setup-php@v2
with:
php-version: 8.2
tools: composer:v2

- name: Install Composer dependencies
run: composer install

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "trendyminds/orbit-craft",
"type": "craft-plugin",
"version": "1.0.6",
"version": "2.0.0",
"license": "MIT",
"authors": [
{
Expand Down
58 changes: 28 additions & 30 deletions src/console/controllers/SyncController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,42 +25,37 @@ public function actionIndex(): int
'latest_version' => collect($addon->releases)->first()['version'] ?? null,
]);

$info = [
'orbit_version' => '1.0.0',
'type' => 'craftcms',
'has_cms_update' => count($allUpdates->cms->releases) > 0,
'has_addons_update' => $updates
->filter(fn ($addon) => ! is_null($addon['latest_version']))
->filter(fn ($addon) => $addon['name'] !== 'craftcms/cms')
->isNotEmpty(),
'app' => [
'environment' => App::env('CRAFT_ENVIRONMENT') ?? App::env('ENVIRONMENT'),
'app_name' => Craft::$app->getSystemName(),
'url' => UrlHelper::siteUrl(),
'admin_url' => UrlHelper::cpUrl(),
'yii_version' => Craft::getVersion(),
'craft_version' => Craft::$app->getVersion().' '.App::editionName(Craft::$app->getEdition()),
'php_version' => App::phpVersion(),
'composer_version' => 'N/A',
'dev_mode' => App::devMode(),
'offline_mode' => ! Craft::$app->getIsLive(),
'ray_enabled' => App::parseBooleanEnv('$RAY_ENABLED'),
],
'drivers' => [],
$data = [
'url' => UrlHelper::siteUrl(),
'admin_url' => UrlHelper::cpUrl(),
'php_version' => App::phpVersion(),
'composer_version' => 'N/A',
'debug_mode' => App::devMode(),
'maintenance_mode' => ! Craft::$app->getIsLive(),
'ray_enabled' => App::parseBooleanEnv('$RAY_ENABLED'),
'platform' => 'Yii',
'platform_version' => Craft::getVersion(),
'cms' => 'Craft CMS',
'cms_version' => Craft::$app->getVersion().' '.App::editionName(Craft::$app->getEdition()),
'static_caching' => null,
'stache_watcher' => null,
'addons' => collect($addons)->map(function ($addon) use ($updates) {
return [
'name' => $addon->name,
'package' => $addon->packageName,
'version' => $addon->version,
'latest_version' => $updates->firstWhere('name', $addon->packageName)['latest_version'] ?? null,
];
})->sortBy('name')
->prepend([
'name' => "Craft CMS",
'package' => "craftcms/cms",
'version' => Craft::$app->getVersion(),
'latest_version' => $allUpdates->cms->releases[0]->version ?? null,
])->values()->toArray(),
})
->sortBy('name')
->prepend([
'name' => 'Craft CMS',
'package' => 'craftcms/cms',
'version' => Craft::$app->getVersion(),
'latest_version' => $allUpdates->cms->releases[0]->version ?? null,
])
->values()
->toArray(),
];

try {
Expand All @@ -70,7 +65,10 @@ public function actionIndex(): int
]);

$client->post('/api/transmit', [
'json' => ['key' => App::env('ORBIT_KEY'), 'info' => $info],
'json' => [
'key' => App::env('ORBIT_KEY'),
...$data,
],
]);
$this->stdout('Data sent to Orbit.');
} catch (\Exception $e) {
Expand Down

0 comments on commit 7bbe60d

Please sign in to comment.