Skip to content

Commit

Permalink
Fully qualify constants and function calls
Browse files Browse the repository at this point in the history
This should give a small performance boost.
Part of vimeo#1837.

The change is enforced via phpcs and can be autofixed
with phpcbf.
  • Loading branch information
LeSuisse committed Jun 26, 2019
1 parent 5ed49c0 commit c319bfd
Show file tree
Hide file tree
Showing 242 changed files with 1,448 additions and 5 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
"bamarni/composer-bin-plugin": "^1.2",
"psalm/plugin-phpunit": "^0.6",
"phpmyadmin/sql-parser": "^5.0",
"symfony/process": "^4.3"
"symfony/process": "^4.3",
"slevomat/coding-standard": "^5.0"
},
"suggest": {
"ext-igbinary": "^2.0.5"
Expand Down
12 changes: 12 additions & 0 deletions phpcs.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<?xml version="1.0"?>
<ruleset name="PHP_CodeSniffer">
<config name="installed_paths" value="../../slevomat/coding-standard"/>
<rule ref="PSR2" />
<!-- Forbid usage of a function or a class constant via fallback global name -->
<rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
<properties>
<property name="allowFallbackGlobalConstants" type="boolean" value="false"/>
<property name="allowFallbackGlobalFunctions" type="boolean" value="false"/>
<property name="allowFullyQualifiedGlobalConstants" type="boolean" value="true"/>
<property name="allowFullyQualifiedGlobalFunctions" type="boolean" value="true"/>
<property name="allowFullyQualifiedGlobalClasses" type="boolean" value="true"/>
</properties>
<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName"/>
</rule>

<file>bin/</file>
<file>src/</file>
Expand Down
14 changes: 14 additions & 0 deletions src/Psalm/CodeLocation.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@

use PhpParser;
use Psalm\Internal\Analyzer\CommentAnalyzer;
use function strlen;
use function strpos;
use function explode;
use function substr;
use function trim;
use function preg_replace;
use function str_replace;
use function preg_quote;
use function preg_match;
use const PREG_OFFSET_CAPTURE;
use function strrpos;
use function min;
use function max;
use function substr_count;

class CodeLocation
{
Expand Down
2 changes: 2 additions & 0 deletions src/Psalm/CodeLocation/ParseErrorLocation.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
namespace Psalm\CodeLocation;

use PhpParser;
use function substr_count;
use function substr;

class ParseErrorLocation extends \Psalm\CodeLocation
{
Expand Down
18 changes: 18 additions & 0 deletions src/Psalm/Codebase.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,24 @@
use Psalm\Storage\ClassLikeStorage;
use Psalm\Storage\FileStorage;
use Psalm\Storage\FunctionLikeStorage;
use const PHP_MAJOR_VERSION;
use const PHP_MINOR_VERSION;
use function in_array;
use function array_combine;
use function strpos;
use function strtolower;
use function explode;
use function array_merge;
use function substr;
use function error_log;
use function ksort;
use function krsort;
use function preg_match;
use function strlen;
use function count;
use function array_shift;
use function substr_count;
use function strrpos;

class Codebase
{
Expand Down
45 changes: 45 additions & 0 deletions src/Psalm/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,51 @@
use Psalm\Progress\Progress;
use Psalm\Progress\VoidProgress;
use SimpleXMLElement;
use const PHP_EOL;
use function realpath;
use function is_dir;
use function dirname;
use const DIRECTORY_SEPARATOR;
use function file_exists;
use function file_get_contents;
use function sha1;
use function libxml_use_internal_errors;
use function libxml_get_errors;
use const LIBXML_ERR_FATAL;
use const LIBXML_ERR_ERROR;
use function libxml_clear_errors;
use function sys_get_temp_dir;
use function mkdir;
use function trigger_error;
use const E_USER_ERROR;
use function phpversion;
use function version_compare;
use function intval;
use function strtolower;
use function preg_replace;
use function class_exists;
use function count;
use function reset;
use function preg_quote;
use function in_array;
use function explode;
use function get_class;
use function array_pop;
use function strpos;
use function preg_match;
use function array_merge;
use function get_defined_constants;
use function get_defined_functions;
use function json_decode;
use function array_unique;
use function strtr;
use function strrpos;
use function substr;
use function substr_count;
use function scandir;
use function filetype;
use function unlink;
use function rmdir;

class Config
{
Expand Down
17 changes: 17 additions & 0 deletions src/Psalm/Config/Creator.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@

use Psalm\Exception\ConfigCreationException;
use Psalm\Internal\Provider;
use function is_dir;
use const DIRECTORY_SEPARATOR;
use function file_exists;
use function json_decode;
use function file_get_contents;
use function is_array;
use function dirname;
use function str_replace;
use function implode;
use function array_merge;
use function preg_replace;
use function array_unique;
use function sort;
use function glob;
use function explode;
use function array_shift;
use function count;

class Creator
{
Expand Down
1 change: 1 addition & 0 deletions src/Psalm/Config/ErrorLevelFileFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
namespace Psalm\Config;

use SimpleXMLElement;
use function in_array;

class ErrorLevelFileFilter extends FileFilter
{
Expand Down
19 changes: 19 additions & 0 deletions src/Psalm/Config/FileFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@

use SimpleXMLElement;
use Psalm\Exception\ConfigException;
use function is_bool;
use function strtolower;
use const DIRECTORY_SEPARATOR;
use function strpos;
use function array_map;
use function array_filter;
use function glob;
use function realpath;
use function is_dir;
use function readlink;
use function stripos;
use function str_replace;
use function preg_match;
use function set_error_handler;
use const E_WARNING;
use function restore_error_handler;
use function preg_replace;
use function in_array;
use function explode;

class FileFilter
{
Expand Down
7 changes: 7 additions & 0 deletions src/Psalm/Config/IssueHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
namespace Psalm\Config;

use SimpleXMLElement;
use function in_array;
use function strtolower;
use function array_filter;
use function array_map;
use function substr;
use function scandir;
use function dirname;

class IssueHandler
{
Expand Down
2 changes: 2 additions & 0 deletions src/Psalm/Config/ProjectFileFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
namespace Psalm\Config;

use SimpleXMLElement;
use function strpos;
use function stripos;

class ProjectFileFilter extends FileFilter
{
Expand Down
10 changes: 10 additions & 0 deletions src/Psalm/Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
use Psalm\Type\Reconciler;
use Psalm\Type;
use Psalm\Type\Union;
use function in_array;
use function count;
use function array_filter;
use function preg_quote;
use function preg_match;
use function strpos;
use function array_keys;
use function strtolower;
use function preg_replace;
use function json_encode;

class Context
{
Expand Down
17 changes: 17 additions & 0 deletions src/Psalm/DocComment.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
namespace Psalm;

use Psalm\Exception\DocblockParseException;
use function trim;
use function preg_replace;
use function explode;
use function preg_match;
use function rtrim;
use function str_replace;
use function implode;
use function preg_match_all;
use const PREG_SET_ORDER;
use function array_filter;
use function strlen;
use function min;
use function str_repeat;
use function substr;
use function in_array;
use const PREG_OFFSET_CAPTURE;
use function strpos;

class DocComment
{
Expand Down
14 changes: 14 additions & 0 deletions src/Psalm/ErrorBaseline.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
namespace Psalm;

use Psalm\Internal\Provider\FileProvider;
use function array_reduce;
use const LIBXML_NOBLANKS;
use function str_replace;
use function min;
use function array_intersect;
use function array_filter;
use function strpos;
use function ksort;
use function array_merge;
use function get_loaded_extensions;
use function usort;
use function implode;
use function phpversion;
use function array_map;

class ErrorBaseline
{
Expand Down
1 change: 1 addition & 0 deletions src/Psalm/FileBasedPluginAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
use Psalm\Internal\Scanner\FileScanner;
use SimpleXMLElement;
use function reset;

class FileBasedPluginAdapter implements Plugin\PluginEntryPointInterface
{
Expand Down
6 changes: 6 additions & 0 deletions src/Psalm/FileManipulation.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<?php
namespace Psalm;

use function sha1;
use function strrpos;
use function strlen;
use function substr;
use function trim;

class FileManipulation
{
/** @var int */
Expand Down
3 changes: 3 additions & 0 deletions src/Psalm/Internal/Analyzer/AlgebraAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
use Psalm\Issue\RedundantCondition;
use Psalm\IssueBuffer;
use Psalm\Type\Algebra;
use function array_intersect_key;
use function count;
use function array_unique;

/**
* @internal
Expand Down
2 changes: 2 additions & 0 deletions src/Psalm/Internal/Analyzer/CanAlias.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
use Psalm\Aliases;
use Psalm\CodeLocation;
use Psalm\Internal\FileManipulation\FileManipulationBuffer;
use function implode;
use function strtolower;

trait CanAlias
{
Expand Down
14 changes: 14 additions & 0 deletions src/Psalm/Internal/Analyzer/ClassAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@
use Psalm\Storage\ClassLikeStorage;
use Psalm\Storage\FunctionLikeParameter;
use Psalm\Type;
use function preg_replace;
use function preg_match;
use function explode;
use function array_pop;
use function array_merge;
use function strtolower;
use function implode;
use function substr;
use function array_map;
use function array_shift;
use function str_replace;
use function count;
use function array_search;
use function array_keys;

/**
* @internal
Expand Down
8 changes: 8 additions & 0 deletions src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
use Psalm\StatementsSource;
use Psalm\Storage\ClassLikeStorage;
use Psalm\Type;
use function strtolower;
use function preg_replace;
use function in_array;
use function preg_match;
use function explode;
use function array_pop;
use function implode;
use function gettype;

/**
* @internal
Expand Down
21 changes: 21 additions & 0 deletions src/Psalm/Internal/Analyzer/CommentAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,27 @@
use Psalm\Internal\Scanner\VarDocblockComment;
use Psalm\Internal\Type\ParseTree;
use Psalm\Type;
use function trim;
use function substr_count;
use function strlen;
use function preg_replace;
use function str_replace;
use function preg_match;
use function count;
use function reset;
use function preg_split;
use const PREG_SPLIT_DELIM_CAPTURE;
use const PREG_SPLIT_NO_EMPTY;
use function array_shift;
use function implode;
use function substr;
use function strpos;
use function strtolower;
use function in_array;
use function explode;
use function array_merge;
use const PREG_OFFSET_CAPTURE;
use function rtrim;

/**
* @internal
Expand Down
8 changes: 8 additions & 0 deletions src/Psalm/Internal/Analyzer/FileAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
use Psalm\IssueBuffer;
use Psalm\StatementsSource;
use Psalm\Type;
use function implode;
use function strtolower;
use function explode;
use function strpos;
use function array_keys;
use function count;
use function array_merge;
use function array_diff;

/**
* @internal
Expand Down

0 comments on commit c319bfd

Please sign in to comment.