Merge pull request #18 from peckadesign/fqn-function-constants

MilanPala · web-flow · commit a66fedeed311 · 2018-04-06T10:37:03.000+02:00
Jsou vyžadovány FQN pro globální konstanty a funkce
diff --git a/composer.json b/composer.json
@@ -2,9 +2,9 @@
     "name": "pd/coding-standard",
     "description": "Coding standard pro PeckaDesign",
     "require": {
-        "squizlabs/php_codesniffer": "^2.8",
+        "squizlabs/php_codesniffer": "3.2.*",
         "php": "7.*",
-        "slevomat/coding-standard": "2.*"
+        "slevomat/coding-standard": "4.5.*"
     },
     "license": "MIT",
     "authors": [
diff --git a/src/PeckaCodingStandardStrict/Sniffs/Files/OneClassInterfaceTraitPerFileSniff.php b/src/PeckaCodingStandardStrict/Sniffs/Files/OneClassInterfaceTraitPerFileSniff.php
@@ -1,7 +1,7 @@
 <?php
 
 
-class PeckaCodingStandardStrict_Sniffs_Files_OneClassInterfaceTraitPerFileSniff implements PHP_CodeSniffer_Sniff
+class PeckaCodingStandardStrict_Sniffs_Files_OneClassInterfaceTraitPerFileSniff implements \PHP_CodeSniffer\Sniffs\Sniff
 {
 
 	public function register()
@@ -10,7 +10,7 @@ public function register()
 	}
 
 
-	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	public function process(\PHP_CodeSniffer\Files\File $phpcsFile, $stackPtr)
 	{
 		$nextInterface = $phpcsFile->findNext($this->register(), ($stackPtr + 1));
 		if ($nextInterface !== FALSE) {
@@ -20,3 +20,4 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	}
 
 }
+
diff --git a/src/PeckaCodingStandardStrict/ruleset.xml b/src/PeckaCodingStandardStrict/ruleset.xml
@@ -6,5 +6,7 @@
 
 	<!-- Namespaces -->
 	<rule ref="../../../../slevomat/coding-standard/SlevomatCodingStandard/Sniffs/Namespaces/UseOnlyWhitelistedNamespacesSniff.php"/>
+	<rule ref="../../../../slevomat/coding-standard/SlevomatCodingStandard/Sniffs/Namespaces/FullyQualifiedGlobalConstantsSniff.php"/>
+	<rule ref="../../../../slevomat/coding-standard/SlevomatCodingStandard/Sniffs/Namespaces/FullyQualifiedGlobalFunctionsSniff.php"/>
 
 </ruleset>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`
`4`		`-class PeckaCodingStandardStrict_Sniffs_Files_OneClassInterfaceTraitPerFileSniff implements PHP_CodeSniffer_Sniff`
	`4`	`+class PeckaCodingStandardStrict_Sniffs_Files_OneClassInterfaceTraitPerFileSniff implements \PHP_CodeSniffer\Sniffs\Sniff`
`5`	`5`	`{`
`6`	`6`
`7`	`7`	`public function register()`
`@@ -10,7 +10,7 @@ public function register()`
`10`	`10`	`}`
`11`	`11`
`12`	`12`
`13`		`- public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)`
	`13`	`+ public function process(\PHP_CodeSniffer\Files\File $phpcsFile, $stackPtr)`
`14`	`14`	`{`
`15`	`15`	`$nextInterface = $phpcsFile->findNext($this->register(), ($stackPtr + 1));`
`16`	`16`	`if ($nextInterface !== FALSE) {`
`@@ -20,3 +20,4 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`}`
	`23`	`+`