From 4977a733b6f614de868fc405b820d5c66e5bf9b7 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 8 May 2021 19:18:38 +0200 Subject: Auto fixup missing return types by Psalm --- generate-sample-gig-data.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'generate-sample-gig-data.php') diff --git a/generate-sample-gig-data.php b/generate-sample-gig-data.php index 26ba0cf..bbc3e7d 100644 --- a/generate-sample-gig-data.php +++ b/generate-sample-gig-data.php @@ -51,6 +51,9 @@ class BandNameGenerator extends GeneratorBase "ed", ); + /** + * @return string + */ public function get() { $parts = array( @@ -91,6 +94,9 @@ class VenueGenerator extends GeneratorBase "lighthouse" ); + /** + * @return string + */ public function get() { $parts = array( @@ -104,6 +110,9 @@ class VenueGenerator extends GeneratorBase class LinkGenerator extends GeneratorBase { + /** + * @return string + */ public function get() { return 'https://example.com/' . bin2hex(random_bytes(8)); -- cgit v1.2.3 From 557e9f48fb59194f581c6760f484aacb80d5d13d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 8 May 2021 19:27:18 +0200 Subject: Fix return types for abstract class GeneratorBase. --- generate-sample-gig-data.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'generate-sample-gig-data.php') diff --git a/generate-sample-gig-data.php b/generate-sample-gig-data.php index bbc3e7d..cd18197 100644 --- a/generate-sample-gig-data.php +++ b/generate-sample-gig-data.php @@ -7,9 +7,9 @@ abstract class GeneratorBase { - abstract public function get(); + abstract public function get() : string; - function pick($arr) + function pick(array $arr) : string { return $arr[array_rand($arr)]; } @@ -51,10 +51,7 @@ class BandNameGenerator extends GeneratorBase "ed", ); - /** - * @return string - */ - public function get() + public function get() : string { $parts = array( $this->pick($this->prefixes), @@ -94,10 +91,7 @@ class VenueGenerator extends GeneratorBase "lighthouse" ); - /** - * @return string - */ - public function get() + public function get() : string { $parts = array( $this->pick($this->prefix1), @@ -113,7 +107,7 @@ class LinkGenerator extends GeneratorBase /** * @return string */ - public function get() + public function get() : string { return 'https://example.com/' . bin2hex(random_bytes(8)); } -- cgit v1.2.3 From 00b7f2f443a29f345461b00b617bf0f155e938f1 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 8 May 2021 19:30:44 +0200 Subject: Autofix missing property types by Psalm. --- generate-sample-gig-data.php | 49 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) (limited to 'generate-sample-gig-data.php') diff --git a/generate-sample-gig-data.php b/generate-sample-gig-data.php index cd18197..11e9a0a 100644 --- a/generate-sample-gig-data.php +++ b/generate-sample-gig-data.php @@ -17,13 +17,23 @@ abstract class GeneratorBase class BandNameGenerator extends GeneratorBase { - private $prefixes = array( + /** + * @var string[] + * + * @psalm-var array{0: string, 1: string, 2: string} + */ + private array $prefixes = array( "", "a", "the", ); - private $adverbs = array( + /** + * @var string[] + * + * @psalm-var array{0: string, 1: string, 2: string, 3: string, 4: string, 5: string, 6: string, 7: string} + */ + private array $adverbs = array( "bestial", "dead", "incongruent", @@ -34,7 +44,12 @@ class BandNameGenerator extends GeneratorBase "flamboyant", ); - private $verbs = array( + /** + * @var string[] + * + * @psalm-var array{0: string, 1: string, 2: string, 3: string, 4: string, 5: string, 6: string} + */ + private array $verbs = array( "kill", "regurgitat", "destroy", @@ -44,7 +59,12 @@ class BandNameGenerator extends GeneratorBase "mutilat", ); - private $endings = array( + /** + * @var string[] + * + * @psalm-var array{0: string, 1: string, 2: string, 3: string} + */ + private array $endings = array( "er", "ers", "ing", @@ -64,7 +84,12 @@ class BandNameGenerator extends GeneratorBase class VenueGenerator extends GeneratorBase { - private $prefix1 = array( + /** + * @var string[] + * + * @psalm-var array{0: string, 1: string, 2: string, 3: string, 4: string} + */ + private array $prefix1 = array( "", "royal", "shabby", @@ -72,7 +97,12 @@ class VenueGenerator extends GeneratorBase "drunken", ); - private $prefix2 = array( + /** + * @var string[] + * + * @psalm-var array{0: string, 1: string, 2: string, 3: string, 4: string, 5: string} + */ + private array $prefix2 = array( "", "music", "fiddler", @@ -81,7 +111,12 @@ class VenueGenerator extends GeneratorBase "mental", ); - private $type = array( + /** + * @var string[] + * + * @psalm-var array{0: string, 1: string, 2: string, 3: string, 4: string, 5: string, 6: string} + */ + private array $type = array( "hall", "museum", "asylum", -- cgit v1.2.3