Merge pull request #16 from nette/spaces-test

spaces between constants, properties and first method
nette · Sep 26, 2017 · ecff17f · ecff17f
2 parents c00f0d0 + ae2426d
commit ecff17f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/coding-standard-php56.neon b/coding-standard-php56.neon
@@ -143,6 +143,14 @@ 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
+
+	# Last property and 1st method should be separated by 2 spaces
+	Symplify\CodingStandard\Fixer\ClassNotation\LastPropertyAndFirstMethodSeparationFixer:
+		space_count: 2
+
 	# Control Statements - https://nette.org/en/coding-standard#toc-control-statements
 
 	# The keyword `elseif` should be used instead of `else if` so that all control keywords look like single words.

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"license": "MIT",
 	"require": {
 		"php": "^7.1",
-		"symplify/easy-coding-standard": "^2.3"
+		"symplify/easy-coding-standard": "^2.4"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/examples/ValidClass.php b/examples/ValidClass.php
@@ -6,9 +6,8 @@
 
 class ValidClass
 {
-	public const JOY_COUNT = 5;
+	protected const CHILD_COUNT = 1,
-
+		HOUSE_COUNT = 10; // allow comment
-	protected const CHILD_COUNT = 1;
 
 	private const DREAM_COUNT = 250;
 

diff --git a/examples/ValidPropertyAndMethodSpacing.php b/examples/ValidPropertyAndMethodSpacing.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Nette\CodingStandard\Examples;
+
+
+class ValidPropertyAndMethodSpacing
+{
+	private $var;
+
+
+	public function __construct()
+	{
+	}
+}