Skip to content

Commit 77e731e

Browse files
lstrojnylstrojny
committed
Update code
1 parent 982ffc1 commit 77e731e

23 files changed

+225
-176
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ language: php
33
sudo: false
44

55
php:
6-
- 5.6
76
- 7.0
7+
- 7.1
88
- nightly
99
- hhvm
1010

@@ -13,6 +13,7 @@ env:
1313
- DC_VERSION=2.2.*
1414
- DC_VERSION=2.3.*
1515
- DC_VERSION=2.4.*
16+
- DC_VERSION=2.5.*
1617

1718
before_script:
1819
- composer require doctrine/orm:${DC_VERSION} doctrine/dbal:${DC_VERSION} doctrine/common:${DC_VERSION}

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"doctrine/orm": "2.*"
88
},
99
"require-dev": {
10-
"phpunit/phpunit": "~4",
10+
"phpunit/phpunit": "~6",
1111
"lstrojny/phpunit-function-mocker": "dev-master"
1212
},
1313
"authors": [
@@ -17,6 +17,6 @@
1717
}
1818
],
1919
"autoload": {
20-
"psr-0": {"Procrastinator": "src"}
20+
"psr-4": {"Procrastinator\\": "src/Procrastinator"}
2121
}
2222
}

‎src/Procrastinator/DeferralManager.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?php
22
namespace Procrastinator;
33

4+
use Procrastinator\Deferred\Builder;
45
use Procrastinator\Deferred\Deferred;
5-
use Procrastinator\Scheduler\Scheduler;
66
use Procrastinator\Executor\Executor;
7-
use DomainException;
8-
use Procrastinator\Deferred\Builder;
7+
use Procrastinator\Scheduler\Scheduler;
98

109
class DeferralManager extends Manager implements Schedulable
1110
{
@@ -33,13 +32,13 @@ public function newDeferred()
3332
public function schedule()
3433
{
3534
if (!$this->deferreds) {
36-
return;
35+
return null;
3736
}
3837

3938
$executableManager = new ExecutableManager($this->deferreds, $this->executor);
4039
$this->scheduler->schedule($executableManager);
4140

42-
$this->deferreds = array();
41+
$this->deferreds = [];
4342

4443
return $executableManager;
4544
}

‎src/Procrastinator/Deferred/CallbackDeferred.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@ class CallbackDeferred implements Deferred
99

1010
protected $callback;
1111

12-
public function __construct($name, $callback)
12+
public function __construct($name, callable $callback)
1313
{
14-
if (!is_callable($callback)) {
15-
throw new InvalidArgumentException('Invalid callback given');
16-
}
17-
1814
$this->name = $name;
1915
$this->callback = $callback;
2016
}

‎src/Procrastinator/Deferred/Deferred.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
interface Deferred
55
{
6+
/** @return string */
67
public function getName();
78

9+
/** @return callable */
810
public function getCallback();
9-
}
11+
}

‎src/Procrastinator/Deferred/DoctrineEventConditionalDeferred.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class DoctrineEventConditionalDeferred extends CallbackDeferred
77
{
88
private $events;
99

10-
public function __construct($name, $callback, $events)
10+
public function __construct($name, callable $callback, $events)
1111
{
1212
if (!$events) {
1313
throw new InvalidArgumentException('No events specified');

‎src/Procrastinator/Executable.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<?php
22
namespace Procrastinator;
33

4+
use Procrastinator\Executor\Executor;
5+
46
interface Executable extends Manageable
57
{
68
public function execute();
9+
10+
/** @return Executor */
711
public function getExecutor();
812
}

‎src/Procrastinator/Executor/Decorator/DoctrineEventConditionalExecutorDecorator.php‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,128 +3,127 @@
33

44
use Procrastinator\Deferred\Deferred;
55
use Procrastinator\Deferred\DoctrineEventConditionalDeferred;
6-
use Doctrine\Common\EventArgs;
76

87
class DoctrineEventConditionalExecutorDecorator extends ExecutorDecorator
98
{
10-
private $events = array();
9+
private $events = [];
1110

12-
public function postConnect(EventArgs $args)
11+
public function postConnect()
1312
{
1413
$this->rememberEvent(__FUNCTION__);
1514
}
1615

17-
public function onSchemaCreateTable(EventArgs $args)
16+
public function onSchemaCreateTable()
1817
{
1918
$this->rememberEvent(__FUNCTION__);
2019
}
2120

22-
public function onSchemaCreateTableColumn(EventArgs $args)
21+
public function onSchemaCreateTableColumn()
2322
{
2423
$this->rememberEvent(__FUNCTION__);
2524
}
2625

27-
public function onSchemaDropTable(EventArgs $args)
26+
public function onSchemaDropTable()
2827
{
2928
$this->rememberEvent(__FUNCTION__);
3029
}
3130

32-
public function onSchemaAlterTable(EventArgs $args)
31+
public function onSchemaAlterTable()
3332
{
3433
$this->rememberEvent(__FUNCTION__);
3534
}
3635

37-
public function onSchemaAlterTableAddColumn(EventArgs $args)
36+
public function onSchemaAlterTableAddColumn()
3837
{
3938
$this->rememberEvent(__FUNCTION__);
4039
}
4140

42-
public function onSchemaAlterTableRemoveColumn(EventArgs $args)
41+
public function onSchemaAlterTableRemoveColumn()
4342
{
4443
$this->rememberEvent(__FUNCTION__);
4544
}
4645

47-
public function onSchemaAlterTableChangeColumn(EventArgs $args)
46+
public function onSchemaAlterTableChangeColumn()
4847
{
4948
$this->rememberEvent(__FUNCTION__);
5049
}
5150

52-
public function onSchemaAlterTableRenameColumn(EventArgs $args)
51+
public function onSchemaAlterTableRenameColumn()
5352
{
5453
$this->rememberEvent(__FUNCTION__);
5554
}
5655

57-
public function onSchemaColumnDefinition(EventArgs $args)
56+
public function onSchemaColumnDefinition()
5857
{
5958
$this->rememberEvent(__FUNCTION__);
6059
}
6160

62-
public function onSchemaIndexDefinition(EventArgs $args)
61+
public function onSchemaIndexDefinition()
6362
{
6463
$this->rememberEvent(__FUNCTION__);
6564
}
6665

67-
public function preRemove(EventArgs $args)
66+
public function preRemove()
6867
{
6968
$this->rememberEvent(__FUNCTION__);
7069
}
7170

72-
public function postRemove(EventArgs $args)
71+
public function postRemove()
7372
{
7473
$this->rememberEvent(__FUNCTION__);
7574
}
7675

77-
public function prePersist(EventArgs $args)
76+
public function prePersist()
7877
{
7978
$this->rememberEvent(__FUNCTION__);
8079
}
8180

82-
public function postPersist(EventArgs $args)
81+
public function postPersist()
8382
{
8483
$this->rememberEvent(__FUNCTION__);
8584
}
8685

87-
public function preUpdate(EventArgs $args)
86+
public function preUpdate()
8887
{
8988
$this->rememberEvent(__FUNCTION__);
9089
}
9190

92-
public function postUpdate(EventArgs $args)
91+
public function postUpdate()
9392
{
9493
$this->rememberEvent(__FUNCTION__);
9594
}
9695

97-
public function postLoad(EventArgs $args)
96+
public function postLoad()
9897
{
9998
$this->rememberEvent(__FUNCTION__);
10099
}
101100

102-
public function loadClassMetadata(EventArgs $args)
101+
public function loadClassMetadata()
103102
{
104103
$this->rememberEvent(__FUNCTION__);
105104
}
106105

107-
public function preFlush(EventArgs $args)
106+
public function preFlush()
108107
{
109108
$this->rememberEvent(__FUNCTION__);
110109
}
111110

112-
public function onFlush(EventArgs $args)
111+
public function onFlush()
113112
{
114113
$this->rememberEvent(__FUNCTION__);
115114
}
116115

117-
public function postFlush(EventArgs $args)
116+
public function postFlush()
118117
{
119118
$this->rememberEvent(__FUNCTION__);
120119
}
121120

122-
public function onClear(EventArgs $args)
121+
public function onClear()
123122
{
124123
$this->rememberEvent(__FUNCTION__);
125124
}
126125

127-
public function onClassMetadataNotFound(EventArgs $args)
126+
public function onClassMetadataNotFound()
128127
{
129128
$this->rememberEvent(__FUNCTION__);
130129
}

‎src/Procrastinator/Executor/SingleThreadExecutor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public function startExecution(Executable $manager)
1212

1313
public function execute(Deferred $deferred)
1414
{
15-
call_user_func($deferred->getCallback());
15+
$deferred->getCallback()();
1616
}
1717

1818
public function endExecution(Executable $manager)
1919
{
2020
}
21-
}
21+
}

‎src/Procrastinator/Manageable.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
<?php
22
namespace Procrastinator;
33

4+
use Procrastinator\Deferred\Deferred;
5+
46
interface Manageable
57
{
8+
/** @return bool */
69
public function has($name);
10+
11+
/** @return Deferred */
712
public function get($name);
13+
14+
/** @return Deferred[] */
815
public function getAll();
916
}

0 commit comments

Comments
 (0)