diff --git a/composer.json b/composer.json index 533c25d..ac92615 100644 --- a/composer.json +++ b/composer.json @@ -8,14 +8,15 @@ } ], "require": { - "symfony/filesystem": "^3.4", - "symfony/finder": "^3.4", - "symfony/lock": "^3.4", - "aws/aws-sdk-php": "^2.7" + "php": "^8.1", + "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": "dev-master" + "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 1a6b6f2..e64f890 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -1,12 +1,14 @@ -FROM php:7.1 +FROM php:8.1 -RUN pecl install xdebug +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 -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 +COPY ./conf.d /usr/local/etc/php/conf.d + 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..ec77069 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 ''; } @@ -20,6 +19,13 @@ public function getPath() 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'); @@ -33,7 +39,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 +57,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 +80,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 +99,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 +123,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 +147,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 +170,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 +197,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 +221,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 +240,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 +259,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 +278,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 +328,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 +347,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 +365,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 +389,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 +440,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 +491,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 +544,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 +588,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 +607,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 +626,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 +677,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 +728,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 +771,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 +814,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 +836,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 +885,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 +928,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 +946,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 +965,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 +989,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 +1013,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 +1064,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 +1115,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 +1133,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 +1152,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 +1176,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 +1227,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 +1278,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 +1320,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 +1338,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 +1357,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 +1381,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 +1408,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 +1432,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 +1483,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 +1534,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 +1578,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 +1596,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 +1616,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 +1635,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 +1655,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 +1674,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 +1693,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 +1718,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 +1769,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 +1820,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 +1862,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 +1883,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 +1930,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);