Merge pull request #553 from laurieplo/php7.0-upgrade

Add missing typehints and return types

src/Composer/DevelopmentIntegrator.php

@@ -43,7 +43,7 @@ public static function integrate(Event $event)
         $event->getIO()->write('<fg=yellow>'.$process->getOutput().'</fg=yellow>');
     }
 
-    private static function noramlizePath($path): string
+    private static function noramlizePath(string $path): string
     {
         return strtr($path, '/', DIRECTORY_SEPARATOR);
     }

src/Composer/GrumPHPPlugin.php

@@ -62,7 +62,7 @@ public function activate(Composer $composer, IOInterface $io)
      *
      * {@inheritdoc}
      */
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             PackageEvents::POST_PACKAGE_INSTALL => 'postPackageInstall',

src/Configuration/GrumPHP.php

@@ -122,7 +122,7 @@ public function getTestSuites(): TestSuiteCollection
      *
      * @return string|null
      */
-    public function getAsciiContentPath($resource)
+    public function getAsciiContentPath(string $resource)
     {
         $paths = $this->container->getParameter('ascii');
         if (!array_key_exists($resource, $paths)) {

src/Console/Application.php

@@ -13,7 +13,9 @@
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Symfony\Component\Console\Application as SymfonyConsole;
+use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\ConsoleOutput;
@@ -54,7 +56,7 @@ public function __construct()
         parent::__construct(self::APP_NAME, self::APP_VERSION);
     }
 
-    protected function getDefaultInputDefinition()
+    protected function getDefaultInputDefinition(): InputDefinition
     {
         $definition = parent::getDefaultInputDefinition();
         $definition->addOption(
@@ -70,7 +72,7 @@ protected function getDefaultInputDefinition()
         return $definition;
     }
 
-    protected function getDefaultCommands()
+    protected function getDefaultCommands(): array
     {
         $commands = parent::getDefaultCommands();
 
@@ -106,7 +108,7 @@ protected function getDefaultCommands()
         return $commands;
     }
 
-    protected function getDefaultHelperSet()
+    protected function getDefaultHelperSet(): HelperSet
     {
         $helperSet = parent::getDefaultHelperSet();
         $helperSet->set($this->initializeComposerHelper());

src/Console/Helper/PathsHelper.php

@@ -180,15 +180,15 @@ public function getBinDir(): string
      * Search a command in the bin folder
      * Note: the command locator is not injected because it needs the relative bin path.
      */
-    public function getBinCommand($command, $forceUnix = false): string
+    public function getBinCommand($command, bool $forceUnix = false): string
     {
         return $this->externalCommandLocator->locate($command, $forceUnix);
     }
 
     /**
      * @throws FileNotFoundException If file doesn't exists
      */
-    public function getRelativePath($path): string
+    public function getRelativePath(string $path): string
     {
         $realpath = $this->getAbsolutePath($path);
 

src/Console/Helper/TaskRunnerHelper.php

@@ -132,7 +132,7 @@ private function returnWarningMessages(OutputInterface $output, array $warningMe
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getName(): string
     {
         return self::HELPER_NAME;
     }

src/Locator/ConfigurationFile.php

@@ -45,7 +45,7 @@ public function locate(string $workingDir, PackageInterface $package = null): st
         return $defaultPath;
     }
 
-    private function useConfigPathFromComposer(PackageInterface $package, $defaultPath): string
+    private function useConfigPathFromComposer(PackageInterface $package, string $defaultPath): string
     {
         $extra = $package->getExtra();
         if (!isset($extra['grumphp']['config-default-path'])) {
@@ -57,7 +57,7 @@ private function useConfigPathFromComposer(PackageInterface $package, $defaultPa
         return $this->locateConfigFileWithDistSupport($composerDefaultPath);
     }
 
-    private function locateConfigFileWithDistSupport($defaultPath): string
+    private function locateConfigFileWithDistSupport(string $defaultPath): string
     {
         $distPath = ('.dist' !== strpos($defaultPath, -5)) ? $defaultPath.'.dist' : $defaultPath;
         if ($this->filesystem->exists($defaultPath) || !$this->filesystem->exists($distPath)) {

src/Parser/Php/Configurator/TraverserConfigurator.php

@@ -59,11 +59,9 @@ public function registerVisitorId(string $alias, string $visitorId)
     }
 
     /**
-     * @param array|null $visitorOptions
-     *
      * @throws \GrumPHP\Exception\RuntimeException
      */
-    public function registerStandardEnabledVisitor($alias, array $visitorOptions = null)
+    public function registerStandardEnabledVisitor(string $alias, array $visitorOptions = null)
     {
         if (array_key_exists($alias, $this->standardEnabledVisitors)) {
             throw new RuntimeException(

src/Process/ProcessFactory.php

@@ -12,7 +12,7 @@
  */
 final class ProcessFactory
 {
-    public static function fromArguments(ProcessArgumentsCollection $arguments)
+    public static function fromArguments(ProcessArgumentsCollection $arguments): Process
     {
         // @todo Remove backward compatibility layer as soon as Symfony Process accepts an array (3.3+).
         //       From then on, you can simply pass `$arguments->getValues()` directly as the first constructor argument.

src/Util/Regex.php

@@ -22,7 +22,7 @@ class Regex
     /**
      * Regex constructor.
      */
-    public function __construct($string)
+    public function __construct(string $string)
     {
         $this->regex = $this->toRegex($string);
     }