Move alias learning so only aliases of valid phar files are learnt

src/Manager.php

@@ -103,4 +103,14 @@ public function resolveBaseName(string $path, int $flags = null)
     {
         return $this->resolver->resolveBaseName($path, $flags);
     }
+
+    /**
+     * @param string $path
+     * @param null|int $flags
+     * @return bool
+     */
+    public function learnAlias(string $path, int $flags = null)
+    {
+        return $this->resolver->learnAlias($path);
+    }
 }

src/PharStreamWrapper.php

@@ -412,6 +412,7 @@ public function url_stat(string $path, int $flags)
     protected function assert(string $path, string $command)
     {
         if ($this->resolveAssertable()->assert($path, $command) === true) {
+            Manager::instance()->learnAlias($path);
             return;
         }
 

src/Resolvable.php

@@ -20,4 +20,11 @@ interface Resolvable
      * @return null|string
      */
     public function resolveBaseName(string $path, int $flags = null);
+
+    /**
+     * @param string $path
+     * @param int|null $flags
+     * @return bool
+     */
+    public function learnAlias(string $path, int $flags = null);
 }

src/Resolver/BaseNameResolver.php

@@ -47,9 +47,6 @@ public function resolveBaseName(string $path, int $flags = null)
         if ($baseName !== null && $flags & static::RESOLVE_REALPATH) {
             $baseName = realpath($baseName);
         }
-        if ($baseName !== null && $hasPharPrefix && $flags & static::RESOLVE_ALIAS) {
-            $this->learnAlias($baseName);
-        }
 
         return $baseName;
     }
@@ -65,16 +62,30 @@ private function resolveBaseNameFromAliasMap(string $path)
         return $this->getAlias($possibleAlias ?: '');
     }
 
-
     /**
-     * @param string $basePath
+     * @param string $path
+     * @param int|null $flags
+     * @return bool
      */
-    private function learnAlias(string $basePath)
+    public function learnAlias(string $path, int $flags = null): bool
     {
-        $alias = (new Reader($basePath))->resolveContainer()->getAlias();
-        if ($alias !== '' && $alias !== $basePath) {
-            $this->setAlias($alias, $basePath);
+        $flags = $flags ?? static::RESOLVE_REALPATH;
+        $baseName = Helper::determineBaseFile($path);
+        if ($baseName === null) {
+            return false;
         }
+
+        if ($flags & static::RESOLVE_REALPATH) {
+            $baseName = realpath($baseName);
+        }
+
+        $alias = (new Reader($baseName))->resolveContainer()->getAlias();
+        if ($alias === '' || $alias === $baseName) {
+            return false;
+        }
+
+        $this->setAlias($alias, $baseName);
+        return true;
     }
 
     /**