Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'cs/zendframework/zendframework#7004-function-call-space…
Browse files Browse the repository at this point in the history
…-fixer-rules' into develop

Close zendframework/zendframework#7004
  • Loading branch information
Ocramius committed Dec 11, 2014
3 parents 82f06a3 + ffb186a + d3a6450 commit 84e0388
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/Display/Console.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ protected function renderClassDefinition($definition, $class)
foreach ($definition->getMethods($class) as $methodName => $methodIsRequired) {
foreach ($definition->getMethodParameters($class, $methodName) as $fqName => $pData) {
echo ' ' . $pData[0] . ' [type: ';
echo ($pData[1]) ? $pData[1] : 'scalar';
echo ($pData[2] === true && $methodIsRequired) ? ', required' : ', not required';
echo($pData[1]) ? $pData[1] : 'scalar';
echo($pData[2] === true && $methodIsRequired) ? ', required' : ', not required';
echo ', injection-method: ' . $methodName;
echo ' fq-name: ' . $fqName;
echo ']' . PHP_EOL;
Expand Down
4 changes: 2 additions & 2 deletions test/Definition/RuntimeDefinitionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ public function testExceptionDefaultValue()
true,
null,
),
'RecursiveIteratorIterator::__construct:1' => Array (
'RecursiveIteratorIterator::__construct:1' => Array(
'mode',
null,
true,
null,
),
'RecursiveIteratorIterator::__construct:2' => Array (
'RecursiveIteratorIterator::__construct:2' => Array(
'flags',
null,
true,
Expand Down
16 changes: 8 additions & 8 deletions test/DiTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -585,14 +585,14 @@ public function testNewInstanceWillUsePreferredClassForInterfaceHints()

public function testNewInstanceWillThrowAnClassNotFoundExceptionWhenClassIsAnInterface()
{
$definitionArray = array (
$definitionArray = array(
'ZendTest\Di\TestAsset\ConstructorInjection\D' => array(
'supertypes' => array(),
'instantiator' => '__construct',
'methods' => array('__construct' => 3),
'parameters' => array(
'__construct' =>
array (
array(
'ZendTest\Di\TestAsset\ConstructorInjection\D::__construct:0' => array(
0 => 'd',
1 => 'ZendTest\Di\TestAsset\DummyInterface',
Expand Down Expand Up @@ -969,13 +969,13 @@ public function testGetWithParamsWillUseSharedInstance()
$retrievedInstanceClass = 'ZendTest\Di\TestAsset\ConstructorInjection\C';

// Provide definitions for $retrievedInstanceClass, but not for $sharedInstanceClass.
$arrayDefinition = array($retrievedInstanceClass => array (
'supertypes' => array ( ),
$arrayDefinition = array($retrievedInstanceClass => array(
'supertypes' => array( ),
'instantiator' => '__construct',
'methods' => array ('__construct' => true),
'parameters' => array ( '__construct' => array (
"$retrievedInstanceClass::__construct:0" => array ('a', $sharedInstanceClass, true, NULL),
"$retrievedInstanceClass::__construct:1" => array ('params', NULL, false, array()),
'methods' => array('__construct' => true),
'parameters' => array( '__construct' => array(
"$retrievedInstanceClass::__construct:0" => array('a', $sharedInstanceClass, true, NULL),
"$retrievedInstanceClass::__construct:1" => array('params', NULL, false, array()),
)),
));

Expand Down

0 comments on commit 84e0388

Please sign in to comment.