Update build to add PHPCS and PHPStan

.gitattributes

@@ -4,3 +4,4 @@
 .scrutinizer.yml export-ignore
 .travis.yml export-ignore
 phpunit.xml.dist export-ignore
+/phpcs.xml.dist export-ignore

.gitignore

@@ -1,3 +1,5 @@
 vendor/
 composer.lock
 build/
+/phpcs.xml
+/.phpcs-cache

.travis.yml

@@ -1,21 +1,44 @@
-language: php
+dist: trusty
 sudo: false
+language: php
+
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 php:
   - 7.1
+  - 7.2
   - nightly
 
-matrix:
-  fast_finish: true
-
 before_install:
-  - if [[ $TRAVIS_PHP_VERSION = '7.1' ]]; then PHPUNIT_FLAGS="--coverage-clover clover.xml"; fi
+  - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
+
+install:
+  - travis_retry composer -n --prefer-source install
+
+script: ./vendor/bin/phpunit
+
+jobs:
+  allow_failures:
+    - php: nightly
 
-before_script:
-  - composer -n --prefer-source install
+  include:
+    - stage: Coverage
+      before_script:
+        - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
+        - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
+      script:
+        - ./vendor/bin/phpunit --coverage-clover clover.xml
+      after_script:
+        - wget https://scrutinizer-ci.com/ocular.phar
+        - php ocular.phar code-coverage:upload --format=php-clover clover.xml
 
-script:
-  - vendor/bin/phpunit $PHPUNIT_FLAGS
+    - stage: Coding standard
+      script:
+        - ./vendor/bin/phpcs
 
-after_script:
-  - if [ -f clover.xml ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi
+    - stage: Lint
+      before_script:
+        - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.8
+      script: vendor/bin/phpstan analyse -l 3 lib

composer.json

@@ -16,8 +16,9 @@
         "php": "^7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "doctrine/coding-standard": "~0.1@dev"
+        "phpunit/phpunit": "^6.3",
+        "doctrine/coding-standard": "^1.0",
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "autoload": {
         "psr-4": { "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" }

lib/Doctrine/Common/Collections/ArrayCollection.php

@@ -405,7 +405,7 @@ public function matching(Criteria $criteria)
         $length = $criteria->getMaxResults();
 
         if ($offset || $length) {
-            $filtered = array_slice($filtered, (int)$offset, $length);
+            $filtered = array_slice($filtered, (int) $offset, $length);
         }
 
         return $this->createFrom($filtered);

lib/Doctrine/Common/Collections/Criteria.php

@@ -33,7 +33,7 @@ class Criteria
     /**
      * @var string
      */
-    const ASC  = 'ASC';
+    const ASC = 'ASC';
 
     /**
      * @var string

lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php

@@ -74,7 +74,9 @@ public static function getObjectFieldValue($object, $field)
         }
 
         // camelcase field name to support different variable naming conventions
-        $ccField   = preg_replace_callback('/_(.?)/', function($matches) { return strtoupper($matches[1]); }, $field);
+        $ccField = preg_replace_callback('/_(.?)/', function ($matches) {
+            return strtoupper($matches[1]);
+        }, $field);
 
         foreach ($accessors as $accessor) {
             $accessor .= $ccField;
@@ -102,7 +104,7 @@ public static function getObjectFieldValue($object, $field)
     public static function sortByField($name, $orientation = 1, \Closure $next = null)
     {
         if ( ! $next) {
-            $next = function() : int {
+            $next = function () : int {
                 return 0;
             };
         }
@@ -176,7 +178,7 @@ public function walkComparison(Comparison $comparison)
             case Comparison::MEMBER_OF:
                 return function ($object) use ($field, $value) : bool {
                     $fieldValues = ClosureExpressionVisitor::getObjectFieldValue($object, $field);
-                    if (!is_array($fieldValues)) {
+                    if ( ! is_array($fieldValues)) {
                         $fieldValues = iterator_to_array($fieldValues);
                     }
                     return in_array($value, $fieldValues, true);
@@ -217,7 +219,7 @@ public function walkCompositeExpression(CompositeExpression $expr)
             $expressionList[] = $this->dispatch($child);
         }
 
-        switch($expr->getType()) {
+        switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
                 return $this->andExpressions($expressionList);
 

lib/Doctrine/Common/Collections/Expr/Comparison.php

@@ -27,19 +27,19 @@
  */
 class Comparison implements Expression
 {
-    const EQ           = '=';
-    const NEQ          = '<>';
-    const LT           = '<';
-    const LTE          = '<=';
-    const GT           = '>';
-    const GTE          = '>=';
-    const IS           = '='; // no difference with EQ
-    const IN           = 'IN';
-    const NIN          = 'NIN';
-    const CONTAINS     = 'CONTAINS';
-    const MEMBER_OF    = 'MEMBER_OF';
-    const STARTS_WITH  = 'STARTS_WITH';
-    const ENDS_WITH    = 'ENDS_WITH';
+    const EQ          = '=';
+    const NEQ         = '<>';
+    const LT          = '<';
+    const LTE         = '<=';
+    const GT          = '>';
+    const GTE         = '>=';
+    const IS          = '='; // no difference with EQ
+    const IN          = 'IN';
+    const NIN         = 'NIN';
+    const CONTAINS    = 'CONTAINS';
+    const MEMBER_OF   = 'MEMBER_OF';
+    const STARTS_WITH = 'STARTS_WITH';
+    const ENDS_WITH   = 'ENDS_WITH';
 
     /**
      * @var string
@@ -68,7 +68,7 @@ public function __construct($field, $operator, $value)
         }
 
         $this->field = $field;
-        $this->op = $operator;
+        $this->op    = $operator;
         $this->value = $value;
     }
 

lib/Doctrine/Common/Collections/Expr/CompositeExpression.php

@@ -28,7 +28,7 @@
 class CompositeExpression implements Expression
 {
     const TYPE_AND = 'AND';
-    const TYPE_OR = 'OR';
+    const TYPE_OR  = 'OR';
 
     /**
      * @var string

lib/Doctrine/Common/Collections/ExpressionBuilder.php

@@ -195,6 +195,5 @@ public function startsWith($field, $value)
     public function endsWith($field, $value)
     {
         return new Comparison($field, Comparison::ENDS_WITH, new Value($value));
-    }    
-
+    }
 }

phpcs.xml.dist

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors" />
+
+    <!-- Ignore warnings and show progress of the run -->
+    <arg value="np"/>
+
+    <file>lib</file>
+    <file>tests</file>
+
+    <rule ref="Doctrine"/>
+
+    <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+</ruleset>

phpunit.xml.dist

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         verbose="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutTodoAnnotatedTests="true"
+     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+     colors="true"
+     verbose="true"
+     beStrictAboutOutputDuringTests="true"
+     beStrictAboutTodoAnnotatedTests="true"
 >
     <testsuites>
         <testsuite name="Doctrine Collections Test Suite">

tests/Doctrine/Tests/Common/Collections/AbstractLazyArrayCollectionTest.php

@@ -40,7 +40,7 @@ public function testLazyCollection() : void
         /** @var LazyArrayCollection $collection */
         $collection = $this->buildCollection(['a', 'b', 'c']);
 
-        $this->assertFalse($collection->isInitialized());
-        $this->assertCount(3, $collection);
+        self::assertFalse($collection->isInitialized());
+        self::assertCount(3, $collection);
     }
 }