minor symfony#32771 [DoctrineBridge] add parameter type declarations to private methods (xabbuh)

fabpot · fabpot · commit 5acd99cb3f1d · 2019-07-27T08:17:37.000+02:00
This PR was merged into the 4.2 branch. Discussion ---------- [DoctrineBridge] add parameter type declarations to private methods | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 8157db4 add parameter type declarations to private methods
diff --git 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
@@ -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
@@ -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
@@ -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);
     }

Original file line number	Diff line number	Diff line change
`@@ -129,10 +129,7 @@ public function removeEventListener($events, $listener)`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`- /**`
`133`		`- * @param string $eventName`
`134`		`- */`
`135`		`- private function initializeListeners($eventName)`
	`132`	`+ private function initializeListeners(string $eventName)`
`136`	`133`	`{`
`137`	`134`	`foreach ($this->listeners[$eventName] as $hash => $listener) {`
`138`	`135`	`if (\is_string($listener)) {`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function getName()`
`120`	`120`	`return 'db';`
`121`	`121`	`}`
`122`	`122`
`123`		`- private function sanitizeQueries($connectionName, $queries)`
	`123`	`+ private function sanitizeQueries(string $connectionName, array $queries)`
`124`	`124`	`{`
`125`	`125`	`foreach ($queries as $i => $query) {`
`126`	`126`	`$queries[$i] = $this->sanitizeQuery($connectionName, $query);`
`@@ -129,7 +129,7 @@ private function sanitizeQueries($connectionName, $queries)`
`129`	`129`	`return $queries;`
`130`	`130`	`}`
`131`	`131`
`132`		`- private function sanitizeQuery($connectionName, $query)`
	`132`	`+ private function sanitizeQuery(string $connectionName, $query)`
`133`	`133`	`{`
`134`	`134`	`$query['explainable'] = true;`
`135`	`135`	`if (null === $query['params']) {`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private function addTaggedListeners(ContainerBuilder $container)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`- private function getEventManagerDef(ContainerBuilder $container, $name)`
	`112`	`+ private function getEventManagerDef(ContainerBuilder $container, string $name)`
`113`	`113`	`{`
`114`	`114`	`if (!isset($this->eventManagers[$name])) {`
`115`	`115`	`$this->eventManagers[$name] = $container->getDefinition(sprintf($this->managerTemplate, $name));`
`@@ -128,12 +128,9 @@ private function getEventManagerDef(ContainerBuilder $container, $name)`
`128`	`128`	`* @see https://bugs.php.net/bug.php?id=53710`
`129`	`129`	`* @see https://bugs.php.net/bug.php?id=60926`
`130`	`130`	`*`
`131`		`- * @param string $tagName`
`132`		`- * @param ContainerBuilder $container`
`133`		`- *`
`134`	`131`	`* @return array`
`135`	`132`	`*/`
`136`		`- private function findAndSortTags($tagName, ContainerBuilder $container)`
	`133`	`+ private function findAndSortTags(string $tagName, ContainerBuilder $container)`
`137`	`134`	`{`
`138`	`135`	`$sortedTags = [];`
`139`	`136`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function setRepository(EntityManagerInterface $entityManager, $entityName`
`50`	`50`	`/**`
`51`	`51`	`* @return ObjectRepository`
`52`	`52`	`*/`
`53`		`- private function createRepository(EntityManagerInterface $entityManager, $entityName)`
	`53`	`+ private function createRepository(EntityManagerInterface $entityManager, string $entityName)`
`54`	`54`	`{`
`55`	`55`	`/* @var $metadata ClassMetadata */`
`56`	`56`	`$metadata = $entityManager->getClassMetadata($entityName);`
`@@ -59,7 +59,7 @@ private function createRepository(EntityManagerInterface $entityManager, $entity`
`59`	`59`	`return new $repositoryClassName($entityManager, $metadata);`
`60`	`60`	`}`
`61`	`61`
`62`		`- private function getRepositoryHash(EntityManagerInterface $entityManager, $entityName)`
	`62`	`+ private function getRepositoryHash(EntityManagerInterface $entityManager, string $entityName)`
`63`	`63`	`{`
`64`	`64`	`return $entityManager->getClassMetadata($entityName)->getName().spl_object_hash($entityManager);`
`65`	`65`	`}`