@@ -119,9 +119,9 @@ |
||
119 | 119 | */ |
120 | 120 | abstract class BaseTestLatt |
121 | 121 | { |
122 | - public function testProp(){} |
|
122 | + public function testProp(){} |
|
123 | 123 | |
124 | - public function testProp2(){} |
|
124 | + public function testProp2(){} |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | class Latt_Simple extends BaseTestLatt |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | public function invalidSpecProvider() |
94 | 94 | { |
95 | 95 | return [ |
96 | - [ [ 'invalid' ] ], |
|
97 | - [ [ ['missing one'] ] ] |
|
96 | + [['invalid']], |
|
97 | + [[['missing one']]] |
|
98 | 98 | ]; |
99 | 99 | } |
100 | 100 | |
@@ -119,9 +119,9 @@ discard block |
||
119 | 119 | */ |
120 | 120 | abstract class BaseTestLatt |
121 | 121 | { |
122 | - public function testProp(){} |
|
122 | + public function testProp() {} |
|
123 | 123 | |
124 | - public function testProp2(){} |
|
124 | + public function testProp2() {} |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | class Latt_Simple extends BaseTestLatt |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | { |
150 | 150 | use ListenerAggregateTrait; |
151 | 151 | |
152 | - public $testEventsSpec =[]; |
|
152 | + public $testEventsSpec = []; |
|
153 | 153 | |
154 | 154 | protected function eventsProvider() |
155 | 155 | { |
@@ -25,9 +25,9 @@ |
||
25 | 25 | */ |
26 | 26 | class TriggerTest extends \PHPUnit_Framework_TestCase |
27 | 27 | { |
28 | - /** |
|
29 | - * @var TriggerTestEventManagerMock |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var TriggerTestEventManagerMock |
|
30 | + */ |
|
31 | 31 | protected $target; |
32 | 32 | |
33 | 33 | public function setUp() |
@@ -60,7 +60,7 @@ |
||
60 | 60 | { |
61 | 61 | $event = new Event(); |
62 | 62 | $callback = function() {}; |
63 | - $this->target->triggerUntil($callback,$event); |
|
63 | + $this->target->triggerUntil($callback, $event); |
|
64 | 64 | |
65 | 65 | $this->assertSame($callback, $this->target->callback); |
66 | 66 |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | protected $target = '\Core\EventManager\EventManager'; |
33 | 33 | |
34 | - protected $inheritance = [ '\Zend\EventManager\EventManager', '\Core\EventManager\EventProviderInterface' ]; |
|
34 | + protected $inheritance = ['\Zend\EventManager\EventManager', '\Core\EventManager\EventProviderInterface']; |
|
35 | 35 | |
36 | 36 | public function testSetEventPrototype() |
37 | 37 | { |
@@ -44,23 +44,23 @@ discard block |
||
44 | 44 | { |
45 | 45 | $testTarget = new \stdClass(); |
46 | 46 | $testTarget2 = new \stdClass(); |
47 | - $testParams1 = [ 'params1' => 'value1' ]; |
|
48 | - $testParams2 = [ 'name' => 'test6', 'param2' => 'value2' ]; |
|
49 | - $testParams3 = [ 'name' => 'test8', 'target' => $testTarget, 'param3' => 'value3' ]; |
|
50 | - $expect2 = [ 'param2' => 'value2' ]; |
|
51 | - $expect3 = [ 'param3' => 'value3' ]; |
|
47 | + $testParams1 = ['params1' => 'value1']; |
|
48 | + $testParams2 = ['name' => 'test6', 'param2' => 'value2']; |
|
49 | + $testParams3 = ['name' => 'test8', 'target' => $testTarget, 'param3' => 'value3']; |
|
50 | + $expect2 = ['param2' => 'value2']; |
|
51 | + $expect3 = ['param3' => 'value3']; |
|
52 | 52 | |
53 | 53 | return [ |
54 | - [ 'test1', null, [], [ 'name' => 'test1', 'target' => null, 'params' => []]], |
|
55 | - [ 'test2', $testTarget, [], [ 'name' => 'test2', 'target' => $testTarget, 'params' => []]], |
|
56 | - [ 'test3', null, $testParams1, [ 'name' => 'test3', 'target' => null, 'params' => $testParams1]], |
|
57 | - 'setParamsAsFirstArg' => [ $testParams1, null, ['ignoreme' => 'yes' ], [ 'name' => null, 'target' => null, 'params' => $testParams1 ]], |
|
58 | - 'setParamsAsSecondArg' => [ 'test5', $testParams1, ['ignoreme' => 'yes' ], ['name' => 'test5', 'target' => null, 'params' => $testParams1 ]], |
|
59 | - 'setNameInParamsAsFirstArg' => [ $testParams2, null, [], [ 'name' => 'test6', 'target' => null, 'params' => $expect2]], |
|
60 | - 'setNameInParamsAsFirstArgAndTarget' => [ $testParams2, $testTarget, ['ignoreme' => 'yes'], [ 'name' => 'test6', 'target' => $testTarget, 'params' => $expect2]], |
|
61 | - 'setNameAndTargetInParams' => [ $testParams3, null, [], [ 'name' => 'test8', 'target' => $testTarget, 'params' => $expect3]], |
|
62 | - [ 'test9', $testTarget2, $testParams3, ['name' => 'test9', 'target' => $testTarget2, 'params' => $testParams3 ]], |
|
63 | - [ null, $testParams2, [], ['name' => 'test6', 'target' => null, 'params' => $expect2 ]], |
|
54 | + ['test1', null, [], ['name' => 'test1', 'target' => null, 'params' => []]], |
|
55 | + ['test2', $testTarget, [], ['name' => 'test2', 'target' => $testTarget, 'params' => []]], |
|
56 | + ['test3', null, $testParams1, ['name' => 'test3', 'target' => null, 'params' => $testParams1]], |
|
57 | + 'setParamsAsFirstArg' => [$testParams1, null, ['ignoreme' => 'yes'], ['name' => null, 'target' => null, 'params' => $testParams1]], |
|
58 | + 'setParamsAsSecondArg' => ['test5', $testParams1, ['ignoreme' => 'yes'], ['name' => 'test5', 'target' => null, 'params' => $testParams1]], |
|
59 | + 'setNameInParamsAsFirstArg' => [$testParams2, null, [], ['name' => 'test6', 'target' => null, 'params' => $expect2]], |
|
60 | + 'setNameInParamsAsFirstArgAndTarget' => [$testParams2, $testTarget, ['ignoreme' => 'yes'], ['name' => 'test6', 'target' => $testTarget, 'params' => $expect2]], |
|
61 | + 'setNameAndTargetInParams' => [$testParams3, null, [], ['name' => 'test8', 'target' => $testTarget, 'params' => $expect3]], |
|
62 | + ['test9', $testTarget2, $testParams3, ['name' => 'test9', 'target' => $testTarget2, 'params' => $testParams3]], |
|
63 | + [null, $testParams2, [], ['name' => 'test6', 'target' => null, 'params' => $expect2]], |
|
64 | 64 | |
65 | 65 | ]; |
66 | 66 | } |
@@ -52,7 +52,7 @@ |
||
52 | 52 | //public function setServiceLocatorDeprecated(ContainerInterface $container, $count = 1) |
53 | 53 | //{ |
54 | 54 | // $this->setExpectedCallCount('getServiceLocator', $count); |
55 | - // |
|
55 | + // |
|
56 | 56 | // return parent::setServiceLocator($container); |
57 | 57 | //} |
58 | 58 |
@@ -169,7 +169,7 @@ |
||
169 | 169 | throw new \PHPUnit_Framework_AssertionFailedError( |
170 | 170 | sprintf('%s::%s(%s) was expected to be called %d times%s, but was actually called %d times.', |
171 | 171 | get_class($this), $methodName, '*' == $name ? '' : $name, $count, |
172 | - null === $options ? '' : ' with options hash ' . $optHash, $actual |
|
172 | + null === $options ? '' : ' with options hash '.$optHash, $actual |
|
173 | 173 | ) |
174 | 174 | ); |
175 | 175 | } |
@@ -21,12 +21,12 @@ |
||
21 | 21 | */ |
22 | 22 | class Config extends ZfConfig |
23 | 23 | { |
24 | - public function __construct( array $config = [] ) { |
|
25 | - parent::__construct( $config ); |
|
26 | - $this->config = array_merge($this->config,$config); |
|
27 | - } |
|
24 | + public function __construct( array $config = [] ) { |
|
25 | + parent::__construct( $config ); |
|
26 | + $this->config = array_merge($this->config,$config); |
|
27 | + } |
|
28 | 28 | |
29 | - public function configureServiceManager(ServiceManager $serviceManager) |
|
29 | + public function configureServiceManager(ServiceManager $serviceManager) |
|
30 | 30 | { |
31 | 31 | /* @var ServiceManagerMock $serviceManager */ |
32 | 32 | parent::configureServiceManager($serviceManager); |
@@ -21,9 +21,9 @@ |
||
21 | 21 | */ |
22 | 22 | class Config extends ZfConfig |
23 | 23 | { |
24 | - public function __construct( array $config = [] ) { |
|
25 | - parent::__construct( $config ); |
|
26 | - $this->config = array_merge($this->config,$config); |
|
24 | + public function __construct(array $config = []) { |
|
25 | + parent::__construct($config); |
|
26 | + $this->config = array_merge($this->config, $config); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | public function configureServiceManager(ServiceManager $serviceManager) |
@@ -53,27 +53,27 @@ discard block |
||
53 | 53 | $this->args = $args; |
54 | 54 | } |
55 | 55 | |
56 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
57 | - { |
|
58 | - if (empty($this->args)) { |
|
59 | - return new $this->class; |
|
60 | - } |
|
56 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
57 | + { |
|
58 | + if (empty($this->args)) { |
|
59 | + return new $this->class; |
|
60 | + } |
|
61 | 61 | |
62 | - $reflection = new \ReflectionClass($this->class); |
|
63 | - $args = array_map( |
|
64 | - function ($arg) use ($container) { |
|
65 | - return is_string($arg) && 0 === strpos($arg, '@') ? $container->get(substr($arg, 1)) : $arg; |
|
66 | - }, |
|
67 | - $this->args |
|
68 | - ); |
|
62 | + $reflection = new \ReflectionClass($this->class); |
|
63 | + $args = array_map( |
|
64 | + function ($arg) use ($container) { |
|
65 | + return is_string($arg) && 0 === strpos($arg, '@') ? $container->get(substr($arg, 1)) : $arg; |
|
66 | + }, |
|
67 | + $this->args |
|
68 | + ); |
|
69 | 69 | |
70 | - $instance = $reflection->newInstanceArgs($args); |
|
70 | + $instance = $reflection->newInstanceArgs($args); |
|
71 | 71 | |
72 | - return $instance; |
|
73 | - } |
|
72 | + return $instance; |
|
73 | + } |
|
74 | 74 | |
75 | 75 | |
76 | - /** |
|
76 | + /** |
|
77 | 77 | * Creates a service instance. |
78 | 78 | * |
79 | 79 | * @param ServiceLocatorInterface $serviceLocator |
@@ -82,6 +82,6 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function createService(ServiceLocatorInterface $serviceLocator) |
84 | 84 | { |
85 | - return $this($serviceLocator,$this->class); |
|
85 | + return $this($serviceLocator,$this->class); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | \ No newline at end of file |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $this->args = $args; |
54 | 54 | } |
55 | 55 | |
56 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
56 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
|
57 | 57 | { |
58 | 58 | if (empty($this->args)) { |
59 | 59 | return new $this->class; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | $reflection = new \ReflectionClass($this->class); |
63 | 63 | $args = array_map( |
64 | - function ($arg) use ($container) { |
|
64 | + function($arg) use ($container) { |
|
65 | 65 | return is_string($arg) && 0 === strpos($arg, '@') ? $container->get(substr($arg, 1)) : $arg; |
66 | 66 | }, |
67 | 67 | $this->args |
@@ -82,6 +82,6 @@ discard block |
||
82 | 82 | */ |
83 | 83 | public function createService(ServiceLocatorInterface $serviceLocator) |
84 | 84 | { |
85 | - return $this($serviceLocator,$this->class); |
|
85 | + return $this($serviceLocator, $this->class); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | \ No newline at end of file |
@@ -78,7 +78,7 @@ |
||
78 | 78 | protected function failureDescription($other) |
79 | 79 | { |
80 | 80 | $name = $other instanceOf \ReflectionClass ? $other->getName() : (is_string($other) ? $other : get_class($other)); |
81 | - return $name . ' ' . $this->toString(); |
|
81 | + return $name.' '.$this->toString(); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | protected function additionalFailureDescription($other) |
@@ -79,7 +79,7 @@ |
||
79 | 79 | |
80 | 80 | protected function failureDescription($other) |
81 | 81 | { |
82 | - return ($other instanceOf \ReflectionClass ? $other->getName() : get_class($other)) . ' ' . $this->toString(); |
|
82 | + return ($other instanceOf \ReflectionClass ? $other->getName() : get_class($other)).' '.$this->toString(); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | protected function additionalFailureDescription($other) |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | protected function failureDescription($other) |
109 | 109 | { |
110 | - return ($other instanceOf \ReflectionClass ? $other->getName() : get_class($other)) . ' ' . $this->toString(); |
|
110 | + return ($other instanceOf \ReflectionClass ? $other->getName() : get_class($other)).' '.$this->toString(); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | protected function additionalFailureDescription($other) |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | if (true === $msg) { |
119 | 119 | $info .= "\n + $prop"; |
120 | 120 | } else { |
121 | - $info .= sprintf("\n - %-25s: %s", $prop, $msg); |
|
121 | + $info .= sprintf("\n - %-25s: %s", $prop, $msg); |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 |