Merge pull request #29 from InteractionDesignFoundation/fix-type-issue

MaxMindDatabase: Fix type issue caused by strict mode

Author: alies-dev

psalm-baseline.xml

@@ -313,29 +313,11 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Services/MaxMindDatabase.php">
-    <MissingClosureParamType>
-      <code><![CDATA[$directory]]></code>
-    </MissingClosureParamType>
     <MixedArgument>
-      <code><![CDATA[$directory]]></code>
-      <code><![CDATA[$directory]]></code>
       <code><![CDATA[$this->config('database_path')]]></code>
       <code><![CDATA[$this->config('locales', ['en'])]]></code>
       <code><![CDATA[$this->config('update_url')]]></code>
     </MixedArgument>
-    <MixedAssignment>
-      <code><![CDATA[$file]]></code>
-    </MixedAssignment>
-    <MixedMethodCall>
-      <code><![CDATA[getFilename]]></code>
-    </MixedMethodCall>
-    <PossiblyInvalidArgument>
-      <code><![CDATA[$file]]></code>
-    </PossiblyInvalidArgument>
-    <PossiblyInvalidMethodCall>
-      <code><![CDATA[getPathName]]></code>
-      <code><![CDATA[isDir]]></code>
-    </PossiblyInvalidMethodCall>
   </file>
   <file src="src/Services/MaxMindWebService.php">
     <MixedArgument>

src/Services/MaxMindDatabase.php

@@ -74,7 +74,7 @@ public function update()
             throw new \Exception('Database path not set in config file.');
         }
 
-        $this->withTemporaryDirectory(function ($directory) {
+        $this->withTemporaryDirectory(function ($directory): void {
             $tarFile = sprintf('%s/maxmind.tar.gz', $directory);
 
             file_put_contents($tarFile, fopen($this->config('update_url'), 'rb'));
@@ -97,7 +97,7 @@ public function update()
      * Provide a temporary directory to perform operations in
      * and ensure it is removed afterward.
      *
-     * @param callable $callback
+     * @param callable(string):void $callback
      *
      * @return void
      */
@@ -125,17 +125,18 @@ protected function withTemporaryDirectory(callable $callback)
      *
      * @param \PharData $archive
      *
-     * @return mixed
+     * @return \PharFileInfo
      * @throws \Exception
      */
-    protected function findDatabaseFile($archive)
+    protected function findDatabaseFile(\PharData $archive)
     {
+        /** @var \PharFileInfo $file */
         foreach ($archive as $file) {
             if ($file->isDir()) {
                 return $this->findDatabaseFile(new \PharData($file->getPathName()));
             }
 
-            if (pathinfo($file, \PATHINFO_EXTENSION) === 'mmdb') {
+            if (pathinfo($file->getPathName(), \PATHINFO_EXTENSION) === 'mmdb') {
                 return $file;
             }
         }