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

Str::getRealClass -> class_basename

This commit is contained in:
Sam Georges 2014-09-29 13:12:34 +10:00
parent 2255b9404e
commit bf47eb94ed
9 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ class FormController extends ControllerBehavior
$config = $this->makeConfig($this->config->form); $config = $this->makeConfig($this->config->form);
$config->model = $model; $config->model = $model;
$config->arrayName = Str::getRealClass($model); $config->arrayName = class_basename($model);
$config->context = $context; $config->context = $context;
/* /*

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

@ -1,7 +1,6 @@
<?php namespace Backend\Behaviors; <?php namespace Backend\Behaviors;
use DB; use DB;
use Str;
use Lang; use Lang;
use Event; use Event;
use Form as FormHelper; use Form as FormHelper;
@ -400,7 +399,7 @@ class RelationController extends ControllerBehavior
*/ */
public function relationGetId($suffix = null) public function relationGetId($suffix = null)
{ {
$id = Str::getRealClass($this); $id = class_basename($this);
if ($this->field) if ($this->field)
$id .= '-' . $this->field; $id .= '-' . $this->field;
@ -673,7 +672,7 @@ class RelationController extends ControllerBehavior
elseif ($this->viewMode == 'single') { elseif ($this->viewMode == 'single') {
$config = $this->makeConfig($this->config->form); $config = $this->makeConfig($this->config->form);
$config->model = $this->relationModel; $config->model = $this->relationModel;
$config->arrayName = Str::getRealClass($this->relationModel); $config->arrayName = class_basename($this->relationModel);
$config->context = 'relation'; $config->context = 'relation';
$config->alias = $this->alias . 'ViewForm'; $config->alias = $this->alias . 'ViewForm';
@ -732,7 +731,7 @@ class RelationController extends ControllerBehavior
elseif ($this->manageMode == 'form' && isset($this->config->form)) { elseif ($this->manageMode == 'form' && isset($this->config->form)) {
$config = $this->makeConfig($this->config->form); $config = $this->makeConfig($this->config->form);
$config->model = $this->relationModel; $config->model = $this->relationModel;
$config->arrayName = Str::getRealClass($this->relationModel); $config->arrayName = class_basename($this->relationModel);
$config->context = 'relation'; $config->context = 'relation';
$config->alias = $this->alias . 'ManageForm'; $config->alias = $this->alias . 'ManageForm';
@ -778,7 +777,7 @@ class RelationController extends ControllerBehavior
{ {
$config = $this->makeConfig($this->config->pivot); $config = $this->makeConfig($this->config->pivot);
$config->model = $this->relationModel; $config->model = $this->relationModel;
$config->arrayName = Str::getRealClass($this->relationModel); $config->arrayName = class_basename($this->relationModel);
$config->context = 'relation'; $config->context = 'relation';
$config->alias = $this->alias . 'ManagePivotForm'; $config->alias = $this->alias . 'ManagePivotForm';

3
modules/backend/classes/Controller.php
View File

@ -1,7 +1,6 @@
<?php namespace Backend\Classes; <?php namespace Backend\Classes;
use App; use App;
use Str;
use Log; use Log;
use Lang; use Lang;
use View; use View;
@ -459,7 +458,7 @@ class Controller extends Extendable
*/ */
public function getId($suffix = null) public function getId($suffix = null)
{ {
$id = Str::getRealClass(get_called_class()) . '-' . $this->action; $id = class_basename(get_called_class()) . '-' . $this->action;
if ($suffix !== null) if ($suffix !== null)
$id .= '-' . $suffix; $id .= '-' . $suffix;

3
modules/backend/classes/Skin.php
View File

@ -1,6 +1,5 @@
<?php namespace Backend\Classes; <?php namespace Backend\Classes;
use Str;
use File; use File;
use Config; use Config;
use October\Rain\Router\Helper as RouterHelper; use October\Rain\Router\Helper as RouterHelper;
@ -55,7 +54,7 @@ abstract class Skin
* Guess the skin path * Guess the skin path
*/ */
$class = get_called_class(); $class = get_called_class();
$classFolder = strtolower(Str::getRealClass($class)); $classFolder = strtolower(class_basename($class));
$classFile = realpath(dirname(File::fromClass($class))); $classFile = realpath(dirname(File::fromClass($class)));
$this->skinPath = $classFile $this->skinPath = $classFile
? $classFile . '/' . $classFolder ? $classFile . '/' . $classFolder

2
modules/backend/classes/WidgetBase.php
View File

@ -123,7 +123,7 @@ abstract class WidgetBase
*/ */
public function getId($suffix = null) public function getId($suffix = null)
{ {
$id = Str::getRealClass(get_called_class()); $id = class_basename(get_called_class());
if ($this->alias != $this->defaultAlias) if ($this->alias != $this->defaultAlias)
$id .= '-' . $this->alias; $id .= '-' . $this->alias;

3
modules/cms/twig/DebugExtension.php
View File

@ -1,6 +1,5 @@
<?php namespace Cms\Twig; <?php namespace Cms\Twig;
use Str;
use Twig_Extension; use Twig_Extension;
use Twig_Environment; use Twig_Environment;
use Twig_SimpleFunction; use Twig_SimpleFunction;
@ -243,7 +242,7 @@ class DebugExtension extends Twig_Extension
protected function evalObjLabel($variable) protected function evalObjLabel($variable)
{ {
$class = get_class($variable); $class = get_class($variable);
$label = Str::getRealClass($variable); $label = class_basename($variable);
if ($variable instanceof ComponentBase) if ($variable instanceof ComponentBase)
$label = '<strong>Component</strong>'; $label = '<strong>Component</strong>';

3
modules/system/controllers/Settings.php
View File

@ -1,6 +1,5 @@
<?php namespace System\Controllers; <?php namespace System\Controllers;
use Str;
use Lang; use Lang;
use Flash; use Flash;
use Backend; use Backend;
@ -125,7 +124,7 @@ class Settings extends Controller
{ {
$config = $model->getFieldConfig(); $config = $model->getFieldConfig();
$config->model = $model; $config->model = $model;
$config->arrayName = Str::getRealClass($model); $config->arrayName = class_basename($model);
$config->context = 'update'; $config->context = 'update';
$widget = $this->makeWidget('Backend\Widgets\Form', $config); $widget = $this->makeWidget('Backend\Widgets\Form', $config);

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

@ -1,6 +1,5 @@
<?php namespace System\Traits; <?php namespace System\Traits;
use Str;
use File; use File;
use Lang; use Lang;
use Event; use Event;
@ -156,7 +155,7 @@ trait ConfigMaker
*/ */
public function guessConfigPathFrom($class, $suffix = '') public function guessConfigPathFrom($class, $suffix = '')
{ {
$classFolder = strtolower(Str::getRealClass($class)); $classFolder = strtolower(class_basename($class));
$classFile = realpath(dirname(File::fromClass($class))); $classFile = realpath(dirname(File::fromClass($class)));
$guessedPath = $classFile ? $classFile . '/' . $classFolder . $suffix : null; $guessedPath = $classFile ? $classFile . '/' . $classFolder . $suffix : null;
return $guessedPath; return $guessedPath;

3
modules/system/traits/ViewMaker.php
View File

@ -1,6 +1,5 @@
<?php namespace System\Traits; <?php namespace System\Traits;
use Str;
use File; use File;
use Lang; use Lang;
use Block; use Block;
@ -212,7 +211,7 @@ trait ViewMaker
*/ */
public function guessViewPathFrom($class, $suffix = '', $isPublic = false) public function guessViewPathFrom($class, $suffix = '', $isPublic = false)
{ {
$classFolder = strtolower(Str::getRealClass($class)); $classFolder = strtolower(class_basename($class));
$classFile = realpath(dirname(File::fromClass($class))); $classFile = realpath(dirname(File::fromClass($class)));
$guessedPath = $classFile ? $classFile . '/' . $classFolder . $suffix : null; $guessedPath = $classFile ? $classFile . '/' . $classFolder . $suffix : null;
return ($isPublic) ? File::localToPublic($guessedPath) : $guessedPath; return ($isPublic) ? File::localToPublic($guessedPath) : $guessedPath;