Skip to content

Commit c7b7071

Browse files
toplantoplan
committed
Merge pull request #1 from toplan/analysis-8KZrkj
Applied fixes from StyleCI
2 parents 32420e1 + a7a1c18 commit c7b7071

File tree

6 files changed

+244
-142
lines changed

6 files changed

+244
-142
lines changed

‎demo/demo.php

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,50 @@
11
<?php
2+
23
//require('../vendor/autoload.php');
3-
require('../src/TaskBalancer/Balancer.php');
4-
require('../src/TaskBalancer/Driver.php');
5-
require('../src/TaskBalancer/Task.php');
6-
require('../src/TaskBalancer/TaskBalancerException.php');
4+
require '../src/TaskBalancer/Balancer.php';
5+
require '../src/TaskBalancer/Driver.php';
6+
require '../src/TaskBalancer/Task.php';
7+
require '../src/TaskBalancer/TaskBalancerException.php';
78

89
use Toplan\TaskBalance\Balancer;
910

1011
//define task:
1112
$data = [
1213
'name' => 'top lan',
13-
'age' => '20'
14+
'age' => '20',
1415
];
15-
$t = Balancer::task('test1', $data, function($task){
16-
$task->driver('driver_1 100', 'backup', function($driver, $data){
16+
$t = Balancer::task('test1', $data, function ($task) {
17+
$task->driver('driver_1 100', 'backup', function ($driver, $data) {
1718
$person = new Person($data['name'], $data['age']);
1819
$driver->failed();
1920
print_r('run work! by '.$driver->name.'<br>');
21+
2022
return ['test.driver1 working', $person->toString()];
2123
});
2224

23-
$task->driver('driver_2', 90, function($driver, $data){
25+
$task->driver('driver_2', 90, function ($driver, $data) {
2426
$driver->failed();
2527
print_r('run work! by '.$driver->name.'<br>');
28+
2629
return ['test.driver2 working', $data];
2730
})
2831
->data(['this is data 2']);
2932

3033
$task->driver('driver_3')
3134
->weight(0)->backUp()
3235
->data(['this is data 3'])
33-
->work(function($driver, $data){
36+
->work(function ($driver, $data) {
3437
$driver->success();
3538
print_r('run work! by '.$driver->name.'<br>');
39+
3640
return ['test.driver3 working', $data];
3741
});
3842

39-
$task->beforeRun(function($task){
43+
$task->beforeRun(function ($task) {
4044
print_r('before run --------!<br>');
4145
});
4246

43-
$task->afterRun(function($task, $results){
47+
$task->afterRun(function ($task, $results) {
4448
print_r('after run --------!<br>');
4549
});
4650
});
@@ -54,11 +58,11 @@
5458
print_r('<hr>task object:<br>');
5559
var_dump($t);
5660

57-
class Person {
58-
59-
protected $name;
61+
class Person
62+
{
63+
protected $name;
6064

61-
protected $age;
65+
protected $age;
6266

6367
public function __construct($name, $age)
6468
{
@@ -70,4 +74,4 @@ public function toString()
7074
{
7175
return "hi, I am $this->name, and $this->age year old";
7276
}
73-
}
77+
}

‎demo/demo2.php

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,58 @@
11
<?php
2+
23
//test multiple handlers
34

45
//require('../vendor/autoload.php');
5-
require('../src/TaskBalancer/Balancer.php');
6-
require('../src/TaskBalancer/Driver.php');
7-
require('../src/TaskBalancer/Task.php');
8-
require('../src/TaskBalancer/TaskBalancerException.php');
6+
require '../src/TaskBalancer/Balancer.php';
7+
require '../src/TaskBalancer/Driver.php';
8+
require '../src/TaskBalancer/Task.php';
9+
require '../src/TaskBalancer/TaskBalancerException.php';
910

1011
use Toplan\TaskBalance\Balancer;
1112

1213
//define task:
13-
Balancer::task('task1', $data, function($task){
14-
$task->driver('driver1 10 backup', function($driver, $data){
14+
Balancer::task('task1', $data, function ($task) {
15+
$task->driver('driver1 10 backup', function ($driver, $data) {
1516
$driver->failed();
1617
print_r('run work! by '.$driver->name.'<br>');
1718
});
1819

19-
$task->beforeRun(function($task, $preReturn, $index, $handlers){
20+
$task->beforeRun(function ($task, $preReturn, $index, $handlers) {
2021
print_r("before run ---$preReturn-----$index<br>");
22+
2123
return 11;
2224
});
2325

24-
$task->beforeRun(function($task, $preReturn, $index, $handlers){
26+
$task->beforeRun(function ($task, $preReturn, $index, $handlers) {
2527
print_r("before run ---$preReturn-----$index<br>");
28+
2629
return 22;
2730
}, false);
2831

29-
$task->beforeRun(function($task, $preReturn, $index, $handlers){
32+
$task->beforeRun(function ($task, $preReturn, $index, $handlers) {
3033
print_r("before run ---$preReturn-----$index<br>");
3134
});
3235

33-
$task->hook('beforeDriverRun', function($task, $preReturn, $index, $handlers){
36+
$task->hook('beforeDriverRun', function ($task, $preReturn, $index, $handlers) {
3437
print_r("before driver run ---$preReturn-----$index<br>");
38+
3539
return [1];
3640
});
3741

38-
$task->hook('beforeDriverRun', function($task, $preReturn, $index, $handlers){
39-
print_r("before driver run ---".implode(',', $preReturn)."-----$index<br>");
40-
return [1,2];
42+
$task->hook('beforeDriverRun', function ($task, $preReturn, $index, $handlers) {
43+
print_r('before driver run ---'.implode(',', $preReturn)."-----$index<br>");
44+
45+
return [1, 2];
4146
}, true);
4247

43-
$task->hook('beforeDriverRun', function($task, $preReturn, $index, $handlers){
44-
print_r("before driver run ---".implode(',', $preReturn)."-----$index<br>");
45-
return [1,2,3];
48+
$task->hook('beforeDriverRun', function ($task, $preReturn, $index, $handlers) {
49+
print_r('before driver run ---'.implode(',', $preReturn)."-----$index<br>");
50+
51+
return [1, 2, 3];
4652
});
4753

48-
$task->afterRun(function($task, $results, $preReturn, $index, $handlers){
49-
print_r("after run --------!<br>");
54+
$task->afterRun(function ($task, $results, $preReturn, $index, $handlers) {
55+
print_r('after run --------!<br>');
5056
});
5157
});
5258

‎src/TaskBalancer/Balancer.php

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
<?php
2+
23
namespace Toplan\TaskBalance;
34

45
/**
5-
* Class Balancer
6-
* @package Toplan\TaskBalance
6+
* Class Balancer.
77
*/
8-
class Balancer {
9-
8+
class Balancer
9+
{
1010
/**
11-
* task instances
11+
* task instances.
12+
*
1213
* @var array
1314
*/
1415
protected static $tasks = [];
1516

1617
/**
17-
* create a task instance
18-
* @param string $name
19-
* @param mixed $data
18+
* create a task instance.
19+
*
20+
* @param string $name
21+
* @param mixed $data
2022
* @param \Closure|null $callback
2123
*
2224
* @return null|Task
@@ -32,16 +34,19 @@ public static function task($name, $data = null, \Closure $callback = null)
3234
$task = Task::create($name, $data, $callback);
3335
self::$tasks[$name] = $task;
3436
}
37+
3538
return $task;
3639
}
3740

3841
/**
39-
* run a task instance
42+
* run a task instance.
43+
*
4044
* @param string $name
4145
* @param array $opts
4246
*
43-
* @return mixed
4447
* @throws TaskBalancerException
48+
*
49+
* @return mixed
4550
*/
4651
public static function run($name = '', array $opts = [])
4752
{
@@ -55,13 +60,15 @@ public static function run($name = '', array $opts = [])
5560
$driverName = isset($opts['driver']) ?
5661
$opts['driver'] : (isset($opts['agent']) ?
5762
$opts['agent'] : '');
58-
$results = $task->run((String) $driverName);
63+
$results = $task->run((string) $driverName);
5964
$task->reset();
65+
6066
return $results;
6167
}
6268

6369
/**
64-
* whether has task
70+
* whether has task.
71+
*
6572
* @param $name
6673
*
6774
* @return bool
@@ -74,11 +81,13 @@ public static function hasTask($name)
7481
if (isset(self::$tasks[$name])) {
7582
return true;
7683
}
84+
7785
return false;
7886
}
7987

8088
/**
81-
* get a task instance by name
89+
* get a task instance by name.
90+
*
8291
* @param $name
8392
*
8493
* @return null|object
@@ -88,6 +97,7 @@ public static function getTask($name)
8897
if (self::hasTask($name)) {
8998
return self::$tasks[$name];
9099
}
91-
return null;
100+
101+
return;
92102
}
93103
}

0 commit comments

Comments
 (0)