consolidation / annotated-command

src/AnnotatedCommandFactory.php

Spacing +4 added lines, -4 removed lines

@@ -246,7 +246,7 @@ 
         // can never be commands.
         $commandMethodNames = array_filter(
             get_class_methods($classNameOrInstance) ?: [],
-            function ($m) use ($classNameOrInstance) {
+            function($m) use ($classNameOrInstance) {
                 $reflectionMethod = new \ReflectionMethod($classNameOrInstance, $m);
                 return !$reflectionMethod->isStatic() && !preg_match('#^_#', $m);
             }
@@ -258,7 +258,7 @@ 
                 if (!static::isCommandOrHookMethod($commandInfo, $this->getIncludeAllPublicMethods())) {
                     $commandInfo->invalidate();
                 }
-                $commandInfoList[$commandMethodName] =  $commandInfo;
+                $commandInfoList[$commandMethodName] = $commandInfo;
             }
         }
 
@@ -279,7 +279,7 @@ 
         return $this->createSelectedCommandsFromClassInfo(
             $commandInfoList,
             $commandFileInstance,
-            function ($commandInfo) use ($includeAllPublicMethods) {
+            function($commandInfo) use ($includeAllPublicMethods) {
                 return static::isCommandMethod($commandInfo, $includeAllPublicMethods);
             }
         );
@@ -289,7 +289,7 @@ 
     {
         $commandInfoList = $this->filterCommandInfoList($commandInfoList, $commandSelector);
         return array_map(
-            function ($commandInfo) use ($commandFileInstance) {
+            function($commandInfo) use ($commandFileInstance) {
                 return $this->createCommand($commandInfo, $commandFileInstance);
             },
             $commandInfoList

src/Parser/Internal/DocblockTag.php

Doc Comments +5 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
     /**
      * Check if the provided string begins with a tag
      * @param string $subject
-     * @return bool
+     * @return integer
      */
     public static function isTag($subject)
     {
@@ -41,7 +41,7 @@ 
      *
      * @param string $subject
      * @param string[] &$matches Sets $matches['tag'] and $matches['description']
-     * @return bool
+     * @return integer
      */
     public static function splitTagAndContent($subject, &$matches)
     {
@@ -101,7 +101,6 @@ 
      * - "@tag $variable description"
      * - "@tag type $variable description"
      *
-     * @param string $subject
      * @param string[] &$matches Sets $matches['variable'] and
      *   $matches['description']; might set $matches['type'].
      * @return bool
@@ -115,10 +114,9 @@ 
 
     /**
      * Determine if tag is "@tag $variable description"
-     * @param string $subject
      * @param string[] &$matches Sets $matches['variable'] and
      *   $matches['description']
-     * @return bool
+     * @return integer
      */
     public function hasVariableAndDescription(&$matches)
     {
@@ -129,10 +127,9 @@ 
     /**
      * Determine if tag is "@tag type $variable description"
      *
-     * @param string $subject
      * @param string[] &$matches Sets $matches['variable'],
      *   $matches['description'] and $matches['type'].
-     * @return bool
+     * @return integer
      */
     public function hasTypeVariableAndDescription(&$matches)
     {
@@ -142,10 +139,9 @@ 
 
     /**
      * Determine if tag is "@tag word description"
-     * @param string $subject
      * @param string[] &$matches Sets $matches['word'] and
      *   $matches['description']
-     * @return bool
+     * @return integer
      */
     public function hasWordAndDescription(&$matches)
     {

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
      */
     public static function splitTagAndContent($subject, &$matches)
     {
-        $regex = '/' . self::TAG_REGEX . self::DESCRIPTION_REGEX . '/';
+        $regex = '/'.self::TAG_REGEX.self::DESCRIPTION_REGEX.'/';
         return preg_match($regex, $subject, $matches);
     }
 
@@ -92,7 +92,7 @@ 
      */
     public function __toString()
     {
-        return '@' . $this->getTag() . ' ' . $this->getContent();
+        return '@'.$this->getTag().' '.$this->getContent();
     }
 
     /**
@@ -122,7 +122,7 @@ 
      */
     public function hasVariableAndDescription(&$matches)
     {
-        $regex = '/' . self::VARIABLE_OR_WORD_REGEX . self::DESCRIPTION_REGEX . '/';
+        $regex = '/'.self::VARIABLE_OR_WORD_REGEX.self::DESCRIPTION_REGEX.'/';
         return preg_match($regex, $this->getContent(), $matches);
     }
 
@@ -136,7 +136,7 @@ 
      */
     public function hasTypeVariableAndDescription(&$matches)
     {
-        $regex = '/' . self::TYPE_REGEX . self::VARIABLE_REGEX . self::DESCRIPTION_REGEX . '/';
+        $regex = '/'.self::TYPE_REGEX.self::VARIABLE_REGEX.self::DESCRIPTION_REGEX.'/';
         return preg_match($regex, $this->getContent(), $matches);
     }
 
@@ -149,7 +149,7 @@ 
      */
     public function hasWordAndDescription(&$matches)
     {
-        $regex = '/' . self::WORD_REGEX . self::DESCRIPTION_REGEX . '/';
+        $regex = '/'.self::WORD_REGEX.self::DESCRIPTION_REGEX.'/';
         return preg_match($regex, $this->getContent(), $matches);
     }
 }

src/Parser/Internal/TagFactory.php

Doc Comments +3 added lines

@@ -21,6 +21,9 @@
         $this->tags = [];
     }
 
+    /**
+     * @param string $line
+     */
     public function parseLine($line)
     {
         if (DocblockTag::isTag($line)) {

src/Parser/Internal/BespokeDocBlockParser.php

Doc Comments +3 added lines

@@ -230,6 +230,9 @@
         return !empty($nextLine);
     }
 
+    /**
+     * @param DocblockTag[] $tags
+     */
     protected function processAllTags($tags)
     {
         // Iterate over all of the tags, and process them as necessary.

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,7 @@ 
     protected function processCommandTag($tag)
     {
         if (!$tag->hasWordAndDescription($matches)) {
-            throw new \Exception('Could not determine command name from tag ' . (string)$tag);
+            throw new \Exception('Could not determine command name from tag '.(string)$tag);
         }
         $commandName = $matches['word'];
         $this->commandInfo->setName($commandName);
@@ -86,7 +86,7 @@ 
     protected function processArgumentTag($tag)
     {
         if (!$tag->hasVariable($matches)) {
-            throw new \Exception('Could not determine parameter name from tag ' . (string)$tag);
+            throw new \Exception('Could not determine parameter name from tag '.(string)$tag);
         }
         if ($matches['variable'] == $this->optionParamName()) {
             return;
@@ -100,7 +100,7 @@ 
     protected function processOptionTag($tag)
     {
         if (!$tag->hasVariable($matches)) {
-            throw new \Exception('Could not determine parameter name from tag ' . (string)$tag);
+            throw new \Exception('Could not determine parameter name from tag '.(string)$tag);
         }
         $this->addOptionOrArgumentTag($tag, $this->commandInfo->options(), $matches['variable'], $matches['description']);
     }
@@ -119,7 +119,7 @@ 
     protected function processDefaultTag($tag)
     {
         if (!$tag->hasWordAndDescription($matches)) {
-            throw new \Exception('Could not determine parameter name from tag ' . (string)$tag);
+            throw new \Exception('Could not determine parameter name from tag '.(string)$tag);
         }
         $variableName = $matches['word'];
         $defaultValue = $this->interpretDefaultValue($matches['description']);
@@ -140,7 +140,7 @@ 
     {
         $lines = explode("\n", $tag->getContent());
         $usage = trim(array_shift($lines));
-        $description = static::removeLineBreaks(implode("\n", array_map(function ($line) {
+        $description = static::removeLineBreaks(implode("\n", array_map(function($line) {
             return trim($line);
         }, $lines)));
 
@@ -161,7 +161,7 @@ 
     protected function processReturnTag($tag)
     {
         if (!$tag->hasWordAndDescription($matches)) {
-            throw new \Exception('Could not determine return type from tag ' . (string)$tag);
+            throw new \Exception('Could not determine return type from tag '.(string)$tag);
         }
         // TODO: look at namespace and `use` statments to make returnType a fqdn
         $returnType = $matches['word'];
@@ -201,7 +201,7 @@ 
         // Trim all of the lines individually.
         $lines =
             array_map(
-                function ($line) {
+                function($line) {
                     return trim($line);
                 },
                 $lines
@@ -210,7 +210,7 @@ 
         // Everything up to the first blank line goes in the description.
         $description = array_shift($lines);
         while ($this->nextLineIsNotEmpty($lines)) {
-            $description .= ' ' . array_shift($lines);
+            $description .= ' '.array_shift($lines);
         }
 
         // Everything else goes in the help.