Merge pull request #79 from object-calisthenics/bump

Bump composer versions

Author: TomasVotruba

.travis.yml

@@ -25,8 +25,8 @@ script:
 after_script:
  # upload coverage.xml file to Coveralls to analyze it
  - |
- wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
- php coveralls.phar --verbose
+ wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
+ php php-coveralls.phar --verbose
 
 # do not send success notifications, they have no value
 notifications:

composer.json

@@ -5,15 +5,15 @@
  "type": "phpcodesniffer-standard",
  "require": {
  "php": "^7.1",
- "squizlabs/php_codesniffer": "^3.2",
+ "squizlabs/php_codesniffer": "^3.3",
  "nette/utils": "^2.4"
  },
  "require-dev": {
  "phpunit/phpunit": "^7.0",
- "phpstan/phpstan": "^0.9",
- "symplify/easy-coding-standard-tester": "^4.0",
- "symplify/coding-standard": "^4.0",
- "slevomat/coding-standard": "^4.5"
+ "phpstan/phpstan": "^0.10.1",
+ "symplify/easy-coding-standard-tester": "^4.5",
+ "symplify/coding-standard": "^4.5",
+ "slevomat/coding-standard": "^4.6"
  },
  "autoload": {
  "psr-4": {
@@ -27,8 +27,13 @@
  },
  "scripts": {
  "complete-check": ["@phpstan", "@check-cs", "phpunit"],
- "phpstan": "phpstan analyze src --level max --configuration phpstan.neon",
+ "phpstan": "phpstan analyze src --level max",
  "check-cs": "ecs check src tests",
  "fix-cs": "ecs check src tests --fix"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.3-dev"
+ }
  }
 }

easy-coding-standard.yml

@@ -30,7 +30,7 @@ parameters:
  SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff:
  - '*src/ObjectCalisthenics/Sniffs/*/*Sniff.php'
 
- PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\AssignmentInConditionSniff.Found: ~
+ PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\AssignmentInConditionSniff.FoundInWhileCondition: ~
 
  exclude_checkers:
  - 'Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenStaticFunctionSniff'

phpstan.neon

@@ -4,3 +4,8 @@ parameters:
  - %currentWorkingDirectory%/vendor/squizlabs/php_codesniffer/autoload.php
  excludes_analyse:
  - **/ObjectCalisthenics/Helper/Slevomat/**
+
+ ignoreErrors:
+ # false float positive
+ - '#Parameter \#1 \$start of method ObjectCalisthenics\\Sniffs\\CodeAnalysis\\OneObjectOperatorPerLineSniff::ignoreWhitespace\(\) expects int, float\|int given#'
+ - '#Method ObjectCalisthenics\\Sniffs\\Metrics\\MaxNestingLevelSniff::subtractFunctionNestingLevel\(\) should return int but returns float\|int#'

phpunit.xml

@@ -4,7 +4,7 @@
  colors="true"
  verbose="true"
 >
- <testsuite>
+ <testsuite name="main">
  <directory>tests</directory>
  </testsuite>
  <filter>

src/ObjectCalisthenics/Sniffs/CodeAnalysis/OneObjectOperatorPerLineSniff.php

@@ -146,7 +146,7 @@ private function computeLastCallOfAnyFrom(array $methods): int
  return in_array($token['token']['content'], $methods, true);
  });
  if (count($calls) > 0) {
- return array_search(end($calls), $this->callerTokens, true);
+ return (int) array_search(end($calls), $this->callerTokens, true);
  }
 
  return -2;

src/ObjectCalisthenics/Sniffs/NamingConventions/ElementNameMinimalLengthSniff.php

@@ -37,7 +37,7 @@ public function register(): array
  public function process(File $file, $position): void
  {
  $elementName = Naming::getElementName($file, $position);
- $elementNameLength = mb_strlen($elementName);
+ $elementNameLength = (int) mb_strlen($elementName);
 
  if ($this->shouldBeSkipped($elementNameLength, $elementName)) {
  return;

tests/bootstrap.php

@@ -5,6 +5,7 @@
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../vendor/squizlabs/php_codesniffer/autoload.php';
 
-if (! defined(T_CLOSURE)) {
+// required for src/ObjectCalisthenics/Sniffs/Metrics/MaxNestingLevelSniff.php
+if (! defined('T_CLOSURE')) {
  new Tokens();
 }