property type for php 7.4

Author: alexpts

src/PTS/SymfonyDiLoader/CacheWatcher.php

@@ -3,6 +3,9 @@
 
 namespace PTS\SymfonyDiLoader;
 
+use RuntimeException;
+use function count;
+
 class CacheWatcher
 {
 	/**
@@ -14,16 +17,15 @@ class CacheWatcher
 	public function isActualCache(string $fileCache, array $configs): bool
 	{
 		$oldConfigs = $this->getMetaCache($fileCache . '.meta');
-		if (\count($oldConfigs) !== \count($configs)) {
-			return false;
-		}
+        $configs = array_unique($configs);
 
-		$diff = array_diff($oldConfigs, $configs);
-		if (\count($diff)) {
+		if (count($oldConfigs) !== count($configs)) {
 			return false;
 		}
 
-		return !$this->isExpired($fileCache, $configs);
+		return array_diff($oldConfigs, $configs)
+            ? false
+            : !$this->isExpired($fileCache, $configs);
 	}
 
 	/**
@@ -34,7 +36,7 @@ public function isActualCache(string $fileCache, array $configs): bool
 	protected function getMetaCache(string $fileMeta): array
 	{
 		if (!file_exists($fileMeta)) {
-			throw new \RuntimeException('Can`t read meta for DI container');
+			throw new RuntimeException('Can`t read meta for DI container');
 		}
 
 		$configs = file_get_contents($fileMeta);

src/PTS/SymfonyDiLoader/FactoryContainer.php

@@ -3,17 +3,16 @@
 
 namespace PTS\SymfonyDiLoader;
 
+use Exception;
 use Symfony\Component\Config\FileLocatorInterface;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 class FactoryContainer
 {
-	/** @var FileLocatorInterface */
-	protected $locator;
-	/** @var string */
-	protected $classLoader;
+	protected FileLocatorInterface $locator;
+	protected string $classLoader;
 
 	public function __construct(string $classLoader, FileLocatorInterface $locator)
 	{
@@ -26,7 +25,7 @@ public function __construct(string $classLoader, FileLocatorInterface $locator)
 	 * @param ExtensionInterface[] $extensions
 	 *
 	 * @return ContainerBuilder
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function create(array $configs, array $extensions = []): ContainerBuilder
 	{
@@ -49,7 +48,7 @@ protected function createBuilder(): ContainerBuilder
 
 	protected function registerExtensions(ContainerBuilder $builder, array $extensions = []): void
     {
-        array_map(function(ExtensionInterface $extension) use ($builder) {
+        array_map(static function(ExtensionInterface $extension) use ($builder) {
             $builder->registerExtension($extension);
         }, $extensions);
     }

src/PTS/SymfonyDiLoader/LoaderContainer.php

@@ -3,35 +3,30 @@
 
 namespace PTS\SymfonyDiLoader;
 
+use RuntimeException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
-use Symfony\Component\DependencyInjection\Exception\EnvParameterException;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Throwable;
 
 class LoaderContainer implements LoaderContainerInterface
 {
-	/** @var array */
-	protected $configFiles = [];
-
-	/** @var FactoryContainer */
-	protected $factory;
-	/** @var ContainerInterface */
-	protected $container;
-	/** @var CacheWatcher */
-	protected $cacheWatcher;
+	/** @var string[] */
+	protected array $configFiles = [];
+
+	protected FactoryContainer $factory;
+	protected ?ContainerInterface $container = null;
+	protected CacheWatcher $cacheWatcher;
 	/** @var ExtensionInterface[] */
-	protected $extensions = [];
+	protected array $extensions = [];
 
-	/** @var string */
-	protected $cacheFile = '';
-	/** @var bool */
-	protected $checkExpired = true;
+	protected string $cacheFile = '';
+	protected bool $checkExpired = true;
 
-	/** @var string */
-	protected $classContainer = 'AppContainer';
+	protected string $classContainer = 'AppContainer';
 
 	/**
 	 * @param string[] $configFiles
@@ -58,10 +53,6 @@ public function setCheckExpired(bool $checkExpired = true): self
 		return $this;
 	}
 
-	/**
-	 * @return ContainerInterface
-	 * @throws \Exception
-	 */
 	public function getContainer(): ContainerInterface
 	{
 		if ($this->container === null) {
@@ -94,18 +85,11 @@ protected function dumpMeta(string $filePath, array $configFiles): void
 	{
 		try {
 			file_put_contents($filePath, serialize($configFiles));
-		} catch (\Throwable $throwable) {
-			throw new \RuntimeException('Can`t dump meta for DI container', 0, $throwable);
+		} catch (Throwable $throwable) {
+			throw new RuntimeException('Can`t dump meta for DI container', 0, $throwable);
 		}
 	}
 
-	/**
-	 * @param string $filePath
-	 * @param string $className
-	 * @param ContainerBuilder $container
-	 *
-	 * @throws EnvParameterException
-	 */
 	protected function dump(string $filePath, string $className, ContainerBuilder $container): void
 	{
 		$dumper = new PhpDumper($container);
@@ -114,8 +98,8 @@ protected function dump(string $filePath, string $className, ContainerBuilder $c
 			file_put_contents($filePath, $dumper->dump([
 				'class' => $className,
 			]));
-		} catch (\Throwable $throwable) {
-			throw new \RuntimeException('Can`t dump cache for DI container', 0, $throwable);
+		} catch (Throwable $throwable) {
+			throw new RuntimeException('Can`t dump cache for DI container', 0, $throwable);
 		}
 	}