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

Code dusting (#2826) 

Code cleaning according to PSR-2 w/ exemptions (mostly dust).
This commit is contained in:
Quezler 2017-04-24 13:38:19 +02:00 committed by Samuel Georges
parent cb56c61e36
commit cc17b679f1
134 changed files with 231 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/broadcasting.php
View File

@ -49,4 +49,4 @@ return [
],
];
];

2
config/cache.php
View File

@ -76,4 +76,4 @@ return [
'prefix' => 'october',
];
];

2
config/mail.php
View File

@ -121,4 +121,4 @@ return [
'pretend' => false,
];
];

2
config/queue.php
View File

@ -89,4 +89,4 @@ return [
'database' => 'mysql', 'table' => 'failed_jobs',
],
];
];

2
config/services.php
View File

@ -34,4 +34,4 @@ return [
'secret' => '',
],
];
];

8
config/testing/cms.php
View File

@ -18,8 +18,8 @@ return [
| Time to live for parsed CMS objects.
|--------------------------------------------------------------------------
|
| Specifies the number of minutes the CMS object cache lives. After the interval
| is expired item are re-cached. Note that items are re-cached automatically when
| Specifies the number of minutes the CMS object cache lives. After the interval
| is expired item are re-cached. Note that items are re-cached automatically when
| the corresponding template file is modified.
|
*/
@ -32,7 +32,7 @@ return [
|--------------------------------------------------------------------------
|
| If the caching is enabled, the page URL map is saved in the cache. If a page
| URL was changed on the disk, the old URL value could be still saved in the cache.
| URL was changed on the disk, the old URL value could be still saved in the cache.
| To update the cache the back-end Clear Cache feature should be used. It is recommended
| to disable the caching during the development, and enable it in the production mode.
|
@ -59,7 +59,7 @@ return [
|--------------------------------------------------------------------------
|
| If the caching is enabled, combined assets are cached. If a asset file
| is changed on the disk, the old file contents could be still saved in the cache.
| is changed on the disk, the old file contents could be still saved in the cache.
| To update the cache the back-end Clear Cache feature should be used. It is recommended
| to disable the caching during the development, and enable it in the production mode.
|

2
modules/backend/ServiceProvider.php
View File

@ -64,7 +64,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
protected function registerAssetBundles()
{
CombineAssets::registerCallback(function($combiner) {
CombineAssets::registerCallback(function ($combiner) {
$combiner->registerBundle('~/modules/backend/assets/less/october.less');
$combiner->registerBundle('~/modules/backend/assets/js/october.js');
$combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');

14
modules/backend/behaviors/FormController.php
View File

@ -246,7 +246,7 @@ class FormController extends ControllerBehavior
$this->controller->formBeforeCreate($model);
$modelsToSave = $this->prepareModelsToSave($model, $this->formWidget->getSaveData());
Db::transaction(function() use ($modelsToSave) {
Db::transaction(function () use ($modelsToSave) {
foreach ($modelsToSave as $modelToSave) {
$modelToSave->save(null, $this->formWidget->getSessionKey());
}
@ -313,7 +313,7 @@ class FormController extends ControllerBehavior
$this->controller->formBeforeUpdate($model);
$modelsToSave = $this->prepareModelsToSave($model, $this->formWidget->getSaveData());
Db::transaction(function() use ($modelsToSave) {
Db::transaction(function () use ($modelsToSave) {
foreach ($modelsToSave as $modelToSave) {
$modelToSave->save(null, $this->formWidget->getSessionKey());
}
@ -466,7 +466,7 @@ class FormController extends ControllerBehavior
}
if (post('refresh', false)) {
return Redirect::refresh();
return Redirect::refresh();
}
if (post('redirect', true)) {
@ -481,7 +481,7 @@ class FormController extends ControllerBehavior
}
/**
* Internal method that returns a redirect URL from the config based on
* Internal method that returns a redirect URL from the config based on
* supplied context. Otherwise the default redirect is used.
*
* @param string $context Redirect context, eg: create, update, delete.
@ -553,7 +553,7 @@ class FormController extends ControllerBehavior
}
/**
* View helper to check if a form tab has fields in the
* View helper to check if a form tab has fields in the
* non-tabbed section (outside fields).
*
* <?php if ($this->formHasOutsideFields()): ?>
@ -581,7 +581,7 @@ class FormController extends ControllerBehavior
}
/**
* View helper to check if a form tab has fields in the
* View helper to check if a form tab has fields in the
* primary tab section.
*
* <?php if ($this->formHasPrimaryTabs()): ?>
@ -609,7 +609,7 @@ class FormController extends ControllerBehavior
}
/**
* View helper to check if a form tab has fields in the
* View helper to check if a form tab has fields in the
* secondary tab section.
*
* <?php if ($this->formHasSecondaryTabs()): ?>

6
modules/backend/behaviors/ImportExportController.php
View File

@ -318,7 +318,7 @@ class ImportExportController extends ControllerBehavior
$firstRow = $reader->fetchOne(0);
if (!post('first_row_titles')) {
array_walk($firstRow, function(&$value, $key) {
array_walk($firstRow, function (&$value, $key) {
$value = 'Column #'.($key + 1);
});
}
@ -345,7 +345,7 @@ class ImportExportController extends ControllerBehavior
$widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
$widget->bindEvent('form.beforeRefresh', function($holder) {
$widget->bindEvent('form.beforeRefresh', function ($holder) {
$holder->data = [];
});
@ -503,7 +503,7 @@ class ImportExportController extends ControllerBehavior
$widget = $this->makeWidget('Backend\Widgets\Form', $widgetConfig);
$widget->bindEvent('form.beforeRefresh', function($holder) {
$widget->bindEvent('form.beforeRefresh', function ($holder) {
$holder->data = [];
});

2
modules/backend/behaviors/ListController.php
View File

@ -244,7 +244,7 @@ class ListController extends ControllerBehavior
/*
* Extend the query of the list of options
*/
$filterWidget->bindEvent('filter.extendQuery', function($query, $scope) {
$filterWidget->bindEvent('filter.extendQuery', function ($query, $scope) {
$this->controller->listFilterExtendQuery($query, $scope);
});

12
modules/backend/behaviors/RelationController.php
View File

@ -650,17 +650,17 @@ class RelationController extends ControllerBehavior
* Apply defined constraints
*/
if ($sqlConditions = $this->getConfig('view[conditions]')) {
$widget->bindEvent('list.extendQueryBefore', function($query) use ($sqlConditions) {
$widget->bindEvent('list.extendQueryBefore', function ($query) use ($sqlConditions) {
$query->whereRaw($sqlConditions);
});
}
elseif ($scopeMethod = $this->getConfig('view[scope]')) {
$widget->bindEvent('list.extendQueryBefore', function($query) use ($scopeMethod) {
$widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) {
$query->$scopeMethod($this->model);
});
}
else {
$widget->bindEvent('list.extendQueryBefore', function($query) {
$widget->bindEvent('list.extendQueryBefore', function ($query) {
$this->relationObject->addDefinedConstraintsToQuery($query);
});
}
@ -780,17 +780,17 @@ class RelationController extends ControllerBehavior
* Apply defined constraints
*/
if ($sqlConditions = $this->getConfig('manage[conditions]')) {
$widget->bindEvent('list.extendQueryBefore', function($query) use ($sqlConditions) {
$widget->bindEvent('list.extendQueryBefore', function ($query) use ($sqlConditions) {
$query->whereRaw($sqlConditions);
});
}
elseif ($scopeMethod = $this->getConfig('manage[scope]')) {
$widget->bindEvent('list.extendQueryBefore', function($query) use ($scopeMethod) {
$widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) {
$query->$scopeMethod($this->model);
});
}
else {
$widget->bindEvent('list.extendQueryBefore', function($query) {
$widget->bindEvent('list.extendQueryBefore', function ($query) {
$this->relationObject->addDefinedConstraintsToQuery($query);
});
}

2
modules/backend/behaviors/ReorderController.php
View File

@ -96,7 +96,7 @@ class ReorderController extends ControllerBehavior
{
$this->addJs('js/october.reorder.js', 'core');
$this->controller->pageTitle = $this->controller->pageTitle
$this->controller->pageTitle = $this->controller->pageTitle
?: Lang::get($this->getConfig('title', 'backend::lang.reorder.default_title'));
$this->validateModel();

2
modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
View File

@ -50,7 +50,7 @@ class TranscodeFilter extends php_user_filter
}
$this->encodingTo = mb_internal_encoding();
if (isset( $matches[3] )) {
if (isset($matches[3])) {
$this->encodingTo = $matches[3];
}

6
modules/backend/classes/AuthManager.php
View File

@ -68,8 +68,8 @@ class AuthManager extends RainAuthManager
/**
* Registers the back-end permission items.
* The argument is an array of the permissions. The array keys represent the
* permission codes, specific for the plugin/module. Each element in the
* The argument is an array of the permissions. The array keys represent the
* permission codes, specific for the plugin/module. Each element in the
* array should be an associative array with the following keys:
* - label - specifies the menu label localization string key, required.
* - order - a position of the item in the menu, optional.
@ -92,7 +92,7 @@ class AuthManager extends RainAuthManager
/**
* Returns a list of the registered permissions items.
* @return array
* @return array
*/
public function listPermissions()
{

2
modules/backend/controllers/Files.php
View File

@ -42,7 +42,7 @@ class Files extends Controller
echo $this->findFileObject($code)->outputThumb(
$width,
$height,
compact('mode','extension')
compact('mode', 'extension')
);
exit;
}

2
modules/backend/controllers/Index.php
View File

@ -71,7 +71,7 @@ class Index extends Controller
protected function checkPermissionRedirect()
{
if (!$this->user->hasAccess('backend.access_dashboard')) {
$true = function(){ return true; };
$true = function () { return true; };
if ($first = array_first(BackendMenu::listMainMenuItems(), $true)) {
return Redirect::intended($first->url);
}

2
modules/backend/database/migrations/2015_10_01_000008_Db_Backend_Add_Superuser_Flag.php
View File

@ -12,7 +12,7 @@ class DbBackendAddSuperuserFlag extends Migration
$table->boolean('is_superuser')->default(false);
});
AdminModel::all()->each(function($user) {
AdminModel::all()->each(function ($user) {
if ($user->hasPermission('superuser')) {
$user->is_superuser = true;
$user->save();

2
modules/backend/facades/Backend.php
View File

@ -6,7 +6,7 @@ class Backend extends Facade
{
/**
* Get the registered name of the component.
*
*
* @see \Backend\Helpers\Backend
* @return string
*/

4
modules/backend/facades/BackendAuth.php
View File

@ -6,10 +6,10 @@ class BackendAuth extends Facade
{
/**
* Get the registered name of the component.
*
*
* Resolves to:
* - Backend\Classes\AuthManager
*
*
* @return string
*/
protected static function getFacadeAccessor()

4
modules/backend/facades/BackendMenu.php
View File

@ -6,10 +6,10 @@ class BackendMenu extends Facade
{
/**
* Get the registered name of the component.
*
*
* Resolves to:
* - Backend\Classes\NavigationManager
*
*
* @return string
*/
protected static function getFacadeAccessor()

5
modules/backend/formwidgets/FileUpload.php
View File

@ -13,7 +13,6 @@ use ApplicationException;
use ValidationException;
use Exception;
/**
* File upload field
* Renders a form file uploader field.
@ -146,7 +145,7 @@ class FileUpload extends FormWidgetBase
/*
* Decorate each file with thumb and custom download path
*/
$list->each(function($file) {
$list->each(function ($file) {
$this->decorateFileAttributes($file);
});
@ -246,7 +245,7 @@ class FileUpload extends FormWidgetBase
$types = explode(',', $types);
}
$types = array_map(function($value) use ($includeDot) {
$types = array_map(function ($value) use ($includeDot) {
$value = trim($value);
if (substr($value, 0, 1) == '.') {

2
modules/backend/formwidgets/PermissionEditor.php
View File

@ -75,4 +75,4 @@ class PermissionEditor extends FormWidgetBase
{
return strlen($this->mode) ? $this->mode : 'radio';
}
}
}

6
modules/backend/formwidgets/RecordFinder.php
View File

@ -279,17 +279,17 @@ class RecordFinder extends FormWidgetBase
]);
if ($sqlConditions = $this->conditions) {
$widget->bindEvent('list.extendQueryBefore', function($query) use ($sqlConditions) {
$widget->bindEvent('list.extendQueryBefore', function ($query) use ($sqlConditions) {
$query->whereRaw($sqlConditions);
});
}
elseif ($scopeMethod = $this->scope) {
$widget->bindEvent('list.extendQueryBefore', function($query) use ($scopeMethod) {
$widget->bindEvent('list.extendQueryBefore', function ($query) use ($scopeMethod) {
$query->$scopeMethod($this->model);
});
}
else {
$widget->bindEvent('list.extendQueryBefore', function($query) {
$widget->bindEvent('list.extendQueryBefore', function ($query) {
$this->getRelationObject()->addDefinedConstraintsToQuery($query);
});
}

4
modules/backend/formwidgets/RichEditor.php
View File

@ -106,7 +106,7 @@ class RichEditor extends FormWidgetBase
$buttons = $this->toolbarButtons;
if (is_string($buttons)) {
$buttons = array_map(function($button) {
$buttons = array_map(function ($button) {
return strlen($button) ? $button : '|';
}, explode('|', $buttons));
}
@ -210,7 +210,7 @@ class RichEditor extends FormWidgetBase
$links[] = ['name' => Lang::get('backend::lang.pagelist.select_page'), 'url' => false];
$iterator = function($links, $level = 0) use (&$iterator) {
$iterator = function ($links, $level = 0) use (&$iterator) {
$result = [];
foreach ($links as $linkUrl => $link) {

2
modules/backend/lang/be/lang.php
View File

@ -467,4 +467,4 @@ return [
'encoding_not_supported_error' => "Не атрымалася вызначыць кадзіроўку файла. Калі ласка, выберыце правільны фармат самастойна",
'encoding_format' => "Кадзіроўка файла"
]
];
];

2
modules/backend/lang/de/lang.php
View File

@ -95,7 +95,7 @@ return [
'view_access_logs' => 'Zugriffsprotokoll betrachten',
'nice_message' => 'Wir wünschen einen schönen Tag!',
]
],
],
'user' => [
'name' => 'Administrator',
'menu_label' => 'Administratoren',

14
modules/backend/lang/el/lang.php
View File

@ -24,9 +24,9 @@ return [
],
'no_database' => [
'label' => 'Δεν βρέθηκε η βάση δεδομένων',
'help' => "Η βάση δεδομένων είναι απαραίτητη για να έχετε πρόσβαση στο back-end. Ελέγξτε εάν η βάση δεδομένων είναι ρυθμισμένη και συνδεδεμένη πριν προσπαθήσετε ξανά.",
'help' => "Η βάση δεδομένων είναι απαραίτητη για να έχετε πρόσβαση στο back-end. Ελέγξτε εάν η βάση δεδομένων είναι ρυθμισμένη και συνδεδεμένη πριν προσπαθήσετε ξανά.",
'cms_link' => 'Επιστροφή στην αρχική',
],
],
],
'partial' => [
'not_found_name' => "Το μερικό ':name' δεν βρέθηκε.",
@ -55,7 +55,7 @@ return [
'ok' => 'Εντάξει',
],
'dashboard' => [
'menu_label' => 'Κέντρο Ελένχου',
'menu_label' => 'Κέντρο Ελένχου',
'widget_label' => 'Widget',
'widget_width' => 'Πλάτος',
'full_width' => 'πλήρες πλάτος',
@ -99,7 +99,7 @@ return [
'last_sign_in' => 'Η τελευταία σύνδεση σας ήταν',
'view_access_logs' => 'Προβολή του αρχείου καταγραφής προσβάσεων',
'nice_message' => 'Να έχετε μια υπέροχη ημέρα!',
]
]
],
'user' => [
'name' => 'Διαχειριστής',
@ -175,8 +175,8 @@ return [
'delete_selected_confirm' => 'Να διαγραφούν οι επιλεγμένες εγγραφές;',
'delete_selected_success' => 'Διαγραφή επιλεγμένων εγγραφών.',
'column_switch_true' => 'Ναι',
'column_switch_false' => 'Όχι'
],
'column_switch_false' => 'Όχι'
],
'fileupload' => [
'attachment' => 'Επισύναψη',
'help' => 'Προσθέστε τίτλο και περιγραφή για αυτήν την επισύναψη.',
@ -284,7 +284,7 @@ return [
'reorder' => [
'default_title' => 'Αναδιάταξη εγγραφών',
'no_records' => 'Δεν υπάρχουν διαθέσιμες εγγραφές για ταξινόμηση.',
],
],
'model' => [
'name' => 'Μοντέλο',
'not_found' => "Η κλάση ':class' του μοντέλου με ID :id δεν μπόρεσε να βρεθεί",

4
modules/backend/lang/es/lang.php
View File

@ -244,7 +244,7 @@ return [
'find_record' => 'Buscar Registro'
],
'relation' => [
'missing_config' => "Relación de comportamiento no tiene ninguna configuración para ':config'.",
'missing_config' => "Relación de comportamiento no tiene ninguna configuración para ':config'.",
'missing_definition' => "Relación de comportamiento no contiene una definición para ':field'.",
'missing_model' => 'Relación de comportamiento utilizado en :class no tiene un modelo definido.',
'invalid_action_single' => 'Esta acción no se puede realizar en una relación singular.',
@ -279,7 +279,7 @@ return [
'reorder' => [
'default_title' => 'Reordenar registros',
'no_records' => 'No existen registros disponibles para ordenar.'
],
],
'model' => [
'name' => 'Modelo',
'not_found' => "Modelo ':class' con el ID :id no se pudo encontrar",

4
modules/backend/lang/it/lang.php
View File

@ -86,7 +86,7 @@ return [
'request_log' => 'Log richieste',
'app_birthday' => 'Online dal',
],
'welcome' => [
'welcome' => [
'widget_title_default' => 'Benvenuto',
'welcome_back_name' => 'Bentornato su :app, :name.',
'welcome_to_name' => 'Benvenuto su :app, :name.',
@ -238,7 +238,7 @@ return [
'delete_row' => 'Elimina riga',
'concurrency_file_changed_title' => 'Il file è stato cambiato',
'concurrency_file_changed_description' => "Il file che stavi modificando è stato cambiato da un altro utente. Puoi ricaricare il file e perdere le tue modifiche oppure sovrascrivere il file sul disco.",
'return_to_list' => 'Ritorna all\'elenco'
'return_to_list' => 'Ritorna all\'elenco'
],
'recordfinder' => [
'find_record' => 'Trova record'

1
modules/backend/lang/zh-cn/lang.php
View File

@ -329,4 +329,3 @@ return [
'all' => '全部'
]
];

2
modules/backend/lang/zh-tw/lang.php
View File

@ -299,4 +299,4 @@ return [
'filter' => [
'all' => '全部'
]
];
];

4
modules/backend/models/EditorSetting.php
View File

@ -88,7 +88,7 @@ class EditorSetting extends Model
{
$count = 0;
return array_build($arr, function($key, $value) use (&$count) {
return array_build($arr, function ($key, $value) use (&$count) {
return [$count++, ['class_label' => $value, 'class_name' => $key]];
});
}
@ -106,7 +106,7 @@ class EditorSetting extends Model
$defaultValue = $instance->getDefaultValue($key);
if (is_array($value)) {
$value = array_build($value, function($key, $value) {
$value = array_build($value, function ($key, $value) {
return [array_get($value, 'class_name'), array_get($value, 'class_label')];
});
}

4
modules/backend/models/ImportModel.php
View File

@ -109,7 +109,7 @@ abstract class ImportModel extends Model
$reader = CsvReader::createFromPath($filePath, 'r');
// Filter out empty rows
$reader->addFilter(function(array $row) {
$reader->addFilter(function (array $row) {
return count($row) > 1 || reset($row) !== null;
});
@ -233,7 +233,7 @@ abstract class ImportModel extends Model
'Windows-1252'
];
$translated = array_map(function($option){
$translated = array_map(function ($option) {
return Lang::get('backend::lang.import_export.encodings.'.Str::slug($option, '_'));
}, $options);

2
modules/backend/models/Preference.php
View File

@ -191,7 +191,7 @@ class Preference extends Model
}
// Sort the array by offset, identifier ascending
usort($tempTimezones, function($a, $b) {
usort($tempTimezones, function ($a, $b) {
return $a['offset'] === $b['offset']
? strcmp($a['identifier'], $b['identifier'])
: $a['offset'] - $b['offset'];

2
modules/backend/traits/FormModelSaver.php
View File

@ -100,7 +100,7 @@ trait FormModelSaver
$model->addPurgeable($attributesToPurge);
}
else {
$model->bindEventOnce('model.saveInternal', function() use ($model, $attributesToPurge) {
$model->bindEventOnce('model.saveInternal', function () use ($model, $attributesToPurge) {
foreach ($attributesToPurge as $attribute) {
unset($model->attributes[$attribute]);
}

2
modules/backend/traits/InspectableContainer.php
View File

@ -69,4 +69,4 @@ trait InspectableContainer
'options' => $optionsArray
];
}
}
}

2
modules/backend/traits/WidgetMaker.php
View File

@ -7,7 +7,7 @@ use SystemException;
/**
* Config Maker Trait
*
* Adds widget based methods to a controller class, or a class that contains a
* Adds widget based methods to a controller class, or a class that contains a
* $controller property referencing a controller.
*
* @package october\backend

2
modules/backend/widgets/Filter.php
View File

@ -365,7 +365,7 @@ class Filter extends WidgetBase
{
$filteredOptions = [];
$optionMatchesSearch = function($words, $option) {
$optionMatchesSearch = function ($words, $option) {
foreach ($words as $word) {
$word = trim($word);
if (!strlen($word)) {

6
modules/backend/widgets/Lists.php
View File

@ -1173,7 +1173,7 @@ class Lists extends WidgetBase
if ($scopeMethod = $this->searchScope) {
$searchMethod = $boolean == 'and' ? 'where' : 'orWhere';
$query->$searchMethod(function($q) use ($term, $columns, $scopeMethod) {
$query->$searchMethod(function ($q) use ($term, $columns, $scopeMethod) {
$q->$scopeMethod($term, $columns);
});
}
@ -1260,7 +1260,7 @@ class Lists extends WidgetBase
*/
if ($this->sortColumn === null || !$this->isSortable($this->sortColumn)) {
$columns = $this->visibleColumns ?: $this->getVisibleColumns();
$columns = array_filter($columns, function($column){ return $column->sortable; });
$columns = array_filter($columns, function ($column) { return $column->sortable; });
$this->sortColumn = key($columns);
$this->sortDirection = 'desc';
}
@ -1291,7 +1291,7 @@ class Lists extends WidgetBase
}
$columns = $this->getColumns();
$sortable = array_filter($columns, function($column){
$sortable = array_filter($columns, function ($column) {
return $column->sortable;
});

2
modules/backend/widgets/ReportContainer.php
View File

@ -98,7 +98,7 @@ class ReportContainer extends WidgetBase
}
/**
* Ensure report widgets are registered so they can also be bound to
* Ensure report widgets are registered so they can also be bound to
* the controller this allows their AJAX features to operate.
* @return void
*/

4
modules/backend/widgets/Table.php
View File

@ -10,7 +10,7 @@ use SystemException;
* Table Widget.
*
* Represents an editable tabular control.
*
*
* @package october\backend
* @author Alexey Bobkov, Samuel Georges
*/
@ -156,7 +156,7 @@ class Table extends WidgetBase
/**
* Converts the columns associative array to a regular array and translates column headers and drop-down options.
* Working with regular arrays is much faster in JavaScript.
* References:
* References:
* - http://www.smashingmagazine.com/2012/11/05/writing-fast-memory-efficient-javascript/
* - http://jsperf.com/performance-of-array-vs-object/3
*/

2
modules/backend/widgets/table/ClientMemoryDataSource.php
View File

@ -59,4 +59,4 @@ class ClientMemoryDataSource extends DataSourceBase
{
return $this->data;
}
}
}

4
modules/backend/widgets/table/DataSourceBase.php
View File

@ -6,7 +6,7 @@
abstract class DataSourceBase
{
/**
* @var string Specifies a name of record's key column
* @var string Specifies a name of record's key column
*/
protected $keyColumn;
@ -75,4 +75,4 @@ abstract class DataSourceBase
return $result;
}
}
}

2
modules/backend/widgets/table/ServerEventDataSource.php
View File

@ -80,4 +80,4 @@ class ServerEventDataSource extends DataSourceBase
public function getAllRecords()
{
}
}
}

4
modules/cms/ServiceProvider.php
View File

@ -73,7 +73,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
protected function registerThemeLogging()
{
CmsObject::extend(function($model) {
CmsObject::extend(function ($model) {
ThemeLog::bindEventsToModel($model);
});
}
@ -86,7 +86,7 @@ class ServiceProvider extends ModuleServiceProvider
/*
* Register asset bundles
*/
CombineAssets::registerCallback(function($combiner) {
CombineAssets::registerCallback(function ($combiner) {
$combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/js/mediamanager-browser.js');
$combiner->registerBundle('~/modules/cms/widgets/mediamanager/assets/less/mediamanager.less');
});

4
modules/cms/classes/CmsCompoundObject.php
View File

@ -207,7 +207,7 @@ class CmsCompoundObject extends CmsObject
/**
* Returns a component by its name.
* This method is used only in the back-end and for internal system needs when
* This method is used only in the back-end and for internal system needs when
* the standard way to access components is not an option.
* @param string $componentName Specifies the component name.
* @return \Cms\Classes\ComponentBase Returns the component instance or null.
@ -347,7 +347,7 @@ class CmsCompoundObject extends CmsObject
/**
* Returns the configured view bag component.
* This method is used only in the back-end and for internal system needs when
* This method is used only in the back-end and for internal system needs when
* the standard way to access components is not an option.
* @return \Cms\Components\ViewBag Returns the view bag component instance.
*/

6
modules/cms/classes/CmsObjectCollection.php
View File

@ -19,7 +19,7 @@ class CmsObjectCollection extends CollectionBase
*/
public function withComponent($components, $callback = null)
{
return $this->filter(function($object) use ($components, $callback) {
return $this->filter(function ($object) use ($components, $callback) {
$hasComponent = false;
@ -47,7 +47,7 @@ class CmsObjectCollection extends CollectionBase
*/
public function where($property, $value, $strict = true)
{
return $this->filter(function($object) use ($property, $value, $strict) {
return $this->filter(function ($object) use ($property, $value, $strict) {
if (!array_key_exists($property, $object->settings)) {
return false;
@ -69,7 +69,7 @@ class CmsObjectCollection extends CollectionBase
*/
public function whereComponent($components, $property, $value, $strict = false)
{
return $this->filter(function($object) use ($components, $property, $value, $strict) {
return $this->filter(function ($object) use ($components, $property, $value, $strict) {
$hasComponent = false;

2
modules/cms/classes/CodeParser.php
View File

@ -27,7 +27,7 @@ class CodeParser
/**
* @var mixed The internal cache, keeps parsed object information during a request.
*/
static protected $cache = [];
protected static $cache = [];
/**
* @var string Key for the parsed PHP file information cache.

4
modules/cms/classes/ComponentBase.php
View File

@ -41,7 +41,7 @@ abstract class ComponentBase extends Extendable
public $isHidden = false;
/**
* @var string Icon of the plugin that defines the component.
* @var string Icon of the plugin that defines the component.
* This field is used by the CMS internally.
*/
public $pluginIcon;
@ -121,7 +121,7 @@ abstract class ComponentBase extends Extendable
}
/**
* Executed when this component is bound to a page or layout, part of
* Executed when this component is bound to a page or layout, part of
* the page life cycle.
*/
public function onRun()

2
modules/cms/classes/Controller.php
View File

@ -868,7 +868,7 @@ class Controller
foreach ($partial->settings['components'] as $component => $properties) {
// Do not inject the viewBag component to the environment.
// Not sure if they're needed there by the requirements,
// but there were problems with array-typed properties used by Static Pages
// but there were problems with array-typed properties used by Static Pages
// snippets and setComponentPropertiesFromParams(). --ab
if ($component == 'viewBag') {
continue;

2
modules/cms/classes/LayoutCode.php
View File

@ -9,7 +9,7 @@
class LayoutCode extends CodeBase
{
/**
* This event is triggered after the layout components are executed,
* This event is triggered after the layout components are executed,
* but before the page's onStart event.
*/
public function onBeforePageStart()

9
modules/cms/classes/MediaLibrary.php
View File

@ -152,14 +152,13 @@ class MediaLibrary
$words = explode(' ', Str::lower($searchTerm));
$result = [];
$findInFolder = function($folder) use (&$findInFolder, $words, &$result, $sortBy, $filter) {
$findInFolder = function ($folder) use (&$findInFolder, $words, &$result, $sortBy, $filter) {
$folderContents = $this->listFolderContents($folder, $sortBy, $filter);
foreach ($folderContents as $item) {
if ($item->type == MediaLibraryItem::TYPE_FOLDER)
$findInFolder($item->path);
else
if ($this->pathMatchesSearch($item->path, $words))
elseif ($this->pathMatchesSearch($item->path, $words))
$result[] = $item;
}
};
@ -320,7 +319,7 @@ class MediaLibrary
{
$disk = $this->getStorageDisk();
$copyDirectory = function($srcPath, $destPath) use (&$copyDirectory, $disk) {
$copyDirectory = function ($srcPath, $destPath) use (&$copyDirectory, $disk) {
$srcPath = self::validatePath($srcPath);
$fullSrcPath = $this->getMediaPath($srcPath);
@ -621,7 +620,7 @@ class MediaLibrary
$files = [];
$folders = [];
usort($itemList, function($a, $b) use ($sortBy) {
usort($itemList, function ($a, $b) use ($sortBy) {
switch ($sortBy) {
case self::SORT_BY_TITLE: return strcasecmp($a->path, $b->path);
case self::SORT_BY_SIZE:

2
modules/cms/classes/MediaViewHelper.php
View File

@ -103,4 +103,4 @@ class MediaViewHelper
}
}
}
}

4
modules/cms/classes/Page.php
View File

@ -175,9 +175,9 @@ class Page extends CmsCompoundObject
* - url - the menu item URL. Not required for menu item types that return all available records.
* The URL should be returned relative to the website root and include the subdirectory, if any.
* Use the URL::to() helper to generate the URLs.
* - isActive - determines whether the menu item is active. Not required for menu item types that
* - isActive - determines whether the menu item is active. Not required for menu item types that
* return all available records.
* - items - an array of arrays with the same keys (url, isActive, items) + the title key.
* - items - an array of arrays with the same keys (url, isActive, items) + the title key.
* The items array should be added only if the $item's $nesting property value is TRUE.
* @param \RainLab\Pages\Classes\MenuItem $item Specifies the menu item.
* @param string $url Specifies the current page URL, normalized, in lower case

6
modules/cms/classes/Router.php
View File

@ -21,11 +21,11 @@ use October\Rain\Router\Helper as RouterHelper;
* <pre>/blog/:post_id?/comments - although the :post_id parameter is marked as optional,
* it will be processed as required.</pre>
* Optional parameters can have default values which are used as fallback values in case if the real
* parameter value is not presented in the URL. Default values cannot contain the pipe symbols and question marks.
* parameter value is not presented in the URL. Default values cannot contain the pipe symbols and question marks.
* Specify the default value after the question mark:
* <pre>/blog/category/:category_id?10 - The category_id parameter would be 10 for this URL: /blog/category</pre>
* You can also add regular expression validation to parameters. To add a validation expression
* add the pipe symbol after the parameter name (or the question mark) and specify the expression.
* add the pipe symbol after the parameter name (or the question mark) and specify the expression.
* The forward slash symbol is not allowed in the expressions. Examples:
* <pre>/blog/:post_id|^[0-9]+$/comments - this will match /blog/post/10/comments
* /blog/:post_id|^[0-9]+$ - this will match /blog/post/3
@ -209,7 +209,7 @@ class Router
/**
* Loads the URL map - a list of page file names and corresponding URL patterns.
* The URL map can is cached. The clearUrlMap() method resets the cache. By default
* the map is updated every time when a page is saved in the back-end, or
* the map is updated every time when a page is saved in the back-end, or
* when the interval defined with the cms.urlCacheTtl expires.
* @return boolean Returns true if the URL map was loaded from the cache. Otherwise returns false.
*/

4
modules/cms/classes/Theme.php
View File

@ -152,7 +152,7 @@ class Theme
if (App::hasDatabase()) {
try {
try {
$dbResult = Cache::remember(self::ACTIVE_KEY, 1440, function() {
$dbResult = Cache::remember(self::ACTIVE_KEY, 1440, function () {
return Parameter::applyKey(self::ACTIVE_KEY)->pluck('value');
});
}
@ -216,7 +216,7 @@ class Theme
/**
* Sets the active theme.
* The active theme code is stored in the database and overrides the configuration cms.activeTheme parameter.
* The active theme code is stored in the database and overrides the configuration cms.activeTheme parameter.
* @param string $code Specifies the active theme code.
*/
public static function setActiveTheme($code)

6
modules/cms/components/Resources.php
View File

@ -11,17 +11,17 @@ use System\Classes\CombineAssets;
class Resources extends ComponentBase
{
/**
* @var string The default JavaScript directory
* @var string The default JavaScript directory
*/
public $jsDir = 'js';
/**
* @var string The default CSS directory
* @var string The default CSS directory
*/
public $cssDir = 'css';
/**
* @var string The default LESS directory
* @var string The default LESS directory
*/
public $lessDir = 'less';

2
modules/cms/controllers/Media.php
View File

@ -32,4 +32,4 @@ class Media extends Controller
{
$this->bodyClass = 'compact-container';
}
}
}

2
modules/cms/facades/Cms.php
View File

@ -6,7 +6,7 @@ class Cms extends Facade
{
/**
* Get the registered name of the component.
*
*
* @see \Cms\Helpers\Cms
* @return string
*/

2
modules/cms/formwidgets/MediaFinder.php
View File

@ -14,7 +14,7 @@ use Backend\Classes\FormWidgetBase;
* label: Some image
* type: media
* prompt: Click the %s button to find a user
*
*
* @package october\cms
* @author Alexey Bobkov, Samuel Georges
*/

2
modules/cms/helpers/Cms.php
View File

@ -36,4 +36,4 @@ class Cms
return Url::to($path);
}
}
}
}

2
modules/cms/lang/el/lang.php
View File

@ -161,7 +161,7 @@ return [
'new_title' => 'Νέος τίτλος σελίδας',
'url' => 'URL',
'filename' => 'Όνομα Αρχείου',
'layout' => 'Διάταξη',
'layout' => 'Διάταξη',
'description' => 'Περιγραφή',
'preview' => 'Προεπισκόπηση',
'meta' => 'Meta',

26
modules/cms/lang/es/lang.php
View File

@ -10,15 +10,15 @@ return [
'invalid_file_extension' => 'Extensión de archivo inválida: :invalid. Las extensiones permitidas son: :allowed.',
'error_deleting' => 'Error borrando el archivo template ":name". Por favor, revisa los permisos de escritura.',
'delete_success' => 'Los templates fueron borrados satisfactoriamente: :count.',
'file_name_required' => 'Falta el nombre del campo del archivo.',
'safe_mode_enabled' => 'Modo seguro esta actualmente activado.'
'file_name_required' => 'Falta el nombre del campo del archivo.',
'safe_mode_enabled' => 'Modo seguro esta actualmente activado.'
],
'dashboard' => [
'active_theme' => [
'widget_title_default' => 'Sitio Web',
'online' => 'en línea',
'maintenance' => 'en mantenimiento',
'manage_themes' => 'Gestionar plantilla'
'manage_themes' => 'Gestionar plantilla'
]
],
'theme' => [
@ -34,7 +34,7 @@ return [
],
'settings_menu' => 'Tema para el Front-end',
'settings_menu_description' => 'Previsualiza la lista de temas instalados y selecciona un tema activo.',
'default_tab' => 'Propiedades',
'default_tab' => 'Propiedades',
'name_label' => 'Nombre',
'name_create_placeholder' => 'Nombre del nuevo tema',
'author_label' => 'Autor',
@ -48,10 +48,10 @@ return [
'dir_name_label' => 'Nombre del directorio',
'dir_name_create_label' => 'El directorio de destino del tema',
'theme_label' => 'Tema',
'theme_title' => 'Temas',
'theme_title' => 'Temas',
'activate_button' => 'Activar',
'active_button' => 'Activar',
'customize_theme' => 'Personalizar Tema',
'customize_theme' => 'Personalizar Tema',
'customize_button' => 'Personalizar',
'duplicate_button' => 'Duplicar',
'duplicate_title' => 'Duplicar tema',
@ -87,7 +87,7 @@ return [
'dir_name_invalid' => 'El nombre sólo puede contener dígitos, letras latinas y los siguientes símbolos: _-',
'dir_name_taken' => 'Este directorio ya existe.',
'find_more_themes' => 'Buscar nuevos temas',
'saving' => 'Salvando tema...',
'saving' => 'Salvando tema...',
'return' => 'Volver a la lista de temas'
],
'maintenance' => [
@ -180,7 +180,7 @@ return [
],
'asset' => [
'menu_label' => 'Assets',
'unsaved_label' => 'Asset(s) sin salvar',
'unsaved_label' => 'Asset(s) sin salvar',
'drop_down_add_title' => 'Añadir...',
'drop_down_operation_title' => 'Acción...',
'upload_files' => 'Subir archivo(s)',
@ -245,11 +245,11 @@ return [
'manage_layouts' => 'Gestionar diseños',
'manage_partials' => 'Gestionar parciales',
'manage_themes' => 'Gestionar plantilla',
'manage_media' => 'Gestionar media'
'manage_media' => 'Gestionar media'
],
'mediafinder' => [
'default_prompt' => 'Haga clic en el botón de %s para buscar un elemento multimedia'
],
],
'media' => [
'invalid_path' => "Ruta de archivo especificada no válida: ':path'.",
'menu_label' => 'Media',
@ -258,7 +258,7 @@ return [
'delete' => 'Eliminar',
'add_folder' => 'Nueva carpeta',
'search' => 'Buscar',
'display' => 'Mostrar',
'display' => 'Mostrar',
'filter_everything' => 'Todo',
'filter_images' => 'Imágenes',
'filter_video' => 'Vídeos',
@ -278,8 +278,8 @@ return [
'multiple_selected' => 'Se han selecciondo varios elementos.',
'uploading_file_num' => 'Subiendo :number archivo(s)...',
'uploading_complete' => 'Subida completada',
'uploading_error' => 'Error al subir',
'type_blocked' => 'El tipo de archivo usado a sido bloqueado por motivos de seguridad.',
'uploading_error' => 'Error al subir',
'type_blocked' => 'El tipo de archivo usado a sido bloqueado por motivos de seguridad.',
'order_by' => 'Ordenar por',
'folder' => 'Carpeta',
'no_files_found' => 'No se han encontrado archivos.',

2
modules/cms/lang/zh-tw/lang.php
View File

@ -299,4 +299,4 @@ return [
'image_size' => '圖片大小:',
'selected_size' => '選中:'
]
];
];

2
modules/cms/models/ThemeExport.php
View File

@ -138,4 +138,4 @@ class ThemeExport extends Model
return $result;
}
}
}

2
modules/cms/models/ThemeImport.php
View File

@ -181,4 +181,4 @@ class ThemeImport extends Model
return true;
}
}
}

4
modules/cms/models/ThemeLog.php
View File

@ -39,11 +39,11 @@ class ThemeLog extends Model
*/
public static function bindEventsToModel(HalcyonModel $template)
{
$template->bindEvent('model.beforeDelete', function() use ($template) {
$template->bindEvent('model.beforeDelete', function () use ($template) {
self::add($template, self::TYPE_DELETE);
});
$template->bindEvent('model.beforeSave', function() use ($template) {
$template->bindEvent('model.beforeSave', function () use ($template) {
self::add($template, $template->exists ? self::TYPE_UPDATE : self::TYPE_CREATE);
});
}

4
modules/cms/widgets/MediaManager.php
View File

@ -247,7 +247,7 @@ class MediaManager extends WidgetBase
*/
$filesToDelete[] = $path;
}
else if ($type === MediaLibraryItem::TYPE_FOLDER) {
elseif ($type === MediaLibraryItem::TYPE_FOLDER) {
/*
* Delete single folder
*/
@ -943,7 +943,7 @@ class MediaManager extends WidgetBase
'isError' => false,
'imageUrl' => $this->getThumbnailImageUrl($thumbnailPath)
]);
}
}
catch (Exception $ex) {
if ($tempFilePath) {
File::delete($tempFilePath);

6
modules/cms/widgets/TemplateList.php
View File

@ -72,7 +72,7 @@ class TemplateList extends WidgetBase
public $ignoreDirectories = [];
/**
* @var boolean Defines sorting properties.
* @var boolean Defines sorting properties.
* The sorting feature is disabled if there are no sorting properties defined.
*/
public $sortingProperties = [];
@ -233,7 +233,7 @@ class TemplateList extends WidgetBase
}
}
// Sort folders by name regardless of the
// Sort folders by name regardless of the
// selected sorting options.
ksort($foundGroups);
@ -261,7 +261,7 @@ class TemplateList extends WidgetBase
$ignoreCache = [];
$items = array_filter($items, function($item) use (&$ignoreCache) {
$items = array_filter($items, function ($item) use (&$ignoreCache) {
$fileName = $item->getBaseFileName();
$dirName = dirname($fileName);

14
modules/system/ServiceProvider.php
View File

@ -198,7 +198,7 @@ class ServiceProvider extends ModuleServiceProvider
/*
* Allow plugins to use the scheduler
*/
Event::listen('console.schedule', function($schedule) {
Event::listen('console.schedule', function ($schedule) {
$plugins = PluginManager::instance()->getPlugins();
foreach ($plugins as $plugin) {
if (method_exists($plugin, 'registerSchedule')) {
@ -210,7 +210,7 @@ class ServiceProvider extends ModuleServiceProvider
/*
* Add CMS based cache clearing to native command
*/
Event::listen('cache:cleared', function() {
Event::listen('cache:cleared', function () {
\System\Helpers\Cache::clearInternal();
});
@ -241,7 +241,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
protected function registerErrorHandler()
{
Event::listen('exception.beforeRender', function ($exception, $httpCode, $request){
Event::listen('exception.beforeRender', function ($exception, $httpCode, $request) {
$handler = new ErrorHandler;
return $handler->handleException($exception);
});
@ -377,7 +377,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
protected function registerBackendSettings()
{
Event::listen('system.settings.extendItems', function($manager) {
Event::listen('system.settings.extendItems', function ($manager) {
\System\Models\LogSetting::filterSettingItems($manager);
});
@ -460,7 +460,7 @@ class ServiceProvider extends ModuleServiceProvider
/*
* Register asset bundles
*/
CombineAssets::registerCallback(function($combiner) {
CombineAssets::registerCallback(function ($combiner) {
$combiner->registerBundle('~/modules/system/assets/less/styles.less');
$combiner->registerBundle('~/modules/system/assets/ui/storm.less');
$combiner->registerBundle('~/modules/system/assets/ui/storm.js');
@ -476,12 +476,12 @@ class ServiceProvider extends ModuleServiceProvider
* Allowed file extensions, as opposed to mime types.
* - extensions: png,jpg,txt
*/
Validator::extend('extensions', function($attribute, $value, $parameters) {
Validator::extend('extensions', function ($attribute, $value, $parameters) {
$extension = strtolower($value->getClientOriginalExtension());
return in_array($extension, $parameters);
});
Validator::replacer('extensions', function($message, $attribute, $rule, $parameters) {
Validator::replacer('extensions', function ($message, $attribute, $rule, $parameters) {
return strtr($message, [':values' => implode(', ', $parameters)]);
});
}

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

@ -457,7 +457,7 @@ class CombineAssets
{
$key = '';
$assetFiles = array_map(function($file) {
$assetFiles = array_map(function ($file) {
return File::symbolizePath($file, null) ?: $this->localPath . $file;
}, $assets);
@ -524,7 +524,7 @@ class CombineAssets
/**
* Registers a callback function that defines bundles.
* The callback function should register bundles by calling the manager's
* `registerBundle` method. Thi instance is passed to the callback
* `registerBundle` method. Thi instance is passed to the callback
* function as an argument. Usage:
*
* CombineAssets::registerCallback(function($combiner){

2
modules/system/classes/ComposerManager.php
View File

@ -121,4 +121,4 @@ class ComposerManager
return $path;
}
}
}

4
modules/system/classes/MarkupManager.php
View File

@ -97,7 +97,7 @@ class MarkupManager
/**
* Registers the CMS Twig extension items.
* The argument is an array of the extension definitions. The array keys represent the
* The argument is an array of the extension definitions. The array keys represent the
* function/filter name, specific for the plugin/module. Each element in the
* array should be an associative array.
* @param string $type The extension type: filters, functions, tokens
@ -291,7 +291,7 @@ class MarkupManager
}
/**
* Tests if a callable type contains a wildcard, also acts as a
* Tests if a callable type contains a wildcard, also acts as a
* utility to replace the wildcard with a string.
* @param callable $callable
* @param string|bool $replaceWith

2
modules/system/classes/PluginBase.php
View File

@ -107,7 +107,7 @@ class PluginBase extends ServiceProviderBase
$navigation = $configuration['navigation'];
if (is_array($navigation)) {
array_walk_recursive($navigation, function(&$item, $key){
array_walk_recursive($navigation, function (&$item, $key) {
if ($key === 'url') {
$item = Backend::url($item);
}

4
modules/system/classes/SettingsManager.php
View File

@ -207,8 +207,8 @@ class SettingsManager
/**
* Registers the back-end setting items.
* The argument is an array of the settings items. The array keys represent the
* setting item codes, specific for the plugin/module. Each element in the
* The argument is an array of the settings items. The array keys represent the
* setting item codes, specific for the plugin/module. Each element in the
* array should be an associative array with the following keys:
* - label - specifies the settings label localization string key, required.
* - icon - an icon name from the Font Awesome icon collection, required.

4
modules/system/console/OctoberEnv.php
View File

@ -194,7 +194,7 @@ class OctoberEnv extends Command
*/
private function saveEnvSettings($key, $value)
{
if ( ! $this->envKeyExists($key)) {
if (! $this->envKeyExists($key)) {
$line = sprintf("%s=%s\n", $key, $this->stripQuotes($value));
if ($this->config == 'database' && $key != 'DB_CONNECTION') {
@ -394,4 +394,4 @@ class OctoberEnv extends Command
];
}
}
}

4
modules/system/console/OctoberUtil.php
View File

@ -59,9 +59,9 @@ class OctoberUtil extends Command
$method = 'util'.studly_case($command);
$methods = preg_grep('/^util/', get_class_methods(get_called_class()));
$list = array_map(function($item){
$list = array_map(function ($item) {
return "october:".snake_case($item, " ");
},$methods);
}, $methods);
if (!$this->argument('name')) {
$message = 'There are no commands defined in the "util" namespace.';

2
modules/system/helpers/View.php
View File

@ -21,7 +21,7 @@ class View
return static::$globalVarCache;
}
$vars = array_filter(ViewFacade::getShared(), function($var) {
$vars = array_filter(ViewFacade::getShared(), function ($var) {
return is_scalar($var) || is_array($var);
});

2
modules/system/lang/bg/client.php
View File

@ -45,4 +45,4 @@ return [
'confirm_button_text' => 'Потвърди',
'cancel_button_text' => 'Откажи',
],
];
];

3
modules/system/lang/cs/client.php
View File

@ -52,6 +52,3 @@ return [
],
];

6
modules/system/lang/el/client.php
View File

@ -49,9 +49,9 @@ return [
'datepicker' => [
'previousMonth' => 'Προηγούμενος Μήνας',
'nextMonth' => 'Επόμενος Μήνας',
'months' => ['Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάιος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος'],
'weekdays' => ['Κυριακή', 'Δευτέρα', 'Τρίτη', 'Τετάρτη', 'Πέμπτη', 'Παρασκευή', 'Σάββατο'],
'weekdaysShort' => ['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σαβ']
'months' => ['Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάιος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος'],
'weekdays' => ['Κυριακή', 'Δευτέρα', 'Τρίτη', 'Τετάρτη', 'Πέμπτη', 'Παρασκευή', 'Σάββατο'],
'weekdaysShort' => ['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σαβ']
],
'filter' => [
'group' => [

2
modules/system/lang/el/lang.php
View File

@ -156,7 +156,7 @@ return [
'menu_layouts_label' => 'Πρότυπα Ηλεκτρονικού Ταχυδρομείου',
'layout' => 'Διάταξη',
'layouts' => 'Διάταξεις',
'no_layout' => '-- Χωρίς διάταξη --',
'no_layout' => '-- Χωρίς διάταξη --',
'name' => 'Όνομα',
'name_comment' => 'Μοναδικό όνομα που χρησιμοποιείται για την αναφορά σε αυτό το πρότυπο',
'code' => 'Κωδικος',

2
modules/system/lang/es/validation.php
View File

@ -46,7 +46,7 @@ return [
"array" => "El campo :attribute no debe tener más de :max elementos."
],
"mimes" => "El campo :attribute debe ser un archivo del tipo: :values.",
"extensions" => "El campo :attribute debe tener una extensión de: :values.",
"extensions" => "El campo :attribute debe tener una extensión de: :values.",
"min" => [
"numeric" => "El campo :attribute debe ser :min o más.",
"file" => "El campo :attribute debe ocupar :min kilobytes o más.",

28
modules/system/lang/pl/lang.php
View File

@ -32,7 +32,7 @@ return [
'my_settings' => 'Moje Ustawienia'
]
],
'theme' => [
'theme' => [
'label' => 'Motyw',
'unnamed' => 'Nienazwany motyw',
'name' => [
@ -49,7 +49,7 @@ return [
'remove_confirm' => 'Na pewno usunąć ten motyw?'
],
'plugin' => [
'label' => 'Wtyczka',
'label' => 'Wtyczka',
'unnamed' => 'Wtyczka bez nazwy',
'name' => [
'label' => 'Nazwa Wtyczki',
@ -60,7 +60,7 @@ return [
'manage' => 'Zarządzaj Wtyczkami',
'enable_or_disable' => 'Włącz lub wyłącz',
'enable_or_disable_title' => 'Włącz lub Wyłącz Wtyczki',
'install' => 'Zainstaluj wtyczki',
'install' => 'Zainstaluj wtyczki',
'install_products' => 'Zainstaluj produkty',
'search' => 'szukaj wtyczek do instalacji...',
'installed' => 'Zainstalowane wtyczki',
@ -70,7 +70,7 @@ return [
'refresh' => 'Odśwież',
'disabled_label' => 'Wyłączona',
'disabled_help' => 'Wyłączone wtyczki są ignorowane przez aplikację.',
'frozen_label' => 'Zablokuj zaktualizacje',
'frozen_label' => 'Zablokuj zaktualizacje',
'frozen_help' => 'Zamrożone wtyczki będą pomijane w procesie aktualizacji.',
'selected_amount' => 'Zaznaczono wtyczek: :amount',
'remove_confirm' => 'Czy jesteś pewny?',
@ -133,7 +133,7 @@ return [
'mailgun_domain_comment' => 'Proszę podać nazwę domeny Mailgun.',
'mailgun_secret' => 'Mailgun Secret',
'mailgun_secret_comment' => 'Podaj swój klucz API Mailgun.',
'mandrill' => 'Mandrill',
'mandrill' => 'Mandrill',
'mandrill_secret' => 'Mandrill secret',
'mandrill_secret_comment' => 'Podaj swój klucz API Mandrill.',
'ses' => 'SES',
@ -184,9 +184,9 @@ return [
'install' => [
'project_label' => 'Podłącz do Projektu',
'plugin_label' => 'Zainstaluj Wtyczkę',
'theme_label' => 'Zainstaluj Motyw',
'theme_label' => 'Zainstaluj Motyw',
'missing_plugin_name' => 'Proszę podać nazwę Wtyczki do zainstalowania.',
'missing_theme_name' => 'Proszę podać nazwę Motywu do zainstalowania.',
'missing_theme_name' => 'Proszę podać nazwę Motywu do zainstalowania.',
'install_completing' => 'Proces instalacji prawie zakończony.',
'install_success' => 'Wtyczka została zainstalowana pomyślnie.'
],
@ -195,11 +195,11 @@ return [
'name' => 'Aktualizacje',
'menu_label' => 'Aktualizacje',
'menu_description' => 'Aktualizacja systemu, zarządzaj i instaluj wtyczki oraz szablony.',
'return_link' => 'Wróć do aktualizacji systemu',
'return_link' => 'Wróć do aktualizacji systemu',
'check_label' => 'Sprawdź aktualizacje',
'retry_label' => 'Spróbuj ponownie',
'plugin_name' => 'Nazwa',
'plugin_code' => 'Kod',
'plugin_code' => 'Kod',
'plugin_description' => 'Opis',
'plugin_version' => 'Wersja',
'plugin_author' => 'Autor',
@ -210,12 +210,12 @@ return [
'core_downloading' => 'Pobieranie plików aplikacji',
'core_extracting' => 'Rozpakowywanie plików aplikacji',
'plugins' => 'Wtyczki',
'themes' => 'Motywy',
'themes' => 'Motywy',
'disabled' => 'Wyłączony',
'plugin_downloading' => 'Pobieranie wtyczki: :name',
'plugin_extracting' => 'Rozpakowywanie wtyczki: :name',
'plugin_version_none' => 'Nowa wtyczka',
'plugin_current_version' => 'Aktualna wersja',
'plugin_current_version' => 'Aktualna wersja',
'theme_new_install' => 'Zainstaluj nowy motyw.',
'theme_downloading' => 'Pobieranie nowego motywu: :name',
'theme_extracting' => 'Rozpakowywanie motywu: :name',
@ -233,7 +233,7 @@ return [
'label' => 'Brak aktualizacji',
'help' => 'Brak nowych aktualizacji.'
],
'important_action' => [
'important_action' => [
'empty' => 'Wybierz działanie',
'confirm' => 'Zatwierdź aktualizację',
'skip' => 'Pomiń tę wtyczkę (tylko teraz)',
@ -304,13 +304,13 @@ return [
'name' => 'System',
'manage_system_settings' => 'Zarządzaj ustawienia systemu',
'manage_software_updates' => 'Zarządzaj aktualizacjami – software',
'access_logs' => 'Przeglądaj logi systemowe',
'access_logs' => 'Przeglądaj logi systemowe',
'manage_mail_templates' => 'Zarządzaj szablonami wiadomości',
'manage_mail_settings' => 'Zarządzaj ustawieniami wiadomości',
'manage_other_administrators' => 'Zarządzaj innymi administratorami',
'manage_preferences' => 'Zarządzaj ustawieniami backend',
'manage_editor' => 'Zarządzaj ustawieniami edytora kodu',
'view_the_dashboard' => 'Zobacz kokpit',
'manage_branding' => 'Personalizuj zaplecze'
'manage_branding' => 'Personalizuj zaplecze'
]
];

3
modules/system/lang/ro/client.php
View File

@ -52,6 +52,3 @@ return [
],
];

3
modules/system/lang/sv/client.php
View File

@ -52,6 +52,3 @@ return [
],
];

2
modules/system/lang/zh-tw/lang.php
View File

@ -261,4 +261,4 @@ return [
'view_the_dashboard' => '查看儀表板',
'manage_branding' => '自訂後台'
]
];
];

2
modules/system/traits/AssetMaker.php
View File

@ -102,7 +102,7 @@ trait AssetMaker
}
/**
* Adds JavaScript asset to the asset list. Call $this->makeAssets() in a view
* Adds JavaScript asset to the asset list. Call $this->makeAssets() in a view
* to output corresponding markup.
* @param string $name Specifies a path (URL) to the script.
* @param array $attributes Adds extra HTML attributes to the asset link.

2
modules/system/traits/ConfigMaker.php
View File

@ -100,7 +100,7 @@ trait ConfigMaker
}
/**
* Makes a config object from an array, making the first level keys properties a new object.
* Makes a config object from an array, making the first level keys properties a new object.
* Property values are converted to camelCase and are not set if one already exists.
* @param array $configArray Config array.
* @return stdClass The config object

2
modules/system/traits/PropertyContainer.php
View File

@ -3,7 +3,7 @@
/**
* Property container trait
*
* Adds properties and methods for classes that could define properties,
* Adds properties and methods for classes that could define properties,
* like components or report widgets.
*
* @package october\system

2
tests/fixtures/plugins/database/tester/Plugin.php vendored
View File

@ -14,4 +14,4 @@ class Plugin extends PluginBase
];
}
}
}

2
tests/fixtures/plugins/database/tester/models/Category.php vendored
View File

@ -29,4 +29,4 @@ class CategoryNested extends Category
* @var string The database table used by the model.
*/
public $table = 'database_tester_categories_nested';
}
}

2
tests/fixtures/plugins/database/tester/models/Phone.php vendored
View File

@ -27,4 +27,4 @@ class Phone extends Model
'author' => 'Database\Tester\Models\Author',
];
}
}

2
tests/fixtures/plugins/database/tester/models/User.php vendored
View File

@ -54,4 +54,4 @@ class UserWithAuthorAndSoftDelete extends UserWithAuthor
class UserWithSoftAuthorAndSoftDelete extends UserWithSoftAuthor
{
use \October\Rain\Database\Traits\SoftDelete;
}
}

2
tests/fixtures/plugins/database/tester/updates/create_authors_table.php vendored
View File

@ -8,7 +8,7 @@ class CreateAuthorsTable extends Migration
public function up()
{
Schema::create('database_tester_authors', function($table)
Schema::create('database_tester_authors', function ($table)
{
$table->engine = 'InnoDB';
$table->increments('id');

4
tests/fixtures/plugins/database/tester/updates/create_categories_table.php vendored
View File

@ -8,7 +8,7 @@ class CreateCategoriesTable extends Migration
public function up()
{
Schema::create('database_tester_categories', function($table)
Schema::create('database_tester_categories', function ($table)
{
$table->engine = 'InnoDB';
$table->increments('id');
@ -22,7 +22,7 @@ class CreateCategoriesTable extends Migration
$table->softDeletes();
});
Schema::create('database_tester_categories_nested', function($table)
Schema::create('database_tester_categories_nested', function ($table)
{
$table->engine = 'InnoDB';
$table->increments('id');

2
tests/fixtures/plugins/database/tester/updates/create_event_log_table.php vendored
View File

@ -8,7 +8,7 @@ class CreateEventLogTable extends Migration
public function up()
{
Schema::create('database_tester_event_log', function($table)
Schema::create('database_tester_event_log', function ($table)
{
$table->engine = 'InnoDB';
$table->increments('id');

2
tests/fixtures/plugins/database/tester/updates/create_meta_table.php vendored
View File

@ -8,7 +8,7 @@ class CreateMetaTable extends Migration
public function up()
{
Schema::create('database_tester_meta', function($table)
Schema::create('database_tester_meta', function ($table)
{
$table->engine = 'InnoDB';
$table->increments('id')->unsigned();

2
tests/fixtures/plugins/database/tester/updates/create_phones_table.php vendored
View File

@ -8,7 +8,7 @@ class CreatePhonesTable extends Migration
public function up()
{
Schema::create('database_tester_phones', function($table)
Schema::create('database_tester_phones', function ($table)
{
$table->engine = 'InnoDB';
$table->increments('id');

2
tests/fixtures/plugins/database/tester/updates/create_posts_table.php vendored
View File

@ -8,7 +8,7 @@ class CreatePostsTable extends Migration
public function up()
{
Schema::create('database_tester_posts', function($table)
Schema::create('database_tester_posts', function ($table)
{
$table->engine = 'InnoDB';
$table->increments('id');

Some files were not shown because too many files have changed in this diff Show More