Merge pull request #1163 from veewee/bump-deps

Bump deps
phpro · Nov 26, 2024 · d8107de · d8107de
2 parents d1a72f4 + 19b9aea
commit d8107de
Show file tree

Hide file tree

Showing 12 changed files with 240 additions and 210 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/spec/Process/ProcessBuilderSpec.php b/spec/Process/ProcessBuilderSpec.php
@@ -84,6 +84,17 @@ public function getMatchers(): array
     {
         return [
             'beQuoted' => function ($subject, $string) {
+                if ('\\' === DIRECTORY_SEPARATOR) {
+                    if ($subject !== $string) {
+                        throw new FailureException(sprintf(
+                            'Expected %s, got %s.',
+                            $string,
+                            $subject
+                        ));
+                    }
+                    return true;
+                }
+
                 $regex = sprintf('{^([\'"])%s\1$}', preg_quote($string));
                 if (!preg_match($regex, $subject)) {
                     throw new FailureException(sprintf(

diff --git a/spec/Process/ProcessFactorySpec.php b/spec/Process/ProcessFactorySpec.php
@@ -42,6 +42,17 @@ public function getMatchers(): array
     {
         return [
             'beQuoted' => function ($subject, $string) {
+                if ('\\' === DIRECTORY_SEPARATOR) {
+                    if ($subject !== $string) {
+                        throw new FailureException(sprintf(
+                            'Expected %s, got %s.',
+                            $string,
+                            $subject
+                        ));
+                    }
+                    return true;
+                }
+
                 $regex = sprintf('{^([\'"])%s\1$}', preg_quote($string));
                 if (!preg_match($regex, $subject)) {
                     throw new FailureException(sprintf(

diff --git a/src/Configuration/Loader/DistFileLoader.php b/src/Configuration/Loader/DistFileLoader.php
@@ -18,12 +18,12 @@ public function __construct(LoaderInterface $loader)
         $this->loader = $loader;
     }
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         return $this->loader->load($resource, $type);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;

diff --git a/src/Console/Command/ConfigureCommand.php b/src/Console/Command/ConfigureCommand.php
@@ -147,7 +147,7 @@ protected function buildConfiguration(InputInterface $input, OutputInterface $ou
         ];
     }
 
-    protected function createQuestionString(string $question, string $default = null, string $separator = ':'): string
+    protected function createQuestionString(string $question, ?string $default = null, string $separator = ':'): string
     {
         return null !== $default ?
             sprintf('<fg=green>%s</fg=green> [<fg=yellow>%s</fg=yellow>]%s ', $question, $default, $separator) :

diff --git a/src/Event/Dispatcher/Bridge/SymfonyEventDispatcher.php b/src/Event/Dispatcher/Bridge/SymfonyEventDispatcher.php
@@ -24,7 +24,7 @@ public function __construct($eventDispatcher)
         $this->dispatcher = $eventDispatcher;
     }
 
-    public function dispatch(Event $event, string $name = null): void
+    public function dispatch(Event $event, ?string $name = null): void
     {
         $interfacesImplemented = class_implements($this->dispatcher);
         if (in_array(SymfonyEventDispatcherContract::class, $interfacesImplemented, true)) {

diff --git a/src/Event/Dispatcher/EventDispatcherInterface.php b/src/Event/Dispatcher/EventDispatcherInterface.php
@@ -8,5 +8,5 @@
 
 interface EventDispatcherInterface
 {
-    public function dispatch(Event $event, string $name = null): void;
+    public function dispatch(Event $event, ?string $name = null): void;
 }
diff --git a/src/Parser/Php/Configurator/TraverserConfigurator.php b/src/Parser/Php/Configurator/TraverserConfigurator.php
@@ -61,7 +61,7 @@ public function registerVisitorId(string $alias, string $visitorId): void
     /**
      * @throws \GrumPHP\Exception\RuntimeException
      */
-    public function registerStandardEnabledVisitor(string $alias, array $visitorOptions = null): void
+    public function registerStandardEnabledVisitor(string $alias, ?array $visitorOptions = null): void
     {
         if (array_key_exists($alias, $this->standardEnabledVisitors)) {
             throw new RuntimeException(

diff --git a/src/Process/ProcessBuilder.php b/src/Process/ProcessBuilder.php
@@ -41,7 +41,7 @@ public function __construct(ExternalCommand $externalCommandLocator, IOInterface
      */
     public function createArgumentsForCommand(
         string $command,
-        callable $pathManipulator = null
+        ?callable $pathManipulator = null
     ): ProcessArgumentsCollection {
         $executable = $this->externalCommandLocator->locate($command);
         $manipulatedExecutable = $pathManipulator ? $pathManipulator($executable) : $executable;

diff --git a/src/Runner/TaskRunnerContext.php b/src/Runner/TaskRunnerContext.php
@@ -43,7 +43,7 @@ class TaskRunnerContext
      */
     public function __construct(
         ContextInterface $taskContext,
-        TestSuiteInterface $testSuite = null,
+        ?TestSuiteInterface $testSuite = null,
         array $taskNames = []
     ) {
         $this->taskContext = $taskContext;

diff --git a/test/E2E/AbstractE2ETestCase.php b/test/E2E/AbstractE2ETestCase.php
@@ -73,6 +73,8 @@ protected function initializeGitSubModule(string $gitPath, string $submodulePath
         $process = new Process(
             [
                 $this->executableFinder->find('git'),
+                '-c',
+                'protocol.file.allow=always',
                 'submodule',
                 'add',
                 '-f',
@@ -174,7 +176,7 @@ protected function mergeComposerConfig(string $composerFile, array $config, $rec
         $this->dumpFile($composerFile, json_encode($newSource,  $flags));
     }
 
-    protected function ensureHooksExist(string $gitPath = null, string $containsPattern = '{grumphp}')
+    protected function ensureHooksExist(?string $gitPath = null, string $containsPattern = '{grumphp}')
     {
         $gitPath = $gitPath ?: $this->rootDir;
         $hooks = ['pre-commit', 'commit-msg'];
@@ -346,7 +348,7 @@ protected function installComposer(string $path, array $arguments = [])
         $this->runCommand('install composer', $process);
     }
 
-    protected function commitAll(string $gitPath = null)
+    protected function commitAll(?string $gitPath = null)
     {
         $gitPath = $gitPath ?: $this->rootDir;
         $git = $this->executableFinder->find('git');
@@ -362,7 +364,7 @@ protected function commitAll(string $gitPath = null)
      * --all: Tell the command to automatically stage files that have been modified and deleted,
      * but new files you have not told Git about are not affected.
      */
-    protected function commitModifiedAndDeleted(string $gitPath = null)
+    protected function commitModifiedAndDeleted(?string $gitPath = null)
     {
         $gitPath = $gitPath ?: $this->rootDir;
         $git = $this->executableFinder->find('git');
@@ -382,7 +384,7 @@ protected function runGrumphp(string $projectPath, string $vendorPath = './vendo
     {
         $projectPath = $this->relativeRootPath($projectPath);
         $process = new Process(
-            [$vendorPath.'/bin/grumphp', 'run', '-vvv'],
+            [$this->executableFinder->find('php'), $vendorPath.'/bin/grumphp', 'run', '-vvv'],
             $projectPath
         );
 
@@ -396,7 +398,7 @@ protected function runGrumphpWithConfig(string $projectPath, string $grumphpFile
         $projectPath = $this->relativeRootPath($projectPath);
         $this->runCommand('grumphp run with config',
             new Process(
-                [$vendorPath.'/bin/grumphp', 'run', '-vvv', '--config='.$grumphpFile],
+                [$this->executableFinder->find('php'), $vendorPath.'/bin/grumphp', 'run', '-vvv', '--config='.$grumphpFile],
                 $projectPath
             )
         );
@@ -407,7 +409,7 @@ protected function runGrumphpInfo(string $projectPath, $vendorPath = './vendor')
         $projectPath = $this->relativeRootPath($projectPath);
         $this->runCommand('grumphp info',
             new Process(
-                [$vendorPath.'/bin/grumphp'],
+                [$this->executableFinder->find('php'), $vendorPath.'/bin/grumphp'],
                 $projectPath
             )
         );
@@ -418,7 +420,7 @@ protected function initializeGrumphpGitHooksWithConfig(string $grumphpFile, $ven
         $this->runCommand(
             'grumphp git:init',
             new Process(
-                [$vendorPath.'/bin/grumphp', 'git:init', '--config='.$grumphpFile],
+                [$this->executableFinder->find('php'), $vendorPath.'/bin/grumphp', 'git:init', '--config='.$grumphpFile],
                 $this->rootDir
             )
         );

diff --git a/test/E2E/GitHookParametersTest.php b/test/E2E/GitHookParametersTest.php
@@ -48,7 +48,7 @@ function it_can_specify_hook_exec_command_with_additional_arguments()
 
         $this->installComposer($this->rootDir);
 
-        $hookPattern = sprintf('{[\'"]%s[\'"] [\'"]-d date\.timezone=Europe/Brussels[\'"]}', preg_quote($php));
+        $hookPattern = sprintf('{([\'"]?)%s([\'"]?) [\'"]-d date\.timezone=Europe/Brussels[\'"]}', preg_quote($php));
         $this->ensureHooksExist($this->rootDir, $hookPattern);
 
         $this->enableValidatePathsTask($grumphpFile, $this->rootDir);