Merge pull request #19 from php-fig-rectified/php7

1.0.0 prep - PHP7.2+

Author: dereuromark

.editorconfig

@@ -1,6 +1,5 @@
 ; This file is for unifying the coding style for different editors and IDEs.
-; More information at http://editorconfig.org
-
+; More information at https://editorconfig.org
 root = true
 
 [*]
@@ -16,6 +15,3 @@ end_of_line = crlf
 [*.yml]
 indent_style = space
 indent_size = 2
-
-[*.neon]
-indent_style = space

.gitattributes

@@ -1,15 +1,6 @@
 # Define the line ending behavior of the different file extensions
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
-* text eol=lf
-
-# Explicitly declare text files we want to always be normalized and converted
-# to native line endings on checkout.
-*.php text
-*.txt text
-*.xml text
-*.yml text
-.htaccess text
+# Set default behavior, in case users don't have core.autocrlf set.
+* text text=auto eol=lf
 
 # Declare files that will always have CRLF line endings on checkout.
 *.bat eol=crlf
@@ -18,4 +9,14 @@
 *.pem eol=lf
 
 # Denote all files that are truly binary and should not be modified.
+*.jpg binary
+*.png binary
 *.phar binary
+
+# Remove files for archives generated using `git archive`
+phpunit.xml.dist export-ignore
+.travis.yml export-ignore
+.gitignore export-ignore
+.gitattributes export-ignore
+.editorconfig export-ignore
+tests/ export-ignore

.gitignore

@@ -1,7 +1,7 @@
-/vendor/*
+/vendor/
 /phpunit.phar
-.phpunit.result.cache
+/.phpunit.result.cache
 /composer.phar
 /composer.lock
-.idea
-clover.xml
+/.idea/
+/clover.xml

.travis.yml

@@ -1,19 +1,16 @@
 language: php
 
-sudo: false
-
 php:
-  - 5.6
-  - 7.3
-  - 7.4snapshot
+  - 7.2
+  - 7.4
 
 env:
   global:
     - DEFAULT=1
 
 matrix:
   include:
-    - php: 7.2
+    - php: 7.3
       env: CHECKS=1 DEFAULT=0
 
   fast_finish: true
@@ -22,7 +19,7 @@ before_script:
   - composer install --prefer-dist --no-interaction
 
 script:
-  - if [[ $CHECKS == 1 ]]; then composer phpstan-setup && composer phpstan ; fi
+  - if [[ $CHECKS == 1 ]]; then composer stan ; fi
   - composer cs-check
 
 notifications:

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Mark Scherer
+Copyright (c) 2016-present Mark Scherer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PSR2R/Sniffs/Classes/ClassCreateInstanceSniff.php

@@ -34,6 +34,7 @@ public function process(File $phpcsFile, $stackPtr) {
 		// We can only invoke the fixer if we know this is a static constructor function call.
 		if ($tokens[$constructorIndex]['code'] !== T_STRING && $tokens[$constructorIndex]['code'] !== T_NS_SEPARATOR) {
 			$phpcsFile->addError($error, $stackPtr, 'ParenthesisMissing');
+
 			return;
 		}
 

PSR2R/Sniffs/Classes/ClassFileNameSniff.php

@@ -2,15 +2,12 @@
 /**
  * Squiz_Sniffs_Classes_ClassFileNameSniff.
  *
- * PHP version 5
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @package PHP_CodeSniffer
+ * @author Greg Sherwood <gsherwood@squiz.net>
+ * @author Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
+ * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link http://pear.php.net/package/PHP_CodeSniffer
  */
 
 namespace PSR2R\Sniffs\Classes;
@@ -24,12 +21,12 @@
  * Tests that the file name and the name of the class contained within the file
  * match.
  *
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
+ * @author Greg Sherwood <gsherwood@squiz.net>
+ * @author Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/PHP_CodeSniffer
+ * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @version Release: @package_version@
+ * @link http://pear.php.net/package/PHP_CodeSniffer
  */
 class ClassFileNameSniff extends AbstractSniff {
 

PSR2R/Sniffs/Classes/PropertyDeclarationSniff.php

@@ -9,13 +9,13 @@
 /**
  * Verifies that properties are declared correctly.
  *
- * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @author Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  *
- * @version   Release: @package_version@
+ * @version Release: @package_version@
  *
- * @link      http://pear.php.net/package/PHP_CodeSniffer
+ * @link http://pear.php.net/package/PHP_CodeSniffer
  */
 class PropertyDeclarationSniff extends AbstractVariableSniff {
 

PSR2R/Sniffs/Classes/SelfAccessorSniff.php

@@ -31,6 +31,7 @@ public function process(File $phpcsFile, $stackPtr) {
 
 		if ($tokens[$stackPtr]['code'] === T_SELF) {
 			$this->checkSelf($phpcsFile, $stackPtr);
+
 			return;
 		}
 
@@ -50,11 +51,13 @@ public function process(File $phpcsFile, $stackPtr) {
 		for ($i = $startIndex + 1; $i < $endIndex; $i++) {
 			if ($tokens[$i]['code'] === T_NEW) {
 				$this->checkNew($phpcsFile, $i, $name);
+
 				continue;
 			}
 
 			if ($tokens[$i]['code'] === T_DOUBLE_COLON) {
 				$this->checkDoubleColon($phpcsFile, $i, $name);
+
 				continue;
 			}
 		}
@@ -63,6 +66,7 @@ public function process(File $phpcsFile, $stackPtr) {
 	/**
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
 	 * @param int $stackPtr
+*
 	 * @return void
 	 */
 	protected function checkSelf(File $phpcsFile, $stackPtr) {
@@ -83,6 +87,7 @@ protected function checkSelf(File $phpcsFile, $stackPtr) {
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
 	 * @param int $i
 	 * @param string $name
+*
 	 * @return void
 	 */
 	protected function checkNew(File $phpcsFile, $i, $name) {
@@ -104,6 +109,7 @@ protected function checkNew(File $phpcsFile, $i, $name) {
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
 	 * @param int $index
 	 * @param string $name
+*
 	 * @return void
 	 */
 	protected function fixNameToSelf(File $phpcsFile, $index, $name) {
@@ -125,6 +131,7 @@ protected function fixNameToSelf(File $phpcsFile, $index, $name) {
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
 	 * @param int $i
 	 * @param string $name
+*
 	 * @return void
 	 */
 	protected function checkDoubleColon(File $phpcsFile, $i, $name) {

PSR2R/Sniffs/Commenting/DocBlockParamAllowDefaultValueSniff.php

@@ -66,6 +66,7 @@ public function process(File $phpCsFile, $stackPointer) {
 
 			if ($tokens[$classNameIndex]['type'] !== 'T_DOC_COMMENT_STRING') {
 				$phpCsFile->addError('Missing type in param doc block', $i, 'CommentAllowDefault');
+
 				continue;
 			}