update tests

Author: lukaspijak

composer.json

@@ -21,15 +21,14 @@
         "ext-curl": "*"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.9",
+        "phpstan/phpstan": "^2",
         "nette/tester": "^2",
-        "mockery/mockery": "1.4.2",
-        "tracy/tracy": "^2.9",
-        "rector/rector": "^0.16"
+        "mockery/mockery": "^1.6",
+        "tracy/tracy": "^2.9"
     },
     "scripts": {
         "tester": "tester -C tests --colors=1",
-        "coverage": "tester -C --coverage=coverage.html --coverage-src=src --colors=1",
+        "coverage": "tester -C --coverage=coverage.html --coverage-src=src --colors=1 -o console-lines",
         "phpstan": "phpstan analyse -c phpstan.neon --memory-limit=1G"
     }
 }

rector.php

@@ -9,6 +9,9 @@
 
 use function is_callable;
 
+/**
+ * @phpstan-ignore trait.unused
+ */
 trait FactoryStatic
 {
 	private static Container $container;

src/DI/FactoryStatic.php

@@ -43,7 +43,7 @@ class ResultCollection implements ArrayAccess, Countable, IteratorAggregate
 
 
 	/**
-	 * @param array<array-key, array<array-key, mixed>> $list
+	 * @param array<array-key, array<array-key, mixed>|mixed> $list
 	 */
 	public function __construct(array $list = [])
 	{

src/Database/ResultCollection.php

@@ -28,6 +28,9 @@ class Requirements
 	 */
 	public function run(array $output = []): array
 	{
+		/**
+		 * @phpstan-ignore greaterOrEqual.alwaysTrue
+		 */
 		$output[] = $this->same(true, PHP_VERSION_ID >= 70400, 'PHP >= 7.4 Version');
 		$output[] = $this->same(true, extension_loaded('intl'), 'INTL Extension', true);
 		$output[] = $this->same(true, extension_loaded('curl'), 'cURL Extension', true);

src/Debug/Requirements.php

@@ -15,7 +15,7 @@ class Settings
 	use Strict;
 
 	/**
-	 * @var array<string, Collection<string, Repository\Entity\Setting>>
+	 * @var array<string, Collection<string, Repository\Entity\Setting>|mixed>
 	 */
 	private array $settings = [];
 

src/Settings/Settings.php

@@ -62,3 +62,14 @@ public function __construct(ConnectionTest $service)
 		$this->service = $service;
 	}
 }
+
+
+class TestExternalService
+{
+	public DateTime $service;
+
+	public function __construct(DateTime $service)
+	{
+		$this->service = $service;
+	}
+}

tests/DI/Assets/TestClass.php

@@ -2,19 +2,17 @@
 
 namespace BulkGate\Plugin\DI\Test;
 
-/**
- * @author Lukáš Piják 2023 TOPefekt s.r.o.
- * @link https://www.bulkgate.com/
- */
+require __DIR__ . '/../bootstrap.php';
+require_once __DIR__ . '/Assets/TestClass.php';
 
+use DateTime;
 use Tester\{Assert, TestCase};
-use Connection, TestClassEntity, ConnectionTest;
+use Connection, TestClassEntity, ConnectionTest, TestExternalService;
 use BulkGate\Plugin\DI\{AutoWiringException, Container, InvalidStateException, MissingParameterException, MissingServiceException};
 
-require __DIR__ . '/../bootstrap.php';
-require_once __DIR__ . '/Assets/TestClass.php';
-
 /**
+ * @author Lukáš Piják 2023 TOPefekt s.r.o.
+ * @link https://www.bulkgate.com/
  * @testCase
  */
 class ContainerTest extends TestCase
@@ -96,6 +94,9 @@ class ContainerTest extends TestCase
 		$container['entity'] = TestClassEntity::class;
 
 		Assert::exception(fn() => $container->getByClass(TestClassEntity::class), MissingParameterException::class, 'Missing \'string\' parameter \'TestClassEntity::$name\'');
+
+		$container['external'] = ['factory' => \TestExternalService::class];
+		Assert::exception(fn () => $container->getByClass(\TestExternalService::class), MissingServiceException::class, "Service 'DateTime' not found");
 	}
 
 
@@ -134,8 +135,11 @@ class ContainerTest extends TestCase
 	{
 		$container = new Container('rewrite');
 		$container['production'] = ['factory' => \ConnectionTest::class, 'factory_method' => fn () => new \ConnectionProduction()];
+		$container['external'] = ['factory' => \TestExternalService::class, 'factory_method' => fn () => new TestExternalService(new DateTime())];
 
 		Assert::exception(fn () => $container->getByClass(\Connection::class), MissingParameterException::class, 'Factory method must return instance of \'ConnectionTest\'');
+
+		Assert::type(TestExternalService::class, $container->getByClass(\TestExternalService::class));
 	}
 
 

tests/DI/ContainerTest.phpt

@@ -2,17 +2,14 @@
 
 namespace BulkGate\Plugin\DI\Test;
 
-/**
- * @author Lukáš Piják 2023 TOPefekt s.r.o.
- * @link https://www.bulkgate.com/
- */
+require __DIR__ . '/../bootstrap.php';
 
 use Tester\{Assert, TestCase};
 use BulkGate\Plugin\DI\{Factory, Container, FactoryStatic};
 
-require __DIR__ . '/../bootstrap.php';
-
 /**
+ * @author Lukáš Piják 2023 TOPefekt s.r.o.
+ * @link https://www.bulkgate.com/
  * @testCase
  */
 class FactoryTest extends TestCase

tests/DI/FactoryTest.phpt

@@ -2,18 +2,15 @@
 
 namespace BulkGate\Plugin\Debug\Test;
 
-/**
- * @author Lukáš Piják 2023 TOPefekt s.r.o.
- * @link https://www.bulkgate.com/
- */
+require __DIR__ . '/../bootstrap.php';
 
 use Tester\{Assert, TestCase};
 use BulkGate\Plugin\Database\Result;
 use BulkGate\Plugin\Database\ResultCollection;
 
-require __DIR__ . '/../bootstrap.php';
-
 /**
+ * @author Lukáš Piják 2023 TOPefekt s.r.o.
+ * @link https://www.bulkgate.com/
  * @testCase
  */
 class ResultCollectionTest extends TestCase