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

Commit

Permalink
Close zendframework/zendframework#5282
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Willbanks committed Oct 20, 2013
198 parents d0aa8c2 + 29ea285 + c9418a6 + fdeb27b + c382628 + ee15e76 + 5f29760 + 714d1a8 + 84b0297 + cbc5f03 + 76361f8 + e7209df + 87630e0 + df43daf + f7d6cbb + 7e2b798 + 3ed1ead + 87505b6 + c229265 + eb61c8f + efcb00e + 0a0842f + b6d0c88 + 7edee62 + 60ea64c + a08bcca + b40ec3e + 63172ed + 448f428 + 92a516a + 5ecbc99 + a2df21b + 4de87f2 + 7c259ec + a22bdcb + 084ad9f + 9414e5a + 489be93 + cb39e7e + 54a28dc + c9c769e + dda791d + 70d382a + 8bbad0e + 9321185 + 7ab35a6 + b93694e + 3ea7087 + 0fe3d3a + bd5e189 + d1cba17 + 8d75392 + 3fb5b55 + 6cb0ccb + 30aa565 + 8409977 + 8074ba0 + 8f92486 + 94860d1 + 05d33c4 + 425826b + f0e91f0 + e31468f + 7d2af87 + 2e4dc80 + 19d128f + 1b9e4b2 + 1c46483 + fdda3f2 + 595fcd1 + 213395c + 8e514a8 + 2f30186 + bb4ed65 + 132d5b6 + 030ff33 + f2f20f3 + a50e133 + 4c554ee + dbfb1b8 + ccab83f + 00b350f + 78945d0 + f0e5f4b + ceb7d8c + 9e124d1 + 3de5912 + b6a974a + 10a6438 + cb6c1e7 + 18afd6c + 3baf1bd + c800904 + f52dcb8 + 126ccb2 + e7d6206 + e2d24ab + ec1abfc + 290ea90 + 9f4ca1b + edaa760 + c4c0c95 + d21f055 + 5b18029 + e6b97af + 010fb36 + 64c7b8d + 636523e + 4cc2cd6 + e34098a + 16367cd + 943c77f + 8226e5b + 0b47726 + 3cd8a03 + cc4782c + 9c653a6 + 656dbe5 + 9bce1ba + 7dc18ca + 861130d + 2d2ffbd + 4f413a5 + 2e1067a + 1d082e4 + e8aeb79 + b562091 + ff2fdc3 + 4aa72c0 + 1bb67ac + cd015c8 + 5e89910 + 0c21258 + dd54faf + 57f9063 + b88ce2e + af68643 + 06cd3b4 + 2c71b71 + ee02c35 + 9456314 + 5a77a7b + e98a077 + 738f2e6 + cb1e63c + 736df07 + d0a0154 + 990523c + 78687de + a5b6e79 + 6e9dfe9 + e201a1c + d9b45ef + 76222ad + 16d67da + 1ab2258 + b81d711 + ed2e9bc + 61efe82 + f353ea5 + 1f02519 + 58c1fe8 + ed502d9 + 2defba6 + 4885013 + 06a8384 + 17d9eed + 3b21b5d + c62101c + 909ef34 + 13d376a + 8a75367 + 98a3cf5 + 270f2c4 + 3038cfa + 1112202 + c8fb359 + 8d37cd0 + 4d868a7 + 555cb91 + 7ac5858 + 8103f1f + 9fe9c96 + a3ecac6 + 10e77c1 + e0d3e13 + 19ad608 + e0d665c + 1a5b402 + 56ae12a + 9073fc1 + 2d5b32f + a8e6198 + 83e8f34 + 30eb247 + 6204c2f + c3855a9 + 543aa17 commit 77ca040
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion src/Hydrator/AbstractHydrator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function getFilter()
*
* <code>
* $composite->addFilter("servicelocator",
* function($property) {
* function ($property) {
* list($class, $method) = explode('::', $property);
* if ($method === 'getServiceLocator') {
* return false;
Expand Down
6 changes: 3 additions & 3 deletions src/Hydrator/Filter/FilterComposite.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class FilterComposite implements FilterInterface
public function __construct($orFilter = array(), $andFilter = array())
{
array_walk($orFilter,
function($value, $key) {
function ($value, $key) {
if (
!is_callable($value)
&& !$value instanceof FilterInterface
Expand All @@ -55,7 +55,7 @@ function($value, $key) {
);

array_walk($andFilter,
function($value, $key) {
function ($value, $key) {
if (
!is_callable($value)
&& !$value instanceof FilterInterface
Expand All @@ -79,7 +79,7 @@ function($value, $key) {
* This example will exclude all methods from the hydration, that starts with 'getService'
* <code>
* $composite->addFilter('exclude',
* function($method) {
* function ($method) {
* if (preg_match('/^getService/', $method) {
* return false;
* }
Expand Down
12 changes: 6 additions & 6 deletions src/Hydrator/Strategy/ClosureStrategy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ClosureStrategy implements StrategyInterface
{
/**
* Function, used in extract method, default:
* function($value) {
* function ($value) {
* return $value;
* };
* @var callable
Expand All @@ -22,7 +22,7 @@ class ClosureStrategy implements StrategyInterface

/**
* Function, used in hydrate method, default:
* function($value) {
* function ($value) {
* return $value;
* };
* @var callable
Expand All @@ -32,10 +32,10 @@ class ClosureStrategy implements StrategyInterface
/**
* You can describe how your values will extract and hydrate, like this:
* $hydrator->addStrategy('category', new ClosureStrategy(
* function(Category $value) {
* function (Category $value) {
* return (int) $value->id;
* },
* function($value) {
* function ($value) {
* return new Category((int) $value);
* }
* ));
Expand All @@ -54,7 +54,7 @@ public function __construct($extractFunc = null, $hydrateFunc = null)

$this->extractFunc = $extractFunc;
} else {
$this->extractFunc = function($value) {
$this->extractFunc = function ($value) {
return $value;
};
}
Expand All @@ -66,7 +66,7 @@ public function __construct($extractFunc = null, $hydrateFunc = null)

$this->hydrateFunc = $hydrateFunc;
} else {
$this->hydrateFunc = function($value) {
$this->hydrateFunc = function ($value) {
return $value;
};
}
Expand Down
8 changes: 4 additions & 4 deletions test/HydratorClosureStrategyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ public function testRetrieveStrategy()
public function testExtractingObjects()
{
$this->hydrator->addStrategy('field1', new ClosureStrategy(
function($value) {
function ($value) {
return sprintf('%s', $value);
},
null
));
$this->hydrator->addStrategy('field2', new ClosureStrategy(
function($value) {
function ($value) {
return sprintf('hello, %s!', $value);
},
null
Expand All @@ -96,13 +96,13 @@ public function testHydratingObjects()
{
$this->hydrator->addStrategy('field2', new ClosureStrategy(
null,
function($value) {
function ($value) {
return sprintf('hello, %s!', $value);
}
));
$this->hydrator->addStrategy('field3', new ClosureStrategy(
null,
function($value) {
function ($value) {
return new TestAsset\HydratorClosureStrategyEntity($value, sprintf('111%s', $value));
}
));
Expand Down
6 changes: 3 additions & 3 deletions test/HydratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public function testHydratorClassMethodsWithCustomFilter()
$hydrator = new ClassMethods(false);
$datas = $hydrator->extract($this->classMethodsCamelCase);
$hydrator->addFilter("exclude",
function($property) {
function ($property) {
list($class, $method) = explode('::', $property);

if ($method == 'getHasFoo') {
Expand Down Expand Up @@ -395,7 +395,7 @@ public function testArraySerializableFilter($hydrator, $serializable)
$hydrator->extract($serializable)
);

$hydrator->addFilter("foo", function($property) {
$hydrator->addFilter("foo", function ($property) {
if ($property == "foo") {
return false;
}
Expand All @@ -411,7 +411,7 @@ public function testArraySerializableFilter($hydrator, $serializable)
$hydrator->extract($serializable)
);

$hydrator->addFilter("len", function($property) {
$hydrator->addFilter("len", function ($property) {
if (strlen($property) !== 3) {
return false;
}
Expand Down
30 changes: 15 additions & 15 deletions test/TestAsset/FilterCompositeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function testValidationAdd()
{
$this->assertTrue($this->filterComposite->filter("foo"));
$this->filterComposite->addFilter("has",
function($property) {
function ($property) {
return false;
}
);
Expand All @@ -34,7 +34,7 @@ function($property) {
public function testValidationRemove()
{
$this->filterComposite->addFilter("has",
function($property) {
function ($property) {
return false;
}
);
Expand All @@ -46,7 +46,7 @@ function($property) {
public function testValidationHas()
{
$this->filterComposite->addFilter("has",
function($property) {
function ($property) {
return false;
}
);
Expand All @@ -61,7 +61,7 @@ public function testComplexValidation()
$this->filterComposite->addFilter("is", new \Zend\Stdlib\Hydrator\Filter\IsFilter());

$this->filterComposite->addFilter("exclude",
function($property) {
function ($property) {
$method = substr($property, strpos($property, '::'));

if ($method === 'getServiceLocator') {
Expand All @@ -79,13 +79,13 @@ function($property) {
public function testConstructorInjection()
{
$andCondition = array(
'servicelocator' => function($property) {
'servicelocator' => function ($property) {
if ($property === 'getServiceLocator') {
return false;
}
return true;
},
'foobar' => function($property) {
'foobar' => function ($property) {
if ($property === 'getFooBar') {
return false;
}
Expand All @@ -108,10 +108,10 @@ public function testConstructorInjection()
public function testWithOnlyAndFiltersAdded()
{
$filter = new FilterComposite();
$filter->addFilter("foobarbaz", function($property) {
$filter->addFilter("foobarbaz", function ($property) {
return true;
}, FilterComposite::CONDITION_AND);
$filter->addFilter("foobar", function($property) {
$filter->addFilter("foobar", function ($property) {
return true;
}, FilterComposite::CONDITION_AND);
$this->assertTrue($filter->filter("foo"));
Expand All @@ -120,10 +120,10 @@ public function testWithOnlyAndFiltersAdded()
public function testWithOnlyOrFiltersAdded()
{
$filter = new FilterComposite();
$filter->addFilter("foobarbaz", function($property) {
$filter->addFilter("foobarbaz", function ($property) {
return true;
});
$filter->addFilter("foobar", function($property) {
$filter->addFilter("foobar", function ($property) {
return false;
});
$this->assertTrue($filter->filter("foo"));
Expand All @@ -132,25 +132,25 @@ public function testWithOnlyOrFiltersAdded()
public function testWithComplexCompositeAdded()
{
$filter1 = new FilterComposite();
$filter1->addFilter("foobarbaz", function($property) {
$filter1->addFilter("foobarbaz", function ($property) {
return true;
});
$filter1->addFilter("foobar", function($property) {
$filter1->addFilter("foobar", function ($property) {
return false;
});
$filter2 = new FilterComposite();
$filter2->addFilter("bar", function($property) {
$filter2->addFilter("bar", function ($property) {
return true;
}, FilterComposite::CONDITION_AND);
$filter2->addFilter("barblubb", function($property) {
$filter2->addFilter("barblubb", function ($property) {
return true;
}, FilterComposite::CONDITION_AND);
$this->assertTrue($filter1->filter("foo"));
$this->assertTrue($filter2->filter("foo"));
$filter1->addFilter("bar", $filter2);
$this->assertTrue($filter1->filter("blubb"));

$filter1->addFilter("blubb", function($property) { return false; }, FilterComposite::CONDITION_AND);
$filter1->addFilter("blubb", function ($property) { return false; }, FilterComposite::CONDITION_AND);
$this->assertFalse($filter1->filter("test"));
}

Expand Down

0 comments on commit 77ca040

Please sign in to comment.