Skip to content
This repository was archived by the owner on Dec 5, 2022. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/class-loader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.4.44
Choose a base ref
...
head repository: symfony/class-loader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.4.45
Choose a head ref
  • 1 commit
  • 10 files changed
  • 1 contributor

Commits on Sep 2, 2020

  1. Enable "native_constant_invocation" CS rule

    @nicolas-grekas
    nicolas-grekas committed Sep 2, 2020
    Copy the full SHA
    5e119b7 View commit details
Showing with 27 additions and 27 deletions.
  1. +1 −1 ApcClassLoader.php
  2. +7 −7 ClassCollectionLoader.php
  3. +1 −1 ClassLoader.php
  4. +11 −11 ClassMapGenerator.php
  5. +1 −1 MapClassLoader.php
  6. +1 −1 Psr4ClassLoader.php
  7. +2 −2 Tests/ApcClassLoaderTest.php
  8. +1 −1 Tests/ClassLoaderTest.php
  9. +1 −1 WinCacheClassLoader.php
  10. +1 −1 XcacheClassLoader.php
2 changes: 1 addition & 1 deletion ApcClassLoader.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Symfony\Component\ClassLoader;

@trigger_error('The '.__NAMESPACE__.'\ApcClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\ApcClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', \E_USER_DEPRECATED);

/**
* ApcClassLoader implements a wrapping autoloader cached in APC for PHP 5.3.
14 changes: 7 additions & 7 deletions ClassCollectionLoader.php
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
namespace Symfony\Component\ClassLoader;

if (\PHP_VERSION_ID >= 70000) {
@trigger_error('The '.__NAMESPACE__.'\ClassCollectionLoader class is deprecated since Symfony 3.3 and will be removed in 4.0.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\ClassCollectionLoader class is deprecated since Symfony 3.3 and will be removed in 4.0.', \E_USER_DEPRECATED);
}

/**
@@ -216,7 +216,7 @@ public static function fixNamespaceDeclarations($source)
$inNamespace = false;
$tokens = token_get_all($source);

$nsTokens = [T_WHITESPACE => true, T_NS_SEPARATOR => true, T_STRING => true];
$nsTokens = [\T_WHITESPACE => true, \T_NS_SEPARATOR => true, \T_STRING => true];
if (\defined('T_NAME_QUALIFIED')) {
$nsTokens[T_NAME_QUALIFIED] = true;
}
@@ -225,10 +225,10 @@ public static function fixNamespaceDeclarations($source)
$token = $tokens[$i];
if (!isset($token[1]) || 'b"' === $token) {
$rawChunk .= $token;
} elseif (\in_array($token[0], [T_COMMENT, T_DOC_COMMENT])) {
} elseif (\in_array($token[0], [\T_COMMENT, \T_DOC_COMMENT])) {
// strip comments
continue;
} elseif (T_NAMESPACE === $token[0]) {
} elseif (\T_NAMESPACE === $token[0]) {
if ($inNamespace) {
$rawChunk .= "}\n";
}
@@ -245,15 +245,15 @@ public static function fixNamespaceDeclarations($source)
$rawChunk = rtrim($rawChunk)."\n{";
$inNamespace = true;
}
} elseif (T_START_HEREDOC === $token[0]) {
} elseif (\T_START_HEREDOC === $token[0]) {
$output .= self::compressCode($rawChunk).$token[1];
do {
$token = $tokens[++$i];
$output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
} while (T_END_HEREDOC !== $token[0]);
} while (\T_END_HEREDOC !== $token[0]);
$output .= "\n";
$rawChunk = '';
} elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
} elseif (\T_CONSTANT_ENCAPSED_STRING === $token[0]) {
$output .= self::compressCode($rawChunk).$token[1];
$rawChunk = '';
} else {
2 changes: 1 addition & 1 deletion ClassLoader.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Symfony\Component\ClassLoader;

@trigger_error('The '.__NAMESPACE__.'\ClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\ClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', \E_USER_DEPRECATED);

/**
* ClassLoader implements an PSR-0 class loader.
22 changes: 11 additions & 11 deletions ClassMapGenerator.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Symfony\Component\ClassLoader;

@trigger_error('The '.__NAMESPACE__.'\ClassMapGenerator class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\ClassMapGenerator class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', \E_USER_DEPRECATED);

/**
* ClassMapGenerator.
@@ -62,7 +62,7 @@ public static function createMap($dir)

$path = $file->getRealPath() ?: $file->getPathname();

if ('php' !== pathinfo($path, PATHINFO_EXTENSION)) {
if ('php' !== pathinfo($path, \PATHINFO_EXTENSION)) {
continue;
}

@@ -93,7 +93,7 @@ private static function findClasses($path)
$contents = file_get_contents($path);
$tokens = token_get_all($contents);

$nsTokens = [T_STRING => true, T_NS_SEPARATOR => true];
$nsTokens = [\T_STRING => true, \T_NS_SEPARATOR => true];
if (\defined('T_NAME_QUALIFIED')) {
$nsTokens[T_NAME_QUALIFIED] = true;
}
@@ -111,7 +111,7 @@ private static function findClasses($path)
$class = '';

switch ($token[0]) {
case T_NAMESPACE:
case \T_NAMESPACE:
$namespace = '';
// If there is a namespace, extract it
while (isset($tokens[++$i][1])) {
@@ -121,20 +121,20 @@ private static function findClasses($path)
}
$namespace .= '\\';
break;
case T_CLASS:
case T_INTERFACE:
case T_TRAIT:
case \T_CLASS:
case \T_INTERFACE:
case \T_TRAIT:
// Skip usage of ::class constant
$isClassConstant = false;
for ($j = $i - 1; $j > 0; --$j) {
if (!isset($tokens[$j][1])) {
break;
}

if (T_DOUBLE_COLON === $tokens[$j][0]) {
if (\T_DOUBLE_COLON === $tokens[$j][0]) {
$isClassConstant = true;
break;
} elseif (!\in_array($tokens[$j][0], [T_WHITESPACE, T_DOC_COMMENT, T_COMMENT])) {
} elseif (!\in_array($tokens[$j][0], [\T_WHITESPACE, \T_DOC_COMMENT, \T_COMMENT])) {
break;
}
}
@@ -146,9 +146,9 @@ private static function findClasses($path)
// Find the classname
while (isset($tokens[++$i][1])) {
$t = $tokens[$i];
if (T_STRING === $t[0]) {
if (\T_STRING === $t[0]) {
$class .= $t[1];
} elseif ('' !== $class && T_WHITESPACE === $t[0]) {
} elseif ('' !== $class && \T_WHITESPACE === $t[0]) {
break;
}
}
2 changes: 1 addition & 1 deletion MapClassLoader.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Symfony\Component\ClassLoader;

@trigger_error('The '.__NAMESPACE__.'\MapClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\MapClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', \E_USER_DEPRECATED);

/**
* A class loader that uses a mapping file to look up paths.
2 changes: 1 addition & 1 deletion Psr4ClassLoader.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Symfony\Component\ClassLoader;

@trigger_error('The '.__NAMESPACE__.'\Psr4ClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\Psr4ClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use Composer instead.', \E_USER_DEPRECATED);

/**
* A PSR-4 compatible class loader.
4 changes: 2 additions & 2 deletions Tests/ApcClassLoaderTest.php
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ class ApcClassLoaderTest extends TestCase
{
protected function setUp()
{
if (!(filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN))) {
if (!(filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
$this->markTestSkipped('The apc extension is not enabled.');
} else {
apcu_clear_cache();
@@ -31,7 +31,7 @@ protected function setUp()

protected function tearDown()
{
if (filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), FILTER_VALIDATE_BOOLEAN)) {
if (filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) && filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
apcu_clear_cache();
}
}
2 changes: 1 addition & 1 deletion Tests/ClassLoaderTest.php
View file
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ public function testUseIncludePath()
$loader->setUseIncludePath(true);
$this->assertTrue($loader->getUseIncludePath());

set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
set_include_path(__DIR__.'/Fixtures/includepath'.\PATH_SEPARATOR.$includePath);

$this->assertEquals(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'includepath'.\DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));

2 changes: 1 addition & 1 deletion WinCacheClassLoader.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Symfony\Component\ClassLoader;

@trigger_error('The '.__NAMESPACE__.'\WinCacheClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\WinCacheClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', \E_USER_DEPRECATED);

/**
* WinCacheClassLoader implements a wrapping autoloader cached in WinCache.
2 changes: 1 addition & 1 deletion XcacheClassLoader.php
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Symfony\Component\ClassLoader;

@trigger_error('The '.__NAMESPACE__.'\XcacheClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', E_USER_DEPRECATED);
@trigger_error('The '.__NAMESPACE__.'\XcacheClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.', \E_USER_DEPRECATED);

/**
* XcacheClassLoader implements a wrapping autoloader cached in XCache for PHP 5.3.