Permalink
Browse files

Merge pull request #22 from nette/symplify-30-bump

Upgrade to EasyCodingStandard 3.1
  • Loading branch information...
Tomáš Votruba
Tomáš Votruba committed Jan 2, 2018
2 parents e9930fc + 2f187ce commit 7809ca79efa8ee8d6914621a9944154242ba764a
Showing with 20 additions and 10 deletions.
  1. +5 −5 .travis.yml
  2. +3 −3 coding-standard-php56.neon
  3. +4 −1 composer.json
  4. +8 −1 examples/ValidPropertyAndMethodSpacing.php
@@ -5,17 +5,17 @@ php:
- 7.2

matrix:
allow_failures:
- php: 7.2
fast_finish: true
include:
- php: 7.1
env: COMPOSER_PROJECT=true

install:
- composer install
- composer create-project nette/coding-standard:@dev temp/nette-coding-standard
- if [[ $COMPOSER_PROJECT != "" ]]; then composer create-project nette/coding-standard:@dev temp/nette-coding-standard; fi

script:
- temp/nette-coding-standard/ecs check src examples --config temp/nette-coding-standard/coding-standard-php71.neon
- composer test
- if [[ $COMPOSER_PROJECT != "" ]]; then temp/nette-coding-standard/ecs check src examples --config temp/nette-coding-standard/coding-standard-php71.neon; fi

notifications:
email: false
@@ -143,9 +143,9 @@ checkers:
Nette\CodingStandard\Fixer\ClassNotation\ClassAndTraitVisibilityRequiredFixer:
elements: [property, method]

# Constants and Properties should be separated by 1 space
Symplify\CodingStandard\Fixer\ClassNotation\PropertyAndConstantSeparationFixer:
space_count: 1
# Constants and Properties should be separated by 1 blank line
PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer:
elements: [const, property]

# Last property and 1st method should be separated by 2 spaces
Symplify\CodingStandard\Fixer\ClassNotation\LastPropertyAndFirstMethodSeparationFixer:
@@ -3,7 +3,10 @@
"license": "MIT",
"require": {
"php": "^7.1",
"symplify/easy-coding-standard": "^2.5"
"symplify/easy-coding-standard": "^3.1"
},
"require-dev": {
"tracy/tracy": "^2.4"
},
"autoload": {
"psr-4": {
@@ -6,10 +6,17 @@
class ValidPropertyAndMethodSpacing
{
private $var;
private $someProperty;
private $anoterProperty;
public function __construct()
{
}
public function anotherMethod()
{
}
}

0 comments on commit 7809ca7

Please sign in to comment.