From 8157db45229ae3e9326b854018a6e8ff6dec45fd Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 27 Jul 2019 08:08:43 +0200 Subject: [PATCH] add parameter type declarations to private methods --- src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php | 5 +---- .../Doctrine/DataCollector/DoctrineDataCollector.php | 4 ++-- .../RegisterEventListenersAndSubscribersPass.php | 7 ++----- src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 4496d3ac9a3d9..8ecf2135d9245 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -129,10 +129,7 @@ public function removeEventListener($events, $listener) } } - /** - * @param string $eventName - */ - private function initializeListeners($eventName) + private function initializeListeners(string $eventName) { foreach ($this->listeners[$eventName] as $hash => $listener) { if (\is_string($listener)) { diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php index ee4c644f0ea8a..a25a670e80ef9 100644 --- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php +++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php @@ -120,7 +120,7 @@ public function getName() return 'db'; } - private function sanitizeQueries($connectionName, $queries) + private function sanitizeQueries(string $connectionName, array $queries) { foreach ($queries as $i => $query) { $queries[$i] = $this->sanitizeQuery($connectionName, $query); @@ -129,7 +129,7 @@ private function sanitizeQueries($connectionName, $queries) return $queries; } - private function sanitizeQuery($connectionName, $query) + private function sanitizeQuery(string $connectionName, $query) { $query['explainable'] = true; if (null === $query['params']) { diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php index deaa64e7c9084..6016c8ce0905f 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php @@ -109,7 +109,7 @@ private function addTaggedListeners(ContainerBuilder $container) } } - private function getEventManagerDef(ContainerBuilder $container, $name) + private function getEventManagerDef(ContainerBuilder $container, string $name) { if (!isset($this->eventManagers[$name])) { $this->eventManagers[$name] = $container->getDefinition(sprintf($this->managerTemplate, $name)); @@ -128,12 +128,9 @@ private function getEventManagerDef(ContainerBuilder $container, $name) * @see https://bugs.php.net/bug.php?id=53710 * @see https://bugs.php.net/bug.php?id=60926 * - * @param string $tagName - * @param ContainerBuilder $container - * * @return array */ - private function findAndSortTags($tagName, ContainerBuilder $container) + private function findAndSortTags(string $tagName, ContainerBuilder $container) { $sortedTags = []; diff --git a/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php b/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php index e7df3702ebf1f..db9db4f286f0a 100644 --- a/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php +++ b/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php @@ -50,7 +50,7 @@ public function setRepository(EntityManagerInterface $entityManager, $entityName /** * @return ObjectRepository */ - private function createRepository(EntityManagerInterface $entityManager, $entityName) + private function createRepository(EntityManagerInterface $entityManager, string $entityName) { /* @var $metadata ClassMetadata */ $metadata = $entityManager->getClassMetadata($entityName); @@ -59,7 +59,7 @@ private function createRepository(EntityManagerInterface $entityManager, $entity return new $repositoryClassName($entityManager, $metadata); } - private function getRepositoryHash(EntityManagerInterface $entityManager, $entityName) + private function getRepositoryHash(EntityManagerInterface $entityManager, string $entityName) { return $entityManager->getClassMetadata($entityName)->getName().spl_object_hash($entityManager); }