[FrameworkBundle] Added type declarations where possible.

derrabus · derrabus · commit 377f5ed8bad8 · 2019-07-10T13:37:29.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -69,10 +69,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
     }
 
     /**
-     * @param string       $cacheDir
-     * @param ArrayAdapter $arrayAdapter
-     *
      * @return bool false if there is nothing to warm-up
      */
-    abstract protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter);
+    abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter);
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -43,7 +43,7 @@ public function __construct(Reader $annotationReader, string $phpArrayFile, stri
     /**
      * {@inheritdoc}
      */
-    protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)
     {
         $annotatedClassPatterns = $cacheDir.'/annotations.map';
 
@@ -77,7 +77,7 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
         return true;
     }
 
-    private function readAllComponents(Reader $reader, $class)
+    private function readAllComponents(Reader $reader, string $class)
     {
         $reflectionClass = new \ReflectionClass($class);
         $reader->getClassAnnotations($reflectionClass);
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -42,7 +42,7 @@ public function __construct(array $loaders, string $phpArrayFile)
     /**
      * {@inheritdoc}
      */
-    protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)
     {
         if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
             return false;
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -43,7 +43,7 @@ public function __construct(ValidatorBuilder $validatorBuilder, string $phpArray
     /**
      * {@inheritdoc}
      */
-    protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)
     {
         if (!method_exists($this->validatorBuilder, 'getLoaders')) {
             return false;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -55,7 +55,7 @@ protected function listBundles($output)
     /**
      * @return ExtensionInterface
      */
-    protected function findExtension($name)
+    protected function findExtension(string $name)
     {
         $bundles = $this->initializeBundles();
         $minScore = INF;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -96,11 +96,8 @@ protected function getOutput()
 
     /**
      * Writes content to output.
-     *
-     * @param string $content
-     * @param bool   $decorated
      */
-    protected function write($content, $decorated = false)
+    protected function write(string $content, bool $decorated = false)
     {
         $this->output->write($content, false, $decorated ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW);
     }
@@ -224,12 +221,9 @@ protected function formatParameter($value)
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param string           $serviceId
-     *
      * @return mixed
      */
-    protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceId)
+    protected function resolveServiceDefinition(ContainerBuilder $builder, string $serviceId)
     {
         if ($builder->hasDefinition($serviceId)) {
             return $builder->getDefinition($serviceId);
@@ -249,12 +243,9 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showHidden
-     *
      * @return array
      */
-    protected function findDefinitionsByTag(ContainerBuilder $builder, $showHidden)
+    protected function findDefinitionsByTag(ContainerBuilder $builder, bool $showHidden)
     {
         $definitions = [];
         $tags = $builder->findTags();
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -139,7 +139,7 @@ public function build(ContainerBuilder $container)
         }
     }
 
-    private function addCompilerPassIfExists(ContainerBuilder $container, $class, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, $priority = 0)
+    private function addCompilerPassIfExists(ContainerBuilder $container, string $class, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
     {
         $container->addResource(new ClassExistenceResource($class));
 

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`72`		`- * @param string $cacheDir`
`73`		`- * @param ArrayAdapter $arrayAdapter`
`74`		`- *`
`75`	`72`	`* @return bool false if there is nothing to warm-up`
`76`	`73`	`*/`
`77`		`- abstract protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter);`
	`74`	`+ abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter);`
`78`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(Reader $annotationReader, string $phpArrayFile, stri`
`43`	`43`	`/**`
`44`	`44`	`* {@inheritdoc}`
`45`	`45`	`*/`
`46`		`- protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)`
	`46`	`+ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)`
`47`	`47`	`{`
`48`	`48`	`$annotatedClassPatterns = $cacheDir.'/annotations.map';`
`49`	`49`
`@@ -77,7 +77,7 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)`
`77`	`77`	`return true;`
`78`	`78`	`}`
`79`	`79`
`80`		`- private function readAllComponents(Reader $reader, $class)`
	`80`	`+ private function readAllComponents(Reader $reader, string $class)`
`81`	`81`	`{`
`82`	`82`	`$reflectionClass = new \ReflectionClass($class);`
`83`	`83`	`$reader->getClassAnnotations($reflectionClass);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct(array $loaders, string $phpArrayFile)`
`42`	`42`	`/**`
`43`	`43`	`* {@inheritdoc}`
`44`	`44`	`*/`
`45`		`- protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)`
	`45`	`+ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter)`
`46`	`46`	`{`
`47`	`47`	`if (!class_exists(CacheClassMetadataFactory::class) \|\| !method_exists(XmlFileLoader::class, 'getMappedClasses') \|\| !method_exists(YamlFileLoader::class, 'getMappedClasses')) {`
`48`	`48`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected function listBundles($output)`
`55`	`55`	`/**`
`56`	`56`	`* @return ExtensionInterface`
`57`	`57`	`*/`
`58`		`- protected function findExtension($name)`
	`58`	`+ protected function findExtension(string $name)`
`59`	`59`	`{`
`60`	`60`	`$bundles = $this->initializeBundles();`
`61`	`61`	`$minScore = INF;`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public function build(ContainerBuilder $container)`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`		`- private function addCompilerPassIfExists(ContainerBuilder $container, $class, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, $priority = 0)`
	`142`	`+ private function addCompilerPassIfExists(ContainerBuilder $container, string $class, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)`
`143`	`143`	`{`
`144`	`144`	`$container->addResource(new ClassExistenceResource($class));`
`145`	`145`