TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to October Rain assetic

This commit is contained in:
Samuel Georges 2020-02-27 20:03:19 +11:00
parent 54b70f6b32
commit 73b551cf04
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/backend/classes/FormField.php
View File

@ -124,7 +124,7 @@ class FormField
/**
* @var string Specifies a comment to accompany the field
*/
public $comment;
public $comment = '';
/**
* @var string Specifies the comment position.
@ -139,7 +139,7 @@ class FormField
/**
* @var string Specifies a message to display when there is no value supplied (placeholder).
*/
public $placeholder;
public $placeholder = '';
/**
* @var array Contains a list of attributes specified in the field configuration.

2
modules/backend/routes.php
View File

@ -25,7 +25,7 @@ App::before(function ($request) {
'middleware' => ['web'],
'prefix' => Config::get('cms.backendUri', 'backend')
], function () {
Route::any('{slug}', 'Backend\Classes\BackendController@run')->where('slug', '(.*)?');
Route::any('{slug?}', 'Backend\Classes\BackendController@run')->where('slug', '(.*)?');
})
;

2
modules/system/aliases.php
View File

@ -16,7 +16,6 @@ return [
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'Hash' => Illuminate\Support\Facades\Hash::class,
'Input' => October\Rain\Support\Facades\Input::class,
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,
@ -42,6 +41,7 @@ return [
'Config' => October\Rain\Support\Facades\Config::class,
'Seeder' => October\Rain\Database\Updates\Seeder::class,
'Flash' => October\Rain\Support\Facades\Flash::class,
'Input' => October\Rain\Support\Facades\Input::class,
'Form' => October\Rain\Support\Facades\Form::class,
'Html' => October\Rain\Support\Facades\Html::class,
'Http' => October\Rain\Support\Facades\Http::class,

24
modules/system/classes/CombineAssets.php
View File

@ -10,11 +10,11 @@ use Route;
use Config;
use Request;
use Response;
use Assetic\Asset\FileAsset;
use Assetic\Asset\AssetCache;
use Assetic\Asset\AssetCollection;
use Assetic\Factory\AssetFactory;
use October\Rain\Parse\Assetic\FilesystemCache;
use October\Rain\Assetic\Asset\FileAsset;
use October\Rain\Assetic\Asset\AssetCache;
use October\Rain\Assetic\Asset\AssetCollection;
use October\Rain\Assetic\Cache\FilesystemCache;
use October\Rain\Assetic\Factory\AssetFactory;
use System\Helpers\Cache as CacheHelper;
use ApplicationException;
use DateTime;
@ -126,22 +126,22 @@ class CombineAssets
/*
* Register JavaScript filters
*/
$this->registerFilter('js', new \October\Rain\Parse\Assetic\JavascriptImporter);
$this->registerFilter('js', new \October\Rain\Assetic\Filter\JavascriptImporter);
/*
* Register CSS filters
*/
$this->registerFilter('css', new \Assetic\Filter\CssImportFilter);
$this->registerFilter(['css', 'less', 'scss'], new \Assetic\Filter\CssRewriteFilter);
$this->registerFilter('less', new \October\Rain\Parse\Assetic\LessCompiler);
$this->registerFilter('scss', new \October\Rain\Parse\Assetic\ScssCompiler);
$this->registerFilter('css', new \October\Rain\Assetic\Filter\CssImportFilter);
$this->registerFilter(['css', 'less', 'scss'], new \October\Rain\Assetic\Filter\CssRewriteFilter);
$this->registerFilter('less', new \October\Rain\Assetic\Filter\LessCompiler);
$this->registerFilter('scss', new \October\Rain\Assetic\Filter\ScssCompiler);
/*
* Minification filters
*/
if ($this->useMinify) {
$this->registerFilter('js', new \Assetic\Filter\JSqueezeFilter);
$this->registerFilter(['css', 'less', 'scss'], new \October\Rain\Parse\Assetic\StylesheetMinify);
$this->registerFilter('js', new \October\Rain\Assetic\Filter\JSMinFilter);
$this->registerFilter(['css', 'less', 'scss'], new \October\Rain\Assetic\Filter\StylesheetMinify);
}
/*

1
modules/system/console/OctoberUpdate.php
View File

@ -17,7 +17,6 @@ use Symfony\Component\Console\Input\InputOption;
*/
class OctoberUpdate extends Command
{
/**
* The console command name.
*/