CS: Use "self" keyword instead of class name if possible
This commit is contained in:
parent
feb48c26b3
commit
e72128fa86
@ -224,7 +224,7 @@ class ExprBuilder
|
|||||||
public static function buildExpressions(array $expressions)
|
public static function buildExpressions(array $expressions)
|
||||||
{
|
{
|
||||||
foreach ($expressions as $k => $expr) {
|
foreach ($expressions as $k => $expr) {
|
||||||
if ($expr instanceof ExprBuilder) {
|
if ($expr instanceof self) {
|
||||||
$if = $expr->ifPart;
|
$if = $expr->ifPart;
|
||||||
$then = $expr->thenPart;
|
$then = $expr->thenPart;
|
||||||
$expressions[$k] = function ($v) use ($if, $then) {
|
$expressions[$k] = function ($v) use ($if, $then) {
|
||||||
|
@ -82,7 +82,7 @@ abstract class FileLoader extends Loader
|
|||||||
try {
|
try {
|
||||||
$loader = $this->resolve($resource, $type);
|
$loader = $this->resolve($resource, $type);
|
||||||
|
|
||||||
if ($loader instanceof FileLoader && null !== $this->currentDir) {
|
if ($loader instanceof self && null !== $this->currentDir) {
|
||||||
// we fallback to the current locator to keep BC
|
// we fallback to the current locator to keep BC
|
||||||
// as some some loaders do not call the parent __construct()
|
// as some some loaders do not call the parent __construct()
|
||||||
// @deprecated should be removed in 3.0
|
// @deprecated should be removed in 3.0
|
||||||
|
@ -139,7 +139,7 @@ class File extends \SplFileInfo
|
|||||||
|
|
||||||
$target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
|
$target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
|
||||||
|
|
||||||
return new File($target, false);
|
return new self($target, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -117,7 +117,7 @@ final class Intl
|
|||||||
{
|
{
|
||||||
if (null === self::$currencyBundle) {
|
if (null === self::$currencyBundle) {
|
||||||
self::$currencyBundle = new CurrencyBundle(
|
self::$currencyBundle = new CurrencyBundle(
|
||||||
self::getDataDirectory().'/'.Intl::CURRENCY_DIR,
|
self::getDataDirectory().'/'.self::CURRENCY_DIR,
|
||||||
self::getEntryReader(),
|
self::getEntryReader(),
|
||||||
self::getLocaleBundle()
|
self::getLocaleBundle()
|
||||||
);
|
);
|
||||||
@ -135,11 +135,11 @@ final class Intl
|
|||||||
{
|
{
|
||||||
if (null === self::$languageBundle) {
|
if (null === self::$languageBundle) {
|
||||||
self::$languageBundle = new LanguageBundle(
|
self::$languageBundle = new LanguageBundle(
|
||||||
self::getDataDirectory().'/'.Intl::LANGUAGE_DIR,
|
self::getDataDirectory().'/'.self::LANGUAGE_DIR,
|
||||||
self::getEntryReader(),
|
self::getEntryReader(),
|
||||||
self::getLocaleBundle(),
|
self::getLocaleBundle(),
|
||||||
new ScriptDataProvider(
|
new ScriptDataProvider(
|
||||||
self::getDataDirectory().'/'.Intl::SCRIPT_DIR,
|
self::getDataDirectory().'/'.self::SCRIPT_DIR,
|
||||||
self::getEntryReader()
|
self::getEntryReader()
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
@ -157,7 +157,7 @@ final class Intl
|
|||||||
{
|
{
|
||||||
if (null === self::$localeBundle) {
|
if (null === self::$localeBundle) {
|
||||||
self::$localeBundle = new LocaleBundle(
|
self::$localeBundle = new LocaleBundle(
|
||||||
self::getDataDirectory().'/'.Intl::LOCALE_DIR,
|
self::getDataDirectory().'/'.self::LOCALE_DIR,
|
||||||
self::getEntryReader()
|
self::getEntryReader()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -174,7 +174,7 @@ final class Intl
|
|||||||
{
|
{
|
||||||
if (null === self::$regionBundle) {
|
if (null === self::$regionBundle) {
|
||||||
self::$regionBundle = new RegionBundle(
|
self::$regionBundle = new RegionBundle(
|
||||||
self::getDataDirectory().'/'.Intl::REGION_DIR,
|
self::getDataDirectory().'/'.self::REGION_DIR,
|
||||||
self::getEntryReader(),
|
self::getEntryReader(),
|
||||||
self::getLocaleBundle()
|
self::getLocaleBundle()
|
||||||
);
|
);
|
||||||
|
@ -76,7 +76,7 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface
|
|||||||
public function __construct($propertyPath)
|
public function __construct($propertyPath)
|
||||||
{
|
{
|
||||||
// Can be used as copy constructor
|
// Can be used as copy constructor
|
||||||
if ($propertyPath instanceof PropertyPath) {
|
if ($propertyPath instanceof self) {
|
||||||
/* @var PropertyPath $propertyPath */
|
/* @var PropertyPath $propertyPath */
|
||||||
$this->elements = $propertyPath->elements;
|
$this->elements = $propertyPath->elements;
|
||||||
$this->singulars = $propertyPath->singulars;
|
$this->singulars = $propertyPath->singulars;
|
||||||
|
@ -50,7 +50,7 @@ class DumperCollection implements \IteratorAggregate
|
|||||||
*/
|
*/
|
||||||
public function add($child)
|
public function add($child)
|
||||||
{
|
{
|
||||||
if ($child instanceof DumperCollection) {
|
if ($child instanceof self) {
|
||||||
$child->setParent($this);
|
$child->setParent($this);
|
||||||
}
|
}
|
||||||
$this->children[] = $child;
|
$this->children[] = $child;
|
||||||
@ -64,7 +64,7 @@ class DumperCollection implements \IteratorAggregate
|
|||||||
public function setAll(array $children)
|
public function setAll(array $children)
|
||||||
{
|
{
|
||||||
foreach ($children as $child) {
|
foreach ($children as $child) {
|
||||||
if ($child instanceof DumperCollection) {
|
if ($child instanceof self) {
|
||||||
$child->setParent($this);
|
$child->setParent($this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ class DumperPrefixCollection extends DumperCollection
|
|||||||
|
|
||||||
// Prefix starts with route's prefix
|
// Prefix starts with route's prefix
|
||||||
if ('' === $collection->prefix || 0 === strpos($prefix, $collection->prefix)) {
|
if ('' === $collection->prefix || 0 === strpos($prefix, $collection->prefix)) {
|
||||||
$child = new DumperPrefixCollection();
|
$child = new self();
|
||||||
$child->setPrefix(substr($prefix, 0, strlen($collection->prefix) + 1));
|
$child->setPrefix(substr($prefix, 0, strlen($collection->prefix) + 1));
|
||||||
$collection->add($child);
|
$collection->add($child);
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
|
|||||||
*/
|
*/
|
||||||
public function equals(SecurityIdentityInterface $sid)
|
public function equals(SecurityIdentityInterface $sid)
|
||||||
{
|
{
|
||||||
if (!$sid instanceof RoleSecurityIdentity) {
|
if (!$sid instanceof self) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
|
|||||||
*/
|
*/
|
||||||
public function equals(SecurityIdentityInterface $sid)
|
public function equals(SecurityIdentityInterface $sid)
|
||||||
{
|
{
|
||||||
if (!$sid instanceof UserSecurityIdentity) {
|
if (!$sid instanceof self) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -154,7 +154,7 @@ abstract class Constraint
|
|||||||
*/
|
*/
|
||||||
public function addImplicitGroupName($group)
|
public function addImplicitGroupName($group)
|
||||||
{
|
{
|
||||||
if (in_array(Constraint::DEFAULT_GROUP, $this->groups) && !in_array($group, $this->groups)) {
|
if (in_array(self::DEFAULT_GROUP, $this->groups) && !in_array($group, $this->groups)) {
|
||||||
$this->groups[] = $group;
|
$this->groups[] = $group;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ class Parser
|
|||||||
// array
|
// array
|
||||||
if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
|
if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
|
||||||
$c = $this->getRealCurrentLineNb() + 1;
|
$c = $this->getRealCurrentLineNb() + 1;
|
||||||
$parser = new Parser($c);
|
$parser = new self($c);
|
||||||
$parser->refs = &$this->refs;
|
$parser->refs = &$this->refs;
|
||||||
$data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport);
|
$data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport);
|
||||||
} else {
|
} else {
|
||||||
@ -100,7 +100,7 @@ class Parser
|
|||||||
) {
|
) {
|
||||||
// this is a compact notation element, add to next block and parse
|
// this is a compact notation element, add to next block and parse
|
||||||
$c = $this->getRealCurrentLineNb();
|
$c = $this->getRealCurrentLineNb();
|
||||||
$parser = new Parser($c);
|
$parser = new self($c);
|
||||||
$parser->refs = &$this->refs;
|
$parser->refs = &$this->refs;
|
||||||
|
|
||||||
$block = $values['value'];
|
$block = $values['value'];
|
||||||
@ -143,7 +143,7 @@ class Parser
|
|||||||
$value = $this->getNextEmbedBlock();
|
$value = $this->getNextEmbedBlock();
|
||||||
}
|
}
|
||||||
$c = $this->getRealCurrentLineNb() + 1;
|
$c = $this->getRealCurrentLineNb() + 1;
|
||||||
$parser = new Parser($c);
|
$parser = new self($c);
|
||||||
$parser->refs = &$this->refs;
|
$parser->refs = &$this->refs;
|
||||||
$parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport);
|
$parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport);
|
||||||
|
|
||||||
@ -180,7 +180,7 @@ class Parser
|
|||||||
$data[$key] = null;
|
$data[$key] = null;
|
||||||
} else {
|
} else {
|
||||||
$c = $this->getRealCurrentLineNb() + 1;
|
$c = $this->getRealCurrentLineNb() + 1;
|
||||||
$parser = new Parser($c);
|
$parser = new self($c);
|
||||||
$parser->refs = &$this->refs;
|
$parser->refs = &$this->refs;
|
||||||
$data[$key] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport);
|
$data[$key] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user