Skip to content

Commit 871cfeb

Browse files
committed
Initial development of Composer support within Manage Updates area
1 parent 49c8529 commit 871cfeb

28 files changed

+410
-136
lines changed

composer.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
"winter/wn-backend-module": "dev-develop",
3636
"winter/wn-cms-module": "dev-develop",
3737
"laravel/framework": "^9.1",
38-
"wikimedia/composer-merge-plugin": "~2.1.0"
38+
"winter/packager": "dev-main",
39+
"wikimedia/composer-merge-plugin": "~2.1.0",
40+
"nyholm/psr7": "^1.8"
3941
},
4042
"require-dev": {
4143
"phpunit/phpunit": "^9.5.8",
@@ -79,7 +81,8 @@
7981
"config": {
8082
"allow-plugins": {
8183
"composer/installers": true,
82-
"wikimedia/composer-merge-plugin": true
84+
"wikimedia/composer-merge-plugin": true,
85+
"php-http/discovery": false
8386
}
8487
}
8588
}

config/marketplace.php

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Cache marketplace packages
8+
|--------------------------------------------------------------------------
9+
|
10+
| By default, marketplace metadata is cached locally to reduce the number
11+
| of calls to the API. This can be disabled by setting this value to false,
12+
| however, this may result in a slower experience when managing themes and
13+
| plugins, or browsing the marketplace.
14+
|
15+
*/
16+
17+
'cache' => true,
18+
19+
/*
20+
|--------------------------------------------------------------------------
21+
| Marketplace package cache store
22+
|--------------------------------------------------------------------------
23+
|
24+
| If caching is enabled, the following value sets the store that should be
25+
| used to store the cache. If this is `null`, the default store will be
26+
| used.
27+
|
28+
*/
29+
30+
'store' => null,
31+
32+
];

modules/backend/formwidgets/fileupload/assets/css/fileupload.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.permissioneditor table{width:100%}
55
.permissioneditor table th{padding:30px 4px 8px 4px;color:#2a3e51;font-weight:normal;border-bottom:1px solid #dbe1e3}
66
.permissioneditor table th.tab{font-size:13px}
7-
.permissioneditor table th.permission-type{text-transform:uppercase;font-size:11px;text-align:center;cursor:pointer}
7+
.permissioneditor table th.permission-type{text-transform:uppercase;font-size:11px;text-align:center}
88
.permissioneditor table td{padding:10px 4px;vertical-align:top;border-bottom:1px solid #ecf0f1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
99
.permissioneditor table td.permission-value{text-align:center}
1010
.permissioneditor table td.permission-name{font-size:13px;cursor:pointer;color:#777}
@@ -37,4 +37,4 @@
3737
.permissioneditor table tr:last-child td{border-bottom:none}
3838
.permissioneditor table tr:first-child th{padding-top:0}
3939
.permissioneditor table tr.disabled td.permission-name{color:#AAA}
40-
.permissioneditor table tr.last-section-row td{border-bottom:none}
40+
.permissioneditor table tr.last-section-row td{border-bottom:none}

modules/system/ServiceProvider.php

+20
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
use Markdown;
1313
use Request;
1414
use System\Classes\CombineAssets;
15+
use System\Classes\DetailedPackage;
16+
use System\Classes\DetailedVersionedPackage;
1517
use System\Classes\ErrorHandler;
1618
use System\Classes\MailManager;
1719
use System\Classes\MarkupManager;
@@ -83,6 +85,7 @@ public function register()
8385
$this->registerBackendNavigation();
8486
$this->registerBackendReportWidgets();
8587
$this->registerBackendSettings();
88+
$this->registerComposer();
8689
}
8790
}
8891

@@ -580,6 +583,7 @@ protected function registerAssetBundles()
580583
$combiner->registerBundle('~/modules/system/assets/js/framework.combined.js');
581584
$combiner->registerBundle('~/modules/system/assets/less/framework.extras.less');
582585
$combiner->registerBundle('~/modules/system/assets/less/snowboard.extras.less');
586+
$combiner->registerBundle('~/modules/system/assets/less/updates/updates.less');
583587
});
584588
}
585589

@@ -629,4 +633,20 @@ protected function registerGlobalViewVars()
629633
{
630634
View::share('appName', Config::get('app.name'));
631635
}
636+
637+
protected function registerComposer()
638+
{
639+
$this->app->bind('system.composer', function () {
640+
\Winter\Packager\Composer::setPackageClass('detailedPackage', DetailedPackage::class);
641+
\Winter\Packager\Composer::setPackageClass('detailedVersionedPackage', DetailedVersionedPackage::class);
642+
643+
$composer = new \Winter\Packager\Composer;
644+
$composer
645+
->setHomeDir(storage_path('temp/packager'), true)
646+
->setWorkDir(base_path())
647+
->setStorage(new \System\Classes\PackageStorage);
648+
649+
return $composer;
650+
});
651+
}
632652
}

modules/system/aliases.php

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
'BackendMenu' => Backend\Facades\BackendMenu::class,
5757
'Block' => Winter\Storm\Support\Facades\Block::class,
5858
'Cms' => Cms\Facades\Cms::class,
59+
'Composer' => System\Facades\Composer::class,
5960
'Config' => Winter\Storm\Support\Facades\Config::class,
6061
'DbDongle' => Winter\Storm\Support\Facades\DbDongle::class,
6162
'File' => Winter\Storm\Support\Facades\File::class,

modules/system/assets/css/updates/updates.css

+1-116
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/system/assets/js/build/manifest.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/system/assets/js/build/system.debug.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/system/assets/js/build/system.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/system/assets/js/snowboard/build/snowboard.base.debug.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/system/assets/js/snowboard/build/snowboard.base.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)