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

*** REMOVED ALL DEPRECATED CODE **

This commit is contained in:
Samuel Georges 2015-02-14 14:11:25 +11:00
parent 47eff923e5
commit 6a2f64757b
14 changed files with 0 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/backend/assets/less/controls/breadcrumb.less
View File

@ -45,7 +45,6 @@
}
// Breadcrumb to sit flush to the element below
&.no-bottom-margin, // @deprecated remove if year >= 2015
&.breadcrumb-flush {
margin-bottom: 0;
}

1
modules/backend/assets/less/controls/forms.less
View File

@ -150,7 +150,6 @@ label {
margin-top: -5px;
}
&.no-padding, // @deprecated remove if year >= 2015
&.field-slim {
&.span-left, &.span-right {
width: 50%;

5
modules/backend/assets/less/controls/lists.less
View File

@ -367,11 +367,6 @@ table.table.data {
background-color: @color-list-header-bg;
padding: 0 20px 1px 20px;
// Remove if year >= 2015
//&.control-breadcrumb {
// padding-bottom: 20px !important;
//}
h3 {
font-size: 14px;
color: @color-status-list-text;

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

@ -137,12 +137,6 @@ class FilterScope
if (isset($config['descriptionFrom'])) {
$this->descriptionFrom = $config['descriptionFrom'];
}
// @todo Remove line if year >= 2015
if (isset($config['nameColumn'])) {
$this->nameFrom = $config['nameColumn'];
}
if (array_key_exists('disabled', $config)) {
$this->disabled = $config['disabled'];
}

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

@ -278,10 +278,6 @@ class FormField
if (isset($config['dependsOn'])) {
$this->dependsOn = $config['dependsOn'];
}
/* @deprecated remove if year >= 2016 */
elseif (isset($config['depends'])) {
$this->dependsOn = $config['depends'];
}
if (isset($config['path'])) {
$this->path = $config['path'];
}

11
modules/backend/classes/FormWidgetBase.php
View File

@ -55,9 +55,6 @@ abstract class FormWidgetBase extends WidgetBase
$this->valueFrom = $formField->valueFrom;
$this->model = $model;
// @todo Remove line if year >= 2015
$this->columnName = $formField->valueFrom;
if (isset($configuration->sessionKey)) {
$this->sessionKey = $configuration->sessionKey;
}
@ -65,14 +62,6 @@ abstract class FormWidgetBase extends WidgetBase
$this->previewMode = $configuration->previewMode;
}
/*
* Form fields originally passed their configuration via the options index.
* This step should be removed if year >= 2015.
*/
if (isset($configuration->options)) {
$configuration = array_merge($configuration->options, (array) $configuration);
}
parent::__construct($controller, $configuration);
}

5
modules/backend/classes/ListColumn.php
View File

@ -135,11 +135,6 @@ class ListColumn
$this->path = $config['path'];
}
// @todo Remove lines if year >= 2015
if (isset($config['nameFrom'])) {
$this->valueFrom = $config['nameFrom'];
}
return $config;
}
}

5
modules/backend/classes/WidgetManager.php
View File

@ -104,11 +104,6 @@ class WidgetManager
{
$widgetCode = isset($widgetInfo['code']) ? $widgetInfo['code'] : null;
/* @todo Remove line if year >= 2015 */
if (!$widgetCode) {
$widgetCode = isset($widgetInfo['alias']) ? $widgetInfo['alias'] : null;
}
if (!$widgetCode) {
$widgetCode = Str::getClassId($className);
}

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

@ -84,15 +84,6 @@ class RecordFinder extends FormWidgetBase
$this->nameFrom = $this->getConfig('nameFrom', $this->nameFrom);
$this->descriptionFrom = $this->getConfig('descriptionFrom', $this->descriptionFrom);
/* @todo Remove lines if year >= 2015 */
if ($this->getConfig('nameColumn')) {
$this->nameFrom = $this->getConfig('nameColumn');
}
/* @todo Remove lines if year >= 2015 */
if ($this->getConfig('descriptionColumn')) {
$this->descriptionFrom = $this->getConfig('descriptionColumn');
}
if (!$this->model->hasRelation($this->relationName)) {
throw new SystemException(Lang::get('backend::lang.model.missing_relation', [
'class' => get_class($this->model),

9
modules/backend/formwidgets/Relation.php
View File

@ -61,15 +61,6 @@ class Relation extends FormWidgetBase
$this->descriptionFrom = $this->getConfig('descriptionFrom', $this->descriptionFrom);
$this->emptyOption = $this->getConfig('emptyOption');
/* @todo Remove lines if year >= 2015 */
if ($this->getConfig('nameColumn')) {
$this->nameFrom = $this->getConfig('nameColumn');
}
/* @todo Remove lines if year >= 2015 */
if ($this->getConfig('descriptionColumn')) {
$this->descriptionFrom = $this->getConfig('descriptionColumn');
}
if (!$this->model->hasRelation($this->relationName)) {
throw new SystemException(Lang::get(
'backend::lang.model.missing_relation',

8
modules/backend/widgets/Form.php
View File

@ -803,14 +803,6 @@ class Form extends WidgetBase
$widgetValue = $widget->getSaveValue(array_get($data, $dotted));
/*
* @deprecated Remove if year >= 2016
*/
if (method_exists($widget, 'getSaveData')) {
traceLog('Method getSaveData() is deprecated, use getSaveValue() instead. Found in: ' . get_class($widget), 'warning');
$widgetValue = $widget->getSaveData(array_get($data, $dotted));
}
array_set($data, $dotted, $widgetValue);
}

36
modules/cms/classes/CmsPropertyHelper.php
View File

@ -1,36 +0,0 @@
<?php namespace Cms\Classes;
/**
*
* DEPRECATED WARNING: This class is deprecated and should be deleted
* if the current year is equal to or greater than 2015.
*
* @todo Delete this file if year >= 2015.
*
*/
use Flash;
use Cms\Classes\Page;
use ApplicationException;
/**
* This class provides helper methods for inspectable properties.
*
* @package october\cms
* @author Alexey Bobkov, Samuel Georges
*/
class CmsPropertyHelper
{
/**
* Returns a list of CMS pages as array of page file paths and titles.
* @return array
*/
public static function listPages()
{
Flash::warning(
"CmsPropertyHelper::listPages() is deprecated, use Page::sortBy('baseFileName')->lists('baseFileName',
'baseFileName') instead."
);
return Page::sortBy('baseFileName')->lists('baseFileName', 'baseFileName');
}
}

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

@ -117,11 +117,6 @@ abstract class ComponentBase extends Extendable
public function init()
{
}
// @deprecated: Remove this line if year >= 2015
public function onInit()
{
}
/**
* Executed when this component is bound to a page or layout, part of

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

@ -457,7 +457,6 @@ class Controller
$this->setComponentPropertiesFromParams($componentObj);
$componentObj->init();
$componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015
return $componentObj;
}
@ -825,7 +824,6 @@ class Controller
$this->setComponentPropertiesFromParams($componentObj, $parameters);
$componentObj->init();
$componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015
}
CmsException::mask($this->page, 300);