Error202
/
yii2-swiftmailer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Changed usage of self to static to allow extendibility 

code style section has been added here:
https://github.com/yiisoft/yii2/wiki/Core-framework-code-style#self-vs-static

verification code for properties:
https://gist.github.com/cebe/7566916
tags/2.0.0-beta
Carsten Brandt 11 years ago
parent
64862f96ca
commit
e775c82dd8
6 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      apps/basic/models/User.php
  2. 2
      extensions/jui/Widget.php
  3. 64
      framework/yii/BaseYii.php
  4. 6
      framework/yii/helpers/BaseInflector.php
  5. 2
      framework/yii/web/Response.php
  6. 6
      tests/unit/TestCase.php

4
apps/basic/models/User.php
Unescape View File

@ -26,14 +26,14 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
public static function findIdentity($id)
{
return isset(self::$users[$id]) ? new self(self::$users[$id]) : null;
return isset(self::$users[$id]) ? new static(self::$users[$id]) : null;
}
public static function findByUsername($username)
{
foreach (self::$users as $user) {
if (strcasecmp($user['username'], $username) === 0) {
return new self($user);
return new static($user);
}
}
return null;

2
extensions/jui/Widget.php
Unescape View File

@ -66,7 +66,7 @@ class Widget extends \yii\base\Widget
/** @var \yii\web\AssetBundle $assetBundle */
$assetBundle::register($view);
/** @var \yii\web\AssetBundle $themeAsset */
$themeAsset = self::$theme;
$themeAsset = static::$theme;
$themeAsset::register($view);
$id = $this->options['id'];

64
framework/yii/BaseYii.php
Unescape View File

@ -147,11 +147,11 @@ class BaseYii
$pos = strpos($alias, '/');
$root = $pos === false ? $alias : substr($alias, 0, $pos);
if (isset(self::$aliases[$root])) {
if (is_string(self::$aliases[$root])) {
return $pos === false ? self::$aliases[$root] : self::$aliases[$root] . substr($alias, $pos);
if (isset(static::$aliases[$root])) {
if (is_string(static::$aliases[$root])) {
return $pos === false ? static::$aliases[$root] : static::$aliases[$root] . substr($alias, $pos);
} else {
foreach (self::$aliases[$root] as $name => $path) {
foreach (static::$aliases[$root] as $name => $path) {
if (strpos($alias . '/', $name . '/') === 0) {
return $path . substr($alias, strlen($name));
}
@ -178,11 +178,11 @@ class BaseYii
$pos = strpos($alias, '/');
$root = $pos === false ? $alias : substr($alias, 0, $pos);
if (isset(self::$aliases[$root])) {
if (is_string(self::$aliases[$root])) {
if (isset(static::$aliases[$root])) {
if (is_string(static::$aliases[$root])) {
return $root;
} else {
foreach (self::$aliases[$root] as $name => $path) {
foreach (static::$aliases[$root] as $name => $path) {
if (strpos($alias . '/', $name . '/') === 0) {
return $name;
}
@ -229,30 +229,30 @@ class BaseYii
$root = $pos === false ? $alias : substr($alias, 0, $pos);
if ($path !== null) {
$path = strncmp($path, '@', 1) ? rtrim($path, '\\/') : static::getAlias($path);
if (!isset(self::$aliases[$root])) {
if (!isset(static::$aliases[$root])) {
if ($pos === false) {
self::$aliases[$root] = $path;
static::$aliases[$root] = $path;
} else {
self::$aliases[$root] = [$alias => $path];
static::$aliases[$root] = [$alias => $path];
}
} elseif (is_string(self::$aliases[$root])) {
} elseif (is_string(static::$aliases[$root])) {
if ($pos === false) {
self::$aliases[$root] = $path;
static::$aliases[$root] = $path;
} else {
self::$aliases[$root] = [
static::$aliases[$root] = [
$alias => $path,
$root => self::$aliases[$root],
$root => static::$aliases[$root],
];
}
} else {
self::$aliases[$root][$alias] = $path;
krsort(self::$aliases[$root]);
static::$aliases[$root][$alias] = $path;
krsort(static::$aliases[$root]);
}
} elseif (isset(self::$aliases[$root])) {
if (is_array(self::$aliases[$root])) {
unset(self::$aliases[$root][$alias]);
} elseif (isset(static::$aliases[$root])) {
if (is_array(static::$aliases[$root])) {
unset(static::$aliases[$root][$alias]);
} elseif ($pos === false) {
unset(self::$aliases[$root]);
unset(static::$aliases[$root]);
}
}
}
@ -278,8 +278,8 @@ class BaseYii
*/
public static function autoload($className)
{
if (isset(self::$classMap[$className])) {
$classFile = self::$classMap[$className];
if (isset(static::$classMap[$className])) {
$classFile = static::$classMap[$className];
if ($classFile[0] === '@') {
$classFile = static::getAlias($classFile);
}
@ -362,8 +362,8 @@ class BaseYii
$class = ltrim($class, '\\');
if (isset(self::$objectConfig[$class])) {
$config = array_merge(self::$objectConfig[$class], $config);
if (isset(static::$objectConfig[$class])) {
$config = array_merge(static::$objectConfig[$class], $config);
}
if (($n = func_num_args()) > 1) {
@ -394,7 +394,7 @@ class BaseYii
public static function trace($message, $category = 'application')
{
if (YII_DEBUG) {
self::$app->getLog()->log($message, Logger::LEVEL_TRACE, $category);
static::$app->getLog()->log($message, Logger::LEVEL_TRACE, $category);
}
}
@ -407,7 +407,7 @@ class BaseYii
*/
public static function error($message, $category = 'application')
{
self::$app->getLog()->log($message, Logger::LEVEL_ERROR, $category);
static::$app->getLog()->log($message, Logger::LEVEL_ERROR, $category);
}
/**
@ -419,7 +419,7 @@ class BaseYii
*/
public static function warning($message, $category = 'application')
{
self::$app->getLog()->log($message, Logger::LEVEL_WARNING, $category);
static::$app->getLog()->log($message, Logger::LEVEL_WARNING, $category);
}
/**
@ -431,7 +431,7 @@ class BaseYii
*/
public static function info($message, $category = 'application')
{
self::$app->getLog()->log($message, Logger::LEVEL_INFO, $category);
static::$app->getLog()->log($message, Logger::LEVEL_INFO, $category);
}
/**
@ -453,7 +453,7 @@ class BaseYii
*/
public static function beginProfile($token, $category = 'application')
{
self::$app->getLog()->log($token, Logger::LEVEL_PROFILE_BEGIN, $category);
static::$app->getLog()->log($token, Logger::LEVEL_PROFILE_BEGIN, $category);
}
/**
@ -465,7 +465,7 @@ class BaseYii
*/
public static function endProfile($token, $category = 'application')
{
self::$app->getLog()->log($token, Logger::LEVEL_PROFILE_END, $category);
static::$app->getLog()->log($token, Logger::LEVEL_PROFILE_END, $category);
}
/**
@ -504,8 +504,8 @@ class BaseYii
*/
public static function t($category, $message, $params = [], $language = null)
{
if (self::$app !== null) {
return self::$app->getI18n()->translate($category, $message, $params, $language ?: self::$app->language);
if (static::$app !== null) {
return static::$app->getI18n()->translate($category, $message, $params, $language ?: static::$app->language);
} else {
$p = [];
foreach ((array) $params as $name => $value) {

6
framework/yii/helpers/BaseInflector.php
Unescape View File

@ -280,8 +280,8 @@ class BaseInflector
*/
public static function pluralize($word)
{
if (isset(self::$specials[$word])) {
return self::$specials[$word];
if (isset(static::$specials[$word])) {
return static::$specials[$word];
}
foreach (static::$plurals as $rule => $replacement) {
if (preg_match($rule, $word)) {
@ -298,7 +298,7 @@ class BaseInflector
*/
public static function singularize($word)
{
$result = array_search($word, self::$specials, true);
$result = array_search($word, static::$specials, true);
if ($result !== false) {
return $result;
}

2
framework/yii/web/Response.php
Unescape View File

@ -254,7 +254,7 @@ class Response extends \yii\base\Response
throw new InvalidParamException("The HTTP status code is invalid: $value");
}
if ($text === null) {
$this->statusText = isset(self::$httpStatuses[$this->_statusCode]) ? self::$httpStatuses[$this->_statusCode] : '';
$this->statusText = isset(static::$httpStatuses[$this->_statusCode]) ? static::$httpStatuses[$this->_statusCode] : '';
} else {
$this->statusText = $text;
}

6
tests/unit/TestCase.php
Unescape View File

@ -32,10 +32,10 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
*/
public function getParam($name, $default = null)
{
if (self::$params === null) {
self::$params = require(__DIR__ . '/data/config.php');
if (static::$params === null) {
static::$params = require(__DIR__ . '/data/config.php');
}
return isset(self::$params[$name]) ? self::$params[$name] : $default;
return isset(static::$params[$name]) ? static::$params[$name] : $default;
}
/**

Write Preview
Loading…
Cancel
Save