This commit is contained in:
		
							
								
								
									
										12
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										12
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							@@ -3181,16 +3181,16 @@
 | 
				
			|||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "name": "phpstan/phpdoc-parser",
 | 
					            "name": "phpstan/phpdoc-parser",
 | 
				
			||||||
            "version": "1.22.1",
 | 
					            "version": "1.23.0",
 | 
				
			||||||
            "source": {
 | 
					            "source": {
 | 
				
			||||||
                "type": "git",
 | 
					                "type": "git",
 | 
				
			||||||
                "url": "https://github.com/phpstan/phpdoc-parser.git",
 | 
					                "url": "https://github.com/phpstan/phpdoc-parser.git",
 | 
				
			||||||
                "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0"
 | 
					                "reference": "a2b24135c35852b348894320d47b3902a94bc494"
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            "dist": {
 | 
					            "dist": {
 | 
				
			||||||
                "type": "zip",
 | 
					                "type": "zip",
 | 
				
			||||||
                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0",
 | 
					                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a2b24135c35852b348894320d47b3902a94bc494",
 | 
				
			||||||
                "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0",
 | 
					                "reference": "a2b24135c35852b348894320d47b3902a94bc494",
 | 
				
			||||||
                "shasum": ""
 | 
					                "shasum": ""
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            "require": {
 | 
					            "require": {
 | 
				
			||||||
@@ -3222,9 +3222,9 @@
 | 
				
			|||||||
            "description": "PHPDoc parser with support for nullable, intersection and generic types",
 | 
					            "description": "PHPDoc parser with support for nullable, intersection and generic types",
 | 
				
			||||||
            "support": {
 | 
					            "support": {
 | 
				
			||||||
                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
 | 
					                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
 | 
				
			||||||
                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1"
 | 
					                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.0"
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            "time": "2023-06-29T20:46:06+00:00"
 | 
					            "time": "2023-07-23T22:17:56+00:00"
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            "name": "phpstan/phpstan",
 | 
					            "name": "phpstan/phpstan",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,12 +24,6 @@ class Rclone
 | 
				
			|||||||
    protected LoggerInterface $logger;
 | 
					    protected LoggerInterface $logger;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    protected string $rclonePath;
 | 
					    protected string $rclonePath;
 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * Global options
 | 
					 | 
				
			||||||
     *
 | 
					 | 
				
			||||||
     * @var array<string>
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    protected array $globalOptions = [];
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    protected string $version = "";
 | 
					    protected string $version = "";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -54,7 +48,7 @@ class Rclone
 | 
				
			|||||||
        $this->version = explode("\n", $process->getOutput())[0];
 | 
					        $this->version = explode("\n", $process->getOutput())[0];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (!\str_contains($this->version, 'rclone')) {
 | 
					        if (!\str_contains($this->version, 'rclone')) {
 | 
				
			||||||
            throw new Exception("Rclone not recognized");
 | 
					            throw new Exception("rclone not recognized");
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -126,7 +120,6 @@ class Rclone
 | 
				
			|||||||
        $process = new Process(
 | 
					        $process = new Process(
 | 
				
			||||||
            array_merge(
 | 
					            array_merge(
 | 
				
			||||||
                [$this->rclonePath],
 | 
					                [$this->rclonePath],
 | 
				
			||||||
                $this->globalOptions,
 | 
					 | 
				
			||||||
                [$command],
 | 
					                [$command],
 | 
				
			||||||
                $options
 | 
					                $options
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
@@ -134,7 +127,6 @@ class Rclone
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        $this->logger->info("Execute command", [$process->getCommandLine()]);
 | 
					        $this->logger->info("Execute command", [$process->getCommandLine()]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
        $process->setTimeout(4 * 3600);
 | 
					        $process->setTimeout(4 * 3600);
 | 
				
			||||||
        $process->run();
 | 
					        $process->run();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,7 +20,6 @@ final class RcloneTest extends TestCase
 | 
				
			|||||||
        exec('rclone purge temp 2>&1');
 | 
					        exec('rclone purge temp 2>&1');
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    public function testRclonePath(): void
 | 
					    public function testRclonePath(): void
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        $this->expectException(\Exception::class);
 | 
					        $this->expectException(\Exception::class);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user