Merge branch 'feature/#109-extended-code-sniffs' into develop

Close #109

Author: Ocramius

composer.json

@@ -21,7 +21,7 @@
         "doctrine/annotations": "~1.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
         "phpunit/phpunit": "^6.2.3",
-        "zendframework/zend-coding-standard": "~1.0.0"
+        "zendframework/zend-coding-standard": "^1.0.0"
     },
     "suggest": {
         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",

composer.lock

@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <ruleset name="Zend Framework coding standard">
     <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
 
     <!-- Paths to check -->
     <file>src</file>
     <file>test</file>
     <exclude-pattern>*/TestAsset/*</exclude-pattern>
+    <exclude-pattern>*/_files/*</exclude-pattern>
 </ruleset>

phpcs.xml

@@ -99,11 +99,11 @@ public function createAnnotation(array $annotationData)
 
         $eventManager = $this->getEventManager();
         $results = $eventManager->triggerEventUntil(function ($r) {
-            return (is_object($r));
+            return is_object($r);
         }, $event);
 
         $annotation = $results->last();
 
-        return (is_object($annotation) ? $annotation : false);
+        return is_object($annotation) ? $annotation : false;
     }
 }

src/Annotation/AnnotationManager.php

@@ -140,7 +140,7 @@ public function registerAnnotations($annotations)
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s: expects an array or Traversable; received "%s"',
                 __METHOD__,
-                (is_object($annotations) ? get_class($annotations) : gettype($annotations))
+                is_object($annotations) ? get_class($annotations) : gettype($annotations)
             ));
         }
 

src/Annotation/Parser/DoctrineAnnotationParser.php

@@ -80,7 +80,7 @@ public function onCreateAnnotation(EventInterface $e)
      *
      * @param  string|AnnotationInterface $annotation String class name of an
      *         AnnotationInterface implementation, or actual instance
-     * @return GenericAnnotationParser
+     * @return void
      * @throws Exception\InvalidArgumentException
      */
     public function registerAnnotation($annotation)
@@ -96,7 +96,7 @@ public function registerAnnotation($annotation)
                 '%s: expects an instance of %s\AnnotationInterface; received "%s"',
                 __METHOD__,
                 __NAMESPACE__,
-                (is_object($annotation) ? get_class($annotation) : gettype($annotation))
+                is_object($annotation) ? get_class($annotation) : gettype($annotation)
             ));
         }
 
@@ -126,7 +126,7 @@ public function registerAnnotations($annotations)
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s: expects an array or Traversable; received "%s"',
                 __METHOD__,
-                (is_object($annotations) ? get_class($annotations) : gettype($annotations))
+                is_object($annotations) ? get_class($annotations) : gettype($annotations)
             ));
         }
 
@@ -203,7 +203,7 @@ protected function hasAlias($alias)
     {
         $alias = $this->normalizeAlias($alias);
 
-        return (isset($this->aliases[$alias]));
+        return isset($this->aliases[$alias]);
     }
 
     /**

src/Annotation/Parser/GenericAnnotationParser.php

@@ -31,7 +31,7 @@ abstract class AbstractGenerator implements GeneratorInterface
     /**
      * @var string
      */
-    protected $sourceContent = null;
+    protected $sourceContent;
 
     /**
      * @param  array $options
@@ -108,7 +108,7 @@ public function setOptions($options)
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects an array or Traversable object; received "%s"',
                 __METHOD__,
-                (is_object($options) ? get_class($options) : gettype($options))
+                is_object($options) ? get_class($options) : gettype($options)
             ));
         }