cs: apply doctrine coding standard

qa: use self instead of $this in PhpUnit assertions

Signed-off-by: Thomas Rieschl <thomas@trinet.at>

.gitignore

@@ -3,4 +3,5 @@ vendor/
 .idea/
 phpunit.xml
 phpcs.xml
+.phpcs-cache
 build

.travis.yml

@@ -77,7 +77,7 @@ script:
   - docker vendor/bin/doctrine-module odm:schema:create
   - docker vendor/bin/doctrine-module odm:schema:drop
   - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/phpunit --coverage-clover build/logs/clover.xml ; else php vendor/bin/phpunit ; fi
-  - if [[ $CS_CHECK == 'true' ]]; then php vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/ ./config/ ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then php vendor/bin/phpcs ; fi
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/php-coveralls -v ; fi

composer.json

@@ -62,6 +62,7 @@
         "symfony/var-dumper": "^5.1"
     },
     "require-dev": {
+        "doctrine/coding-standard": "^8.2",
         "laminas/laminas-console": "^2.8",
         "laminas/laminas-developer-tools": "^2.0",
         "laminas/laminas-i18n": "^2.10.1",
@@ -71,8 +72,7 @@
         "laminas/laminas-serializer": "^2.9.1",
         "laminas/laminas-session": "^2.9.1",
         "laminas/laminas-view": "^2.11.4",
-        "phpunit/phpunit": "^8.5.2",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpunit/phpunit": "^8.5.2"
     },
     "autoload": {
         "psr-4": {

phpcs.xml.dist

@@ -4,25 +4,16 @@
 
     <!-- display progress -->
     <arg value="p"/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value=".phpcs-cache"/>
     <arg name="colors"/>
 
-    <!-- inherit rules from: -->
-    <rule ref="PSR2"/>
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Generic.Formatting.SpaceAfterNot"/>
-    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
-        <properties>
-            <property name="ignoreNewlines" value="true"/>
-        </properties>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="false"/>
-        </properties>
-    </rule>
+    <!-- Include full Doctrine Coding Standard -->
+    <rule ref="Doctrine"/>
 
     <!-- Paths to check -->
     <file>config</file>
     <file>src</file>
     <file>tests</file>
-</ruleset>
+</ruleset>

src/DoctrineMongoODMModule/Collector/MongoLoggerCollector.php

@@ -8,6 +8,7 @@
 use Laminas\DeveloperTools\Collector\AutoHideInterface;
 use Laminas\DeveloperTools\Collector\CollectorInterface;
 use Laminas\Mvc\MvcEvent;
+
 use function count;
 
 /**
@@ -66,20 +67,20 @@ public function canHide()
         return empty($this->mongoLogger->queries);
     }
 
-    public function getQueryCount() : int
+    public function getQueryCount(): int
     {
         return count($this->mongoLogger->queries);
     }
 
     /**
      * @return mixed[]
      */
-    public function getQueries() : array
+    public function getQueries(): array
     {
         return $this->mongoLogger->queries;
     }
 
-    public function getQueryTime() : float
+    public function getQueryTime(): float
     {
         return 0.0;
     }

src/DoctrineMongoODMModule/Logging/DebugStack.php

@@ -8,6 +8,7 @@
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSucceededEvent;
+
 use function MongoDB\Driver\Monitoring\addSubscriber;
 use function MongoDB\Driver\Monitoring\removeSubscriber;