From f494b07c846e2e29b0946babc1123893f180036a Mon Sep 17 00:00:00 2001 From: Patrick Brouwers Date: Mon, 28 May 2018 08:50:40 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- src/Contracts/UrlRoutable.php | 1 - src/DoctrineManager.php | 2 +- src/IlluminateRegistry.php | 3 ++- src/Loggers/Formatters/ReplaceQueryParams.php | 7 +++---- src/Middleware/SubstituteBindings.php | 1 - tests/Middleware/SubstituteBindingsTest.php | 1 - 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Contracts/UrlRoutable.php b/src/Contracts/UrlRoutable.php index bbee52a8..2f8c1eb9 100644 --- a/src/Contracts/UrlRoutable.php +++ b/src/Contracts/UrlRoutable.php @@ -6,4 +6,3 @@ interface UrlRoutable { public static function getRouteKeyName(): string; } - diff --git a/src/DoctrineManager.php b/src/DoctrineManager.php index a9836bfe..6cf4bc6d 100644 --- a/src/DoctrineManager.php +++ b/src/DoctrineManager.php @@ -65,7 +65,7 @@ public function extendAll($callback) /** * @param string|null $connection - * @param string|callback $callback + * @param string|callable $callback * @param ManagerRegistry $registry */ private function callExtendOn($connection = null, $callback, ManagerRegistry $registry) diff --git a/src/IlluminateRegistry.php b/src/IlluminateRegistry.php index 7242987c..a277e3a6 100644 --- a/src/IlluminateRegistry.php +++ b/src/IlluminateRegistry.php @@ -273,7 +273,7 @@ public function closeManager($name = null) /** * Purge a named object manager. - * + * * This method can be used if you wish to close an object manager manually, without opening a new one. * This can be useful if you wish to open a new manager later (but maybe with different settings). * @@ -306,6 +306,7 @@ public function purgeManager($name = null) public function resetManager($name = null) { $this->closeManager($name); + return $this->getManager($name); } diff --git a/src/Loggers/Formatters/ReplaceQueryParams.php b/src/Loggers/Formatters/ReplaceQueryParams.php index 046db657..3a7a6a8f 100644 --- a/src/Loggers/Formatters/ReplaceQueryParams.php +++ b/src/Loggers/Formatters/ReplaceQueryParams.php @@ -2,11 +2,9 @@ namespace LaravelDoctrine\ORM\Loggers\Formatters; -use DateTime; use DateTimeInterface; use Exception; use function is_array; -use function json_decode; class ReplaceQueryParams implements QueryFormatter { @@ -68,10 +66,11 @@ function ($part) { } /** - * @param array $array + * @param array $array * @return bool */ - private function isNestedArray(array $array) { + private function isNestedArray(array $array) + { foreach ($array as $key => $value) { if (is_array($value)) { return true; diff --git a/src/Middleware/SubstituteBindings.php b/src/Middleware/SubstituteBindings.php index b86ec925..49a232bd 100644 --- a/src/Middleware/SubstituteBindings.php +++ b/src/Middleware/SubstituteBindings.php @@ -103,4 +103,3 @@ private function signatureParameters(Route $route) })->toArray(); } } - diff --git a/tests/Middleware/SubstituteBindingsTest.php b/tests/Middleware/SubstituteBindingsTest.php index bc040172..1d8dac89 100644 --- a/tests/Middleware/SubstituteBindingsTest.php +++ b/tests/Middleware/SubstituteBindingsTest.php @@ -223,4 +223,3 @@ public function interfacer(BindableEntityWithInterface $entity) return $entity->getId(); } } -