consolidation / annotated-command

src/Hooks/HookManager.php

Spacing +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
     {
         $names = array_merge(
             (array)$names,
-            ($annotationData == null) ? [] : array_map(function ($item) {
+            ($annotationData == null) ? [] : array_map(function($item) {
                 return "@$item";
             }, $annotationData->keys())
         );

src/Cache/CacheWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public function get($key)
     {
-        return (array) $this->dataStore->get($key);
+        return (array)$this->dataStore->get($key);
     }
 
     /**

src/Parser/CommandInfo.php

Doc Comments +8 added lines, -2 removed lines

@@ -137,6 +137,9 @@ 
         return filemtime($path) != $cache['mtime'];
     }
 
+    /**
+     * @param string $methodName
+     */
     protected function constructFromClassAndMethod($classNameOrInstance, $methodName)
     {
         $this->otherAnnotations = new AnnotationData();
@@ -400,7 +403,7 @@ 
     /**
      * Return the list of refleaction parameters.
      *
-     * @return ReflectionParameter[]
+     * @return \ReflectionParameter[]
      */
     public function getParameters()
     {
@@ -540,7 +543,7 @@ 
      * Examine the parameters of the method for this command, and
      * build a list of commandline arguements for them.
      *
-     * @return array
+     * @return DefaultsWithDescriptions
      */
     protected function determineAgumentClassifications()
     {
@@ -560,6 +563,7 @@ 
      * Examine the provided parameter, and determine whether it
      * is a parameter that will be filled in with a positional
      * commandline argument.
+     * @param DefaultsWithDescriptions $result
      */
     protected function addParameterToResult($result, $param)
     {
@@ -650,6 +654,8 @@ 
     /**
      * Given a list that might be 'a b c' or 'a, b, c' or 'a,b,c',
      * convert the data into the last of these forms.
+     * @param string $text
+     * @return string
      */
     protected static function convertListToCommaSeparated($text)
     {

Spacing +5 added lines, -5 removed lines

@@ -227,7 +227,7 @@ 
      */
     public function replaceRawAnnotations($annotationData)
     {
-        $this->otherAnnotations = new AnnotationData((array) $annotationData);
+        $this->otherAnnotations = new AnnotationData((array)$annotationData);
         return $this;
     }
 
@@ -309,7 +309,7 @@ 
         // Convert to an array and merge if there are multiple
         // instances of the same annotation defined.
         if (isset($this->otherAnnotations[$name])) {
-            $content = array_merge((array) $this->otherAnnotations[$name], (array)$content);
+            $content = array_merge((array)$this->otherAnnotations[$name], (array)$content);
         }
         $this->otherAnnotations[$name] = $content;
     }
@@ -487,7 +487,7 @@ 
         $opts = $this->options()->getValues();
         foreach ($opts as $name => $defaultValue) {
             if ($defaultValue === true) {
-                $key = 'no-' . $name;
+                $key = 'no-'.$name;
                 if (!array_key_exists($key, $opts)) {
                     $description = "Negate --$name option.";
                     $this->options()->add($key, $description, false);
@@ -691,8 +691,8 @@ 
      */
     protected function convertName($camel)
     {
-        $splitter="-";
-        $camel=preg_replace('/(?!^)[[:upper:]][[:lower:]]/', '$0', preg_replace('/(?!^)[[:upper:]]+/', $splitter.'$0', $camel));
+        $splitter = "-";
+        $camel = preg_replace('/(?!^)[[:upper:]][[:lower:]]/', '$0', preg_replace('/(?!^)[[:upper:]]+/', $splitter.'$0', $camel));
         $camel = preg_replace("/$splitter/", ':', $camel, 1);
         return strtolower($camel);
     }

src/Parser/DefaultsWithDescriptions.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     public function __construct($values = [], $defaultDefault = null)
     {
         $this->values = $values;
-        $this->hasDefault = array_filter($this->values, function ($value) {
+        $this->hasDefault = array_filter($this->values, function($value) {
             return isset($value);
         });
         $this->descriptions = [];

src/Hooks/Dispatchers/ReplaceCommandHookDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function hasReplaceCommandHook()
     {
-        return (bool) count($this->getReplaceCommandHooks());
+        return (bool)count($this->getReplaceCommandHooks());
     }
 
     /**

src/Options/PrepareTerminalWidthOption.php

Doc Comments +3 added lines

@@ -72,6 +72,9 @@
         $options->setWidth($width);
     }
 
+    /**
+     * @return CommandData
+     */
     protected function getTerminalWidth()
     {
         // Don't wrap if wrapping has been disabled.

src/CommandData.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
         if ($value === true) {
             // Check if the --no-* option exists. Note that none of the other
             // alteration apply in the $value == true case, so we can exit early here.
-            $negation_key = 'no-' . $option;
+            $negation_key = 'no-'.$option;
             return array_key_exists($negation_key, $options) && $options[$negation_key];
         }
 

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 . '/s';
+        $regex = '/'.self::TAG_REGEX.self::DESCRIPTION_REGEX.'/s';
         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 = '/^\s*' . self::VARIABLE_OR_WORD_REGEX . self::DESCRIPTION_REGEX . '/s';
+        $regex = '/^\s*'.self::VARIABLE_OR_WORD_REGEX.self::DESCRIPTION_REGEX.'/s';
         return preg_match($regex, $this->getContent(), $matches);
     }
 
@@ -136,7 +136,7 @@ 
      */
     public function hasTypeVariableAndDescription(&$matches)
     {
-        $regex = '/^\s*' . self::TYPE_REGEX . self::VARIABLE_REGEX . self::DESCRIPTION_REGEX . '/s';
+        $regex = '/^\s*'.self::TYPE_REGEX.self::VARIABLE_REGEX.self::DESCRIPTION_REGEX.'/s';
         return preg_match($regex, $this->getContent(), $matches);
     }
 
@@ -149,7 +149,7 @@ 
      */
     public function hasWordAndDescription(&$matches)
     {
-        $regex = '/^\s*' . self::WORD_REGEX . self::DESCRIPTION_REGEX . '/s';
+        $regex = '/^\s*'.self::WORD_REGEX.self::DESCRIPTION_REGEX.'/s';
         return preg_match($regex, $this->getContent(), $matches);
     }
 }