Add illuminate/html package, DB -> Db, HTML -> Html
This commit is contained in:
Samuel Georges
parent
899100919d
commit
03eb949e71
|
|
@ -5,7 +5,8 @@
|
|||
System\Classes\ApplicationException -> ApplicationException
|
||||
System\Classes\SystemException -> SystemException
|
||||
October\Rain\Support\ValidationException -> ValidationException
|
||||
|
||||
DB -> Db
|
||||
HTML -> Html
|
||||
|
||||
### File system changes
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
"require": {
|
||||
"php": ">=5.4",
|
||||
"laravel/framework": "5.0.*@dev",
|
||||
"illuminate/html": "5.0.*@dev",
|
||||
"october/system": "~1.0",
|
||||
"october/backend": "~1.0",
|
||||
"october/cms": "~1.0",
|
||||
|
|
|
|||
|
|
@ -1,77 +1,67 @@
|
|||
<?php
|
||||
|
||||
return array(
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Default Cache Driver
|
||||
| Default Cache Store
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This option controls the default cache "driver" that will be used when
|
||||
| using the Caching library. Of course, you may use other drivers any
|
||||
| time you wish. This is the default when another is not specified.
|
||||
|
|
||||
| Supported: "file", "database", "apc", "memcached", "redis", "array"
|
||||
| This option controls the default cache connection that gets used while
|
||||
| using this caching library. This connection is used when another is
|
||||
| not explicitly specified when executing a given caching function.
|
||||
|
|
||||
*/
|
||||
|
||||
'driver' => 'file',
|
||||
'default' => env('CACHE_DRIVER', 'file'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| File Cache Location
|
||||
| Cache Stores
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| When using the "file" cache driver, we need a location where the cache
|
||||
| files may be stored. A sensible default has been specified, but you
|
||||
| are free to change it to any other place on disk that you desire.
|
||||
| Here you may define all of the cache "stores" for your application as
|
||||
| well as their drivers. You may even define multiple stores for the
|
||||
| same cache driver to group types of items stored in your caches.
|
||||
|
|
||||
*/
|
||||
|
||||
'path' => storage_path().'/cache',
|
||||
'stores' => [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Database Cache Connection
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| When using the "database" cache driver you may specify the connection
|
||||
| that should be used to store the cached items. When this option is
|
||||
| null the default database connection will be utilized for cache.
|
||||
|
|
||||
*/
|
||||
'apc' => [
|
||||
'driver' => 'apc'
|
||||
],
|
||||
|
||||
'connection' => null,
|
||||
'array' => [
|
||||
'driver' => 'array'
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Database Cache Table
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| When using the "database" cache driver we need to know the table that
|
||||
| should be used to store the cached items. A default table name has
|
||||
| been provided but you're free to change it however you deem fit.
|
||||
|
|
||||
*/
|
||||
'database' => [
|
||||
'driver' => 'database',
|
||||
'table' => 'cache',
|
||||
'connection' => null,
|
||||
],
|
||||
|
||||
'table' => 'cache',
|
||||
'file' => [
|
||||
'driver' => 'file',
|
||||
'path' => storage_path().'/framework/cache',
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Memcached Servers
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Now you may specify an array of your Memcached servers that should be
|
||||
| used when utilizing the Memcached cache driver. All of the servers
|
||||
| should contain a value for "host", "port", and "weight" options.
|
||||
|
|
||||
*/
|
||||
'memcached' => [
|
||||
'driver' => 'memcached',
|
||||
'servers' => [
|
||||
[
|
||||
'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100
|
||||
],
|
||||
],
|
||||
],
|
||||
|
||||
'memcached' => array(
|
||||
'redis' => [
|
||||
'driver' => 'redis',
|
||||
'connection' => 'default',
|
||||
],
|
||||
|
||||
array('host' => '127.0.0.1', 'port' => 11211, 'weight' => 100),
|
||||
|
||||
),
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
@ -84,6 +74,6 @@ return array(
|
|||
|
|
||||
*/
|
||||
|
||||
'prefix' => 'laravel',
|
||||
'prefix' => 'october',
|
||||
|
||||
);
|
||||
];
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php namespace Backend\Behaviors;
|
||||
|
||||
use DB;
|
||||
use Db;
|
||||
use Lang;
|
||||
use Event;
|
||||
use Form as FormHelper;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php namespace Backend\Classes;
|
||||
|
||||
use Str;
|
||||
use HTML;
|
||||
use Html;
|
||||
use Model;
|
||||
|
||||
/**
|
||||
|
|
@ -356,7 +356,7 @@ class FormField
|
|||
public function getAttributes($position = 'field', $htmlBuild = true)
|
||||
{
|
||||
$result = array_get($this->attributes, $position, []);
|
||||
return $htmlBuild ? HTML::attributes($result) : $result;
|
||||
return $htmlBuild ? Html::attributes($result) : $result;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php namespace Backend\Classes;
|
||||
|
||||
use Str;
|
||||
use HTML;
|
||||
use Lang;
|
||||
use IteratorAggregate;
|
||||
use ArrayIterator;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php namespace Backend\Widgets;
|
||||
|
||||
use DB as Db;
|
||||
use Db;
|
||||
use Event;
|
||||
use Backend\Classes\WidgetBase;
|
||||
use Backend\Classes\FilterScope;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php namespace Backend\Widgets;
|
||||
|
||||
use DB as Db;
|
||||
use Db;
|
||||
use HTML as Html;
|
||||
use App;
|
||||
use Lang;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,9 @@ return [
|
|||
'URL' => 'Illuminate\Support\Facades\URL',
|
||||
'Validator' => 'Illuminate\Support\Facades\Validator',
|
||||
'View' => 'Illuminate\Support\Facades\View',
|
||||
'Form' => 'Illuminate\Support\Facades\Form',
|
||||
|
||||
'Form' => 'Illuminate\Html\FormFacade',
|
||||
'Html' => 'Illuminate\Html\HtmlFacade',
|
||||
|
||||
/*
|
||||
* October aliases
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ class SettingsModel extends ModelBehavior
|
|||
*/
|
||||
public function getSettingsRecord()
|
||||
{
|
||||
|
||||
$record = Cache::remember($this->getCacheKey(), 1440, function() {
|
||||
return $this->model
|
||||
->where('item', $this->recordCode)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
use Str;
|
||||
use File;
|
||||
use Yaml;
|
||||
use DB as Db;
|
||||
use Db;
|
||||
use Carbon\Carbon;
|
||||
use October\Rain\Database\Updater;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php namespace System\Traits;
|
||||
|
||||
use HTML;
|
||||
use Html;
|
||||
use File;
|
||||
use Request;
|
||||
use System\Models\Parameters;
|
||||
|
|
@ -49,7 +49,7 @@ trait AssetMaker
|
|||
/*
|
||||
* Prevent duplicates
|
||||
*/
|
||||
$attributes = HTML::attributes(array_merge(
|
||||
$attributes = Html::attributes(array_merge(
|
||||
[
|
||||
'rel' => 'stylesheet',
|
||||
'href' => $this->getAssetEntryBuildPath($asset)
|
||||
|
|
@ -63,7 +63,7 @@ trait AssetMaker
|
|||
|
||||
if ($type == null || $type == 'rss') {
|
||||
foreach ($this->assets['rss'] as $asset) {
|
||||
$attributes = HTML::attributes(array_merge(
|
||||
$attributes = Html::attributes(array_merge(
|
||||
[
|
||||
'rel' => 'alternate',
|
||||
'href' => $this->getAssetEntryBuildPath($asset),
|
||||
|
|
@ -79,7 +79,7 @@ trait AssetMaker
|
|||
|
||||
if ($type == null || $type == 'js') {
|
||||
foreach ($this->assets['js'] as $asset) {
|
||||
$attributes = HTML::attributes(array_merge(
|
||||
$attributes = Html::attributes(array_merge(
|
||||
[
|
||||
'src' => $this->getAssetEntryBuildPath($asset)
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in New Issue