Make cache file handling more readable

qossmic · Nov 28, 2023 · e252109 · e252109
1 parent eebe225
commit e252109
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/Supportive/DependencyInjection/ServiceContainerBuilder.php b/src/Supportive/DependencyInjection/ServiceContainerBuilder.php
@@ -129,18 +129,21 @@ private static function loadServices(ContainerBuilder $container, ?SplFileInfo $
             return;
         }
 
-        $dirname = $cacheFile->getPath() ?: '.';
-
-        if ((
-            !is_dir($dirname)
-            && mkdir($dirname.'/', 0777, true)
-            && !is_dir($dirname)
-        ) || (
-            !file_exists($cacheFile->getPathname())
-            && !touch($cacheFile->getPathname())
-            && !is_writable($cacheFile->getPathname())
-        )) {
-            throw CacheFileException::notWritable($cacheFile);
+        if (!file_exists($cacheFile->getPathname())) {
+            $dirname = $cacheFile->getPath() ?: '.';
+
+            if (!is_dir($dirname)
+                && mkdir($dirname.'/', 0777, true)
+                && !is_dir($dirname)
+            ) {
+                throw CacheFileException::notWritable($cacheFile);
+            }
+
+            if (!touch($cacheFile->getPathname())
+                && !is_writable($cacheFile->getPathname())
+            ) {
+                throw CacheFileException::notWritable($cacheFile);
+            }
         }
 
         $container->setParameter('deptrac.cache_file', $cacheFile->getPathname());