Completed
Push — develop ( f102ca...488b09 )
by Mathias
20:12 queued 11:00
created
module/Core/test/CoreTest/Queue/Controller/MongoQueueListControllerTest.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     {
112 112
         $queueName = 'test';
113 113
         $queue = $this->getMockBuilder(MongoQueue::class)->disableOriginalConstructor()
114
-                      ->setMethods(['listing'])->getMock();
114
+                        ->setMethods(['listing'])->getMock();
115 115
         $this->queueManager->expects($this->once())->method('get')->with($queueName)->willReturn($queue);
116 116
         $params = $this->setupParamsMock([
117 117
             ['queue', null, $queueName],
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
         $date = new \DateTime();
136 136
         $date->setTimezone(new \DateTimeZone('UTC'));
137 137
         $jobs = [
138
-           [
139
-               'job' => $job,
140
-               'created' => new \MongoDb\BSON\UTCDateTime($date->getTimestamp() * 1000),
141
-               'executed' => new \MongoDb\BSON\UTCDateTime($date->getTimestamp() * 1000),
142
-               'scheduled' => new \MongoDb\BSON\UTCDateTime($date->getTimestamp() * 1000),
143
-               'tried' => 10,
144
-           ],
138
+            [
139
+                'job' => $job,
140
+                'created' => new \MongoDb\BSON\UTCDateTime($date->getTimestamp() * 1000),
141
+                'executed' => new \MongoDb\BSON\UTCDateTime($date->getTimestamp() * 1000),
142
+                'scheduled' => new \MongoDb\BSON\UTCDateTime($date->getTimestamp() * 1000),
143
+                'tried' => 10,
144
+            ],
145 145
         ];
146 146
 
147 147
         $queue->expects($this->once())->method('listing')->with(['limit' => 10, 'status' => 1])->willReturn($jobs);
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         ],
45 45
     ];
46 46
 
47
-    private $inheritance = [ AbstractConsoleController::class ];
47
+    private $inheritance = [AbstractConsoleController::class];
48 48
 
49 49
     private function injectConstructorDependencies()
50 50
     {
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
         $lineTmpl = '%-20s %s';
150 150
         $console = $this->target->getConsole();
151 151
         $console->expects($this->exactly(7))->method('writeLine')->withConsecutive(
152
-            [ get_class($job) . ' [ test ]' ],
153
-            [ sprintf($lineTmpl, 'Created', $date->format('Y-m-d H:i:s')) ],
154
-            [ sprintf($lineTmpl, 'Executed', $date->format('Y-m-d H:i:s')) ],
155
-            [ sprintf($lineTmpl, 'Scheduled', $date->format('Y-m-d H:i:s')) ],
156
-            [ sprintf($lineTmpl, 'Tries', $jobs[0]['tried']) ]
152
+            [get_class($job).' [ test ]'],
153
+            [sprintf($lineTmpl, 'Created', $date->format('Y-m-d H:i:s'))],
154
+            [sprintf($lineTmpl, 'Executed', $date->format('Y-m-d H:i:s'))],
155
+            [sprintf($lineTmpl, 'Scheduled', $date->format('Y-m-d H:i:s'))],
156
+            [sprintf($lineTmpl, 'Tries', $jobs[0]['tried'])]
157 157
         )->willReturn(null);
158 158
 
159 159
         $this->assertEmpty($this->target->listAction());
Please login to merge, or discard this patch.
module/Core/test/CoreTest/Queue/MongoQueueFactoryTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
      */
37 37
     private $target = MongoQueueFactory::class;
38 38
 
39
-    private $inheritance = [ FactoryInterface::class ];
39
+    private $inheritance = [FactoryInterface::class];
40 40
 
41 41
     public function testCreateServiceWithoutConfig()
42 42
     {
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             {
60 60
                 $this->client = $client;
61 61
             }
62
-            public function getMongoClient() { return $this->client;}
62
+            public function getMongoClient() { return $this->client; }
63 63
         })->shouldBeCalled();
64 64
 
65 65
         $dm->getConfiguration()->willReturn(new class { public function getDefaultDB() { return 'testdb'; }})->shouldBeCalled();
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             {
99 99
                 $this->client = $client;
100 100
             }
101
-            public function getMongoClient() { return $this->client;}
101
+            public function getMongoClient() { return $this->client; }
102 102
         })->shouldBeCalled();
103 103
 
104 104
         $dm->getConfiguration()->shouldNotBeCalled();
Please login to merge, or discard this patch.
module/Core/test/CoreTest/Log/Processor/ProcessIdTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
     private $target = ProcessId::class;
29 29
 
30
-    private $inheritance = [ ProcessorInterface::class ];
30
+    private $inheritance = [ProcessorInterface::class];
31 31
 
32 32
     public function testProcessAddsProcessIdToEventArray()
33 33
     {
Please login to merge, or discard this patch.
module/Core/test/CoreTestUtils/TestCase/SetupTargetTrait.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -129,15 +129,15 @@  discard block
 block discarded – undo
129 129
         $testName = array_shift($testNameParts);
130 130
         $testSet  = trim(array_pop($testNameParts), '"');
131 131
 
132
-        $testNameKey = '@' . $testName;
133
-        $testNameSetKey = $testNameKey . '|' . $testSet;
132
+        $testNameKey = '@'.$testName;
133
+        $testNameSetKey = $testNameKey.'|'.$testSet;
134 134
         $testSpec = isset($spec[$testNameKey]) ? $spec[$testNameKey] : (isset($spec[$testNameSetKey]) ? $spec[$testNameSetKey] : null);
135 135
 
136 136
         if (null === $testSpec) {
137 137
             foreach (array_keys($spec) as $testSpecPattern) {
138 138
                 if (false === strpos($testSpecPattern, '*')) { continue; }
139 139
 
140
-                if (preg_match('~^' . str_replace('*', '.*', substr($testSpecPattern, 1)) . '~', $testName)) {
140
+                if (preg_match('~^'.str_replace('*', '.*', substr($testSpecPattern, 1)).'~', $testName)) {
141 141
                     $testSpec = $spec[$testSpecPattern];
142 142
                     break;
143 143
                 }
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
                 if (isset($spec[$testSpec])) {
155 155
                     $testSpec = $spec[$testSpec];
156 156
                 } else if (class_exists($testSpec)) {
157
-                    $testSpec = [ $testSpec ];
157
+                    $testSpec = [$testSpec];
158 158
                 } else {
159 159
                     $this->target = $this->{$testSpec}();
160 160
                     return;
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 
186 186
         if (!isset($spec['class'])) {
187 187
             if (!isset($spec[0])) {
188
-                throw new \PHPUnit_Framework_Exception(__TRAIT__ . ': No target class name specified.');
188
+                throw new \PHPUnit_Framework_Exception(__TRAIT__.': No target class name specified.');
189 189
             }
190 190
             $spec['class'] = $spec[0];
191 191
         }
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
             };
259 259
 
260 260
             $methods = [];
261
-            $methodMocks  = [];
261
+            $methodMocks = [];
262 262
 
263 263
             if (is_array($spec)) {
264 264
                 foreach ($spec as $method => $methodSpec) {
Please login to merge, or discard this patch.
module/Core/config/module.config.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,25 +76,25 @@
 block discarded – undo
76 76
     'log' => array(
77 77
         'Core/Log' => array(
78 78
             'writers' => array(
79
-                 array(
80
-                     'name' => 'stream',
79
+                    array(
80
+                        'name' => 'stream',
81 81
                     'priority' => 1000,
82 82
                     'options' => array(
83
-                         'stream' => getcwd().'/var/log/yawik.log',
83
+                            'stream' => getcwd().'/var/log/yawik.log',
84
+                    ),
84 85
                     ),
85
-                 ),
86 86
             ),
87 87
         ),
88 88
         'Log/Core/Mail' => array(
89 89
             'writers' => array(
90
-                 array(
91
-                     'name' => 'stream',
90
+                    array(
91
+                        'name' => 'stream',
92 92
                     'priority' => 1000,
93 93
                     'options' => array(
94
-                         'stream' => getcwd().'/var/log/mails.log',
94
+                            'stream' => getcwd().'/var/log/mails.log',
95 95
                     ),
96 96
 
97
-                 ),
97
+                    ),
98 98
             ),
99 99
         ),
100 100
         'Log/Core/Queue' => array(
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 use Core\Service\Tracy;
23 23
 use Zend\I18n\Translator\Resources;
24 24
 
25
-$doctrineConfig = include __DIR__ . '/doctrine.config.php';
25
+$doctrineConfig = include __DIR__.'/doctrine.config.php';
26 26
 
27 27
 
28 28
 return array(
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     ],
62 62
 
63 63
     'options' => [
64
-        'Core/MailServiceOptions' => [ 'class' => '\Core\Options\MailServiceOptions' ],
64
+        'Core/MailServiceOptions' => ['class' => '\Core\Options\MailServiceOptions'],
65 65
     ],
66 66
     
67 67
     'Core' => array(
@@ -339,19 +339,19 @@  discard block
 block discarded – undo
339 339
             'modules/Core/jsonEntityHydrator' => 'Core\Entity\Hydrator\JsonEntityHydratorFactory',
340 340
             'Core/EntityHydrator' => 'Core\Entity\Hydrator\EntityHydratorFactory',
341 341
             'Core/Options' => 'Core\Factory\ModuleOptionsFactory',
342
-            'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class,'factory'],
343
-            'DefaultListeners' => ['Core\Listener\DefaultListener','factory'],
344
-            'templateProviderStrategy'   => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy','factory'],
345
-            'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class,'factory'],
342
+            'Core/DoctrineMongoODM/RepositoryEvents' => [\Core\Repository\DoctrineMongoODM\Event\RepositoryEventsSubscriber::class, 'factory'],
343
+            'DefaultListeners' => ['Core\Listener\DefaultListener', 'factory'],
344
+            'templateProviderStrategy'   => ['Core\Form\Hydrator\Strategy\TemplateProviderStrategy', 'factory'],
345
+            'Core/Listener/DeferredListenerAggregate' => [\Core\Listener\DeferredListenerAggregate::class, 'factory'],
346 346
             'Core/Listener/CreatePaginator' => 'Core\Listener\CreatePaginatorListener::factory',
347 347
             'Core/Locale' => 'Core\I18n\LocaleFactory',
348 348
             \Core\Listener\AjaxRouteListener::class => \Core\Factory\Listener\AjaxRouteListenerFactory::class,
349 349
             \Core\Listener\DeleteImageSetListener::class => \Core\Factory\Listener\DeleteImageSetListenerFactory::class,
350 350
             'Imagine' => \Core\Factory\Service\ImagineFactory::class,
351
-            'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class,'factory'],
352
-            'Tracy' => [Tracy::class,'factory'],
351
+            'Core/Listener/Notification' => [\Core\Listener\NotificationListener::class, 'factory'],
352
+            'Tracy' => [Tracy::class, 'factory'],
353 353
             Service\EntityEraser\DefaultEntityLoaderListener::class => Service\EntityEraser\DefaultEntityLoaderListenerFactory::class,
354
-            ClearCacheService::class => [ClearCacheService::class,'factory'],
354
+            ClearCacheService::class => [ClearCacheService::class, 'factory'],
355 355
             Queue\Worker\MongoWorker::class => \SlmQueue\Factory\WorkerFactory::class,
356 356
         ),
357 357
         'abstract_factories' => array(
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
         'translation_file_patterns' => array(
376 376
             [
377 377
                 'type' => 'gettext',
378
-                'base_dir' => __DIR__ . '/../language',
378
+                'base_dir' => __DIR__.'/../language',
379 379
                 'pattern' => '%s.mo',
380 380
             ],
381 381
             [
@@ -420,8 +420,8 @@  discard block
 block discarded – undo
420 420
             'Core/File'    => FileControllerFactory::class,
421 421
             'Core/Content' => LazyControllerFactory::class,
422 422
             Controller\Console\PurgeController::class => Controller\Console\PurgeControllerFactory::class,
423
-            AssetsInstallController::class => [AssetsInstallController::class,'factory'],
424
-            ClearCacheController::class => [ClearCacheController::class,'factory'],
423
+            AssetsInstallController::class => [AssetsInstallController::class, 'factory'],
424
+            ClearCacheController::class => [ClearCacheController::class, 'factory'],
425 425
             Queue\Controller\MongoQueueController::class => Queue\Controller\MongoQueueControllerFactory::class,
426 426
             Queue\Controller\MongoQueueListController::class => Queue\Controller\MongoQueueListControllerFactory::class,
427 427
 
@@ -436,9 +436,9 @@  discard block
 block discarded – undo
436 436
             'Core/SearchForm' => 'Core\Factory\Controller\Plugin\SearchFormFactory',
437 437
             'listquery' => 'Core\Controller\Plugin\ListQuery::factory',
438 438
             'mail' => 'Core\Controller\Plugin\Mail::factory',
439
-            'Core/Mailer' => ['Core\Controller\Plugin\Mailer','factory'],
440
-            'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class,'factory'],
441
-            'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class,'factory'],
439
+            'Core/Mailer' => ['Core\Controller\Plugin\Mailer', 'factory'],
440
+            'Core/CreatePaginator' => [\Core\Controller\Plugin\CreatePaginator::class, 'factory'],
441
+            'Core/PaginatorService' => [\Core\Controller\Plugin\CreatePaginatorService::class, 'factory'],
442 442
             Controller\Plugin\EntityEraser::class => Controller\Plugin\EntityEraserFactory::class,
443 443
         ),
444 444
         'invokables' => array(
@@ -469,32 +469,32 @@  discard block
 block discarded – undo
469 469
         'exception_template' => 'error/index',
470 470
         // Map template to files. Speeds up the lookup through the template stack.
471 471
         'template_map' => array(
472
-            'noscript-notice' => __DIR__ . '/../view/layout/_noscript-notice.phtml',
473
-            'layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
474
-            'error/404' => __DIR__ . '/../view/error/404.phtml',
475
-            'error/403' => __DIR__ . '/../view/error/403.phtml',
476
-            'error/index' => __DIR__ . '/../view/error/index.phtml',
477
-            'main-navigation' => __DIR__ . '/../view/partial/main-navigation.phtml',
478
-            'pagination-control' => __DIR__ . '/../view/partial/pagination-control.phtml',
479
-            'core/loading-popup' => __DIR__ . '/../view/partial/loading-popup.phtml',
480
-            'core/notifications' => __DIR__ . '/../view/partial/notifications.phtml',
481
-            'form/core/buttons' => __DIR__ . '/../view/form/buttons.phtml',
482
-            'core/social-buttons' => __DIR__ . '/../view/partial/social-buttons.phtml',
483
-            'form/core/privacy' => __DIR__ . '/../view/form/privacy.phtml',
484
-            'core/form/permissions-fieldset' => __DIR__ . '/../view/form/permissions-fieldset.phtml',
485
-            'core/form/permissions-collection' => __DIR__ . '/../view/form/permissions-collection.phtml',
486
-            'core/form/container-view' => __DIR__ . '/../view/form/container.view.phtml',
487
-            'core/form/tree-manage.view' => __DIR__ . '/../view/form/tree-manage.view.phtml',
488
-            'core/form/tree-manage.form' => __DIR__ . '/../view/form/tree-manage.form.phtml',
489
-            'core/form/tree-add-item' => __DIR__ . '/../view/form/tree-add-item.phtml',
490
-            'mail/header' =>  __DIR__ . '/../view/mail/header.phtml',
491
-            'mail/footer' =>  __DIR__ . '/../view/mail/footer.phtml',
492
-            'mail/footer.en' =>  __DIR__ . '/../view/mail/footer.en.phtml',
472
+            'noscript-notice' => __DIR__.'/../view/layout/_noscript-notice.phtml',
473
+            'layout/layout' => __DIR__.'/../view/layout/layout.phtml',
474
+            'error/404' => __DIR__.'/../view/error/404.phtml',
475
+            'error/403' => __DIR__.'/../view/error/403.phtml',
476
+            'error/index' => __DIR__.'/../view/error/index.phtml',
477
+            'main-navigation' => __DIR__.'/../view/partial/main-navigation.phtml',
478
+            'pagination-control' => __DIR__.'/../view/partial/pagination-control.phtml',
479
+            'core/loading-popup' => __DIR__.'/../view/partial/loading-popup.phtml',
480
+            'core/notifications' => __DIR__.'/../view/partial/notifications.phtml',
481
+            'form/core/buttons' => __DIR__.'/../view/form/buttons.phtml',
482
+            'core/social-buttons' => __DIR__.'/../view/partial/social-buttons.phtml',
483
+            'form/core/privacy' => __DIR__.'/../view/form/privacy.phtml',
484
+            'core/form/permissions-fieldset' => __DIR__.'/../view/form/permissions-fieldset.phtml',
485
+            'core/form/permissions-collection' => __DIR__.'/../view/form/permissions-collection.phtml',
486
+            'core/form/container-view' => __DIR__.'/../view/form/container.view.phtml',
487
+            'core/form/tree-manage.view' => __DIR__.'/../view/form/tree-manage.view.phtml',
488
+            'core/form/tree-manage.form' => __DIR__.'/../view/form/tree-manage.form.phtml',
489
+            'core/form/tree-add-item' => __DIR__.'/../view/form/tree-add-item.phtml',
490
+            'mail/header' =>  __DIR__.'/../view/mail/header.phtml',
491
+            'mail/footer' =>  __DIR__.'/../view/mail/footer.phtml',
492
+            'mail/footer.en' =>  __DIR__.'/../view/mail/footer.en.phtml',
493 493
             //'startpage' => __DIR__ . '/../view/layout/startpage.phtml',
494 494
         ),
495 495
         // Where to look for view templates not mapped above
496 496
         'template_path_stack' => array(
497
-            __DIR__ . '/../view',
497
+            __DIR__.'/../view',
498 498
         ),
499 499
     ),
500 500
     'view_helpers' => array(
Please login to merge, or discard this patch.
module/Core/src/Queue/Strategy/LogStrategy.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
         }
73 73
 
74 74
         if (!is_array($options)) {
75
-            throw new \InvalidArgumentException('Options must be of type array or ' . LoggerInterface::class);
75
+            throw new \InvalidArgumentException('Options must be of type array or '.LoggerInterface::class);
76 76
         }
77 77
 
78 78
         parent::__construct($options);
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
      */
283 283
     private function formatJob(JobInterface $job) : string
284 284
     {
285
-        return get_class($job) . ' [ ' . $job->getId() . ' ] ';
285
+        return get_class($job).' [ '.$job->getId().' ] ';
286 286
     }
287 287
 
288 288
 }
Please login to merge, or discard this patch.
module/Core/src/Queue/MongoQueue.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
         $time      = microtime(true);
212 212
         $micro     = sprintf("%06d", ($time - floor($time)) * 1000000);
213 213
         $this->now = new \DateTime(
214
-            date('Y-m-d H:i:s.' . $micro, $time),
214
+            date('Y-m-d H:i:s.'.$micro, $time),
215 215
             new \DateTimeZone(date_default_timezone_get())
216 216
         );
217 217
         $now = $this->dateTimeToUTCDateTime($this->now);
@@ -250,12 +250,12 @@  discard block
 block discarded – undo
250 250
      */
251 251
     public function listing(array $options = [])
252 252
     {
253
-        $filter = [ 'queue' => $this->getName() ];
253
+        $filter = ['queue' => $this->getName()];
254 254
         if (isset($options['status'])) {
255 255
             $filter['status'] = $options['status'];
256 256
         }
257 257
 
258
-        $opt = [ 'sort' => [ 'scheduled' => 1, 'priority' => 1] ];
258
+        $opt = ['sort' => ['scheduled' => 1, 'priority' => 1]];
259 259
         if (isset($options['limit'])) {
260 260
             $opt['limit'] = $options['limit'];
261 261
         }
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
     {
337 337
         $time      = microtime(true);
338 338
         $micro     = sprintf("%06d", ($time - floor($time)) * 1000000);
339
-        $this->now = new \DateTime(date('Y-m-d H:i:s.' . $micro, $time), new \DateTimeZone(date_default_timezone_get()));
339
+        $this->now = new \DateTime(date('Y-m-d H:i:s.'.$micro, $time), new \DateTimeZone(date_default_timezone_get()));
340 340
         $scheduled = clone ($this->now);
341 341
 
342 342
         if (isset($options['scheduled'])) {
Please login to merge, or discard this patch.
module/Core/src/Queue/Controller/MongoQueueListController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 
75 75
         $lineTmpl = '%-20s %s';
76 76
         foreach ($jobs as $job) {
77
-            $console->writeLine(get_class($job['job']) . ' [ ' . $job['job']->getId() . ' ]');
77
+            $console->writeLine(get_class($job['job']).' [ '.$job['job']->getId().' ]');
78 78
 
79 79
             foreach (['created', 'executed', 'scheduled'] as $key) {
80 80
                 $console->writeLine(sprintf($lineTmpl, ucFirst($key), $job[$key]->toDateTime()->format('Y-m-d H:i:s')));
Please login to merge, or discard this patch.
module/Core/src/Queue/LazyJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
             $job = $options ? new $service(...$options) : new $service;
72 72
 
73 73
         } else {
74
-            throw new FatalJobException('A job with name "' . $service . '" could not be created.');
74
+            throw new FatalJobException('A job with name "'.$service.'" could not be created.');
75 75
         }
76 76
 
77 77
         $job->setContent($this->getContent());
Please login to merge, or discard this patch.