Exakat cobbler for Functions/SetTypehints

exakat · Feb 24, 2022 · c60a05d · c60a05d
1 parent 4a9557d
commit c60a05d
Show file tree

Hide file tree

Showing 65 changed files with 149 additions and 149 deletions.
diff --git a/src/Sculpin/Bundle/ContentTypesBundle/Command/ContentCreateCommand.php b/src/Sculpin/Bundle/ContentTypesBundle/Command/ContentCreateCommand.php
@@ -210,7 +210,7 @@ private function getOutputMessage(string $type, string $singularType, array $tax
     }
 
     private function getIndexTemplate(string $plural, string $singular)
-    {
+    : string {
         $title = ucfirst($plural);
 
         return <<<EOT

diff --git a/src/Sculpin/Bundle/ContentTypesBundle/DependencyInjection/Configuration.php b/src/Sculpin/Bundle/ContentTypesBundle/DependencyInjection/Configuration.php
@@ -45,7 +45,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                         // Default case is we want the user to specify just one
                         // path but we can allow for multiple if they want to.
                         ->ifString()
-                        ->then(function ($v) {
+                        ->then(function ($v) : array {
                             return [$v];
                         })
                     ->end()
@@ -61,14 +61,14 @@ public function getConfigTreeBuilder(): TreeBuilder
                         // Default case is we want the user to specify just one
                         // taxonomy but we can allow for multiple if they want to.
                         ->ifString()
-                        ->then(function ($v) {
+                        ->then(function ($v) : array {
                             return [['name' => $v]];
                         })
                     ->end()
                     ->prototype('array')
                         ->beforeNormalization()
                             ->ifString()
-                            ->then(function ($v) {
+                            ->then(function ($v) : array {
                                 return ['name' => $v];
                             })
                         ->end()

diff --git a/src/Sculpin/Bundle/MarkdownBundle/MarkdownConverter.php b/src/Sculpin/Bundle/MarkdownBundle/MarkdownConverter.php
@@ -32,14 +32,14 @@ final class MarkdownConverter implements ConverterInterface, EventSubscriberInte
     /**
      * @var ParserInterface
      */
-    private $markdown;
+    private ParserInterface $markdown;
 
     /**
      * File name extensions that are handled as markdown.
      *
      * @var string[]
      */
-    private $extensions = [];
+    private array $extensions = [];
 
     /**
      * Constructor.

diff --git a/src/Sculpin/Bundle/MarkdownTwigCompatBundle/ConvertListener.php b/src/Sculpin/Bundle/MarkdownTwigCompatBundle/ConvertListener.php
@@ -31,7 +31,7 @@ final class ConvertListener implements EventSubscriberInterface
      *
      * @var array
      */
-    private static $addPlaceholderRe = [
+    private static array $addPlaceholderRe = [
         '/^({%\s+block\s+(\w+).+?%})$/m',  // {% %} style code
         '/^({%\s+endblock\s+%})$/m',       // {% %} style code
         '/^({{.+?}})$/m',                  // {{ }} style code
@@ -42,14 +42,14 @@ final class ConvertListener implements EventSubscriberInterface
      *
      * @var string
      */
-    private static $placeholder = "\n<div><!-- sculpin-hidden -->$1<!-- /sculpin-hidden --></div>\n";
+    private static string $placeholder = "\n<div><!-- sculpin-hidden -->$1<!-- /sculpin-hidden --></div>\n";
 
     /**
      * Regex used to remove placeholder
      *
      * @var string
      */
-    private static $removePlaceholderRe = "/(\n?<div><!-- sculpin-hidden -->|<!-- \/sculpin-hidden --><\/div>\n|\n?&lt;div&gt;&lt;!-- sculpin-hidden --&gt;|&lt;!-- \/sculpin-hidden --&gt;&lt;\/div&gt;\n)/m"; // @codingStandardsIgnoreLine
+    private static string $removePlaceholderRe = "/(\n?<div><!-- sculpin-hidden -->|<!-- \/sculpin-hidden --><\/div>\n|\n?&lt;div&gt;&lt;!-- sculpin-hidden --&gt;|&lt;!-- \/sculpin-hidden --&gt;&lt;\/div&gt;\n)/m"; // @codingStandardsIgnoreLine
 
     /**
      * {@inheritdoc}

diff --git a/src/Sculpin/Bundle/PaginationBundle/PaginationGenerator.php b/src/Sculpin/Bundle/PaginationBundle/PaginationGenerator.php
@@ -28,19 +28,19 @@ final class PaginationGenerator implements GeneratorInterface
     /**
      * @var DataProviderManager
      */
-    private $dataProviderManager;
+    private DataProviderManager $dataProviderManager;
 
     /**
      * @var SourcePermalinkFactory
      */
-    private $permalinkFactory;
+    private SourcePermalinkFactory $permalinkFactory;
 
     /**
      * Max per page (default)
      *
      * @var int
      */
-    private $maxPerPage;
+    private int $maxPerPage;
 
     public function __construct(
         DataProviderManager $dataProviderManager,

diff --git a/src/Sculpin/Bundle/SculpinBundle/Command/ContainerDebugCommand.php b/src/Sculpin/Bundle/SculpinBundle/Command/ContainerDebugCommand.php
@@ -191,7 +191,7 @@ private function validateInput(InputInterface $input)
     private function outputServices(
         OutputInterface $output,
         $serviceIds,
-        $showPrivate = false,
+        bool $showPrivate = false,
         $showTagAttributes = null
     ): void {
         // set the label to specify public or public+private
@@ -239,14 +239,14 @@ private function outputServices(
             }
         }
         $format = '%-'.$maxName.'s ';
-        $format .= implode("", array_map(function ($length) {
+        $format .= implode("", array_map(function (string $length) : string {
             return "%-{$length}s ";
         }, $maxTags));
         $format .=  '%s';
 
         // the title field needs extra space to make up for comment tags
         $format1 = '%-'.($maxName + 19).'s ';
-        $format1 .= implode("", array_map(function ($length) {
+        $format1 .= implode("", array_map(function (int $length) : string {
             return '%-'.($length + 19).'s ';
         }, $maxTags));
         $format1 .= '%s';
@@ -308,7 +308,7 @@ private function outputServices(
         }
     }
 
-    private function buildArgumentsArray($serviceId, $className, array $tagAttributes = []): array
+    private function buildArgumentsArray(string $serviceId, string $className, array $tagAttributes = []): array
     {
         $arguments = [$serviceId];
         foreach ($tagAttributes as $tagAttribute) {

diff --git a/src/Sculpin/Bundle/SculpinBundle/Command/GenerateCommand.php b/src/Sculpin/Bundle/SculpinBundle/Command/GenerateCommand.php
@@ -191,7 +191,7 @@ protected function runSculpin(
         IoInterface $io
     ) {
         $messages = [];
-        $errPrint = function (\Throwable $e) {
+        $errPrint = function (\Throwable $e) : string {
             return $e->getMessage().PHP_EOL.' at '.str_replace(getcwd().DIRECTORY_SEPARATOR, '', $e->getFile());
         };
 

diff --git a/src/Sculpin/Bundle/SculpinBundle/Console/Application.php b/src/Sculpin/Bundle/SculpinBundle/Console/Application.php
@@ -35,12 +35,12 @@ final class Application extends BaseApplication
     /**
      * @var KernelInterface
      */
-    private $kernel;
+    private KernelInterface $kernel;
 
     /**
      * @var \Throwable[]
      */
-    private $registrationErrors = [];
+    private array $registrationErrors = [];
 
     public function __construct(KernelInterface $kernel)
     {

diff --git a/...ulpin/Bundle/SculpinBundle/DependencyInjection/Compiler/CustomMimeTypesRepositoryPass.php b/...ulpin/Bundle/SculpinBundle/DependencyInjection/Compiler/CustomMimeTypesRepositoryPass.php
@@ -52,7 +52,7 @@ public function process(ContainerBuilder $container)
         }
 
         foreach ($data as $type => $extensions) {
-            $data[$type] = array_filter($extensions, function ($var) {
+            $data[$type] = array_filter($extensions, function ($var) : bool {
                 return strlen($var) > 0;
             });
         }

diff --git a/src/Sculpin/Bundle/SculpinBundle/DependencyInjection/Compiler/PathConfiguratorPass.php b/src/Sculpin/Bundle/SculpinBundle/DependencyInjection/Compiler/PathConfiguratorPass.php
@@ -29,7 +29,7 @@ class PathConfiguratorPass implements CompilerPassInterface
      *
      * @var AntPathMatcher
      */
-    protected $matcher;
+    protected AntPathMatcher $matcher;
 
     /**
      * Constructor.
@@ -73,7 +73,7 @@ protected function antify($paths)
         $matcher = $this->matcher;
 
         return array_map(
-            function ($path) use ($matcher) {
+            function (string $path) use ($matcher) : string {
                 if ($matcher->isPattern($path)) {
                     return $path;
                 }

diff --git a/src/Sculpin/Bundle/SculpinBundle/HttpKernel/AbstractKernel.php b/src/Sculpin/Bundle/SculpinBundle/HttpKernel/AbstractKernel.php
@@ -24,7 +24,7 @@
  */
 abstract class AbstractKernel extends Kernel
 {
-    protected $missingSculpinBundles = [];
+    protected array $missingSculpinBundles = [];
     protected $outputDir;
     protected $projectDir;
     protected $sourceDir;

diff --git a/src/Sculpin/Bundle/SculpinBundle/HttpServer/HttpServer.php b/src/Sculpin/Bundle/SculpinBundle/HttpServer/HttpServer.php
@@ -29,22 +29,22 @@ final class HttpServer
     /**
      * @var bool
      */
-    private $debug;
+    private bool $debug;
 
     /**
      * @var string
      */
-    private $env;
+    private string $env;
 
     /**
      * @var StreamSelectLoop
      */
-    private $loop;
+    private StreamSelectLoop $loop;
 
     /**
      * @var OutputInterface
      */
-    private $output;
+    private OutputInterface $output;
 
     /**
      * @var int

diff --git a/src/Sculpin/Bundle/TextileBundle/TextileConverter.php b/src/Sculpin/Bundle/TextileBundle/TextileConverter.php
@@ -29,14 +29,14 @@ final class TextileConverter implements ConverterInterface, EventSubscriberInter
     /**
      * @var Parser
      */
-    private $textileParser;
+    private Parser $textileParser;
 
     /**
      * File name extensions that are handled as textile.
      *
      * @var string[]
      */
-    private $extensions = [];
+    private array $extensions = [];
 
     /**
      * @param string[] $extensions file name extensions that are handled as markdown

diff --git a/src/Sculpin/Bundle/ThemeBundle/ThemeRegistry.php b/src/Sculpin/Bundle/ThemeBundle/ThemeRegistry.php
@@ -19,7 +19,7 @@
 class ThemeRegistry
 {
     private $finderFactory;
-    private $directory;
+    private string $directory;
     private $activeTheme;
 
     public function __construct($finderFactory, string $directory, ?string $activeTheme = null)

diff --git a/src/Sculpin/Bundle/ThemeBundle/ThemeTwigExtension.php b/src/Sculpin/Bundle/ThemeBundle/ThemeTwigExtension.php
@@ -17,12 +17,12 @@ class ThemeTwigExtension extends AbstractExtension
     /**
      * @var string
      */
-    private $sourceDirectory;
+    private string $sourceDirectory;
 
     /**
      * @var string
      */
-    private $themeDirectory;
+    private string $themeDirectory;
 
     public function __construct(ThemeRegistry $themeRegistry, string $sourceDirectory, string $themeDirectory)
     {

diff --git a/src/Sculpin/Bundle/ThemeBundle/ThemeTwigLoader.php b/src/Sculpin/Bundle/ThemeBundle/ThemeTwigLoader.php
@@ -22,7 +22,7 @@ class ThemeTwigLoader implements LoaderInterface
     /**
      * @var ChainLoader
      */
-    private $chainLoader;
+    private ChainLoader $chainLoader;
 
     public function __construct(ThemeRegistry $themeRegistry, array $extensions)
     {

diff --git a/src/Sculpin/Bundle/TwigBundle/FlexibleExtensionFilesystemLoader.php b/src/Sculpin/Bundle/TwigBundle/FlexibleExtensionFilesystemLoader.php
@@ -28,26 +28,26 @@ final class FlexibleExtensionFilesystemLoader implements LoaderInterface, EventS
     /**
      * @var FilesystemLoader
      */
-    private $filesystemLoader;
+    private FilesystemLoader $filesystemLoader;
 
     /**
      * @var string[]
      */
-    private $cachedCacheKey = [];
+    private array $cachedCacheKey = [];
 
     /**
      * @var string[]
      */
-    private $cachedCacheKeyExtension = [];
+    private array $cachedCacheKeyExtension = [];
 
     /**
      * @var \Throwable[]
      */
-    private $cachedCacheKeyException = [];
+    private array $cachedCacheKeyException = [];
     /**
      * @var string[]
      */
-    private $extensions = [];
+    private array $extensions = [];
 
     /**
      * @param string[] $sourcePaths
@@ -56,7 +56,7 @@ final class FlexibleExtensionFilesystemLoader implements LoaderInterface, EventS
      */
     public function __construct(string $sourceDir, array $sourcePaths, array $paths, array $extensions)
     {
-        $mappedSourcePaths = array_map(function ($path) use ($sourceDir) {
+        $mappedSourcePaths = array_map(function (string $path) use ($sourceDir) : string {
             return $sourceDir.'/'.$path;
         }, $sourcePaths);
 
@@ -66,7 +66,7 @@ public function __construct(string $sourceDir, array $sourcePaths, array $paths,
         );
 
         $this->filesystemLoader = new FilesystemLoader($allPaths);
-        $this->extensions = array_map(function ($ext) {
+        $this->extensions = array_map(function (string $ext) : string {
             return $ext?'.'.$ext:$ext;
         }, $extensions);
     }

diff --git a/src/Sculpin/Bundle/TwigBundle/TemplateResetter.php b/src/Sculpin/Bundle/TwigBundle/TemplateResetter.php
@@ -22,7 +22,7 @@
  */
 final class TemplateResetter implements EventSubscriberInterface
 {
-    private $twig;
+    private Environment $twig;
 
     public function __construct(Environment $twig)
     {

diff --git a/src/Sculpin/Bundle/TwigBundle/TwigFormatter.php b/src/Sculpin/Bundle/TwigBundle/TwigFormatter.php
@@ -27,12 +27,12 @@ final class TwigFormatter implements FormatterInterface
     /**
      * @var Environment
      */
-    private $twig;
+    private Environment $twig;
 
     /**
      * @var ArrayLoader
      */
-    private $arrayLoader;
+    private ArrayLoader $arrayLoader;
 
     public function __construct(Environment $twig, ArrayLoader $arrayLoader)
     {
@@ -101,7 +101,7 @@ public function reset()
     }
 
     private function massageTemplate(FormatContext $formatContext)
-    {
+    : string {
         $template = $formatContext->template();
         if ($layout = $formatContext->data()->get('layout')) {
             // Completely remove anything in verbatim sections so that any blocks defined in there will

diff --git a/src/Sculpin/Bundle/TwigBundle/WebpackEncoreHelper.php b/src/Sculpin/Bundle/TwigBundle/WebpackEncoreHelper.php
@@ -9,7 +9,7 @@
 
 class WebpackEncoreHelper extends AbstractExtension implements GlobalsInterface
 {
-    protected $sourceDir;
+    protected string $sourceDir;
     protected $manifest;
 
     public function __construct(string $sourceDir, ?string $manifest)

diff --git a/src/Sculpin/Contrib/ProxySourceCollection/ProxySourceCollection.php b/src/Sculpin/Contrib/ProxySourceCollection/ProxySourceCollection.php
@@ -22,7 +22,7 @@ class ProxySourceCollection implements \ArrayAccess, \Iterator, \Countable
     /**
      * @var $items ProxySourceItem[]
      */
-    protected $items = [];
+    protected array $items = [];
     protected $sorter;
 
     public function __construct(array $items = [], SorterInterface $sorter = null)
@@ -76,7 +76,7 @@ public function next()
     }
 
     public function valid()
-    {
+    : bool {
         return $this->current() !== false;
     }
 
@@ -130,7 +130,7 @@ public function sort()
         }
         unset($item);
 
-        uasort($this->items, function ($a, $b) use ($comparator) {
+        uasort($this->items, function ($a, $b) use ($comparator) : int {
             $result = $comparator($a[1], $b[1]);
 
             // use the index to prevent undefined behaviour when comparator reports items are "equal"