Apply doctrine coding standards

Author: jaapio

.github/main.workflow

@@ -29,9 +29,9 @@ action "composer-require-checker" {
 }
 
 action "Code style check" {
-  uses = "docker://oskarstark/phpcs-ga"
+  uses = "docker://phpdoc/phpcs-ga:latest"
   secrets = ["GITHUB_TOKEN"]
-  args = "-d memory_limit=1024M"
+  args = "-d memory_limit=1024M -s"
   needs = ["composer"]
 }
 

phpcs.xml.dist

@@ -6,10 +6,25 @@
     <file>tests/unit</file>
     <exclude-pattern>*/tests/unit/Types/ContextFactoryTest.php</exclude-pattern>
     <arg value="p"/>
-     <rule ref="PSR2">
-         <include-pattern>*\.php</include-pattern>
-     </rule>
-      <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
-         <exclude-pattern>*/src/*_.php</exclude-pattern>
-     </rule>
+    <rule ref="PSR2">
+        <include-pattern>*\.php</include-pattern>
+    </rule>
+
+    <rule ref="Doctrine">
+        <exclude name="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint.UselessDocComment" />
+    </rule>
+
+    <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
+        <exclude-pattern>*/src/*_.php</exclude-pattern>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix">
+        <exclude-pattern>*/src/*/Abstract*.php</exclude-pattern>
+    </rule>
+
+    <rule ref="Generic.Formatting.SpaceAfterNot">
+        <properties>
+            <property name="spacing" value="0" />
+        </properties>
+    </rule>
 </ruleset>

src/FqsenResolver.php

@@ -1,25 +1,30 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
+
 /**
  * This file is part of phpDocumentor.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection;
 
+use InvalidArgumentException;
 use phpDocumentor\Reflection\Types\Context;
+use function explode;
+use function implode;
+use function strpos;
 
 class FqsenResolver
 {
     /** @var string Definition of the NAMESPACE operator in PHP */
     private const OPERATOR_NAMESPACE = '\\';
 
-    public function resolve(string $fqsen, Context $context = null): Fqsen
+    public function resolve(string $fqsen, ?Context $context = null) : Fqsen
     {
         if ($context === null) {
             $context = new Context('');
@@ -34,12 +39,8 @@ public function resolve(string $fqsen, Context $context = null): Fqsen
 
     /**
      * Tests whether the given type is a Fully Qualified Structural Element Name.
-     *
-     * @param string $type
-     *
-     * @return bool
      */
-    private function isFqsen(string $type): bool
+    private function isFqsen(string $type) : bool
     {
         return strpos($type, self::OPERATOR_NAMESPACE) === 0;
     }
@@ -48,11 +49,9 @@ private function isFqsen(string $type): bool
      * Resolves a partial Structural Element Name (i.e. `Reflection\DocBlock`) to its FQSEN representation
      * (i.e. `\phpDocumentor\Reflection\DocBlock`) based on the Namespace and aliases mentioned in the Context.
      *
-     * @param string $type
-     * @return Fqsen
-     * @throws \InvalidArgumentException when type is not a valid FQSEN.
+     * @throws InvalidArgumentException When type is not a valid FQSEN.
      */
-    private function resolvePartialStructuralElementName(string $type, Context $context): Fqsen
+    private function resolvePartialStructuralElementName(string $type, Context $context) : Fqsen
     {
         $typeParts = explode(self::OPERATOR_NAMESPACE, $type, 2);
 
@@ -61,7 +60,7 @@ private function resolvePartialStructuralElementName(string $type, Context $cont
         // if the first segment is not an alias; prepend namespace name and return
         if (!isset($namespaceAliases[$typeParts[0]])) {
             $namespace = $context->getNamespace();
-            if ('' !== $namespace) {
+            if ($namespace !== '') {
                 $namespace .= self::OPERATOR_NAMESPACE;
             }
 

src/Type.php

@@ -1,12 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
+
 /**
  * This file is part of phpDocumentor.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -16,8 +17,6 @@ interface Type
 {
     /**
      * Returns a rendered output of the Type as it would be used in a DocBlock.
-     *
-     * @return string
      */
-    public function __toString(): string;
+    public function __toString() : string;
 }