cross-solution / YAWIK

module/Core/test/CoreTest/Mail/FileTransportTest.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $options = $this->createMock(FileOptions::class);
         $options->expects($this->once())
             ->method('getCallback')
-            ->willReturn([$this,'getFileName'])
+            ->willReturn([$this, 'getFileName'])
         ;
         $options->expects($this->exactly(2))
             ->method('getPath')

module/Core/test/CoreTest/Mail/MailServiceFactoryTest.php

Spacing +3 added lines, -3 removed lines

@@ -48,9 +48,9 @@
             ->method('get')
             ->willReturnMap(
                 [
-                    ['Config',[]],
-                    ['Auth/Options',$authOptions],
-                    ['Core/MailServiceOptions',$mailOptions]
+                    ['Config', []],
+                    ['Auth/Options', $authOptions],
+                    ['Core/MailServiceOptions', $mailOptions]
             ]
         );
 

module/Core/test/CoreTest/Listener/LanguageRouteListener/BaseTest.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
     private $target;
 
-    private $inheritance = [ ListenerAggregateInterface::class ];
+    private $inheritance = [ListenerAggregateInterface::class];
 
     protected function setUp()
     {
@@ -73,7 +73,7 @@ 
      */
     public function testDetach()
     {
-        $callableListener = [new CallableListenerMock(),'doSomething'];
+        $callableListener = [new CallableListenerMock(), 'doSomething'];
         
         $events = $this
             ->getMockBuilder(EventManager::class)

module/Core/test/CoreTest/Listener/LanguageRouteListener/OnDispatchErrorCallbackTest.php

Indentation +8 added lines, -8 removed lines

@@ -51,11 +51,11 @@ 
     public function testHandleConsoleRequests()
     {
         $event = $this
-           ->getMockBuilder(MvcEvent::class)
-           ->disableOriginalConstructor()
-           ->setMethods(['getRequest', 'getError'])
-           ->getMock()
-       ;
+            ->getMockBuilder(MvcEvent::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRequest', 'getError'])
+            ->getMock()
+        ;
 
         $request = new \Zend\Console\Request();
 
@@ -136,8 +136,8 @@ 
         $event = $this->getEventMock('/base/uri', '/see/no/lang');
 
         $event->expects($this->once())
-              ->method('stopPropagation')
-              ->with(true)
+                ->method('stopPropagation')
+                ->with(true)
         ;
         $response = new Response();
         $event->setResponse($response);
@@ -150,7 +150,7 @@ 
                     Assert::assertEquals('/base/uri/xx/see/no/lang', (string) $v->getUri());
                     return true;
                 }
-              ))
+                ))
             ->willReturn($routeMatch)
         ;
 

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 
     private $target = [
         LanguageRouteListener::class,
-        'mock' => [ 'detectLanguage' => ['return' => 'xx'], 'setLocale', 'isSupportedLanguage', 'redirect'],
+        'mock' => ['detectLanguage' => ['return' => 'xx'], 'setLocale', 'isSupportedLanguage', 'redirect'],
         'args' => 'getConstructorArgs'
     ];
 
@@ -146,7 +146,7 @@ 
             ->expects($this->once())
             ->method('match')
             ->with($this->callback(
-                function ($v) {
+                function($v) {
                     Assert::assertEquals('/base/uri/xx/see/no/lang', (string) $v->getUri());
                     return true;
                 }
@@ -178,7 +178,7 @@ 
             ->expects($this->once())
             ->method('match')
             ->with($this->callback(
-                function ($v) {
+                function($v) {
                     Assert::assertEquals('/base/uri/xx/non/mappable/route', (string) $v->getUri());
                     return true;
                 }
@@ -207,7 +207,7 @@ 
             ->expects($this->once())
             ->method('match')
             ->with($this->callback(
-                function ($v) {
+                function($v) {
                     Assert::assertEquals('/base/uri/default/see/no/lang', (string) $v->getUri());
                     return true;
                 }
@@ -231,6 +231,6 @@ 
     public function getConstructorArgs()
     {
         $this->moduleOptions = new ModuleOptions();
-        return [new LocaleService([]),$this->moduleOptions];
+        return [new LocaleService([]), $this->moduleOptions];
     }
 }

module/Core/test/CoreTest/Listener/Events/AjaxEventTest.php

Spacing +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
 
     private $target = AjaxEvent::class;
 
-    private $inheritance = [ Event::class ];
+    private $inheritance = [Event::class];
 
     public function propertiesProvider()
     {
@@ -42,12 +42,12 @@ 
             ['contentType', [
                 'value' => 'test/type',
                 'default' => AjaxEvent::TYPE_JSON,
-                'post' => function () {
+                'post' => function() {
                     $this->assertEquals('test/type', $this->target->getParam('contentType'));
                 },
             ]],
             ['contentType', [
-                'pre' => function () {
+                'pre' => function() {
                     $this->target->setParam('contentType', 'type/test');
                 },
                 'value' => 'type/test',
@@ -57,12 +57,12 @@ 
             ['request', [
                 'value' => $request,
                 'default' => null,
-                'post' => function () use ($request) {
+                'post' => function() use ($request) {
                     $this->assertSame($request, $this->target->getParam('request'));
                 },
             ]],
             ['request', [
-                'pre' => function () use ($request) {
+                'pre' => function() use ($request) {
                     $this->target->setParam('request', $request);
                 },
                 'value' => $request,
@@ -72,12 +72,12 @@ 
             ['response', [
                 'value' => $response,
                 'default' => null,
-                'post' => function () use ($response) {
+                'post' => function() use ($response) {
                     $this->assertSame($response, $this->target->getParam('response'));
                 },
             ]],
             ['response', [
-                'pre' => function () use ($response) {
+                'pre' => function() use ($response) {
                     $this->target->setParam('response', $response);
                 },
                 'value' => $response,
@@ -88,12 +88,12 @@ 
             ['result', [
                 'value' => 'testResult',
                 'default' => null,
-                'post' => function () {
+                'post' => function() {
                     $this->assertEquals('testResult', $this->target->getParam('result'));
                 },
             ]],
             ['result', [
-                'pre' => function () {
+                'pre' => function() {
                     $this->target->setParam('result', 'testResult');
                 },
                 'value' => 'testResult',

module/Core/test/CoreTest/Listener/Events/CreatePaginatorEventTest.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
  */
 class CreatePaginatorEventTest extends TestCase
 {
-    use TestSetterGetterTrait,SetupTargetTrait;
+    use TestSetterGetterTrait, SetupTargetTrait;
 
     protected $target = [
         'class' => CreatePaginatorEvent::class
@@ -43,16 +43,16 @@ 
             ->getMock()
         ;
         return [
-            ['paginatorParams',[
+            ['paginatorParams', [
                 'value'     =>['name'=>'value'],
                 'default'   => array(),
             ]],
-            ['paginatorName',[
+            ['paginatorName', [
                 'value' => 'Some/Paginator',
                 'default'   => null,
             ]],
-            ['paginators',$paginators],
-            ['paginator',$paginator]
+            ['paginators', $paginators],
+            ['paginator', $paginator]
         ];
     }
 

module/Core/test/CoreTest/Listener/Events/FileEventTest.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 
     private $target = FileEvent::class;
 
-    private $inheritance = [ Event::class ];
+    private $inheritance = [Event::class];
 
     public function propertiesProvider()
     {
@@ -41,13 +41,13 @@ 
             ['params', [
                 'value' => ['file' => $file, 'one' => 'two'],
                 'expect' => ['one' => 'two'],
-                'post' => function () use ($file) {
+                'post' => function() use ($file) {
                     $this->assertSame($file, $this->target->getFile());
                 },
             ]],
             ['file', $file],
             ['file', [
-                'pre' => function () use ($file) {
+                'pre' => function() use ($file) {
                     $this->target->setParam('file', $file);
                 },
                 'ignore_setter' => true,

module/Core/test/CoreTest/Listener/DeferredListenerAggregateTest.php

Spacing +35 added lines, -35 removed lines

@@ -41,7 +41,7 @@ 
         '@testFactoryMethodReturnsInstance' => false
     ];
 
-    protected $inheritance = [ '\Zend\EventManager\ListenerAggregateInterface' ];
+    protected $inheritance = ['\Zend\EventManager\ListenerAggregateInterface'];
     
     protected $services;
 
@@ -56,39 +56,39 @@ 
     public function propertiesProvider()
     {
         return [
-            [ 'listeners', [
-                'value' => [ [] ],
-                'setter_exception' => [ '\DomainException', 'Listener specification must be an array' ]
+            ['listeners', [
+                'value' => [[]],
+                'setter_exception' => ['\DomainException', 'Listener specification must be an array']
             ]],
-            [ 'listeners', [
-                'value' => [ [ 'event' => 'test' ] ],
-                'setter_exception' => [ '\DomainException', 'Listener specification must be an array' ]
+            ['listeners', [
+                'value' => [['event' => 'test']],
+                'setter_exception' => ['\DomainException', 'Listener specification must be an array']
             ]],
-            [ 'listeners', [
-                'value' => [ [ 'service' => 'test' ] ],
-                'setter_exception' => [ '\DomainException', 'Listener specification must be an array' ]
+            ['listeners', [
+                'value' => [['service' => 'test']],
+                'setter_exception' => ['\DomainException', 'Listener specification must be an array']
             ]],
-            [ 'listeners', [
-                'value' => [ [ 'event' => 'test', 'service' => 'service' ] ],
+            ['listeners', [
+                'value' => [['event' => 'test', 'service' => 'service']],
                 'ignore_getter' => true,
-                'post' => ['assertListenerSpecsProperty', [ '', '@target', '###' ] ],
+                'post' => ['assertListenerSpecsProperty', ['', '@target', '###']],
             ]],
-            [ 'listeners', [
-                'value' => [ [ 'event' => 'test2', 'service' => 'someClass', 'method' => 'method', 'priority' => 12 ] ],
+            ['listeners', [
+                'value' => [['event' => 'test2', 'service' => 'someClass', 'method' => 'method', 'priority' => 12]],
                 'ignore_getter' => true,
-                'post' => ['assertListenerSpecsProperty', [ '', '@target', '###' ] ],
+                'post' => ['assertListenerSpecsProperty', ['', '@target', '###']],
             ]],
-            [ 'listener', [
+            ['listener', [
                 'value' => 'test',
-                'setter_args' => [ 'service', 'method', 10 ],
-                'setter_value' => [ 'event' => 'test', 'service' => 'service', 'method' => 'method', 'priority' => 10, 'instance' => null ],
+                'setter_args' => ['service', 'method', 10],
+                'setter_value' => ['event' => 'test', 'service' => 'service', 'method' => 'method', 'priority' => 10, 'instance' => null],
                 'setter_assert' => 'assertListenerSpecsProperty',
                 'ignore_getter' => true,
             ]],
-            [ 'listener', [
+            ['listener', [
                 'value' => 'test',
-                'setter_args' => [ 'service', 10 ],
-                'setter_value' => [ 'event' => 'test', 'service' => 'service', 'method' => null, 'priority' => 10, 'instance' => null ],
+                'setter_args' => ['service', 10],
+                'setter_value' => ['event' => 'test', 'service' => 'service', 'method' => null, 'priority' => 10, 'instance' => null],
                 'setter_assert' => 'assertListenerSpecsProperty',
                 'ignore_getter' => true,
             ]]
@@ -132,20 +132,20 @@ 
         $this->target->setListener('test02', 'service02', 10);
         
         //In ZF3 EventManager detach should be a callable or it will throws an error
-        $callback = [$testListener,'callback'];
+        $callback = [$testListener, 'callback'];
         $events = $this->getMockBuilder(EventManager::class)
             ->setMethods(['attach', 'detach'])
             ->getMock();
         $events->expects($this->exactly(2))
             ->method('attach')
             ->withConsecutive(
-                [ $this->equalTo('test01'), $this->anything(), $this->equalTo(0) ],
-                [ $this->equalTo('test02'), $this->anything(), $this->equalTo(10) ]
+                [$this->equalTo('test01'), $this->anything(), $this->equalTo(0)],
+                [$this->equalTo('test02'), $this->anything(), $this->equalTo(10)]
             )
             ->will(
                 $this->onConsecutiveCalls(
-                [$testListener,'callback'],
-                [$testListener,'callback']
+                [$testListener, 'callback'],
+                [$testListener, 'callback']
             )
             );
 
@@ -186,13 +186,13 @@ 
     public function listenerProvider()
     {
         return [
-            [ 'nonExistant', null ],
-            [ '\CoreTest\Listener\DLATListenerMock', null ],
-            [ 'listener', new DLATListenerMock() ],
-            [ 'listener', new DLATListenerMock(), 'invoke' ],
-            [ 'listener', new DLATListenerMock(), 'method', 'callback' ],
-            [ 'listener', new DLATListenerMock(), 'methodButNone', 'noMethod' ],
-            [ 'listener', new DLATNonInvokableListenerMock() ],
+            ['nonExistant', null],
+            ['\CoreTest\Listener\DLATListenerMock', null],
+            ['listener', new DLATListenerMock()],
+            ['listener', new DLATListenerMock(), 'invoke'],
+            ['listener', new DLATListenerMock(), 'method', 'callback'],
+            ['listener', new DLATListenerMock(), 'methodButNone', 'noMethod'],
+            ['listener', new DLATNonInvokableListenerMock()],
         ];
     }
 
@@ -211,7 +211,7 @@ 
         if (null === $listener) {
             if (!class_exists($service, true)) {
                 $this->expectException('\UnexpectedValueException');
-                $this->expectExceptionMessage('Cannot create deferred listener "' . $service);
+                $this->expectExceptionMessage('Cannot create deferred listener "'.$service);
             }
             $this->services->expects($this->once())->method('has')->with($service)->willReturn(false);
             $this->services->expects($this->never())->method('get');

module/Core/test/CoreTest/Queue/MongoQueueTest.php

Indentation +57 added lines, -57 removed lines

@@ -153,11 +153,11 @@ 
             'delay' => 100,
         ];
         $resultMock = $this->getMockBuilder(\MongoDB\InsertOneResult::class)->disableOriginalConstructor()
-                           ->setMethods(['getInsertedId'])->getMock();
+                            ->setMethods(['getInsertedId'])->getMock();
         $resultMock->expects($this->once())->method('getInsertedId')->willReturn('ID');
         $this->mongoCollectionMock->expects($this->once())->method('insertOne')
-                                  ->with($this->callback(function ($value) use ($options) {
-                                      return isset($value['queue']) && $value['queue'] == $this->queueName
+                                    ->with($this->callback(function ($value) use ($options) {
+                                        return isset($value['queue']) && $value['queue'] == $this->queueName
                                              && isset($value['status']) && $value['status'] == MongoQueue::STATUS_PENDING
                                              && !isset($value['tried'])
                                              && !isset($value['message']) && !isset($value['trace'])
@@ -166,9 +166,9 @@ 
                                              && $value['created'] instanceof \MongoDB\BSON\UTCDateTime
                                              && (int) ((string) $value['scheduled']) - (int) ((string)$value['created']) == $options['delay'] * 1000
                                              && isset($value['priority']) && $value['priority'] == $options['priority']
-                                          ;
-                                  }))
-                                  ->willReturn($resultMock);
+                                            ;
+                                    }))
+                                    ->willReturn($resultMock);
 
         $this->target->push($job, $options);
 
@@ -184,21 +184,21 @@ 
 
 
         $this->mongoCollectionMock->expects($this->once())->method('findOneAndUpdate')
-                                  ->with(
-                                      $this->equalTo(['_id' => new \MongoDB\BSON\ObjectID($job->getId())]),
-                                      $this->callback(
-                                          function ($value) {
-                                              if (!array_key_exists('$set', $value)) {
-                                                  return false;
-                                              }
-                                              $value = $value['$set'];
-                                              return isset($value['tried']) && $value['tried'] == 10
+                                    ->with(
+                                        $this->equalTo(['_id' => new \MongoDB\BSON\ObjectID($job->getId())]),
+                                        $this->callback(
+                                            function ($value) {
+                                                if (!array_key_exists('$set', $value)) {
+                                                    return false;
+                                                }
+                                                $value = $value['$set'];
+                                                return isset($value['tried']) && $value['tried'] == 10
                                                 && !array_key_exists('created', $value)
                                         ;
-                                          }
-                                  )
-                                  )
-                                  ->willReturn(null);
+                                            }
+                                    )
+                                    )
+                                    ->willReturn(null);
 
         $this->target->retry($job);
     }
@@ -215,33 +215,33 @@ 
 
         $this->jobManagerMock->expects($this->once())->method('get')->with(get_class($job))->willReturn(new $this->testJobClass());
         $this->mongoCollectionMock->expects($this->once())->method('findOneAndUpdate')
-                                  ->with(
-                                      $this->callback(function ($value) {
-                                          return
+                                    ->with(
+                                        $this->callback(function ($value) {
+                                            return
                                                     isset($value['queue']) && $value['queue'] == $this->queueName
                                                     && isset($value['status']) && $value['status'] == MongoQueue::STATUS_PENDING
                                                     && isset($value['scheduled']['$lte']) && $value['scheduled']['$lte'] instanceof \MongoDB\BSON\UTCDateTime
-                                              ;
-                                      }),
-                                      $this->callback(
-                                          function ($value) {
-                                              if (!array_key_exists('$set', $value)) {
-                                                  return false;
-                                              }
-                                              $value = $value['$set'];
-                                              return isset($value['status']) && $value['status'] == MongoQueue::STATUS_RUNNING
+                                                ;
+                                        }),
+                                        $this->callback(
+                                            function ($value) {
+                                                if (!array_key_exists('$set', $value)) {
+                                                    return false;
+                                                }
+                                                $value = $value['$set'];
+                                                return isset($value['status']) && $value['status'] == MongoQueue::STATUS_RUNNING
                                                  && array_key_exists('executed', $value)
-                                              ;
-                                          }
-                                      ),
-                                      $this->callback(function ($value) {
-                                          return
+                                                ;
+                                            }
+                                        ),
+                                        $this->callback(function ($value) {
+                                            return
                                             isset($value['sort']) && $value['sort'] == ['priority' => 1, 'scheduled' => 1]
                                               && isset($value['returnDocument'])&&$value['returnDocument'] = \MongoDB\Operation\FindOneAndUpdate::RETURN_DOCUMENT_AFTER
-                                              ;
-                                      })
-                                  )
-                                  ->willReturn($envelope);
+                                                ;
+                                        })
+                                    )
+                                    ->willReturn($envelope);
 
         $actualJob = $this->target->pop();
 
@@ -251,7 +251,7 @@ 
     public function testPopEmptyQueue()
     {
         $this->mongoCollectionMock->expects($this->once())->method('findOneAndUpdate')
-                                  ->willReturn(null);
+                                    ->willReturn(null);
 
         $actualJob = $this->target->pop();
 
@@ -335,8 +335,8 @@ 
         };
 
         $this->mongoCollectionMock->expects($this->once())->method('find')
-                                  ->with($filter, $opt)
-                                  ->willReturn($cursor);
+                                    ->with($filter, $opt)
+                                    ->willReturn($cursor);
 
         $this->target->listing($options);
     }
@@ -348,23 +348,23 @@ 
         $job->setId(new \MongoDB\BSON\ObjectID());
         $options = ['message' => 'test failure message'];
         $this->mongoCollectionMock->expects($this->once())->method('findOneAndUpdate')
-                                  ->with(
-                                      $this->equalTo(['_id' => new \MongoDB\BSON\ObjectID($job->getId())]),
-                                      $this->callback(
-                                          function ($value) use ($options) {
-                                              if (!array_key_exists('$set', $value)) {
-                                                  return false;
-                                              }
-                                              $value = $value['$set'];
-                                              return isset($value['status']) && $value['status'] == MongoQueue::STATUS_FAILED
+                                    ->with(
+                                        $this->equalTo(['_id' => new \MongoDB\BSON\ObjectID($job->getId())]),
+                                        $this->callback(
+                                            function ($value) use ($options) {
+                                                if (!array_key_exists('$set', $value)) {
+                                                    return false;
+                                                }
+                                                $value = $value['$set'];
+                                                return isset($value['status']) && $value['status'] == MongoQueue::STATUS_FAILED
                                                  && !array_key_exists('created', $value)
                                                 && !array_key_exists('scheduled', $value)
                                               && isset($value['message']) && $value['message'] == $options['message']
-                                              ;
-                                          }
-                                      )
-                                  )
-                                  ->willReturn(null);
+                                                ;
+                                            }
+                                        )
+                                    )
+                                    ->willReturn(null);
 
         $this->target->fail($job, $options);
     }

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
     private $target = [
         MongoQueue::class,
         'setupArgs',
-        '@testInheritance' => [ 'as_reflection' => true ],
+        '@testInheritance' => ['as_reflection' => true],
         '@testConstruction' => false,
         '@testPushLazyWithStringName' => '#mockPush',
         '@testPushLazyWithArraySpec' => '#mockPush',
@@ -46,7 +46,7 @@ 
         ]
     ];
 
-    private $inheritance = [ AbstractQueue::class ];
+    private $inheritance = [AbstractQueue::class];
 
     /**
      *
@@ -127,7 +127,7 @@ 
             ->setMethods(['getInsertedId'])->getMock();
         $resultMock->expects($this->once())->method('getInsertedId')->willReturn('ID');
         $this->mongoCollectionMock->expects($this->once())->method('insertOne')
-            ->with($this->callback(function ($value) {
+            ->with($this->callback(function($value) {
                 return isset($value['queue']) && $value['queue'] == $this->queueName
                     && isset($value['status']) && $value['status'] == MongoQueue::STATUS_PENDING
                     && !isset($value['tried'])
@@ -156,7 +156,7 @@ 
                            ->setMethods(['getInsertedId'])->getMock();
         $resultMock->expects($this->once())->method('getInsertedId')->willReturn('ID');
         $this->mongoCollectionMock->expects($this->once())->method('insertOne')
-                                  ->with($this->callback(function ($value) use ($options) {
+                                  ->with($this->callback(function($value) use ($options) {
                                       return isset($value['queue']) && $value['queue'] == $this->queueName
                                              && isset($value['status']) && $value['status'] == MongoQueue::STATUS_PENDING
                                              && !isset($value['tried'])
@@ -164,7 +164,7 @@ 
                                              && isset($value['created']) && isset($value['scheduled'])
                                              && $value['scheduled'] instanceof \MongoDB\BSON\UTCDateTime
                                              && $value['created'] instanceof \MongoDB\BSON\UTCDateTime
-                                             && (int) ((string) $value['scheduled']) - (int) ((string)$value['created']) == $options['delay'] * 1000
+                                             && (int) ((string) $value['scheduled']) - (int) ((string) $value['created']) == $options['delay'] * 1000
                                              && isset($value['priority']) && $value['priority'] == $options['priority']
                                           ;
                                   }))
@@ -187,7 +187,7 @@ 
                                   ->with(
                                       $this->equalTo(['_id' => new \MongoDB\BSON\ObjectID($job->getId())]),
                                       $this->callback(
-                                          function ($value) {
+                                          function($value) {
                                               if (!array_key_exists('$set', $value)) {
                                                   return false;
                                               }
@@ -216,7 +216,7 @@ 
         $this->jobManagerMock->expects($this->once())->method('get')->with(get_class($job))->willReturn(new $this->testJobClass());
         $this->mongoCollectionMock->expects($this->once())->method('findOneAndUpdate')
                                   ->with(
-                                      $this->callback(function ($value) {
+                                      $this->callback(function($value) {
                                           return
                                                     isset($value['queue']) && $value['queue'] == $this->queueName
                                                     && isset($value['status']) && $value['status'] == MongoQueue::STATUS_PENDING
@@ -224,7 +224,7 @@ 
                                               ;
                                       }),
                                       $this->callback(
-                                          function ($value) {
+                                          function($value) {
                                               if (!array_key_exists('$set', $value)) {
                                                   return false;
                                               }
@@ -234,10 +234,10 @@ 
                                               ;
                                           }
                                       ),
-                                      $this->callback(function ($value) {
+                                      $this->callback(function($value) {
                                           return
                                             isset($value['sort']) && $value['sort'] == ['priority' => 1, 'scheduled' => 1]
-                                              && isset($value['returnDocument'])&&$value['returnDocument'] = \MongoDB\Operation\FindOneAndUpdate::RETURN_DOCUMENT_AFTER
+                                              && isset($value['returnDocument']) && $value['returnDocument'] = \MongoDB\Operation\FindOneAndUpdate::RETURN_DOCUMENT_AFTER
                                               ;
                                       })
                                   )
@@ -264,8 +264,8 @@ 
         /* @var AbstractJob $job2 */
         $job1 = new $this->testJobClass('TestJob1');
         $job2 = new $this->testJobClass('TestJob2');
-        $filter = [ 'queue' => $this->queueName ];
-        $opt    = [ 'sort' => [ 'scheduled' => 1, 'priority' => 1 ] ];
+        $filter = ['queue' => $this->queueName];
+        $opt    = ['sort' => ['scheduled' => 1, 'priority' => 1]];
         $envelopes = [
             [
                 '_id' => $job1->getId(),
@@ -281,7 +281,7 @@ 
             ],
         ];
         $this->jobManagerMock->expects($this->exactly(2))->method('get')
-            ->with($this->testJobClass)->will($this->returnCallback(function () {
+            ->with($this->testJobClass)->will($this->returnCallback(function() {
                 return new $this->testJobClass();
             }));
 
@@ -307,8 +307,8 @@ 
         $jobs = $this->target->listing();
 
         $this->assertEquals(1, $cursor->called, "Cursor::toArray should have been called exactly one time, but was called '{$cursor->called}' times'");
-        $this->assertTrue(is_array($jobs), 'Return value should have been an array, but is "' . gettype($jobs) . '" instead."');
-        $this->assertTrue(2 == count($jobs), 'Only 2 jobs should have been returned, but it were ' . count($jobs));
+        $this->assertTrue(is_array($jobs), 'Return value should have been an array, but is "'.gettype($jobs).'" instead."');
+        $this->assertTrue(2 == count($jobs), 'Only 2 jobs should have been returned, but it were '.count($jobs));
 
         $this->assertArrayHasKey('job', $jobs[0]);
         $this->assertEquals($job1, $jobs[0]['job'], 'Job1 is not the same');
@@ -323,8 +323,8 @@ 
             'limit' => 10,
         ];
 
-        $filter = [ 'queue' => $this->queueName, 'status' => $options['status'] ];
-        $opt    = [ 'sort' => [ 'scheduled' => 1, 'priority' => 1 ], 'limit' => $options['limit'] ];
+        $filter = ['queue' => $this->queueName, 'status' => $options['status']];
+        $opt    = ['sort' => ['scheduled' => 1, 'priority' => 1], 'limit' => $options['limit']];
 
         $this->jobManagerMock->expects($this->never())->method('get');
         $cursor = new class() {
@@ -351,7 +351,7 @@ 
                                   ->with(
                                       $this->equalTo(['_id' => new \MongoDB\BSON\ObjectID($job->getId())]),
                                       $this->callback(
-                                          function ($value) use ($options) {
+                                          function($value) use ($options) {
                                               if (!array_key_exists('$set', $value)) {
                                                   return false;
                                               }