From 2f12ec0a5e16e1637cc5e6563f2f2b85ae09aaff Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Tue, 11 Nov 2014 14:27:36 +0100 Subject: [PATCH] Improved style --- .../Parsers/AbstractSearchParser.php | 15 ++++++++------- src/Services/NetworkingService.php | 2 +- src/Services/PostSnapshotProvider.php | 6 +++++- src/Services/TagService.php | 13 +++++++++---- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/SearchServices/Parsers/AbstractSearchParser.php b/src/SearchServices/Parsers/AbstractSearchParser.php index 885a8c8b..eed3a0e1 100644 --- a/src/SearchServices/Parsers/AbstractSearchParser.php +++ b/src/SearchServices/Parsers/AbstractSearchParser.php @@ -167,17 +167,18 @@ abstract class AbstractSearchParser protected function matches($text, $array) { - $transform = function($text) - { - return str_replace('_', '', strtolower($text)); - }; - - $text = $transform($text); + $text = $this->transformText($text); foreach ($array as $elem) { - if ($transform($elem) == $text) + if ($this->transformText($elem) === $text) return true; } return false; } + + protected function transformText($text) + { + return str_replace('_', '', strtolower($text)); + } + } diff --git a/src/Services/NetworkingService.php b/src/Services/NetworkingService.php index 4b5ec39b..6455d0d1 100644 --- a/src/Services/NetworkingService.php +++ b/src/Services/NetworkingService.php @@ -32,7 +32,7 @@ class NetworkingService $this->httpHelper->setHeader('Pragma', 'public'); $this->httpHelper->setHeader('Cache-Control', 'public, max-age=' . $secondsToLive); $this->httpHelper->setHeader('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + $secondsToLive)); - $this->httpHelper->setHeader( 'Content-Type', MimeHelper::getMimeTypeFromFile($fullPath)); + $this->httpHelper->setHeader('Content-Type', MimeHelper::getMimeTypeFromFile($fullPath)); if ($customFileName) $this->httpHelper->setHeader('Content-Disposition', 'inline; filename="' . $customFileName . '"'); diff --git a/src/Services/PostSnapshotProvider.php b/src/Services/PostSnapshotProvider.php index a8458a2d..6f024bae 100644 --- a/src/Services/PostSnapshotProvider.php +++ b/src/Services/PostSnapshotProvider.php @@ -106,7 +106,11 @@ class PostSnapshotProvider implements ISnapshotProvider sort($data['tags']); sort($data['relations']); - usort($data['notes'], function ($note1, $note2) { return $note1['x'] - $note2['x']; }); + usort($data['notes'], + function ($note1, $note2) + { + return $note1['x'] - $note2['x']; + }); return $data; } diff --git a/src/Services/TagService.php b/src/Services/TagService.php index 57fc70b5..25959a70 100644 --- a/src/Services/TagService.php +++ b/src/Services/TagService.php @@ -194,10 +194,15 @@ class TagService foreach ($posts as $post) { $newTags = $post->getTags(); - $newTags = array_filter($newTags, function(Tag $tag) use ($sourceTag) { - return $tag->getId() !== $sourceTag->getId(); - }); - $newTags []= $targetTag; + $newTags[] = $targetTag; + + $newTags = array_filter( + $newTags, + function(Tag $tag) use ($sourceTag) + { + return $tag->getId() !== $sourceTag->getId(); + }); + $post->setTags($newTags); $this->postDao->save($post); $this->postHistoryService->savePostChange($post);