fix use PHP 7.1 features

nextras · Jan 18, 2024 · 5cfefb9 · 5cfefb9
1 parent e3590bd
commit 5cfefb9
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 45 deletions.
diff --git a/src/Bridges/NetteDI/MigrationsExtension.php b/src/Bridges/NetteDI/MigrationsExtension.php
@@ -27,7 +27,7 @@ class MigrationsExtension extends Nette\DI\CompilerExtension
 	/** attributes = ['for' => names of target migration extensions, 'extension' => name of handled file extension] */
 	const TAG_EXTENSION_HANDLER = 'nextras.migrations.extensionHandler';
 
-	/** @var array */
+	/** @var array<string, mixed> */
 	public $defaults = [
 		'dir' => null,
 		'phpParams' => [],
@@ -40,28 +40,28 @@ class MigrationsExtension extends Nette\DI\CompilerExtension
 		'ignoredQueriesFile' => null,
 	];
 
-	/** @var array<string, class-like> */
+	/** @var array<string, class-string> */
 	protected $dbals = [
 		'dibi' => Nextras\Migrations\Bridges\Dibi\DibiAdapter::class,
 		'doctrine' => Nextras\Migrations\Bridges\DoctrineDbal\DoctrineAdapter::class,
 		'nette' => Nextras\Migrations\Bridges\NetteDatabase\NetteAdapter::class,
 		'nextras' => Nextras\Migrations\Bridges\NextrasDbal\NextrasAdapter::class,
 	];
 
-	/** @var array<string, class-like> */
+	/** @var array<string, class-string> */
 	protected $drivers = [
 		'mysql' => Nextras\Migrations\Drivers\MySqlDriver::class,
 		'pgsql' => Nextras\Migrations\Drivers\PgSqlDriver::class,
 	];
 
-	/** @var array<string, class-like> */
+	/** @var array<string, class-string> */
 	protected $printers = [
 		'console' => Nextras\Migrations\Printers\Console::class,
 		'psrLog' => Nextras\Migrations\Bridges\PsrLog\PsrLogPrinter::class,
 	];
 
 
-	public function loadConfiguration()
+	public function loadConfiguration(): void
 	{
 		$config = $this->validateConfig($this->defaults);
 
@@ -107,7 +107,7 @@ public function loadConfiguration()
 	}
 
 
-	public function beforeCompile()
+	public function beforeCompile(): void
 	{
 		$builder = $this->getContainerBuilder();
 		$config = $this->validateConfig($this->defaults);

diff --git a/src/Bridges/SymfonyBundle/DependencyInjection/NextrasMigrationsExtension.php b/src/Bridges/SymfonyBundle/DependencyInjection/NextrasMigrationsExtension.php
@@ -17,21 +17,21 @@
 
 class NextrasMigrationsExtension extends Extension
 {
-	/** @var array */
+	/** @var array<string, class-string> */
 	protected $dbals = [
 		'dibi' => Nextras\Migrations\Bridges\Dibi\DibiAdapter::class,
 		'doctrine' => Nextras\Migrations\Bridges\DoctrineDbal\DoctrineAdapter::class,
 		'nette' => Nextras\Migrations\Bridges\NetteDatabase\NetteAdapter::class,
 		'nextras' => Nextras\Migrations\Bridges\NextrasDbal\NextrasAdapter::class,
 	];
 
-	/** @var array */
+	/** @var array<string, class-string> */
 	protected $drivers = [
 		'mysql' => Nextras\Migrations\Drivers\MySqlDriver::class,
 		'pgsql' => Nextras\Migrations\Drivers\PgSqlDriver::class,
 	];
 
-	/** @var array */
+	/** @var array<string, class-string> */
 	protected $printers = [
 		'console' => Nextras\Migrations\Printers\Console::class,
 		'psrLog' => Nextras\Migrations\Bridges\PsrLog\PsrLogPrinter::class,

diff --git a/src/Configurations/DefaultConfiguration.php b/src/Configurations/DefaultConfiguration.php
@@ -33,29 +33,26 @@ class DefaultConfiguration implements IConfiguration
 	/** @var bool */
 	protected $withDummyData;
 
-	/** @var array */
+	/** @var array<string, mixed> */
 	protected $phpParams;
 
-	/** @var Group[] */
+	/** @var list<Group> */
 	protected $groups;
 
-	/** @var IExtensionHandler[] */
+	/** @var array<string, IExtensionHandler> */
 	protected $handlers;
 
-	/** @var IDiffGenerator|NULL */
+	/** @var ?IDiffGenerator */
 	protected $structureDiffGenerator;
 
-	/** @var IDiffGenerator|NULL */
+	/** @var ?IDiffGenerator */
 	protected $dummyDataDiffGenerator;
 
 
 	/**
-	 * @param  string  $dir
-	 * @param  IDriver $driver
-	 * @param  bool    $withDummyData
-	 * @param  array   $phpParams
+	 * @param  array<string, mixed> $phpParams
 	 */
-	public function __construct($dir, IDriver $driver, $withDummyData = true, array $phpParams = [])
+	public function __construct(string $dir, IDriver $driver, bool $withDummyData = true, array $phpParams = [])
 	{
 		$this->dir = $dir;
 		$this->driver = $driver;
@@ -64,10 +61,7 @@ public function __construct($dir, IDriver $driver, $withDummyData = true, array
 	}
 
 
-	/**
-	 * @return Group[]
-	 */
-	public function getGroups()
+	public function getGroups(): array
 	{
 		if ($this->groups === null) {
 			$structures = new Group();
@@ -97,10 +91,7 @@ public function getGroups()
 	}
 
 
-	/**
-	 * @return array|IExtensionHandler[] (extension => IExtensionHandler)
-	 */
-	public function getExtensionHandlers()
+	public function getExtensionHandlers(): array
 	{
 		if ($this->handlers === null) {
 			$this->handlers = [
@@ -113,21 +104,13 @@ public function getExtensionHandlers()
 	}
 
 
-	/**
-	 * @param  IDiffGenerator|NULL $generator
-	 * @return void
-	 */
-	public function setStructureDiffGenerator(IDiffGenerator $generator = null)
+	public function setStructureDiffGenerator(?IDiffGenerator $generator = null): void
 	{
 		$this->structureDiffGenerator = $generator;
 	}
 
 
-	/**
-	 * @param  IDiffGenerator|NULL $generator
-	 * @return void
-	 */
-	public function setDummyDataDiffGenerator(IDiffGenerator $generator = null)
+	public function setDummyDataDiffGenerator(?IDiffGenerator $generator = null): void
 	{
 		$this->dummyDataDiffGenerator = $generator;
 	}

diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -24,7 +24,7 @@ abstract class BaseController
 	/** @var string */
 	protected $mode;
 
-	/** @var array (name => Group) */
+	/** @var array<string, Group> (name => Group) */
 	protected $groups;
 
 
@@ -37,7 +37,7 @@ public function __construct(IDriver $driver)
 	}
 
 
-	abstract public function run();
+	abstract public function run(): void;
 
 
     /**

diff --git a/src/Engine/Finder.php b/src/Engine/Finder.php
@@ -145,7 +145,7 @@ protected function getFilesRecursive($dir)
 
 	/**
 	 * @param  string $dir
-	 * @return array
+	 * @return list<string>
 	 */
 	protected function getItems($dir)
 	{

diff --git a/src/Engine/OrderResolver.php b/src/Engine/OrderResolver.php
@@ -107,7 +107,7 @@ public function resolve(array $migrations, array $groups, array $files, string $
 
 	/**
 	 * @param  list<File> $files
-	 * @param  array  $groups (name => Group)
+	 * @param  array<string, Group>  $groups (name => Group)
 	 * @return list<File> sorted
 	 */
 	protected function sortFiles(array $files, array $groups): array
@@ -219,7 +219,7 @@ protected function getAssocFiles(array $files): array
 
 
     /**
-     * @param  array<string, array<string, File>>
+     * @param  array<string, array<string, File>> $files
      * @return list<File>
      */
 	protected function getFlatFiles(array $files): array

diff --git a/src/Engine/Runner.php b/src/Engine/Runner.php
@@ -33,10 +33,10 @@ class Runner
 	/** @var IPrinter */
 	private $printer;
 
-	/** @var array (extension => IExtensionHandler) */
+	/** @var array<string, IExtensionHandler> (extension => IExtensionHandler) */
 	private $extensionsHandlers = [];
 
-	/** @var Group[] */
+	/** @var list<Group> */
 	private $groups = [];
 
 	/** @var IDriver */

diff --git a/src/Extensions/PhpHandler.php b/src/Extensions/PhpHandler.php
@@ -20,7 +20,7 @@
  */
 class PhpHandler implements IExtensionHandler
 {
-	/** @var array name => value */
+	/** @var array<string, mixed> name => value */
 	private $params;