SignpostMarv / daft-interface-collector

Tests/StaticMethodCollectorTest.php

Indentation +31 added lines, -31 removed lines

@@ -15,23 +15,23 @@ 
 class StaticMethodCollectorTest extends Base
 {
 	/**
-	* @var bool
-	*/
+	 * @var bool
+	 */
 	protected $backupGlobals = false;
 
 	/**
-	* @var bool
-	*/
+	 * @var bool
+	 */
 	protected $backupStaticAttributes = false;
 
 	/**
-	* @var bool
-	*/
+	 * @var bool
+	 */
 	protected $runTestInSeparateProcess = false;
 
 	/**
-	* @return Generator<int, array{0:array<class-string, array<string, array<int, class-string>>>, 1:array<int, class-string>, 2:array<int, class-string>, 3:class-string}, mixed, void>
-	*/
+	 * @return Generator<int, array{0:array<class-string, array<string, array<int, class-string>>>, 1:array<int, class-string>, 2:array<int, class-string>, 3:class-string}, mixed, void>
+	 */
 	public function DataProviderCollection() : Generator
 	{
 		yield from [
@@ -60,26 +60,26 @@ 
 	}
 
 	/**
-	* @return Generator<int, array{0:bool, 1:array<class-string, array<string, array<int, class-string>>>, 2:array<int, class-string>, 3:array<int, class-string>, 4:class-string}, mixed, void>
-	*/
+	 * @return Generator<int, array{0:bool, 1:array<class-string, array<string, array<int, class-string>>>, 2:array<int, class-string>, 3:array<int, class-string>, 4:class-string}, mixed, void>
+	 */
 	public function DataProviderCollectionToggle() : Generator
 	{
 		/**
-		* @var iterable<array<int, scalar|array>>
-		*/
+		 * @var iterable<array<int, scalar|array>>
+		 */
 		$sources = $this->DataProviderCollection();
 
 		foreach ($sources as $args) {
 			/**
-			* @var array{0:true, 1:array<class-string, array<string, array<int, class-string>>>, 2:array<int, class-string>, 3:array<int, class-string>, 4:class-string}
-			*/
+			 * @var array{0:true, 1:array<class-string, array<string, array<int, class-string>>>, 2:array<int, class-string>, 3:array<int, class-string>, 4:class-string}
+			 */
 			$out = array_merge([true], $args);
 
 			yield $out;
 
 			/**
-			* @var array{0:false, 1:array<class-string, array<string, array<int, class-string>>>, 2:array<int, class-string>, 3:array<int, class-string>, 4:class-string}
-			*/
+			 * @var array{0:false, 1:array<class-string, array<string, array<int, class-string>>>, 2:array<int, class-string>, 3:array<int, class-string>, 4:class-string}
+			 */
 			$out = array_merge([false], $args);
 
 			yield $out;
@@ -87,12 +87,12 @@ 
 	}
 
 	/**
-	* @param array<class-string, array<string, array<int, class-string>>> $staticMethods
-	* @param array<int, class-string> $interfaces
-	* @param class-string ...$implementations
-	*
-	* @dataProvider DataProviderCollectionToggle
-	*/
+	 * @param array<class-string, array<string, array<int, class-string>>> $staticMethods
+	 * @param array<int, class-string> $interfaces
+	 * @param class-string ...$implementations
+	 *
+	 * @dataProvider DataProviderCollectionToggle
+	 */
 	public function testCollection(
 		bool $semiResetting,
 		array $staticMethods,
@@ -119,15 +119,15 @@ 
 	}
 
 	/**
-	* @param array<class-string, array<string, array<int, class-string>>> $staticMethods
-	* @param array<int, class-string> $interfaces
-	* @param array<int, class-string> $expectedResult
-	* @param string ...$implementations
-	*
-	* @psalm-param class-string ...$implementations
-	*
-	* @dataProvider DataProviderCollectionToggle
-	*/
+	 * @param array<class-string, array<string, array<int, class-string>>> $staticMethods
+	 * @param array<int, class-string> $interfaces
+	 * @param array<int, class-string> $expectedResult
+	 * @param string ...$implementations
+	 *
+	 * @psalm-param class-string ...$implementations
+	 *
+	 * @dataProvider DataProviderCollectionToggle
+	 */
 	public function testCollectionWithoutResettingProcessedSources(
 		bool $semiResetting,
 		array $staticMethods,

Tests/Fixtures/StaticMethodCollector/PublicCollectInterfacesFromImplementationTypes.php

Indentation +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
 class PublicCollectInterfacesFromImplementationTypes extends Base
 {
 	/**
-	* @param class-string $implementation
-	* @param array<int, class-string> $types
-	*
-	* @return Generator<int, class-string, mixed, void>
-	*/
+	 * @param class-string $implementation
+	 * @param array<int, class-string> $types
+	 *
+	 * @return Generator<int, class-string, mixed, void>
+	 */
 	public function PublicCollectInterfacesFromImplementationTypes(
 		string $implementation,
 		string $method,

Tests/Fixtures/NotLoggedIn.php

Indentation +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
 	}
 
 	/**
-	* @return array<int, string> URI prefixes
-	*/
+	 * @return array<int, string> URI prefixes
+	 */
 	public static function DaftRouterRoutePrefixExceptions() : array
 	{
 		return [];

Tests/Fixtures/DaftRoute.php

Indentation +6 added lines, -6 removed lines

@@ -11,14 +11,14 @@
 	public static function DaftRouterHandleRequest(Request $request, array $args) : Response;
 
 	/**
-	* @return array<string, array<int, string>> an array of URIs & methods
-	*/
+	 * @return array<string, array<int, string>> an array of URIs & methods
+	 */
 	public static function DaftRouterRoutes() : array;
 
 	/**
-	* @param array<string, scalar> $args
-	*
-	* @throws \InvalidArgumentException if no uri could be found
-	*/
+	 * @param array<string, scalar> $args
+	 *
+	 * @throws \InvalidArgumentException if no uri could be found
+	 */
 	public static function DaftRouterHttpRoute(array $args, string $method = 'GET') : string;
 }

Tests/Fixtures/DaftMiddleware.php

Indentation +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@
 	) : ? Response;
 
 	/**
-	* @return array<int, string> URI prefixes
-	*/
+	 * @return array<int, string> URI prefixes
+	 */
 	public static function DaftRouterRoutePrefixExceptions() : array;
 }

Tests/Fixtures/DaftSource.php

Indentation +4 added lines, -4 removed lines

@@ -9,9 +9,9 @@
 interface DaftSource
 {
 	/**
-	* Provides an array of DaftRoute, DaftMiddleware, or DaftSource implementations.
-	*
-	* @return array<int, string>
-	*/
+	 * Provides an array of DaftRoute, DaftMiddleware, or DaftSource implementations.
+	 *
+	 * @return array<int, string>
+	 */
 	public static function DaftRouterRouteAndMiddlewareSources() : array;
 }

Tests/Fixtures/SemiResettingStaticMethodCollector.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 class SemiResettingStaticMethodCollector extends Base
 {
 	/**
-	* @param class-string ...$implementations
-	*/
+	 * @param class-string ...$implementations
+	 */
 	public function Collect(string ...$implementations) : Generator
 	{
 		if ($this->autoReset) {

src/StaticMethodCollector.php

Indentation +81 added lines, -81 removed lines

@@ -27,34 +27,34 @@ 
 	const EXPECTED_NUMBER_OF_REQUIRED_PARAMETERS = 0;
 
 	/**
-	* @var array<int, class-string>
-	*/
+	 * @var array<int, class-string>
+	 */
 	protected $processedSources = [];
 
 	/**
-	* @var array<int, class-string>
-	*/
+	 * @var array<int, class-string>
+	 */
 	protected $alreadyYielded = [];
 
 	/**
-	* @var bool
-	*/
+	 * @var bool
+	 */
 	protected $autoReset;
 
 	/**
-	* @var array<class-string, array<string, array<int, class-string>>>
-	*/
+	 * @var array<class-string, array<string, array<int, class-string>>>
+	 */
 	private $staticMethods = [];
 
 	/**
-	* @var array<int, class-string>
-	*/
+	 * @var array<int, class-string>
+	 */
 	private $interfaces = [];
 
 	/**
-	* @param array<class-string, array<string, array<int, class-string>>> $staticMethods
-	* @param array<int, class-string> $interfaces
-	*/
+	 * @param array<class-string, array<string, array<int, class-string>>> $staticMethods
+	 * @param array<int, class-string> $interfaces
+	 */
 	public function __construct(
 		array $staticMethods,
 		array $interfaces,
@@ -74,10 +74,10 @@ 
 	}
 
 	/**
-	* @param class-string ...$implementations
-	*
-	* @return Generator<int, class-string, mixed, void>
-	*/
+	 * @param class-string ...$implementations
+	 *
+	 * @return Generator<int, class-string, mixed, void>
+	 */
 	public function Collect(string ...$implementations) : Generator
 	{
 		if ($this->autoReset) {
@@ -89,18 +89,18 @@ 
 	}
 
 	/**
-	* @param class-string ...$implementations
-	*
-	* @return Generator<int, class-string, mixed, void>
-	*/
+	 * @param class-string ...$implementations
+	 *
+	 * @return Generator<int, class-string, mixed, void>
+	 */
 	protected function CollectInterfaces(string ...$implementations) : Generator
 	{
 		foreach (
 			array_filter(
 				$implementations,
 				/**
-				* @param class-string $implementation
-				*/
+				 * @param class-string $implementation
+				 */
 				function (string $implementation) : bool {
 					return
 						! static::IsStringInArray($implementation, $this->processedSources);
@@ -114,20 +114,20 @@ 
 	}
 
 	/**
-	* @template T as object
-	*
-	* @param class-string<T> $implementation
-	*
-	* @return Generator<int, class-string<T>, mixed, void>
-	*/
+	 * @template T as object
+	 *
+	 * @param class-string<T> $implementation
+	 *
+	 * @return Generator<int, class-string<T>, mixed, void>
+	 */
 	final protected function CollectInterfacesFromImplementationCheckInterfaces(
 		string $implementation
 	) : Generator {
 		$checking = array_filter(
 			$this->interfaces,
 			/**
-			* @param class-string $interface
-			*/
+			 * @param class-string $interface
+			 */
 			function (string $interface) use ($implementation) : bool {
 				return static::IsStringA($implementation, $interface);
 			}
@@ -143,10 +143,10 @@ 
 	}
 
 	/**
-	* @param class-string $implementation
-	*
-	* @return Generator<int, class-string, mixed, void>
-	*/
+	 * @param class-string $implementation
+	 *
+	 * @return Generator<int, class-string, mixed, void>
+	 */
 	final protected function CollectInterfacesFromImplementation(string $implementation) : Generator
 	{
 		$interfaces = array_keys($this->staticMethods);
@@ -163,11 +163,11 @@ 
 	}
 
 	/**
-	* @param class-string $implementation
-	* @param array<int, class-string> $types
-	*
-	* @return Generator<int, class-string, mixed, void>
-	*/
+	 * @param class-string $implementation
+	 * @param array<int, class-string> $types
+	 *
+	 * @return Generator<int, class-string, mixed, void>
+	 */
 	final protected function CollectInterfacesFromImplementationTypes(
 		string $implementation,
 		string $method,
@@ -182,8 +182,8 @@ 
 		}
 
 		/**
-		* @var iterable<class-string>
-		*/
+		 * @var iterable<class-string>
+		 */
 		$methodResult = $implementation::$method();
 
 		foreach ($methodResult as $result) {
@@ -201,20 +201,20 @@ 
 	}
 
 	/**
-	* @template T
-	*
-	* @param T::class $implementation
-	* @param array<int, class-string> $interfaces
-	*
-	* @return array<int, T::class>
-	*/
+	 * @template T
+	 *
+	 * @param T::class $implementation
+	 * @param array<int, class-string> $interfaces
+	 *
+	 * @return array<int, T::class>
+	 */
 	final protected function FilterIsA(string $implementation, array $interfaces) : array
 	{
 		return array_filter(
 			$interfaces,
 			/**
-			* @param class-string $interface
-			*/
+			 * @param class-string $interface
+			 */
 			function (string $interface) use ($implementation) : bool {
 				return static::IsStringA($implementation, $interface);
 			}
@@ -222,15 +222,15 @@ 
 	}
 
 	/**
-	* @param array<int, class-string> $interfaces
-	*
-	* @return array<int, class-string>
-	*/
+	 * @param array<int, class-string> $interfaces
+	 *
+	 * @return array<int, class-string>
+	 */
 	final protected function FilterArrayOfInterfacesOrClasses(array $interfaces) : array
 	{
 		/**
-		* @var array<int, class-string>
-		*/
+		 * @var array<int, class-string>
+		 */
 		$strings = array_filter(
 			$interfaces,
 			function (string $maybe) : bool {
@@ -242,10 +242,10 @@ 
 	}
 
 	/**
-	* @param array<class-string, array<string, array<int, class-string>>> $interfaces
-	*
-	* @return array<class-string, array<string, array<int, class-string>>>
-	*/
+	 * @param array<class-string, array<string, array<int, class-string>>> $interfaces
+	 *
+	 * @return array<class-string, array<string, array<int, class-string>>>
+	 */
 	final protected function FilterArrayOfInterfaceOffsets(array $interfaces) : array
 	{
 		return array_filter(
@@ -258,8 +258,8 @@ 
 	}
 
 	/**
-	* @param class-string $interface
-	*/
+	 * @param class-string $interface
+	 */
 	final protected function MakeMethodFilter(string $interface) : Closure
 	{
 		return function (string $maybe) use ($interface) : bool {
@@ -283,24 +283,24 @@ 
 	final protected function FilterReflectionReturnType(? ReflectionType $refReturn) : bool
 	{
 		/**
-		* @var string|class-string
-		*/
+		 * @var string|class-string
+		 */
 		$refReturnName = ($refReturn instanceof ReflectionNamedType) ? $refReturn->getName() : '';
 
 		return 'array' === $refReturnName || static::IsStringA($refReturnName, Traversable::class);
 	}
 
 	/**
-	* @param class-string $interface
-	* @param array<string, array<int, class-string>> $methods
-	*
-	* @return array<class-string, string[]>
-	*/
+	 * @param class-string $interface
+	 * @param array<string, array<int, class-string>> $methods
+	 *
+	 * @return array<class-string, string[]>
+	 */
 	final protected function FilterMethods(string $interface, array $methods) : array
 	{
 		/**
-		* @var array<class-string, string[]>
-		*/
+		 * @var array<class-string, string[]>
+		 */
 		$filteredMethods = $this->FilterNonZeroArray(array_map(
 			[$this, 'FilterArrayOfInterfacesOrClasses'],
 			array_filter(
@@ -314,13 +314,13 @@ 
 	}
 
 	/**
-	* @return array<class-string, array<string, array<int, class-string>>>
-	*/
+	 * @return array<class-string, array<string, array<int, class-string>>>
+	 */
 	final protected function FilterNonZeroArray(array $in) : array
 	{
 		/**
-		* @var array<class-string, array<string, array<int, class-string>>>
-		*/
+		 * @var array<class-string, array<string, array<int, class-string>>>
+		 */
 		$out = array_filter(
 			$in,
 			function (array $val) : bool {
@@ -332,17 +332,17 @@ 
 	}
 
 	/**
-	* @param class-string $maybe
-	* @param class-string[] $array
-	*/
+	 * @param class-string $maybe
+	 * @param class-string[] $array
+	 */
 	protected static function IsStringInArray(string $maybe, array $array) : bool
 	{
 		return in_array($maybe, $array, true);
 	}
 
 	/**
-	* @param class-string $thing
-	*/
+	 * @param class-string $thing
+	 */
 	protected static function IsStringA(string $maybe, string $thing) : bool
 	{
 		return is_a($maybe, $thing, true);

Spacing +7 added lines, -7 removed lines

@@ -101,7 +101,7 @@ 
 				/**
 				* @param class-string $implementation
 				*/
-				function (string $implementation) : bool {
+				function(string $implementation) : bool {
 					return
 						! static::IsStringInArray($implementation, $this->processedSources);
 				}
@@ -128,7 +128,7 @@ 
 			/**
 			* @param class-string $interface
 			*/
-			function (string $interface) use ($implementation) : bool {
+			function(string $interface) use ($implementation) : bool {
 				return static::IsStringA($implementation, $interface);
 			}
 		);
@@ -215,7 +215,7 @@ 
 			/**
 			* @param class-string $interface
 			*/
-			function (string $interface) use ($implementation) : bool {
+			function(string $interface) use ($implementation) : bool {
 				return static::IsStringA($implementation, $interface);
 			}
 		);
@@ -233,7 +233,7 @@ 
 		*/
 		$strings = array_filter(
 			$interfaces,
-			function (string $maybe) : bool {
+			function(string $maybe) : bool {
 				return interface_exists($maybe) || class_exists($maybe);
 			}
 		);
@@ -250,7 +250,7 @@ 
 	{
 		return array_filter(
 			$interfaces,
-			function (string $maybe) : bool {
+			function(string $maybe) : bool {
 				return interface_exists($maybe);
 			},
 			ARRAY_FILTER_USE_KEY
@@ -262,7 +262,7 @@ 
 	*/
 	final protected function MakeMethodFilter(string $interface) : Closure
 	{
-		return function (string $maybe) use ($interface) : bool {
+		return function(string $maybe) use ($interface) : bool {
 			$ref = new ReflectionClass($interface);
 
 			return
@@ -323,7 +323,7 @@ 
 		*/
 		$out = array_filter(
 			$in,
-			function (array $val) : bool {
+			function(array $val) : bool {
 				return count($val) > self::INT_FILTER_NON_EMPTY_ARRAY;
 			}
 		);