From fe88f0ebc06d9e2bf09f1705b80f332e3484b78a Mon Sep 17 00:00:00 2001 From: Juha Suni Date: Mon, 3 Sep 2012 10:24:12 +0300 Subject: [PATCH 1/2] Removed ZF2-512 changes --- src/FilterChain.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/FilterChain.php b/src/FilterChain.php index e7a9ad7d..1246f737 100644 --- a/src/FilterChain.php +++ b/src/FilterChain.php @@ -224,18 +224,4 @@ public function filter($value) return $valueFiltered; } - - /** - * Prepare filter chain for serialization - * - * FilterPluginManager cannot be serialized, as it contains Traits. For - * this reason property 'plugins' is excluded and thus serialized - * filter chain is not necessarily equal to current chain. - * - * @return array - */ - public function __sleep() - { - return array('filters'); - } } From 8cea1f81cd0330b9d4539593c6a7c3c49cd0e883 Mon Sep 17 00:00:00 2001 From: blanchonvincent Date: Sat, 8 Sep 2012 09:45:01 +0200 Subject: [PATCH 2/2] add cs with space arount with Maks3w recommandation add cs with space arount --- src/Inflector.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Inflector.php b/src/Inflector.php index e91e4f7c..caed7c6f 100644 --- a/src/Inflector.php +++ b/src/Inflector.php @@ -423,16 +423,16 @@ public function filter($source) if (isset($source[$ruleName])) { if (is_string($ruleValue)) { // overriding the set rule - $processedParts['#' . $pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $source[$ruleName]); + $processedParts['#' . $pregQuotedTargetReplacementIdentifier . $ruleName . '#'] = str_replace('\\', '\\\\', $source[$ruleName]); } elseif (is_array($ruleValue)) { $processedPart = $source[$ruleName]; foreach ($ruleValue as $ruleFilter) { $processedPart = $ruleFilter($processedPart); } - $processedParts['#' . $pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $processedPart); + $processedParts['#' . $pregQuotedTargetReplacementIdentifier . $ruleName . '#'] = str_replace('\\', '\\\\', $processedPart); } } elseif (is_string($ruleValue)) { - $processedParts['#' . $pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $ruleValue); + $processedParts['#' . $pregQuotedTargetReplacementIdentifier . $ruleName . '#'] = str_replace('\\', '\\\\', $ruleValue); } }