From d686bcb6f1e47ecfb9dc47efcb621f3336e384e5 Mon Sep 17 00:00:00 2001 From: Mykhailo Zuiev Date: Thu, 21 Nov 2024 10:23:03 +0100 Subject: [PATCH 1/4] Fix "make test" errors --- composer.json | 2 +- docker/test/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 533c25d..74c7c5a 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ }, "require-dev": { "atoum/atoum": "~3.1", - "satooshi/php-coveralls": "dev-master" + "satooshi/php-coveralls": "^2.0" }, "autoload": { "psr-4": { diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 1a6b6f2..df80283 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -1,11 +1,11 @@ FROM php:7.1 -RUN pecl install xdebug +RUN pecl install xdebug-2.9.8 RUN docker-php-ext-enable xdebug RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer -RUN apt-get update && apt-get install -y \ - git + +RUN apt-get update && apt-get install -y git zip COPY ./ssh/ssh_config /etc/ssh/ssh_config From 292cb6a8dde5f1552a02bb89528b54321e9b2461 Mon Sep 17 00:00:00 2001 From: Mykhailo Zuiev Date: Thu, 21 Nov 2024 11:11:32 +0100 Subject: [PATCH 2/4] Update to php8.1 --- composer.json | 12 +- coverage.php | 2 +- docker/test/Dockerfile | 8 +- docker/test/conf.d/xdebug.ini | 1 + src/Adapter/FileAdapter.php | 10 +- tests/units/Adapter/FileAdapter.php | 307 ++++++++++++++---- tests/units/Adapter/MemoryAdapter.php | 2 +- tests/units/Adapter/NullAdapter.php | 2 +- tests/units/Adapter/SQSAdapter.php | 2 +- .../StandardPriorityHandler.php | 2 +- tests/units/QueueClient.php | 2 +- travis-coverage.php | 6 +- 12 files changed, 270 insertions(+), 86 deletions(-) create mode 100644 docker/test/conf.d/xdebug.ini diff --git a/composer.json b/composer.json index 74c7c5a..95a91cc 100644 --- a/composer.json +++ b/composer.json @@ -8,14 +8,14 @@ } ], "require": { - "symfony/filesystem": "^3.4", - "symfony/finder": "^3.4", - "symfony/lock": "^3.4", - "aws/aws-sdk-php": "^2.7" + "symfony/filesystem": "^6.4", + "symfony/finder": "^6.4", + "symfony/lock": "^6.4", + "aws/aws-sdk-php": "^3.328.3" }, "require-dev": { - "atoum/atoum": "~3.1", - "satooshi/php-coveralls": "^2.0" + "atoum/atoum": "^4.2", + "php-coveralls/php-coveralls": "^2.7" }, "autoload": { "psr-4": { diff --git a/coverage.php b/coverage.php index bc9318e..082e59a 100644 --- a/coverage.php +++ b/coverage.php @@ -5,7 +5,7 @@ Do "php path/to/test/file -c path/to/this/file" or "php path/to/atoum/scripts/runner.php -c path/to/this/file -f path/to/test/file" to use it. */ -use \mageekguy\atoum; +use \atoum\atoum; // HTML diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index df80283..bcb1773 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -1,6 +1,6 @@ -FROM php:7.1 +FROM php:8.1 -RUN pecl install xdebug-2.9.8 +RUN pecl install xdebug-3.3.2 RUN docker-php-ext-enable xdebug RUN curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer @@ -9,4 +9,8 @@ RUN apt-get update && apt-get install -y git zip COPY ./ssh/ssh_config /etc/ssh/ssh_config +COPY ./conf.d /usr/local/etc/php/conf.d + +RUN mkdir "/tmp/test" + WORKDIR /data diff --git a/docker/test/conf.d/xdebug.ini b/docker/test/conf.d/xdebug.ini new file mode 100644 index 0000000..b2db12b --- /dev/null +++ b/docker/test/conf.d/xdebug.ini @@ -0,0 +1 @@ +xdebug.mode=coverage \ No newline at end of file diff --git a/src/Adapter/FileAdapter.php b/src/Adapter/FileAdapter.php index 3415369..33a634e 100644 --- a/src/Adapter/FileAdapter.php +++ b/src/Adapter/FileAdapter.php @@ -11,7 +11,7 @@ use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\SplFileInfo; -use Symfony\Component\Lock\Factory; +use Symfony\Component\Lock\LockFactory; use Symfony\Component\Lock\Store\FlockStore; class FileAdapter extends AbstractAdapter implements AdapterInterface @@ -31,7 +31,7 @@ class FileAdapter extends AbstractAdapter implements AdapterInterface /** @var Filesystem $fs */ private $fs; - /** @var Factory $lockHandlerFactory */ + /** @var LockFactory $lockHandlerFactory */ private $lockHandlerFactory; /** @var PriorityHandlerInterface $priorityHandler */ @@ -42,12 +42,12 @@ class FileAdapter extends AbstractAdapter implements AdapterInterface * @param PriorityHandlerInterface $priorityHandler * @param Filesystem $fs * @param Finder $finder - * @param Factory $lockHandlerFactory + * @param LockFactory $lockHandlerFactory * * @throws \InvalidArgumentException * @throws QueueAccessException */ - public function __construct($repository, PriorityHandlerInterface $priorityHandler = null, Filesystem $fs = null, Finder $finder = null, Factory $lockHandlerFactory = null) + public function __construct(string $repository, PriorityHandlerInterface $priorityHandler = null, Filesystem $fs = null, Finder $finder = null, LockFactory $lockHandlerFactory = null) { if (empty($repository)) { throw new \InvalidArgumentException('Argument repository empty or not defined.'); @@ -76,7 +76,7 @@ public function __construct($repository, PriorityHandlerInterface $priorityHandl } if (null === $lockHandlerFactory) { - $lockHandlerFactory = new Factory(new FlockStore($repository)); + $lockHandlerFactory = new LockFactory(new FlockStore($repository)); } $this->priorityHandler = $priorityHandler; diff --git a/tests/units/Adapter/FileAdapter.php b/tests/units/Adapter/FileAdapter.php index 840824d..f8ffe2c 100644 --- a/tests/units/Adapter/FileAdapter.php +++ b/tests/units/Adapter/FileAdapter.php @@ -3,16 +3,15 @@ namespace ReputationVIP\QueueClient\tests\units\Adapter; use ArrayIterator; -use mageekguy\atoum; +use atoum\atoum; use ReputationVIP\QueueClient\PriorityHandler\ThreeLevelPriorityHandler; use Symfony\Component\Filesystem\Exception\IOExceptionInterface; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; -use Symfony\Component\Lock\Factory; class MockIOExceptionInterface extends \Exception implements IOExceptionInterface { - public function getPath() + public function getPath(): ?string { return ''; } @@ -33,7 +32,7 @@ public function testFileAdapter__construct() public function testFileAdapter__constructWithFilesystemError(Filesystem $fs, Finder $finder) { $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $this->exception(function () use ($fs, $finder, $mockLockHandlerFactory) { $this->newTestedInstance('', null, $fs, $finder, $mockLockHandlerFactory); @@ -51,10 +50,13 @@ public function testFileAdapterDeleteQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $this->calling($mockFs)->exists = true; $this->calling($mockLockHandlerFactory)->createLock = function ($repository) { @@ -71,10 +73,13 @@ public function testFileAdapterDeleteQueueWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $this->calling($mockFs)->exists = true; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -87,10 +92,13 @@ public function testFileAdapterDeleteQueueWithNoQueueFile() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $this->calling($mockFs)->exists = false; $this->calling($mockLockHandlerFactory)->createLock = function ($repository) { @@ -108,10 +116,13 @@ public function testFileAdapterDeleteQueueWithLockFailed() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $this->calling($mockFs)->exists = true; $this->calling($mockLockHandlerFactory)->createLock = function ($repository) { @@ -129,10 +140,13 @@ public function testFileAdapterCreateQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { $mockLockHandler = new \mock\Symfony\Component\Lock\LockInterface; @@ -149,10 +163,13 @@ public function testFileAdapterCreateQueueWithFsException() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { $mockLockHandler = new \mock\Symfony\Component\Lock\LockInterface; @@ -173,10 +190,13 @@ public function testFileAdapterCreateQueueWithLockFailed() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { $mockLockHandler = new \mock\Symfony\Component\Lock\LockInterface; @@ -194,10 +214,13 @@ public function testFileAdapterCreateQueueWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $this->calling($mockFs)->exists = true; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -210,10 +233,13 @@ public function testFileAdapterCreateQueueWithExistingQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -226,10 +252,13 @@ public function testFileAdapterCreateQueueWithSpaceIngQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = false; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -242,10 +271,13 @@ public function testFileAdapterPurgeQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -289,10 +321,13 @@ public function testFileAdapterPurgeQueueWithNoQueueFile() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = false; $FileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -305,10 +340,13 @@ public function testFileAdapterPurgeQueueWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); $this->exception(function () use ($fileAdapter) { @@ -320,10 +358,13 @@ public function testFileAdapterPurgeQueueWithLockFailed() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { @@ -341,10 +382,13 @@ public function testFileAdapterPurgeQueueWithEmptyQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -389,10 +433,13 @@ public function testFileAdapterPurgeQueueWithBadQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -437,10 +484,13 @@ public function testFileAdapterIsEmptyWithEmptyQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -487,10 +537,13 @@ public function testFileAdapterIsEmptyWithNoEmptyQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -528,10 +581,13 @@ public function testFileAdapterIsEmptyWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -544,10 +600,13 @@ public function testFileAdapterIsEmptyWithNoQueueFile() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = false; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -560,10 +619,13 @@ public function testFileAdapterIsEmptyWithEmptyQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -608,10 +670,13 @@ public function testFileAdapterIsEmptyWithBadQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -656,10 +721,13 @@ public function testFileAdapterListQueues() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFinder->getMockController()->getIterator = function () use ($priorityHandler) { @@ -696,10 +764,13 @@ public function testFileAdapterListQueuesWithPrefix() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFinder->getMockController()->getIterator = function () use ($priorityHandler) { @@ -736,10 +807,13 @@ public function testFileAdapterListQueuesWithEmptyQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFinder->getMockController()->getIterator = function () { return new ArrayIterator([]); @@ -755,10 +829,13 @@ public function testFileAdapterAddMessage() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -801,9 +878,12 @@ public function testFileAdapterAddMessage() public function testFileAdapterAddMessageWithDelay() { $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', $priorityHandler, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -841,10 +921,13 @@ public function testFileAdapterAddMessageWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); $this->exception(function () use ($fileAdapter) { @@ -856,10 +939,13 @@ public function testFileAdapterAddMessageWithNoQueueFile() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = false; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -872,10 +958,13 @@ public function testFileAdapterAddMessageWithEmptyMessage() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { @@ -893,10 +982,13 @@ public function testFileAdapterAddMessageLockFailed() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { @@ -914,10 +1006,13 @@ public function testFileAdapterAddMessageWithEmptyQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -962,10 +1057,13 @@ public function testFileAdapterAddMessageWithBadQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1010,10 +1108,13 @@ public function testFileAdapterGetNumberMessagesWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); $this->exception(function () use ($fileAdapter) { @@ -1025,10 +1126,13 @@ public function testFileAdapterGetNumberMessagesWithNoQueueFile() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = false; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -1041,10 +1145,13 @@ public function testFileAdapterGetNumberMessagesLockFailed() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { @@ -1062,10 +1169,13 @@ public function testFileAdapterGetNumberMessagesWithEmptyQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1110,10 +1220,13 @@ public function testFileAdapterGetNumberMessagesWithBadQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1158,10 +1271,13 @@ public function testFileAdapterGetNumberMessages() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1197,10 +1313,13 @@ public function testFileAdapterGetMessagesWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); $this->exception(function () use ($fileAdapter) { @@ -1212,10 +1331,13 @@ public function testFileAdapterGetMessagesWithNoQueueFile() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = false; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -1228,10 +1350,13 @@ public function testFileAdapterAddMessagesWithNoNumericNbrMsg() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { @@ -1249,10 +1374,13 @@ public function testFileAdapterGetMessagesWithNotValidNumericNbrMsg() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { @@ -1273,10 +1401,13 @@ public function testFileAdapterGetMessagesLockFailed() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $mockLockHandlerFactory->getMockController()->createLock = function ($repository) { @@ -1294,10 +1425,13 @@ public function testFileAdapterGetMessagesWithEmptyQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1342,10 +1476,13 @@ public function testFileAdapterGetMessagesWithBadQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1390,10 +1527,13 @@ public function testFileAdapterGetMessages() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1431,10 +1571,13 @@ public function testFileAdapterDeleteMessageWithEmptyQueueName() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); $this->exception(function () use ($fileAdapter) { @@ -1446,10 +1589,13 @@ public function testFileAdapterDeleteMessageWithNoQueueFile() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = false; @@ -1463,10 +1609,13 @@ public function testFileAdapterDeleteMessageWithNoMessage() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = false; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -1479,10 +1628,13 @@ public function testFileAdapterDeleteMessageWithNoIdField() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1496,10 +1648,13 @@ public function testFileAdapterDeleteMessageWithNotPriorityField() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -1512,10 +1667,13 @@ public function testFileAdapterDeleteMessageWithBadMessageType() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $mockFs->getMockController()->exists = true; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); @@ -1528,10 +1686,13 @@ public function testFileAdapterDeleteMessageLockFailed() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1550,10 +1711,13 @@ public function testFileAdapterDeleteMessageWithEmptyQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1598,10 +1762,13 @@ public function testFileAdapterDeleteMessageWithBadQueueContent() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1646,10 +1813,13 @@ public function testFileAdapterDeleteMessage() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = true; @@ -1685,10 +1855,13 @@ public function testFileAdapterRenameQueueWithEmptyParameter() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); $this->exception(function () use ($fileAdapter) { @@ -1703,10 +1876,13 @@ public function testFileAdapterRenameQueue() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $priorityHandler = new ThreeLevelPriorityHandler(); $mockFs->getMockController()->exists = function ($queue) { @@ -1747,10 +1923,13 @@ public function testFileAdapterGetPriorityHandler() { $this->mockGenerator->shuntParentClassCalls(); $mockFs = new \mock\Symfony\Component\Filesystem\Filesystem; + $mockFs->getMockController()->exists = function ($path) { + return false; + }; $this->mockGenerator->unshuntParentClassCalls(); $mockFinder = new \mock\Symfony\Component\Finder\Finder; $this->mockGenerator->orphanize('__construct'); - $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\Factory; + $mockLockHandlerFactory = new \mock\Symfony\Component\Lock\LockFactory; $fileAdapter = new \ReputationVIP\QueueClient\Adapter\FileAdapter('/tmp/test/', null, $mockFs, $mockFinder, $mockLockHandlerFactory); $this->given($fileAdapter) diff --git a/tests/units/Adapter/MemoryAdapter.php b/tests/units/Adapter/MemoryAdapter.php index 45be0e6..22b2510 100644 --- a/tests/units/Adapter/MemoryAdapter.php +++ b/tests/units/Adapter/MemoryAdapter.php @@ -2,7 +2,7 @@ namespace ReputationVIP\QueueClient\tests\units\Adapter; -use mageekguy\atoum; +use atoum\atoum; use ReputationVIP\QueueClient\PriorityHandler\Priority\Priority; use ReputationVIP\QueueClient\PriorityHandler\StandardPriorityHandler; use ReputationVIP\QueueClient\PriorityHandler\ThreeLevelPriorityHandler; diff --git a/tests/units/Adapter/NullAdapter.php b/tests/units/Adapter/NullAdapter.php index 29d5ac2..9100523 100644 --- a/tests/units/Adapter/NullAdapter.php +++ b/tests/units/Adapter/NullAdapter.php @@ -2,7 +2,7 @@ namespace ReputationVIP\QueueClient\tests\units\Adapter; -use mageekguy\atoum; +use atoum\atoum; class NullAdapter extends atoum\test { diff --git a/tests/units/Adapter/SQSAdapter.php b/tests/units/Adapter/SQSAdapter.php index 4a109a9..1cf8811 100644 --- a/tests/units/Adapter/SQSAdapter.php +++ b/tests/units/Adapter/SQSAdapter.php @@ -2,7 +2,7 @@ namespace ReputationVIP\QueueClient\tests\units\Adapter; -use mageekguy\atoum; +use atoum\atoum; use ReputationVIP\QueueClient\PriorityHandler\ThreeLevelPriorityHandler; class SQSAdapter extends atoum\test diff --git a/tests/units/PriorityHandler/StandardPriorityHandler.php b/tests/units/PriorityHandler/StandardPriorityHandler.php index 24df4ef..337aae2 100644 --- a/tests/units/PriorityHandler/StandardPriorityHandler.php +++ b/tests/units/PriorityHandler/StandardPriorityHandler.php @@ -2,7 +2,7 @@ namespace ReputationVIP\QueueClient\tests\units\PriorityHandler; -use mageekguy\atoum; +use atoum\atoum; use ReputationVIP\QueueClient\PriorityHandler\Priority\Priority; class StandardPriorityHandler extends atoum\test diff --git a/tests/units/QueueClient.php b/tests/units/QueueClient.php index a419bf0..2b3263c 100644 --- a/tests/units/QueueClient.php +++ b/tests/units/QueueClient.php @@ -2,7 +2,7 @@ namespace ReputationVIP\QueueClient\tests\units; -use mageekguy\atoum; +use atoum\atoum; use ReputationVIP\QueueClient\Adapter\MemoryAdapter; class QueueClient extends atoum\test diff --git a/travis-coverage.php b/travis-coverage.php index 1af2a6b..53485c5 100644 --- a/travis-coverage.php +++ b/travis-coverage.php @@ -5,11 +5,11 @@ Do "php path/to/test/file -c path/to/this/file" or "php path/to/atoum/scripts/runner.php -c path/to/this/file -f path/to/test/file" to use it. */ -use \mageekguy\atoum; +use \atoum\atoum; $cloverWriter = new atoum\writers\file('build/logs/clover.xml'); -$stdOutWriter = new \mageekguy\atoum\writers\std\out(); -$cli = new \mageekguy\atoum\reports\realtime\cli(); +$stdOutWriter = new \atoum\atoum\writers\std\out(); +$cli = new \atoum\atoum\reports\realtime\cli(); $cli->addWriter($stdOutWriter); $cloverReport = new atoum\reports\asynchronous\clover(); $cloverReport->addWriter($cloverWriter); From aeac6380c97f6b1da112af63af4b95723d8a5969 Mon Sep 17 00:00:00 2001 From: Mykhailo Zuiev Date: Thu, 21 Nov 2024 11:18:42 +0100 Subject: [PATCH 3/4] Add php requirement to composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 95a91cc..ac92615 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ } ], "require": { + "php": "^8.1", "symfony/filesystem": "^6.4", "symfony/finder": "^6.4", "symfony/lock": "^6.4", From cf8d526af9b4ae413264bfc64eeddb5383788896 Mon Sep 17 00:00:00 2001 From: Mykhailo Zuiev Date: Mon, 25 Nov 2024 14:24:32 +0100 Subject: [PATCH 4/4] Fix 'The "/tmp/test/" directory does not exist.' exception in tests --- docker/test/Dockerfile | 2 -- tests/units/Adapter/FileAdapter.php | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index bcb1773..e64f890 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -11,6 +11,4 @@ COPY ./ssh/ssh_config /etc/ssh/ssh_config COPY ./conf.d /usr/local/etc/php/conf.d -RUN mkdir "/tmp/test" - WORKDIR /data diff --git a/tests/units/Adapter/FileAdapter.php b/tests/units/Adapter/FileAdapter.php index f8ffe2c..ec77069 100644 --- a/tests/units/Adapter/FileAdapter.php +++ b/tests/units/Adapter/FileAdapter.php @@ -19,6 +19,13 @@ public function getPath(): ?string class FileAdapter extends atoum\test { + public function setUp(): void + { + if (!is_dir('/tmp/test')) { + mkdir('/tmp/test', 0777, true); + } + } + public function testFileAdapterClass() { $this->testedClass->implements('\ReputationVIP\QueueClient\Adapter\AdapterInterface');