x

Author: dg

preset-sniffer/Nette.xml

@@ -270,7 +270,7 @@ https://github.com/slevomat/coding-standard
 	</rule>
 	<rule ref="NetteCodingStandard.Namespaces.OptimizeGlobalCalls"> <!-- use statements for functions & constants -->
 		<properties>
-			<property name="optimizedFunctionsOnly" value="false"/>
+			<property name="optimizedFunctionsOnly" value="true"/>
 			<property name="ignoredFunctions" type="array">
 				<element value="dump"/>
 				<element value="var_dump"/>
@@ -280,9 +280,7 @@ https://github.com/slevomat/coding-standard
 				<element value="debug_backtrace"/>
 			</property>
 			<property name="ignoredConstants" type="array">
-				<element value="E_USER_NOTICE"/>
-				<element value="E_USER_DEPRECATED"/>
-				<element value="E_USER_WARNING"/>
+				<element value="E_*"/>
 				<element value="DEBUG_BACKTRACE_IGNORE_ARGS"/>
 			</property>
 		</properties>

src/NetteCodingStandard/Sniffs/Namespaces/OptimizeGlobalCallsSniff.php

@@ -41,14 +41,14 @@
  *     </properties>
  * </rule>
  * ```
- * @author David Grudl
  */
 
 namespace NetteCodingStandard\Sniffs\Namespaces;
 
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
 use Exception;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use function count, defined, in_array;
 
 
 class OptimizeGlobalCallsSniff implements Sniff
@@ -307,7 +307,6 @@ private function isFunctionDeclaration(File $phpcsFile, int $stackPtr): bool
 	}
 
 
-	// FIX: Re-added the missing method
 	private function isWithinUseStatement(int $stackPtr, array $existingUseStatements): bool
 	{
 		$allStatements = array_merge($existingUseStatements['functions'], $existingUseStatements['constants']);
@@ -606,12 +605,14 @@ private function hasNamespace(File $phpcsFile): bool
 
 	private function isIgnoredConstant(string $constantName): bool
 	{
-		$allIgnored = array_merge($this->builtInIgnoredConstants, $this->ignoredConstants);
-		foreach ($allIgnored as $ignoredConstant) {
-			if (strcasecmp($constantName, $ignoredConstant) === 0) {
+		$ignored = array_merge($this->builtInIgnoredConstants, $this->ignoredConstants);
+		foreach ($ignored as $pattern) {
+			$regex = str_replace('\*', '.*', preg_quote($pattern, '/'));
+			if (preg_match('/^' . $regex . '$/i', $constantName)) {
 				return true;
 			}
 		}
+
 		return false;
 	}