Merge pull request #29 from giggsey/mirror-584

Use absolute paths for metadata
giggsey · Jul 10, 2023 · 40451f1 · 40451f1
2 parents e773d8b + 8c72e29
commit 40451f1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -10,5 +10,6 @@ build.xml export-ignore
 phpunit.xml.dist export-ignore
 infection.json.dist export-ignore
 .github/ export-ignore
+src/CountryCodeToRegionCodeMapForTesting.php export-ignore
 
 * text=auto
diff --git a/composer.json b/composer.json
@@ -54,7 +54,8 @@
       "phpstan.neon.dist",
       "build.xml",
       "phpunit.xml.dist",
-      "infection.json.dist"
+      "infection.json.dist",
+      "src/CountryCodeToRegionCodeMapForTesting.php"
     ]
   },
   "require": {

diff --git a/src/MultiFileMetadataSourceImpl.php b/src/MultiFileMetadataSourceImpl.php
@@ -4,6 +4,9 @@
 
 namespace libphonenumber;
 
+/**
+ * @internal
+ */
 class MultiFileMetadataSourceImpl implements MetadataSourceInterface
 {
     protected static string $metaDataFilePrefix = PhoneNumberUtil::META_DATA_FILE_PREFIX;

diff --git a/src/PhoneNumberUtil.php b/src/PhoneNumberUtil.php
@@ -40,7 +40,7 @@ class PhoneNumberUtil
     /**
      * @internal
      */
-    public const META_DATA_FILE_PREFIX = 'PhoneNumberMetadata';
+    public const META_DATA_FILE_PREFIX = __DIR__ . '/data/PhoneNumberMetadata';
 
     // Region-code for the unknown region.
     protected const UNKNOWN_REGION = 'ZZ';
@@ -407,7 +407,7 @@ public static function getInstance(
             }
 
             if ($metadataSource === null) {
-                $metadataSource = new MultiFileMetadataSourceImpl($metadataLoader, __DIR__ . '/data/' . $baseFileLocation);
+                $metadataSource = new MultiFileMetadataSourceImpl($metadataLoader, $baseFileLocation);
             }
 
             static::$instance = new static($metadataSource, $countryCallingCodeToRegionCodeMap);

diff --git a/tests/Issues/UKNumbersTest.php b/tests/Issues/UKNumbersTest.php
@@ -10,16 +10,12 @@
 
 class UKNumbersTest extends TestCase
 {
-    public const META_DATA_FILE_PREFIX = 'PhoneNumberMetadata';
     protected PhoneNumberUtil $phoneUtil;
 
     public function setUp(): void
     {
         PhoneNumberUtil::resetInstance();
-        $this->phoneUtil = PhoneNumberUtil::getInstance(
-            self::META_DATA_FILE_PREFIX,
-            CountryCodeToRegionCodeMap::COUNTRY_CODE_TO_REGION_CODE_MAP
-        );
+        $this->phoneUtil = PhoneNumberUtil::getInstance();
     }
 
     public function testMobileNumber(): void

diff --git a/tests/core/PhoneNumberUtilTest.php b/tests/core/PhoneNumberUtilTest.php
@@ -18,7 +18,7 @@
 
 class PhoneNumberUtilTest extends TestCase
 {
-    public const TEST_META_DATA_FILE_PREFIX = '../../tests/core/data/PhoneNumberMetadataForTesting';
+    public const TEST_META_DATA_FILE_PREFIX = __DIR__ . '/data/PhoneNumberMetadataForTesting';
     private static PhoneNumber $bsNumber;
     private static PhoneNumber $coFixedLine;
     private static PhoneNumber $internationalTollFree;